packages: gnome-control-center/gnome-control-center.spec, gnome-control-cen...

wiget wiget at pld-linux.org
Sat Oct 15 22:20:14 CEST 2011


Author: wiget                        Date: Sat Oct 15 20:20:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix segfault on esperanto (https://bugzilla.gnome.org/show_bug.cgi?id=661866)
- rel. 2

---- Files affected:
packages/gnome-control-center:
   gnome-control-center.spec (1.56 -> 1.57) , territory_code.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-control-center/gnome-control-center.spec
diff -u packages/gnome-control-center/gnome-control-center.spec:1.56 packages/gnome-control-center/gnome-control-center.spec:1.57
--- packages/gnome-control-center/gnome-control-center.spec:1.56	Tue Sep 27 23:11:55 2011
+++ packages/gnome-control-center/gnome-control-center.spec	Sat Oct 15 22:20:08 2011
@@ -7,7 +7,7 @@
 Summary(uk.UTF-8):	Центр керування GNOME
 Name:		gnome-control-center
 Version:	3.2.0
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications
@@ -16,6 +16,7 @@
 # PLD-specific patches
 Patch0:		system-locale-archive-path.patch
 Patch1:		configure-gettext.patch
+Patch2:		territory_code.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.26.0
 # use libnm-gtk - will use correct NM version
@@ -150,6 +151,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -249,6 +251,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2011/10/15 20:20:08  wiget
+- fix segfault on esperanto (https://bugzilla.gnome.org/show_bug.cgi?id=661866)
+- rel. 2
+
 Revision 1.56  2011/09/27 21:11:55  kiesiu
 - updated to 3.2.0; merged from DEVEL
 

================================================================
Index: packages/gnome-control-center/territory_code.patch
diff -u /dev/null packages/gnome-control-center/territory_code.patch:1.1
--- /dev/null	Sat Oct 15 22:20:14 2011
+++ packages/gnome-control-center/territory_code.patch	Sat Oct 15 22:20:08 2011
@@ -0,0 +1,28 @@
+commit cbda9c4c6bbbeff84895f9fefb61cdc90129c68b
+Author: Artur Frysiak <wiget at pld-linux.org>
+Date:   Sat Oct 15 22:09:26 2011 +0200
+
+    Fix segfault on locale without territory.
+    
+    Some locale (eg. Esperanto) don't have territory. Check
+    locale->territory_code before using it.
+
+diff --git a/panels/common/gdm-languages.c b/panels/common/gdm-languages.c
+index 2dfc436..392e693 100644
+--- a/panels/common/gdm-languages.c
++++ b/panels/common/gdm-languages.c
+@@ -635,9 +635,11 @@ count_languages_and_territories (void)
+ 		count++;
+ 		g_hash_table_insert (gdm_language_count_map, g_strdup (locale->language_code), GINT_TO_POINTER (count));
+ 
+-		count = GPOINTER_TO_INT (g_hash_table_lookup (gdm_territory_count_map, locale->territory_code));
+-		count++;
+-		g_hash_table_insert (gdm_territory_count_map, g_strdup (locale->territory_code), GINT_TO_POINTER (count));
++		if (locale->territory_code) {
++			count = GPOINTER_TO_INT (g_hash_table_lookup (gdm_territory_count_map, locale->territory_code));
++			count++;
++			g_hash_table_insert (gdm_territory_count_map, g_strdup (locale->territory_code), GINT_TO_POINTER (count));
++		}
+         }
+ }
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-control-center/gnome-control-center.spec?r1=1.56&r2=1.57&f=u



More information about the pld-cvs-commit mailing list