summaryrefslogtreecommitdiff
path: root/devel/glib2/patches
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2010-04-20 17:43:50 +0000
committerjmmv <jmmv@pkgsrc.org>2010-04-20 17:43:50 +0000
commit0af1c55b8e75ae6f4fe34fb617c953e56f22d9e4 (patch)
tree901819bdf8730870c30fcd5762748b909c31bf7f /devel/glib2/patches
parent94c058f8b5ceb6c71fbc773463678b5857b77119 (diff)
downloadpkgsrc-0af1c55b8e75ae6f4fe34fb617c953e56f22d9e4.tar.gz
Drop fam support from devel/glib2; I'll readd this as sysutils/gio-fam.
This functionality can easily be built as a loadable module, so it should not be conditional on a build-time option. Split the Makefile into two parts so that the sysutils/gio-fam package can reuse most of it. Bump PKGREVISION to 1.
Diffstat (limited to 'devel/glib2/patches')
-rw-r--r--devel/glib2/patches/patch-cd40
1 files changed, 40 insertions, 0 deletions
diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd
new file mode 100644
index 00000000000..ac5c9be3199
--- /dev/null
+++ b/devel/glib2/patches/patch-cd
@@ -0,0 +1,40 @@
+$NetBSD: patch-cd,v 1.1 2010/04/20 17:43:51 jmmv Exp $
+
+sysutils/glib2-fam builds the gio/fam backend as a separate module. Force it
+to link against the installed version of glib2, as it is not rebuilt by the
+package.
+
+--- gio/fam/Makefile.in.orig 2010-03-16 02:52:15.000000000 +0000
++++ gio/fam/Makefile.in
+@@ -76,10 +76,7 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(giomoduledir)"
+ LTLIBRARIES = $(giomodule_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
+- $(top_builddir)/gobject/libgobject-2.0.la \
+- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
++libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am__objects_1 =
+ am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
+ libgiofam_la-fam-module.lo \
+@@ -311,7 +308,7 @@ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-localedir = @localedir@
++localedir = /usr/pkg/share/locale
+ localstatedir = @localstatedir@
+ lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+@@ -369,9 +366,7 @@ libgiofam_la_CFLAGS = \
+
+ libgiofam_la_LDFLAGS = $(module_flags)
+ libgiofam_la_LIBADD = \
+- $(top_builddir)/gio/libgio-2.0.la \
+- $(top_builddir)/gobject/libgobject-2.0.la \
+- $(top_builddir)/glib/libglib-2.0.la \
++ $$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \
+ $(GLIB_LIBS) \
+ $(FAM_LIBS) \
+ $(NULL)