[arch-commits] CVS update of extra/lib/glib2 (4 files)
Jan de Groot
jgc at archlinux.org
Wed Sep 19 19:30:16 UTC 2007
Date: Wednesday, September 19, 2007 @ 15:30:16
Author: jgc
Path: /home/cvs-extra/extra/lib/glib2
Modified: PKGBUILD (1.56 -> 1.57)
Removed: glib-gmarkup.patch (1.1) glib-gthread.patch (1.1)
gobject-gsignal.patch (1.1)
upgpkg: glib2 2.14.1-1
Remove upstream applied patches
-----------------------+
PKGBUILD | 19 ++++------------
glib-gmarkup.patch | 56 ------------------------------------------------
glib-gthread.patch | 55 -----------------------------------------------
gobject-gsignal.patch | 15 ------------
4 files changed, 5 insertions(+), 140 deletions(-)
Index: extra/lib/glib2/PKGBUILD
diff -u extra/lib/glib2/PKGBUILD:1.56 extra/lib/glib2/PKGBUILD:1.57
--- extra/lib/glib2/PKGBUILD:1.56 Sun Aug 19 06:23:12 2007
+++ extra/lib/glib2/PKGBUILD Wed Sep 19 15:30:14 2007
@@ -1,34 +1,25 @@
-# $Id: PKGBUILD,v 1.56 2007/08/19 10:23:12 jgc Exp $
+# $Id: PKGBUILD,v 1.57 2007/09/19 19:30:14 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=glib2
-pkgver=2.14.0
-pkgrel=3
+pkgver=2.14.1
+pkgrel=1
pkgdesc="Common C routines used by GTK+ 2.4 and other libs"
url="http://www.gtk.org/"
arch=(i686 x86_64)
license=('LGPL')
-depends=('pcre>=7.2')
+depends=('pcre>=7.3')
makedepends=('pkgconfig')
options=('!libtool')
source=(ftp://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${pkgver}.tar.bz2
- glib-gmarkup.patch
- glib-gthread.patch
- gobject-gsignal.patch
glib2.sh
glib2.csh)
-md5sums=('6fabf21f68631043bc6924e01398e3af'
- '4f6e83674d2afeabb5132e40ceee74a2'
- 'a814c19a7d4cd1be58667d1452c32fc2'
- 'd8667f5f92f6d1976ead1e16efb573ec'
+md5sums=('196d7944a8ddc1f7c3d1e9c7146dd560'
'803017b365bd35dc20b092ce43b8c8c5'
'90c7b830bef4baf225c2eb8b7ead0cab')
build() {
cd ${startdir}/src/glib-${pkgver}
- patch -Np1 -i ${startdir}/src/glib-gmarkup.patch || return 1
- patch -Np1 -i ${startdir}/src/glib-gthread.patch || return 1
- patch -Np1 -i ${startdir}/src/gobject-gsignal.patch || return 1
./configure --prefix=/usr --enable-static --enable-shared --with-pcre=system
make || return 1
make DESTDIR=${startdir}/pkg install
Index: extra/lib/glib2/glib-gmarkup.patch
diff -u extra/lib/glib2/glib-gmarkup.patch:1.1 extra/lib/glib2/glib-gmarkup.patch:removed
--- extra/lib/glib2/glib-gmarkup.patch:1.1 Sun Aug 19 06:23:12 2007
+++ extra/lib/glib2/glib-gmarkup.patch Wed Sep 19 15:30:16 2007
@@ -1,56 +0,0 @@
---- trunk/glib/gmarkup.c 2007/07/08 00:18:38 5604
-+++ trunk/glib/gmarkup.c 2007/08/09 02:06:04 5684
-@@ -955,7 +955,7 @@
- set_error (context,
- error,
- G_MARKUP_ERROR_BAD_UTF8,
-- _("Invalid UTF-8 encoded text"));
-+ _("Invalid UTF-8 encoded text - overlong sequence"));
- }
-
- goto finished;
-@@ -983,7 +983,7 @@
- set_error (context,
- error,
- G_MARKUP_ERROR_BAD_UTF8,
-- _("Invalid UTF-8 encoded text"));
-+ _("Invalid UTF-8 encoded text - not a start char"));
- goto finished;
- }
-
-@@ -1019,7 +1019,9 @@
- set_error (context,
- error,
- G_MARKUP_ERROR_BAD_UTF8,
-- _("Invalid UTF-8 encoded text"));
-+ _("Invalid UTF-8 encoded text - not valid '%s'"),
-+ g_strndup (context->current_text,
-+ context->current_text_len));
- goto finished;
- }
-
-@@ -1900,6 +1902,7 @@
- {
- const gchar *p;
- const gchar *end;
-+ gunichar c;
-
- p = text;
- end = text + length;
-@@ -1932,7 +1935,15 @@
- break;
-
- default:
-- g_string_append_len (str, p, next - p);
-+ c = g_utf8_get_char (p);
-+ if ((0x1 <= c && c <= 0x8) ||
-+ (0xb <= c && c <= 0xc) ||
-+ (0xe <= c && c <= 0x1f) ||
-+ (0x7f <= c && c <= 0x84) ||
-+ (0x86 <= c && c <= 0x9f))
-+ g_string_append_printf (str, "&#x%x;", c);
-+ else
-+ g_string_append_len (str, p, next - p);
- break;
- }
-
Index: extra/lib/glib2/glib-gthread.patch
diff -u extra/lib/glib2/glib-gthread.patch:1.1 extra/lib/glib2/glib-gthread.patch:removed
--- extra/lib/glib2/glib-gthread.patch:1.1 Sun Aug 19 06:23:12 2007
+++ extra/lib/glib2/glib-gthread.patch Wed Sep 19 15:30:16 2007
@@ -1,55 +0,0 @@
---- trunk/glib/gthread.c 2007/07/12 23:03:06 5638
-+++ trunk/glib/gthread.c 2007/08/14 00:05:52 5701
-@@ -202,18 +202,19 @@
- gboolean
- g_once_init_enter_impl (volatile gsize *value_location)
- {
-- gboolean need_init;
-+ gboolean need_init = FALSE;
- g_mutex_lock (g_once_mutex);
-- if (!g_once_init_list || !g_slist_find (g_once_init_list, (void*) value_location))
-+ if (g_atomic_pointer_get ((void**) value_location) == 0)
- {
-- g_once_init_list = g_slist_prepend (g_once_init_list, (void*) value_location);
-- need_init = TRUE;
-- }
-- else
-- {
-- while (g_slist_find (g_once_init_list, (void*) value_location))
-- g_cond_wait (g_once_cond, g_once_mutex);
-- need_init = FALSE;
-+ if (!g_slist_find (g_once_init_list, (void*) value_location))
-+ {
-+ need_init = TRUE;
-+ g_once_init_list = g_slist_prepend (g_once_init_list, (void*) value_location);
-+ }
-+ else
-+ do
-+ g_cond_wait (g_once_cond, g_once_mutex);
-+ while (g_slist_find (g_once_init_list, (void*) value_location));
- }
- g_mutex_unlock (g_once_mutex);
- return need_init;
-@@ -579,7 +580,7 @@
-
- /* Just to make sure, this isn't used any more */
- g_system_thread_assign (thread->system_thread, zero_thread);
-- g_free (thread);
-+ g_free (thread);
- }
- }
- }
-@@ -662,8 +663,11 @@
- G_THREAD_UF (thread_create, (g_thread_create_proxy, result,
- stack_size, joinable, bound, priority,
- &result->system_thread, &local_error));
-- result->next = g_thread_all_threads;
-- g_thread_all_threads = result;
-+ if (!local_error)
-+ {
-+ result->next = g_thread_all_threads;
-+ g_thread_all_threads = result;
-+ }
- G_UNLOCK (g_thread);
-
- if (local_error)
Index: extra/lib/glib2/gobject-gsignal.patch
diff -u extra/lib/glib2/gobject-gsignal.patch:1.1 extra/lib/glib2/gobject-gsignal.patch:removed
--- extra/lib/glib2/gobject-gsignal.patch:1.1 Sun Aug 19 06:23:12 2007
+++ extra/lib/glib2/gobject-gsignal.patch Wed Sep 19 15:30:16 2007
@@ -1,15 +0,0 @@
---- trunk/gobject/gsignal.c 2006/09/30 13:59:01 5035
-+++ trunk/gobject/gsignal.c 2007/08/14 22:55:23 5704
-@@ -1058,10 +1058,10 @@
- if (!g_type_name (itype))
- g_warning (G_STRLOC ": unable to list signals for invalid type id `%lu'",
- itype);
-- else if (!G_TYPE_IS_INSTANTIATABLE (itype))
-+ else if (!G_TYPE_IS_INSTANTIATABLE (itype) && !G_TYPE_IS_INTERFACE (itype))
- g_warning (G_STRLOC ": unable to list signals of non instantiatable type `%s'",
- g_type_name (itype));
-- else if (!g_type_class_peek (itype))
-+ else if (!g_type_class_peek (itype) && !G_TYPE_IS_INTERFACE (itype))
- g_warning (G_STRLOC ": unable to list signals of unloaded type `%s'",
- g_type_name (itype));
- }
More information about the arch-commits
mailing list