rpms/pkgconfig/FC-4 pkgconfig-0.15.0-reqprov.patch,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Oct 31 18:44:38 UTC 2005
Author: mclasen
Update of /cvs/dist/rpms/pkgconfig/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv8927
Modified Files:
pkgconfig-0.15.0-reqprov.patch
Log Message:
Update patches
pkgconfig-0.15.0-reqprov.patch:
main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+)
Index: pkgconfig-0.15.0-reqprov.patch
===================================================================
RCS file: /cvs/dist/rpms/pkgconfig/FC-4/pkgconfig-0.15.0-reqprov.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pkgconfig-0.15.0-reqprov.patch 30 Mar 2005 16:25:01 -0000 1.1
+++ pkgconfig-0.15.0-reqprov.patch 31 Oct 2005 18:44:34 -0000 1.2
@@ -1,70 +1,69 @@
-diff -ur pkgconfig-0.15.0/main.c pkgconfig-0.15.0/main.c
---- pkgconfig-0.15.0/main.c 2005-02-02 19:12:20.327992745 -0500
-+++ pkgconfig-0.15.0/main.c 2005-02-02 19:15:45.784804237 -0500
-@@ -173,6 +173,8 @@
- static int want_uninstalled = 0;
- static char *variable_name = NULL;
- static int want_exists = 0;
-+ static int want_prov = 0;
-+ static int want_req = 0;
- static char *required_atleast_version = NULL;
- static char *required_exact_version = NULL;
- static char *required_max_version = NULL;
-@@ -244,6 +246,10 @@
- { "msvc-syntax", 0, POPT_ARG_NONE, &msvc_syntax, 0,
- "output -l and -L flags for the Microsoft compiler (cl)" },
- #endif
+--- pkg-config-0.18.1/main.c.reqprov 2005-07-07 15:38:55.597133000 -0400
++++ pkg-config-0.18.1/main.c 2005-07-07 15:40:19.400246000 -0400
+@@ -187,6 +187,8 @@
+ int want_uninstalled = 0;
+ char *variable_name = NULL;
+ int want_exists = 0;
++ int want_prov = 0;
++ int want_req = 0;
+ char *required_atleast_version = NULL;
+ char *required_exact_version = NULL;
+ char *required_max_version = NULL;
+@@ -254,6 +256,10 @@
+ "show verbose information about missing or conflicting packages" },
+ { "errors-to-stdout", 0, POPT_ARG_NONE, &want_stdout_errors, 0,
+ "print errors from --print-errors to stdout not stderr" },
+ { "print-provides", 0, POPT_ARG_NONE, &want_prov, 0,
+ "print which packages the package provides" },
+ { "print-requires", 0, POPT_ARG_NONE, &want_req, 0,
+ "print which packages the package requires" },
- POPT_AUTOHELP
- { NULL, 0, 0, NULL, 0 }
- };
-@@ -521,6 +527,47 @@
+ #ifdef G_OS_WIN32
+ { "dont-define-prefix", 0, POPT_ARG_NONE, &dont_define_prefix, 0,
+ "don't try to override the value of prefix for each .pc file found with "
+@@ -545,6 +551,47 @@
}
}
-+ if (want_prov)
-+ {
-+ GSList *tmp;
-+ tmp = packages;
-+ while (tmp != NULL)
-+ {
-+ Package *pkg = tmp->data;
-+ char *key;
-+ key = pkg->key;
-+ while (*key == '/')
-+ key++;
-+ if (strlen(key) > 0)
-+ printf ("%s = %s\n", key, pkg->version);
-+ tmp = g_slist_next (tmp);
-+ }
-+ }
++ if (want_prov)
++ {
++ GSList *tmp;
++ tmp = packages;
++ while (tmp != NULL)
++ {
++ Package *pkg = tmp->data;
++ char *key;
++ key = pkg->key;
++ while (*key == '/')
++ key++;
++ if (strlen(key) > 0)
++ printf ("%s = %s\n", key, pkg->version);
++ tmp = g_slist_next (tmp);
++ }
++ }
+
-+ if (want_req)
-+ {
-+ GSList *pkgtmp = packages;
-+ while (pkgtmp != NULL)
-+ {
-+ Package *pkg = pkgtmp->data;
-+ GSList *reqtmp = pkg->requires;
-+ while (reqtmp != NULL)
-+ {
-+ Package *deppkg = reqtmp->data;
-+ RequiredVersion *req;
-+ req = g_hash_table_lookup(pkg->required_versions, deppkg->key);
-+ if ((req == NULL) || (req->comparison == ALWAYS_MATCH))
-+ printf ("%s\n", deppkg->key);
-+ else
-+ printf ("%s %s %s\n", deppkg->key,
-+ comparison_to_str(req->comparison),
-+ req->version);
-+ reqtmp = g_slist_next (reqtmp);
-+ }
-+ pkgtmp = g_slist_next (pkgtmp);
-+ }
-+ }
++ if (want_req)
++ {
++ GSList *pkgtmp = packages;
++ while (pkgtmp != NULL)
++ {
++ Package *pkg = pkgtmp->data;
++ GSList *reqtmp = pkg->requires;
++ while (reqtmp != NULL)
++ {
++ Package *deppkg = reqtmp->data;
++ RequiredVersion *req;
++ req = g_hash_table_lookup(pkg->required_versions, deppkg->key);
++ if ((req == NULL) || (req->comparison == ALWAYS_MATCH))
++ printf ("%s\n", deppkg->key);
++ else
++ printf ("%s %s %s\n", deppkg->key,
++ comparison_to_str(req->comparison),
++ req->version);
++ reqtmp = g_slist_next (reqtmp);
++ }
++ pkgtmp = g_slist_next (pkgtmp);
++ }
++ }
+
if (required_exact_version)
{
More information about the fedora-cvs-commits
mailing list