Fix build with libxklavier-4, bug #278450. Fix potential crash due to extra gconf_entry_free, bug #270319.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 89 insertions, 4 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 70078dd92475..cad3202277d5 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.31 2009/05/21 19:27:28 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.32 2009/07/20 22:48:29 eva Exp $
+
+  20 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-control-center-2.26.0.ebuild,
+  +files/gnome-control-center-2.26.0-gconf-unref.patch,
+  +files/gnome-control-center-2.26.0-libxklavier4.patch:
+  Fix build with libxklavier-4, bug #278450. Fix potential crash due to
+  extra gconf_entry_free, bug #270319.
 
   21 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
   gnome-control-center-2.26.0.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 461f5e160ae8..036937ba372c 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,13 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-control-center-2.24.0.1-capplet-help.patch 2345 RMD160 c92a563b9881b41015918f9fdba546d50e471b60 SHA1 e91afbf8f8802a51411ad5e5c22cf417800b3452 SHA256 c6f3cc0a9b5eeb569e2b62c75bf55f211fd7ba08de7b6db3923c7b40a71e7a95
 AUX gnome-control-center-2.24.0.1-fbsd.patch 394 RMD160 e5558b7be781663e05c8964355443a2ec993b6a4 SHA1 e6a23b54558824b279a74fdda6afbecb7621b9cf SHA256 d7216a88d518110e3d6a9b64e72e8a02fea1c1b48da43783d0ca0c06f610e11f
 AUX gnome-control-center-2.24.0.1-hv-max.patch 2105 RMD160 5424127ae1c41c72853812515d5975c6377ce285 SHA1 f9d8fbdf0cea5d8e9ff51553c4073b98c76e89d2 SHA256 32d8c14ec34c0bf293a4a9490fa950c6883025a5751da860a04c5687fe248b36
 AUX gnome-control-center-2.26.0-automagics-canberra+polkit.patch 2432 RMD160 8dc01ee688986a20339e6d14d39a43d40a03a770 SHA1 cde5a169e98a7d92875bb7fc535502f375774e5b SHA256 1a2a294de055d561985ec95cd612b81cc8ad68820e890011a62afbb1e340b597
 AUX gnome-control-center-2.26.0-default-background.patch 6341 RMD160 287b29d28ea56a7a25cb189412b41b0ba4dec9af SHA1 58297198e1e1d3c0f8de0b63316ddfd9e7488d5d SHA256 c6cf58d7e284df4a25b8ad226b5d3dc8c56f697e23962a4944e140c65c109edd
+AUX gnome-control-center-2.26.0-gconf-unref.patch 680 RMD160 46e913235adea15003228959e9b198941602d904 SHA1 ddac887dd06f47ba2c624882e60f60ff6cb2986e SHA256 cd79f88e29b2c662910c6ddc57bd24958ba4f1c71ca60bf668f7c20261b1c573
+AUX gnome-control-center-2.26.0-libxklavier4.patch 1596 RMD160 4de06433a271a78184a068117d3523ab7bf2e288 SHA1 088ef466c9d6ea540e322d69c93af23d4ea9e2f4 SHA256 4a124c84c728be977543d35f10c8b89d529c6fe44251fad9ff6ba2ece091be44
 AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52
 DIST gnome-control-center-2.24.0.1.tar.bz2 2113356 RMD160 5f211b12f7260a8af8c602066133d72cb61cc3f6 SHA1 daf737c762d53ef984a55fc5008e6a4e85b88294 SHA256 fa5d1ba5cb2f88d3c689c8a2bceb57508777a23cff020dcf2de67ad81b0fe57d
 DIST gnome-control-center-2.26.0.tar.bz2 2262324 RMD160 d22c75b21d63bad9321ad1221e442f381da8dd35 SHA1 4730780aaab599869a2dfe2d72d68dd54bb77058 SHA256 62fb84ea1053971a53c5259b92eb3a282c2f317f72f761ed4dff434ed0e99c05
 EBUILD gnome-control-center-2.24.0.1-r1.ebuild 2772 RMD160 ec7d6c0dad3c33832d87c6bcd4218a19eb21006c SHA1 944ba6d31953d4464e83e10321bcbe8dfb34c067 SHA256 e461ed31c5ac850314aec0797b3dc321b793ee9802b5095f76140ced85e474f7
 EBUILD gnome-control-center-2.24.0.1.ebuild 2556 RMD160 76370a1d6750c343fe9c5791d0335991133a4dfa SHA1 2baecb6a12008f05d9b3f011413e6fe9bdf79bb4 SHA256 413162a78846d58d95e46e051e2a6d6d24ecd235e4acb1a2a5fa636670b6e698
-EBUILD gnome-control-center-2.26.0.ebuild 2746 RMD160 3be071af4ff9cdb93a7593fff65d190c9255dd8e SHA1 4a179017dfd6a0ad7bd30e438240f7637d204503 SHA256 6b20dc6fd1408cc0cabff21b6cb3fa2bf26f2b433cbb8138ed4f7f6e07beac29
-MISC ChangeLog 42570 RMD160 d6d4edb28d73618bf2210a98743d0fe8ec716e04 SHA1 568ab746db84a41233b8cc30489aaaeae91c1164 SHA256 b1c654f8d66158235cb412c3f573b1dbfafe3721098a3e3da800fd7b92351102
+EBUILD gnome-control-center-2.26.0.ebuild 2978 RMD160 d0bcdf1279cab38f08343158c177c064dcd83b94 SHA1 6f9abc966a05cbaa0cf8f139ad02c576c033109f SHA256 4edc47dcaadfc8b74e55605683c1ac3143f235520d1a02ae64105994f4346773
+MISC ChangeLog 42882 RMD160 d01311871bacd5977f1a951c3ffe50d942a3fe27 SHA1 803559d5fdadfaaf19a90e9cc3575e2c8d7c8bd3 SHA256 c5c693670195e91f8ff58ef0eed846ab44d1e87e4fd2a0dccd66e90afdc4e76c
 MISC metadata.xml 264 RMD160 e891c8cddd44dc4a25f7b9a1172e8ad7332177c0 SHA1 379b57843ca1c94fe14c334b39d6aa2d1822623c SHA256 3df2f5e7333311872f1351c41df47ecfbfa3a85534f210911603d72968cb2d22
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpk9EMACgkQ1fmVwcYIWAYM1QCfSWt+MrmM7tuaK5qBcvgo7K6R
+y4wAoIr2xLtsVDhvbJUq2GHrFvoAm1Ji
+=jFs1
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-gconf-unref.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-gconf-unref.patch
new file mode 100644
index 000000000000..24e8938d81e7
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-gconf-unref.patch
@@ -0,0 +1,16 @@
+Fix excessive gconf_entry_free. It causes capplets crashes when gconf isn't build with g_asserts.
+
+Gnome: http://bugzilla.gnome.org/show_bug.cgi?id=583117
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=270319
+--- a/capplets/common/gconf-property-editor.c
++++ b/capplets/common/gconf-property-editor.c
+@@ -351,7 +351,8 @@
+ 	gconf_entry = gconf_client_get_entry (client, GCONF_PROPERTY_EDITOR (obj)->p->key, NULL, TRUE, NULL);
+ 	GCONF_PROPERTY_EDITOR (obj)->p->callback (client, 0, gconf_entry, obj);
+ 	GCONF_PROPERTY_EDITOR (obj)->p->inited = TRUE;
+-	gconf_entry_free (gconf_entry);
++	if (gconf_entry)
++		gconf_entry_free (gconf_entry);
+ 	g_object_unref (client);
+ 
+ 	return obj;
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch
new file mode 100644
index 000000000000..b652c58dffc8
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch
@@ -0,0 +1,43 @@
+From d6c2ab27173cdcab49f152fa190c5594b661f107 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 21 Jul 2009 00:30:10 +0200
+Subject: [PATCH] Add support for libxklavier-4
+
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=278450
+---
+ capplets/keyboard/gnome-keyboard-properties-xkb.c |    4 ++++
+ configure.in                                      |    2 ++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/capplets/keyboard/gnome-keyboard-properties-xkb.c b/capplets/keyboard/gnome-keyboard-properties-xkb.c
+index a0171ac..4cfe305 100644
+--- a/capplets/keyboard/gnome-keyboard-properties-xkb.c
++++ b/capplets/keyboard/gnome-keyboard-properties-xkb.c
+@@ -155,7 +155,11 @@ setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset)
+ 
+ 	engine = xkl_engine_get_instance (GDK_DISPLAY ());
+ 	config_registry = xkl_config_registry_get_instance (engine);
++#ifdef HAVE_XKL_4
++	xkl_config_registry_load (config_registry, FALSE);
++#else
+ 	xkl_config_registry_load (config_registry);
++#endif
+ 
+ 	gkbd_keyboard_config_init (&initial_config, xkb_gconf_client,
+ 				   engine);
+diff --git a/configure.in b/configure.in
+index 515f053..3f7eae2 100644
+--- a/configure.in
++++ b/configure.in
+@@ -180,6 +180,8 @@ CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
+ dnl ==============
+ dnl gswitchit
+ dnl ==============
++PKG_CHECK_MODULES(LIBXKLAVIER, [libxklavier >= 4],
++	[AC_DEFINE(HAVE_XKL_4, [1], [libxklavier-4 support])])
+ PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4.1 libxklavier >= 3.6])
+ AC_SUBST(LIBGNOMEKBD_CFLAGS)
+ AC_SUBST(LIBGNOMEKBD_LIBS)
+-- 
+1.6.3.3
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild
index e6163626c41c..4d5cc1aeab02 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild,v 1.3 2009/05/21 19:27:28 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild,v 1.4 2009/07/20 22:48:29 eva Exp $
 
 EAPI="2"
 
@@ -77,6 +77,7 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
+		--disable-static
 		--enable-canberra
 		$(use_enable eds aboutme)
 		$(use_enable hal)
@@ -97,6 +98,12 @@ src_prepare() {
 	# applied *after* teh automagics patch
 	epatch "${FILESDIR}"/${P}-default-background.patch
 
+	# Add support for libxklavier-4, bug #278450
+	epatch "${FILESDIR}/${PN}-2.26.0-libxklavier4.patch"
+
+	# Check pointer before unreferecing gconf client, bug #270319
+	epatch "${FILESDIR}/${PN}-2.26.0-gconf-unref.patch"
+
 	eautoreconf
 }