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

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

glib-2.25.15.tar.bz2

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

glib-2.25.16.tar.bz2

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

glib2-fix-build-system-pcre.patch

@@ -0,0 +1,33 @@
+From 96d87da379879f20e2c162b468525aaa1a0a82dd Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sat, 04 Sep 2010 00:30:54 +0000
+Subject: Remove redundant header inclusions
+
+---
+diff --git a/glib/gregex.c b/glib/gregex.c
+index 576632d..f21fbe8 100644
+--- a/glib/gregex.c
++++ b/glib/gregex.c
+@@ -23,16 +23,16 @@
+ 
+ #include <string.h>
+ 
+-#include "glib.h"
+-#include "glibintl.h"
+-#include "gregex.h"
+-
+ #ifdef USE_SYSTEM_PCRE
+ #include <pcre.h>
+ #else
+ #include "pcre/pcre.h"
+ #endif
+ 
++#include "gtypes.h"
++#include "gregex.h"
++#include "glibintl.h"
++
+ /**
+  * SECTION:gregex
+  * @title: Perl-compatible regular expressions
+--
+cgit v0.8.3.1

glib2.changes

@@ -1,3 +1,70 @@
+-------------------------------------------------------------------
+Sat Sep 18 10:33:58 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.25.16:
+  + GApplication:
+    - GApplication, GAction and related classes have been removed
+      from this release of glib. There will -not- be a replacement
+      for 2.26.0.
+  + 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 GObject 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-build-system-pcre.patch to fix build with the
+  system pcre: this is the commit that we revert to fix the build.
+
 -------------------------------------------------------------------
 Fri Sep  3 15:38:17 CEST 2010 - vuntz@opensuse.org
 

glib2.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package glib2 (Version 2.25.15)
+# spec file for package glib2 (Version 2.25.16)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,7 +20,7 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.25.15
+Version:        2.25.16
 Release:        1
 # FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib
 # FIXME: remove python BuildRequires once sr#43603 is accepted
@@ -40,6 +40,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-build-system-pcre.patch bgo#629971 vuntz@opensuse.org -- Revert commit that breaks build with system pcre
+Patch0:         glib2-fix-build-system-pcre.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
@@ -221,6 +223,7 @@ to a C programmer and is used by Gtk+ and GNOME.
 %prep
 %setup -q -n %{_name}-%{version}
 translation-update-upstream
+%patch0 -p1 -R
 %patch8
 %patch10 -p1
 %patch11 -p1