Accepting request 76525 from home:vuntz:branches:GNOME:Factory

Update to 2.29.12

OBS-URL: https://build.opensuse.org/request/show/76525
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=154

README.Gsettings-overrides

@@ -14,6 +14,6 @@ following example:
 	key2=1.5
 
 glib-compile-schemas expects schema files to have the extension
-.gschema.override 
+.gschema.override
 
 [1] http://developer.gnome.org/gio/stable/GSettings.html

glib-2.29.10.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81eabdc56ac8a64900e798805f35655395f20f5155b57b42f577311ee45234bb
-size 7466350

glib-2.29.12.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:adc44a83f2eed97650f6816453483c531659e183e69c11d693458a0117e01e98
+size 7522266

glib2-no-deprecated-call.patch

@@ -0,0 +1,30 @@
+commit 92aeb954eacbc4213a759177f8ce7e85fe6e4439
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Wed Jul 20 09:22:12 2011 +0200
+
+    Stop using deprecated g_unicode_canonical_decomposition()
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=654948
+
+diff --git a/glib/guniprop.c b/glib/guniprop.c
+index 923478d..ceec0c6 100644
+--- a/glib/guniprop.c
++++ b/glib/guniprop.c
+@@ -855,15 +855,14 @@ real_toupper (const gchar *str,
+ 		   * which could simplify this considerably.
+ 		   */
+ 		  gsize decomp_len, i;
+-		  gunichar *decomp;
++		  gunichar decomp[4];
+ 
+-		  decomp = g_unicode_canonical_decomposition (c, &decomp_len);
++		  decomp_len = g_unichar_fully_decompose (c, FALSE, decomp, 4);
+ 		  for (i=0; i < decomp_len; i++)
+ 		    {
+ 		      if (decomp[i] != 0x307 /* COMBINING DOT ABOVE */)
+ 			len += g_unichar_to_utf8 (g_unichar_toupper (decomp[i]), out_buffer ? out_buffer + len : NULL);
+ 		    }
+-		  g_free (decomp);
+ 		  
+ 		  len += output_marks (&p, out_buffer ? out_buffer + len : NULL, TRUE);
+ 

glib2.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Jul 20 08:54:59 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 2.29.12:
+  + Add new API to do Unicode (de-)composition in atomic steps, for
+    use in Harfbuzz.
+  + Bugs fixed: bgo#615895, bgo#617949, bgo#620423, bgo#627974,
+    bgo#644687, bgo#649246, bgo#653841, bgo#653935, bgo#654017,
+    bgo#654085, bgo#654195, bgo#654232, bgo#654394, bgo#654536,
+    bgo#654627, bgo#654651, bgo#654917.
+  + Updated translations.
+- Add glib2-no-deprecated-call.patch to fix build by not using
+  newly deprecated API.
+
 -------------------------------------------------------------------
 Mon Jul 11 13:15:42 CEST 2011 - vuntz@opensuse.org
 

glib2.spec

@@ -21,8 +21,8 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.29.10
-Release:        2
+Version:        2.29.12
+Release:        1
 # FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib
 # FIXME: find out if tapsets should really be in devel package or in main package
 License:        LGPLv2+
@@ -44,6 +44,8 @@ Source7:        gtk-doc.m4
 Source99:       baselibs.conf
 # PATCH-FIX-OPENSUSE glib2-use-old-pcre.patch vuntz@opensuse.org -- Do no require a too recent version of pcre on openSUSE versions that don't have it
 Patch0:         glib2-use-old-pcre.patch
+# PATCH-FIX-UPSTREAM glib2-no-deprecated-call.patch bgo#654948 vuntz@opensuse.org -- Stop calling deprecated g_unicode_canonical_decomposition(); fix build.
+Patch1:         glib2-no-deprecated-call.patch
 # PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz@novell.com -- Use X-KDE-SubstituteUID
 Patch8:         glib2-bnc379332-desktop-su.patch
 # PATCH-FEATURE-UPSTREAM glib2-bgo569829-gettext-gkeyfile.patch fate300461 bgo569829 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that we share with Ubuntu and try to push upstream
@@ -266,6 +268,7 @@ translation-update-upstream
 %if 0%{?suse_version} <= 1140
 %patch0 -p1 -R
 %endif
+%patch1 -p1
 %patch8
 %patch10 -p1
 %patch11 -p1