summaryrefslogtreecommitdiff
path: root/devel/pkg-config/files/patch-pkg.c
diff options
context:
space:
mode:
Diffstat (limited to 'devel/pkg-config/files/patch-pkg.c')
-rw-r--r--devel/pkg-config/files/patch-pkg.c74
1 files changed, 0 insertions, 74 deletions
diff --git a/devel/pkg-config/files/patch-pkg.c b/devel/pkg-config/files/patch-pkg.c
deleted file mode 100644
index 1284af1949e2..000000000000
--- a/devel/pkg-config/files/patch-pkg.c
+++ /dev/null
@@ -1,74 +0,0 @@
---- pkg.c.orig Thu Feb 7 14:32:13 2002
-+++ pkg.c Tue Mar 12 16:54:50 2002
-@@ -93,7 +93,7 @@
- * locations, ignoring duplicates
- */
- static void
--scan_dir (const char *dirname)
-+scan_dir (const char *dirname, void *quiet)
- {
- DIR *dir;
- struct dirent *dent;
-@@ -113,7 +113,8 @@
- free (dirname_copy);
- if (!dir)
- {
-- debug_spew ("Cannot open directory '%s' in package search path: %s\n",
-+ if (!quiet)
-+ debug_spew ("Cannot open directory '%s' in package search path: %s\n",
- dirname, g_strerror (errno));
- return;
- }
-@@ -177,7 +178,9 @@
- path_positions = g_hash_table_new (g_str_hash, g_str_equal);
-
- g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL);
-- scan_dir (PKGLIBDIR);
-+ scan_dir (PKGLIBDIR, (void *)0);
-+ scan_dir (XPKGLIBDIR, (void *)1);
-+ scan_dir (LPKGLIBDIR, (void *)1);
- }
- }
-
-@@ -901,6 +904,13 @@
- while (tmp != NULL)
- {
- Package *pkg = tmp->data;
-+ GSList *reqs = pkg->requires;
-+
-+ if (reqs)
-+ {
-+ g_string_append (str, packages_get_other_libs(reqs));
-+ g_string_append (str, " ");
-+ }
-
- if (pkg->other_libs)
- {
-@@ -924,10 +934,13 @@
- char *L_libs;
- char *other_libs;
- GString *str;
-+ GSList *tmp;
- char *retval;
-
- str = g_string_new ("");
-
-+ tmp = pkgs;
-+
- other_libs = packages_get_other_libs (pkgs);
- L_libs = packages_get_L_libs (pkgs);
- l_libs = packages_get_l_libs (pkgs);
-@@ -986,6 +999,13 @@
- while (tmp != NULL)
- {
- Package *pkg = tmp->data;
-+ GSList *reqs = pkg->requires;
-+
-+ if (reqs)
-+ {
-+ g_string_append (str, packages_get_other_cflags(reqs));
-+ g_string_append (str, " ");
-+ }
-
- if (pkg->other_cflags)
- {