Fix crash in date and time panel with gnome-settings-daemon[-policykit] (bug #403527, thanks to Johann Schmitz for reporting). Add a patch to respect LINGUAS for timezone translations. Drop old.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

5 files changed, 102 insertions, 10 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 5748aaf0af8e..f4efdac4f085 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.96 2012/02/14 04:55:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.97 2012/02/14 10:43:43 tetromino Exp $
+
+*gnome-control-center-3.2.2-r1 (14 Feb 2012)
+
+  14 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-control-center-3.2.1.ebuild, +gnome-control-center-3.2.2-r1.ebuild,
+  +files/gnome-control-center-3.2.2-timezone-free.patch,
+  +files/gnome-control-center-3.2.2-timezones-linguas.patch:
+  Fix crash in date and time panel with gnome-settings-daemon[-policykit] (bug
+  #403527, thanks to Johann Schmitz for reporting). Add a patch to respect
+  LINGUAS for timezone translations. Drop old.
 
   14 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-control-center-3.2.1.ebuild, gnome-control-center-3.2.2.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 41aea5f09174..f38016549d4e 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -8,19 +8,20 @@ AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 RMD160 b8afdaa2b5df38ca
 AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 RMD160 16e734ec1dfecc1e95cfc9ffcfe3b8cd294ee712 SHA1 b069adce19b7286e410beae4b9909ecc13485d2e SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538
 AUX gnome-control-center-3.2.1-optional-colord.patch 2005 RMD160 0a170f2ff2bd8886c3ecff18d22fc80a57497f2e SHA1 2047e863537832e3219564403a6207e8e8f7702b SHA256 852ca74531d54e65da41989f9c1c9f3883ecd7e31d0d4a17f6cca793c978284a
 AUX gnome-control-center-3.2.2-metacity-gconf.patch 1051 RMD160 3e828bc3217ff67cc862cc47edbc5b7c7f1a2309 SHA1 fbdfccca12c536bed76ad7783763b9e5a677dc2d SHA256 c3fa18ddebaec274e6095277cd1586041bba08b89cc03daaedada9103abea64d
+AUX gnome-control-center-3.2.2-timezone-free.patch 983 RMD160 1d8a84ebac8b3b80f3db953421f07adf4649359b SHA1 8ffe002d9af49a40bbe7b8a4c06067815b75610b SHA256 4c76fae0549ed5893cf594340576c7ca4230c470bd5402ed686b95fdd65b05af
+AUX gnome-control-center-3.2.2-timezones-linguas.patch 1266 RMD160 e54de3d8eff1b9de3f609c9fe21b128ffb82add5 SHA1 1bff83ce2d7ac31864f2d4f4fccee8043f52f9d7 SHA256 f693ecb6a03c4dbdc220609e6d1976d4a6f3bc8740c0bf1cbd1784e8eabc67d7
 AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 RMD160 47515f3f96d5695b457a8363bac183fb2188a256 SHA1 1e5ba3117aba7f939de25dbed13e430b90968561 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
-DIST gnome-control-center-3.2.1.tar.xz 4252172 RMD160 00542e30fa12775d7683d09c2e12d6d9fa612343 SHA1 794cbff94baf876e80fe73c7e646f468cf5bc398 SHA256 bf354ea096ee7501cbdf53c42386355f19975b4206995e6110c180e7cb74a088
 DIST gnome-control-center-3.2.2.tar.xz 4225196 RMD160 6a97f6cf9824c99daf3b33c0e347131b7024988f SHA1 e946ab719625e6f793141434179a932c35ece183 SHA256 e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2697 RMD160 579c17b90282bc8031137b478feddcf55d5168db SHA1 0cfe31988822ee4bc016f3f6ccc6640685f6f308 SHA256 e5850ae31e5c73ec3f7d77ee8d35af746080e5497dce91fff487e90b727c971b
-EBUILD gnome-control-center-3.2.1.ebuild 3128 RMD160 c994b863af163f8eade2e3c93a36b9d5e0783a54 SHA1 efbec33a9ea5348229ffef751752cc94f20c6b69 SHA256 650dd6dcc10f2ee3c27df7d3efb86aebb00bfd1326c02927b88670ba94adf508
+EBUILD gnome-control-center-3.2.2-r1.ebuild 3530 RMD160 90855fd0a686dbcecae3fc60455aa7ffb47dc52a SHA1 9c600551850767a13ef45192c42f6457df527eec SHA256 54d721646ebf4b7a19f6e0a311e363e2443d4df1922bb2318a94fd675301705c
 EBUILD gnome-control-center-3.2.2.ebuild 3253 RMD160 91a37747066d407caf14a082d0e9d3dc8e9f1280 SHA1 c17bb3ae9c4f089d3eca66787475472c092a137d SHA256 95d34a696089ae71066bcabcc56ce2c85cc2faf03077b445693158088df6f925
-MISC ChangeLog 55010 RMD160 7df2a6bc08ca343e1919571d767dfaa449faf085 SHA1 65dad89a3bd4bb99050e6c3a92fb407b2b62030c SHA256 e617c4a46bf33e2a34af4dd1823ad8c55a2033c5fa39b3f8671a25bb08b2c01e
+MISC ChangeLog 55512 RMD160 5c053bdd096c81fbbdea7a927b92d3c35d13d512 SHA1 bd46f9199917ec0442c4b13264f2cca7899987dc SHA256 3023e9a6a7d9ccf755173a296322063b7f8019c6f4b275a567cdbe2d23a8cea7
 MISC metadata.xml 522 RMD160 4ab7dba7c77c1b268d4276a16475e9854f3610f1 SHA1 6f4dece0998697e456a3967b28e254a8eb7f6f9d SHA256 131c11bbcbcdf6d0ba43d74423f0afdb957375343bfe8de3e578fce0f21491a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk856UgACgkQdjK8w9WeBnAgXwD/TQcKgvtBgLMZutSLYcn0Ab+Y
-ypa3mMZoGj4K5l7ICzQA/Aq8D9OsrhMcXgXygLXCTNRdKVLsk4/Jq1MgeZNeZaxi
-=vo6N
+iF4EAREIAAYFAk86OuUACgkQdjK8w9WeBnA+AQD/SaB+QtDS4mXhWvrqTy+iQ7RX
+ZqDVbCmgtrABRFpqZWoA/izphDksrtYmXRoZlu2SYk6Il7WGVyoeMTjFbdKJTKE2
+=AoJG
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.2-timezone-free.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.2-timezone-free.patch
new file mode 100644
index 000000000000..3d02ca328fd7
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.2-timezone-free.patch
@@ -0,0 +1,31 @@
+From 0c5f7f64d6f8ffd24eda8d6115f54189a18e191e Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 14 Feb 2012 04:21:05 -0500
+Subject: [PATCH] datetime: Make sure timezone is initialized in
+ get_timezone_cb()
+
+If date_time_mechanism_call_get_timezone_finish() fails, timezone is
+left uninitialized, and attempting to free it at the end of
+get_timezone_cb() results in a crash.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=670042
+---
+ panels/datetime/cc-datetime-panel.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
+index 555eaaa..413986e 100644
+--- a/panels/datetime/cc-datetime-panel.c
++++ b/panels/datetime/cc-datetime-panel.c
+@@ -553,7 +553,7 @@ get_timezone_cb (GObject      *source,
+ {
+   CcDateTimePanel *self = user_data;
+   GtkWidget *widget;
+-  gchar *timezone;
++  gchar *timezone = NULL;
+   GError *error;
+ 
+   error = NULL;
+-- 
+1.7.8.4
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.2-timezones-linguas.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.2-timezones-linguas.patch
new file mode 100644
index 000000000000..4473f57cead6
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.2-timezones-linguas.patch
@@ -0,0 +1,39 @@
+From 58d3dd9362ede7b0644242dce55b413a49034949 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 14 Feb 2012 05:07:58 -0500
+Subject: [PATCH] datetime: respect LINGUAS for timezone translations
+
+https://bugzilla.gnome.org/show_bug.cgi?id=670051
+---
+ panels/datetime/po-timezones/Makefile.am |   12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/panels/datetime/po-timezones/Makefile.am b/panels/datetime/po-timezones/Makefile.am
+index 0845a51..33fd5e0 100644
+--- a/panels/datetime/po-timezones/Makefile.am
++++ b/panels/datetime/po-timezones/Makefile.am
+@@ -1,4 +1,12 @@
+-CATALOGS = $(patsubst %.po,%.mo,$(wildcard *.po))
++PO_LINGUAS = $(subst .po,,$(wildcard *.po))
++
++USER_LINGUAS = $(filter $(LINGUAS),$(PO_LINGUAS))
++
++USE_LINGUAS = $(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else LLINGUAS="$(PO_LINGUAS)"; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
++
++ALL_CATALOGS = $(patsubst %.po,%.mo,$(wildcard *.po))
++
++CATALOGS = $(USE_LINGUAS:%=%.mo)
+ 
+ all: $(CATALOGS)
+ 
+@@ -20,6 +28,6 @@ install: $(CATALOGS)
+ 
+ EXTRA_DIST=$(wildcard *.po)
+ 
+-CLEANFILES = $(CATALOGS)
++CLEANFILES = $(ALL_CATALOGS)
+ 
+ -include $(top_srcdir)/git.mk
+-- 
+1.7.8.4
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.2-r1.ebuild
index a718f5cd0248..be38a538aadc 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 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-3.2.1.ebuild,v 1.4 2012/02/14 04:55:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2-r1.ebuild,v 1.1 2012/02/14 10:43:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 
-inherit autotools gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="GNOME Desktop Configuration Tool"
 HOMEPAGE="http://www.gnome.org/"
@@ -86,7 +86,9 @@ DEPEND="${COMMON_DEPEND}
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.10.1
 
-	cups? ( sys-apps/sed )"
+	cups? ( sys-apps/sed )
+
+	gnome-base/gnome-common"
 # Needed for autoreconf
 #	gnome-base/gnome-common
 
@@ -102,6 +104,15 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Upstream patch to not crash on missing metacity; will be in next release
+	epatch "${FILESDIR}/${P}-metacity-gconf.patch"
+
+	# bug #403527, https://bugzilla.gnome.org/show_bug.cgi?id=670042
+	epatch "${FILESDIR}/${P}-timezone-free.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=670051, requires eautoreconf
+	epatch "${FILESDIR}/${P}-timezones-linguas.patch"
+
 	# Make colord plugin optional; requires eautoreconf
 	epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
 	eautoreconf