pool/glib2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Update to 2.29.14

OBS-URL: https://build.opensuse.org/request/show/76767
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=156
This commit is contained in:
Dominique Leuenberger 2011-07-22 13:16:14 +00:00 committed by Git OBS Bridge
parent 476824959c
commit fc9009d0e9
6 changed files with 44 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib-2.29.12.tar.bz2
View File

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

3
glib-2.29.14.tar.bz2 Normal file
View File

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

30
glib2-no-deprecated-call.patch
View File

@ -1,30 +0,0 @@
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);

120
glib2-use-old-pcre.patch
View File

@ -1,120 +0,0 @@
commit c03dc6bf7dfc6e326e7249e9e377676db885d99e
Author: Matthias Clasen <mclasen@redhat.com>
Date: Fri Jan 21 23:10:01 2011 -0500
Update the included copy of PCRE
Update PCRE to version 8.12.
At the same time, also add Unicode 6.0 script support.
diff --git a/glib/gregex.c b/glib/gregex.c
index b62bda7..a1d2315 100644
--- a/glib/gregex.c
+++ b/glib/gregex.c
@@ -230,6 +230,10 @@ match_error (gint errcode)
return _("workspace limit for empty substrings reached");
case PCRE_ERROR_BADNEWLINE:
return _("invalid combination of newline flags");
+ case PCRE_ERROR_BADOFFSET:
+ return _("bad offset");
+ case PCRE_ERROR_SHORTUTF8:
+ return _("short utf8");
default:
break;
}
@@ -565,6 +569,14 @@ g_match_info_next (GMatchInfo *match_info,
prev_match_start = match_info->offsets[0];
prev_match_end = match_info->offsets[1];
+ if (match_info->pos > match_info->string_len)
+ {
+ /* we have reached the end of the string */
+ match_info->pos = -1;
+ match_info->matches = PCRE_ERROR_NOMATCH;
+ return FALSE;
+ }
+
match_info->matches = pcre_exec (match_info->regex->pcre_re,
match_info->regex->extra,
match_info->string,
@@ -1197,6 +1209,8 @@ g_regex_new (const gchar *pattern,
compile_options |= PCRE_NEWLINE_ANY;
}
+ compile_options |= PCRE_UCP;
+
/* compile the pattern */
re = pcre_compile2 (pattern, compile_options, &errcode,
&errmsg, &erroffset, NULL);
@@ -1792,6 +1806,7 @@ g_regex_split_simple (const gchar *pattern,
regex = g_regex_new (pattern, compile_options, 0, NULL);
if (!regex)
return NULL;
+
result = g_regex_split_full (regex, string, -1, 0, match_options, 0, NULL);
g_regex_unref (regex);
return result;
@@ -1924,6 +1939,7 @@ g_regex_split_full (const GRegex *regex,
match_ok = g_regex_match_full (regex, string, string_len, start_position,
match_options, &match_info, &tmp_error);
+
while (tmp_error == NULL)
{
if (match_ok)
diff --git a/glib/tests/regex.c b/glib/tests/regex.c
index 6e015e9..ef3ac68 100644
--- a/glib/tests/regex.c
+++ b/glib/tests/regex.c
@@ -1342,6 +1342,7 @@ test_match_all (gconstpointer d)
#define PCRE_UTF8 0x00000800
#define PCRE_NO_UTF8_CHECK 0x00002000
#define PCRE_NEWLINE_ANY 0x00400000
+#define PCRE_UCP 0x20000000
static void
test_basic (void)
@@ -1353,7 +1354,7 @@ test_basic (void)
regex = g_regex_new ("[A-Z]+", cflags, mflags, NULL);
g_assert (regex != NULL);
- g_assert_cmpint (g_regex_get_compile_flags (regex), ==, cflags|PCRE_UTF8|PCRE_NO_UTF8_CHECK|PCRE_NEWLINE_ANY );
+ g_assert_cmpint (g_regex_get_compile_flags (regex), ==, cflags|PCRE_UTF8|PCRE_NO_UTF8_CHECK|PCRE_NEWLINE_ANY|PCRE_UCP );
g_assert_cmpint (g_regex_get_match_flags (regex), ==, mflags|PCRE_NO_UTF8_CHECK);
g_regex_unref (regex);
@@ -2063,8 +2064,6 @@ main (int argc, char *argv[])
{
setlocale (LC_ALL, "");
- g_setenv ("G_DEBUG", "fatal_warnings", TRUE);
-
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/regex/basic", test_basic);
From 9f0c592b9c5f9ac57d3454f02ffa92e98001ceaf Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu27@gmail.com>
Date: Sat, 22 Jan 2011 15:36:13 +0000
Subject: [PATCH] Bump PCRE minimum version
https://bugzilla.gnome.org/show_bug.cgi?id=640261
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index ca101c5..38bd583 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2611,7 +2611,7 @@ AC_MSG_RESULT($broken_poll)
dnl *********************
dnl *** GRegex checks ***
dnl *********************
-PCRE_REQUIRED_VERSION=7.2
+PCRE_REQUIRED_VERSION=8.11
# Check if we should compile GRegex
AC_ARG_ENABLE(regex, AC_HELP_STRING([--disable-regex],
--
1.7.1

40
glib2.changes
View File

@ -1,3 +1,43 @@
-------------------------------------------------------------------
Fri Jul 22 14:08:21 CEST 2011 - vuntz@opensuse.org
- Update to version 2.29.14:
+ Unicode improvements:
- add g_unicode_script_{to,from}_iso15924
- add G_UNICODE_SPACING_MARK define
- more normalisation improvements
- stop using deprecated g_unicode_canonical_decomposition()
+ GParamSpec:
- mark the 'name' field as 'const' and add a comment to the
header to help avoid future problems caused by bad hacks
+ Merge some (modified) patches from Debian:
- add some blacklisted mount directories
- sleep longer in a test case, if needed to avoid failing
+ Units policy change:
- prefer use of SI units
- deprecate g_format_size_for_display, add g_format_size(_full)
+ GSettings: don't call g_error() when the schema is missing
+ GVariant support for arrays of object paths:
- new g_variant_{new,get,dup}_objv API
- support for g_variant_{new,get} '^ao' and '^a&o' similar to
'^as'
+ GDBus:
- use new improved array-of-objects support and pass 'ao' as
char** instead of GVariant*
- improve handling of 'h' type (Unix file descriptor index)
+ GIO:
- fix compilation without USE_STATFS and USE_STATVFS
+ Documentation fixes.
+ Bugs fixed: bgo#622921, bgo#648271, bgo#654948, bgo#654988,
bgo#655025, bgo#655076.
+ Updated translations.
- Drop glib2-no-deprecated-call.patch: fixed upstream.
- Drop glib2-use-old-pcre.patch: we don't support building this
version of glib2 on 11.4 and earlier as it requires changes in
gtk+ and possibly other packages. So there's no need to keep this
patch for old versions of openSUSE. This means we can also drop
the call to autoreconf.
-------------------------------------------------------------------
Wed Jul 20 08:54:59 CEST 2011 - vuntz@opensuse.org

15
glib2.spec
View File

@ -21,7 +21,7 @@
Name: glib2
%define _name glib
Version: 2.29.12
Version: 2.29.14
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
@ -42,10 +42,6 @@ Source6: macros.glib2
# Please update this file from the latest gtk-doc package:
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
@ -265,10 +261,6 @@ The GObject library provides an object-oriented framework for C.
%prep
%setup -q -n %{_name}-%{version}
translation-update-upstream
%if 0%{?suse_version} <= 1140
%patch0 -p1 -R
%endif
%patch1 -p1
%patch8
%patch10 -p1
%patch11 -p1
@ -283,11 +275,6 @@ NOCONFIGURE=1 ./autogen.sh
%endif
%build
%if 0%{?suse_version} <= 1140
# Needed by patch0
autoreconf -fi -I m4macros
%endif
%configure \
--enable-static \
--enable-selinux \