Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-control-center/files: gnome-control-center-2.32.1-gmodule.patch
Date: Sun, 05 Jan 2014 07:40:00
Message-Id: 20140105073955.6CD962004E@flycatcher.gentoo.org
1 tetromino 14/01/05 07:39:55
2
3 Added: gnome-control-center-2.32.1-gmodule.patch
4 Log:
5 Fix underlinking failure (bug #497112, thanks to d_dart).
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
8
9 Revision Changes Path
10 1.1 gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch?rev=1.1&content-type=text/plain
14
15 Index: gnome-control-center-2.32.1-gmodule.patch
16 ===================================================================
17 diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
18 index 70ad44f..52ea6e6 100644
19 --- a/capplets/common/Makefile.am
20 +++ b/capplets/common/Makefile.am
21 @@ -48,7 +48,8 @@ libcommon_la_LIBADD = \
22 $(METACITY_LIBS) \
23 $(DBUS_LIBS) \
24 $(GNOME_DESKTOP_LIBS) \
25 - $(GIO_LIBS)
26 + $(GIO_LIBS) \
27 + $(GMODULE_LIBS)
28
29 gnome_theme_test_SOURCES = \
30 gnome-theme-test.c
31 diff --git a/configure.ac b/configure.ac
32 index 4bc8d9b..f869f93 100644
33 --- a/configure.ac
34 +++ b/configure.ac
35 @@ -132,6 +132,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
36 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
37 PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
38 PKG_CHECK_MODULES(GIO, gio-2.0)
39 +PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
40
41 gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
42 gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
43 diff --git a/libwindow-settings/Makefile.am b/libwindow-settings/Makefile.am
44 index ee6984d..0464597 100644
45 --- a/libwindow-settings/Makefile.am
46 +++ b/libwindow-settings/Makefile.am
47 @@ -17,7 +17,9 @@ libgnome_window_settings_la_LDFLAGS = \
48 -no-undefined \
49 -version-info 1:0:0
50
51 -libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS)
52 +libgnome_window_settings_la_LIBADD = \
53 + $(GNOMECC_LIBS) \
54 + $(GMODULE_LIBS)
55
56 libgnome_window_settings_la_SOURCES = \
57 gnome-window-manager.c \