/[gentoo-x86]/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch
Gentoo

Contents of /gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Jan 5 07:39:55 2014 UTC (17 months, 3 weeks ago) by tetromino
Branch: MAIN
Fix underlinking failure (bug #497112, thanks to d_dart).

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

1 diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
2 index 70ad44f..52ea6e6 100644
3 --- a/capplets/common/Makefile.am
4 +++ b/capplets/common/Makefile.am
5 @@ -48,7 +48,8 @@ libcommon_la_LIBADD = \
6 $(METACITY_LIBS) \
7 $(DBUS_LIBS) \
8 $(GNOME_DESKTOP_LIBS) \
9 - $(GIO_LIBS)
10 + $(GIO_LIBS) \
11 + $(GMODULE_LIBS)
12
13 gnome_theme_test_SOURCES = \
14 gnome-theme-test.c
15 diff --git a/configure.ac b/configure.ac
16 index 4bc8d9b..f869f93 100644
17 --- a/configure.ac
18 +++ b/configure.ac
19 @@ -132,6 +132,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
20 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
21 PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
22 PKG_CHECK_MODULES(GIO, gio-2.0)
23 +PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
24
25 gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
26 gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
27 diff --git a/libwindow-settings/Makefile.am b/libwindow-settings/Makefile.am
28 index ee6984d..0464597 100644
29 --- a/libwindow-settings/Makefile.am
30 +++ b/libwindow-settings/Makefile.am
31 @@ -17,7 +17,9 @@ libgnome_window_settings_la_LDFLAGS = \
32 -no-undefined \
33 -version-info 1:0:0
34
35 -libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS)
36 +libgnome_window_settings_la_LIBADD = \
37 + $(GNOMECC_LIBS) \
38 + $(GMODULE_LIBS)
39
40 libgnome_window_settings_la_SOURCES = \
41 gnome-window-manager.c \

  ViewVC Help
Powered by ViewVC 1.1.20