diff options
Diffstat (limited to 'devel/pkg-config/files')
-rw-r--r-- | devel/pkg-config/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | devel/pkg-config/files/patch-glib-1.2.10_Makefile.in | 10 | ||||
-rw-r--r-- | devel/pkg-config/files/patch-parse.c | 48 | ||||
-rw-r--r-- | devel/pkg-config/files/patch-pkg.c | 14 |
4 files changed, 0 insertions, 83 deletions
diff --git a/devel/pkg-config/files/patch-Makefile.in b/devel/pkg-config/files/patch-Makefile.in deleted file mode 100644 index 2e7c1f405..000000000 --- a/devel/pkg-config/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Tue Apr 12 13:47:14 2005 -+++ Makefile.in Tue Apr 12 13:48:21 2005 -@@ -18,7 +18,7 @@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ -+pkglibdir = $(prefix)/libdata/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . - diff --git a/devel/pkg-config/files/patch-glib-1.2.10_Makefile.in b/devel/pkg-config/files/patch-glib-1.2.10_Makefile.in deleted file mode 100644 index 0031087c8..000000000 --- a/devel/pkg-config/files/patch-glib-1.2.10_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- glib-1.2.10/Makefile.in.orig Tue Apr 12 13:51:56 2005 -+++ glib-1.2.10/Makefile.in Tue Apr 12 13:52:41 2005 -@@ -727,7 +727,6 @@ - installdirs-am: - - install: $(BUILT_SOURCES) -- $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive - uninstall: uninstall-recursive diff --git a/devel/pkg-config/files/patch-parse.c b/devel/pkg-config/files/patch-parse.c deleted file mode 100644 index a51f5a965..000000000 --- a/devel/pkg-config/files/patch-parse.c +++ /dev/null @@ -1,48 +0,0 @@ ---- parse.c.orig Sun Oct 16 13:09:39 2005 -+++ parse.c Sat Sep 2 14:09:44 2006 -@@ -707,6 +707,16 @@ static void _do_parse_libs (Package *pkg - i++; - g_free(framework); - } -+ else if ((strcmp("-Wl,--rpath",p) == 0 || strcmp("-Wl,-rpath",p) == 0) && -+ i+1 < argc) -+ { -+ gchar *rpath = trim_string (argv[i+1]); -+ -+ pkg->other_libs = g_slist_prepend (pkg->other_libs, -+ g_strconcat(arg, " ", rpath, NULL)); -+ i++; -+ g_free(rpath); -+ } - else - { - if (*arg != '\0') -@@ -1190,9 +1200,9 @@ get_compat_package (const char *name) - { - char *output; - -- debug_spew ("Calling glib-config\n"); -+ debug_spew ("Calling glib12-config\n"); - -- pkg->version = backticks ("glib-config --version"); -+ pkg->version = backticks ("glib12-config --version"); - if (pkg->version == NULL) - { - g_free (pkg); -@@ -1203,12 +1213,12 @@ get_compat_package (const char *name) - pkg->key = g_strdup ("glib"); - pkg->description = g_strdup ("C Utility Library"); - -- output = backticks ("glib-config --libs"); -- parse_libs (pkg, output, "glib-config"); -+ output = backticks ("glib12-config --libs"); -+ parse_libs (pkg, output, "glib12-config"); - g_free (output); - -- output = backticks ("glib-config --cflags"); -- parse_cflags (pkg, output, "glib-config"); -+ output = backticks ("glib12-config --cflags"); -+ parse_cflags (pkg, output, "glib12-config"); - g_free (output); - - return pkg; diff --git a/devel/pkg-config/files/patch-pkg.c b/devel/pkg-config/files/patch-pkg.c deleted file mode 100644 index 48315feb9..000000000 --- a/devel/pkg-config/files/patch-pkg.c +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur pkg-config-0.23-old/pkg.c pkg-config-0.23-new/pkg.c ---- pkg-config-0.23-old/pkg.c 2008-01-16 13:59:49.000000000 -0800 -+++ pkg.c 2008-01-22 15:00:55.000000000 -0800 -@@ -483,6 +483,10 @@ - g_string_append (str, pcsysrootdir); - g_string_append (str, tmpstr+2); - } -+ else -+ { -+ g_string_append (str, tmpstr); -+ } - } - else - { |