| 1 |
jlec 12/04/30 14:54:08 |
| 2 |
|
| 3 |
Added: gnome-keyring-3.2.2-gold-glib-2.32.patch |
| 4 |
Log: |
| 5 |
Add fix for problems with glib-2.32 and gold linker, #414117 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 gnome-base/gnome-keyring/files/gnome-keyring-3.2.2-gold-glib-2.32.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-3.2.2-gold-glib-2.32.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-3.2.2-gold-glib-2.32.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gnome-keyring-3.2.2-gold-glib-2.32.patch |
| 16 |
=================================================================== |
| 17 |
configure.ac | 8 ++++---- |
| 18 |
gcr/Makefile.am | 1 + |
| 19 |
2 files changed, 5 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/configure.ac b/configure.ac |
| 22 |
index 70be49e..0fe24a1 100644 |
| 23 |
--- a/configure.ac |
| 24 |
+++ b/configure.ac |
| 25 |
@@ -69,8 +69,8 @@ AC_SUBST(GLIB_CFLAGS) |
| 26 |
AC_SUBST(GLIB_LIBS) |
| 27 |
|
| 28 |
PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0) |
| 29 |
-AC_SUBST(GLIB_CFLAGS) |
| 30 |
-AC_SUBST(GLIB_LIBS) |
| 31 |
+AC_SUBST(GMODULE_CFLAGS) |
| 32 |
+AC_SUBST(GMODULE_LIBS) |
| 33 |
|
| 34 |
PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.8.0) |
| 35 |
AC_SUBST(GTHREAD_CFLAGS) |
| 36 |
@@ -88,8 +88,8 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0) |
| 37 |
AC_SUBST(GTK_CFLAGS) |
| 38 |
AC_SUBST(GTK_LIBS) |
| 39 |
|
| 40 |
-DAEMON_CFLAGS="$DAEMON_CFLAGS $GLIB_CFLAGS $GTHREAD_CFLAGS $GOBJECT_CFLAGS $GIO_CFLAGS" |
| 41 |
-DAEMON_LIBS="$DAEMON_LIBS $GLIB_LIBS $GTHREAD_LIBS $GOBJECT_LIBS $GIO_LIBS" |
| 42 |
+DAEMON_CFLAGS="$DAEMON_CFLAGS $GLIB_CFLAGS $GTHREAD_CFLAGS $GOBJECT_CFLAGS $GIO_CFLAGS $GMODULE_CFLAGS" |
| 43 |
+DAEMON_LIBS="$DAEMON_LIBS $GLIB_LIBS $GTHREAD_LIBS $GOBJECT_LIBS $GIO_LIBS $GMODULE_LIBS" |
| 44 |
|
| 45 |
GETTEXT_PACKAGE=gnome-keyring |
| 46 |
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name]) |
| 47 |
diff --git a/gcr/Makefile.am b/gcr/Makefile.am |
| 48 |
index 0e40215..1f75aa3 100644 |
| 49 |
--- a/gcr/Makefile.am |
| 50 |
+++ b/gcr/Makefile.am |
| 51 |
@@ -148,6 +148,7 @@ libgcr_@GCR_MAJOR@_la_LIBADD = \ |
| 52 |
$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \ |
| 53 |
$(GOBJECT_LIBS) \ |
| 54 |
$(GLIB_LIBS) \ |
| 55 |
+ $(GMODULE_LIBS) \ |
| 56 |
$(LIBGCRYPT_LIBS) \ |
| 57 |
$(GTK_LIBS) \ |
| 58 |
$(P11_KIT_LIBS) |
Archives