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

thanks OBS-URL: https://build.opensuse.org/request/show/49777 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=104
2010-10-06 14:14:28 +00:00
parent 95d3c41614
commit 7f8f63b486
5 changed files with 95 additions and 5 deletions
--- a/glib-2.26.0.tar.bz2
+++ b/glib-2.26.0.tar.bz2
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c18e3aadb5b20acc7c0f7d3a77da8a2843b85a9fd73fd3aa360a7aea953e3b2
-size 6632632
--- a/glib-2.27.0.tar.bz2
+++ b/glib-2.27.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7266a9580e6984658b3c55bd2683289416e87a26c35e7b1b5f6d5ac87db9ddf4
+size 6564913
--- a/glib2-fix-regex-build.patch
+++ b/glib2-fix-regex-build.patch
@@ -0,0 +1,25 @@
+commit ac05f990db211a27a950d61ef4bf47335ced7cc4
+Author: Ryan Lortie <desrt@desrt.ca>
+Date:   Sat Sep 18 12:52:58 2010 -0400
+
+    Fix header cleaup fallout when using system pcre
+    
+    Using the internal pcre has the side effect of exposing gregex.c to
+    glib.h.  When we use the system one, we lose that, so we need to
+    explicitly include the things we use (glist, gatomic, etc..)
+
+diff --git a/glib/gregex.c b/glib/gregex.c
+index f21fbe8..b62bda7 100644
+--- a/glib/gregex.c
+++ b/glib/gregex.c
+@@ -32,6 +32,10 @@
+ #include "gtypes.h"
+ #include "gregex.h"
+ #include "glibintl.h"
+#include "glist.h"
+#include "gmessages.h"
+#include "gstrfuncs.h"
+#include "gatomic.h"
+ 
+ /**
+  * SECTION:gregex
--- a/glib2.changes
+++ b/glib2.changes
@@ -1,3 +1,65 @@
+-------------------------------------------------------------------
+Tue Oct  5 11:40:10 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.27.0 (compared to 2.25.15):
+  + Build:
+    - massive restructuring to reduce #include abuse
+    - tweaks to silence some harmless compiler warnings
+    - rename gschema-compile.c to glib-compile-schemas.c
+    - Windows fixes
+    - fix building with zlib < 1.2.4 on win32
+  + GDateTime:
+    - better msgctxt for translating month and weekday names
+    - API is changed quite a lot, implementation is improved
+    - GTimeZone is now exposed
+  + GObject:
+    - make ordering for overridden interface properties consistent
+    - ->priv structures are limited to 64k but this was not
+      documented, and exceeding this limit produced bad results.
+      Add docs and enforce the limit properly.
+    - add g_object_class_install_properties() to install multiple
+      properties in one go
+    - improve debugging output for GValue containing G_TYPE_STRV
+  + GIO:
+    - fix priority sorting of GIO extensions
+    - add GCredentials support on FreeBSD
+    - fix support for IPv6 addresses in URI parsing functions
+    - GSocketClient fixes for when g_socket_connect succeeds
+      immediately
+    - clarify string encoding for GFile constructors in docs
+    - new functions g_data_input_stream_read_upto{,async,finish}
+    - tweak confusing documentation for g_output_stream_write()
+  + GDBus:
+    - GDBusMessage can now be locked and copied (like in libdbus)
+    - GDBusConnection filter function API has changed again
+    - GDBusServer: ::new-connection now declares if the connection
+      was claimed
+    - add a partial workaround for bgo#627724.
+    - very many memory leaks fixed
+  + GVariant:
+    - check for size == 0 in g_variant_get_bytestring to avoid a
+      crash when attempting to get_bytestring() from an empty array
+    - improve gobject-introspection annotations
+  + GSettings:
+    - add GSettings Windows registry backend
+    - some internal tweaks to the backend API
+    - remove g_settings_list_items
+    - add g_settings_list_children and _list_keys to replace it
+    - add schema compiler restrictions for dealing with lists
+    - don't automatically emit value changed signals on writability
+      changes
+  + Other:
+    - constify the 'parser' vtable param to
+      g_markup_parse_context_push()
+    - plug many memory leaks in test cases
+  + Bugs closed: bgo#50076, bgo#584284, bgo#624546, bgo#626919,
+    bgo#628029, bgo#628253, bgo#628331, bgo#628345, bgo#628436,
+    bgo#628505, bgo#628839, bgo#628904, bgo#628952, bgo#629192,
+    bgo#629251, bgo#629259, bgo#629328, bgo#629429, bgo#629689,
+    bgo#629698.
+  + Updated translations.
+- Add glib2-fix-regex-build.patch to fix build.
+
 -------------------------------------------------------------------
 Thu Sep 30 16:50:03 UTC 2010 - dimstar@opensuse.org

--- a/glib2.spec
+++ b/glib2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package glib2 (Version 2.26.0)
+# spec file for package glib2 (Version 2.27.0)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,7 +20,7 @@

 Name:           glib2
 %define _name glib
-Version:        2.26.0
+Version:        2.27.0
 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
@@ -39,6 +39,8 @@ Source5:        macros.glib2
 # Please update this file from the latest gtk-doc package:
 Source6:        gtk-doc.m4
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM glib2-fix-regex-build.patch vuntz@opensuse.org -- Fix build of gregex, taken from git
+Patch0:         glib2-fix-regex-build.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
@@ -224,6 +226,7 @@ to a C programmer and is used by Gtk+ and GNOME.
 %prep
 %setup -q -n %{_name}-%{version}
 translation-update-upstream
+%patch0 -p1
 %patch8
 %patch10 -p1
 %patch11 -p1