gnome-control-center

Differences between revisions 1 and 2
Revision 1 as of 2010-09-02 16:25:23
Size: 370
Editor: 69
Comment: Add initial notes
Revision 2 as of 2010-09-04 02:13:25
Size: 1427
Editor: 69
Comment: add patch
Deletions are marked like this. Additions are marked like this.
Line 9: Line 9:


== Patch ==
{{{

--- orig/gnome-control-center-2.30.1/configure.ac 2010-04-26 08:25:21.000000000 -0600
+++ gnome-control-center-2.30.1/configure.ac 2010-09-03 20:07:49.010426208 -0600
@@ -83,6 +83,11 @@
 AC_SUBST(XF86MISC_LIBS)
 AC_CHECK_HEADERS(X11/extensions/XKB.h)
 CPPFLAGS=$savecppflags
+dnl When linking with --as-needed, add -lXcomposite to LIBS
+AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension,,)
+dnl When linking with --as-needed, add -lxklavier to LIBS
+AC_CHECK_LIB(xklavier, xkl_config_rec_new,,)
+
 
 AC_CHECK_LIB(m, floor)
 
--- orig/gnome-control-center-2.30.1/capplets/appearance/Makefile.am 2010-01-26 01:46:31.000000000 -0700
+++ gnome-control-center-2.30.1/capplets/appearance/Makefile.am 2010-09-03 20:04:53.390426235 -0600
@@ -36,7 +36,8 @@
  $(top_builddir)/capplets/common/libcommon.la \
  $(GNOMECC_CAPPLETS_LIBS) \
  $(FONT_CAPPLET_LIBS) \
- $(METACITY_LIBS)
+ $(METACITY_LIBS) \
+ $(CAPPLET_LIBS)
 gnome_appearance_properties_LDFLAGS = -export-dynamic
 
 gtkbuilderdir = $(pkgdatadir)/ui

}}}

gnome-control-center-2.30.1

  • add $(CAPPLET_LIBS) to gnome_appearance_properties_LDADD in
    • capplets/appearance/Makefile.am.
  • dnl When linking with --as-needed, add -lXcomposite to LIBS
    • AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension,,)
  • dnl When linking with --as-needed, add -lxklavier to LIBS
    • AC_CHECK_LIB(xklavier, xkl_config_rec_new,,)

Patch

--- orig/gnome-control-center-2.30.1/configure.ac       2010-04-26 08:25:21.000000000 -0600
+++ gnome-control-center-2.30.1/configure.ac    2010-09-03 20:07:49.010426208 -0600
@@ -83,6 +83,11 @@
 AC_SUBST(XF86MISC_LIBS)
 AC_CHECK_HEADERS(X11/extensions/XKB.h)
 CPPFLAGS=$savecppflags
+dnl When linking with --as-needed, add -lXcomposite to LIBS
+AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension,,)
+dnl When linking with --as-needed, add -lxklavier to LIBS
+AC_CHECK_LIB(xklavier, xkl_config_rec_new,,)
+
 
 AC_CHECK_LIB(m, floor)
 
--- orig/gnome-control-center-2.30.1/capplets/appearance/Makefile.am    2010-01-26 01:46:31.000000000 -0700
+++ gnome-control-center-2.30.1/capplets/appearance/Makefile.am 2010-09-03 20:04:53.390426235 -0600
@@ -36,7 +36,8 @@
        $(top_builddir)/capplets/common/libcommon.la \
        $(GNOMECC_CAPPLETS_LIBS) \
        $(FONT_CAPPLET_LIBS) \
-       $(METACITY_LIBS)
+       $(METACITY_LIBS) \
+       $(CAPPLET_LIBS)
 gnome_appearance_properties_LDFLAGS = -export-dynamic
 
 gtkbuilderdir = $(pkgdatadir)/ui

RobSavoye/GoldFixes/gnome-control-center (last edited 2010-09-04 02:13:25 by 69)