[arch-commits] CVS update of arch/build/lib/glib2 (PKGBUILD gtype-revert-lock.patch)

[Jan de Groot]

    Date: Sunday, August 5, 2007 @ 17:50:19
  Author: jgc
    Path: /home/cvs-arch/arch/build/lib/glib2

   Added: gtype-revert-lock.patch (1.1)
Modified: PKGBUILD (1.54 -> 1.55)

upgpkg: glib2 2.14.0-2
Add patch to revert problems with OpenOffice and Flash


-------------------------+
 PKGBUILD                |   10 +++++++---
 gtype-revert-lock.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)


Index: arch/build/lib/glib2/PKGBUILD
diff -u arch/build/lib/glib2/PKGBUILD:1.54 arch/build/lib/glib2/PKGBUILD:1.55
--- arch/build/lib/glib2/PKGBUILD:1.54	Sat Aug  4 16:08:08 2007
+++ arch/build/lib/glib2/PKGBUILD	Sun Aug  5 17:50:19 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.54 2007/08/04 20:08:08 jgc Exp $
+# $Id: PKGBUILD,v 1.55 2007/08/05 21:50:19 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=glib2
 pkgver=2.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs"
 url="http://www.gtk.org/"
 arch=(i686 x86_64)
@@ -12,13 +12,17 @@
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${pkgver}.tar.bz2
+	gtype-revert-lock.patch
 	glib2.sh
 	glib2.csh)
-md5sums=('6fabf21f68631043bc6924e01398e3af' '803017b365bd35dc20b092ce43b8c8c5'\
+md5sums=('6fabf21f68631043bc6924e01398e3af'
+         'c3709b4bde02527e0e37e8b81787a22b'
+         '803017b365bd35dc20b092ce43b8c8c5'
          '90c7b830bef4baf225c2eb8b7ead0cab')
 
 build() {
   cd ${startdir}/src/glib-${pkgver}
+  patch -Np1 -R -i ${startdir}/src/gtype-revert-lock.patch || return 1
   ./configure --prefix=/usr --enable-static --enable-shared --with-pcre=system
   make || return 1
   make DESTDIR=${startdir}/pkg install
Index: arch/build/lib/glib2/gtype-revert-lock.patch
diff -u /dev/null arch/build/lib/glib2/gtype-revert-lock.patch:1.1
--- /dev/null	Sun Aug  5 17:50:19 2007
+++ arch/build/lib/glib2/gtype-revert-lock.patch	Sun Aug  5 17:50:19 2007
@@ -0,0 +1,33 @@
+--- trunk/gobject/gtype.h	2007/06/22 09:34:33	5582
++++ trunk/gobject/gtype.h	2007/07/10 10:33:03	5618
+@@ -368,23 +368,24 @@
+ GType \
+ type_name##_get_type (void) \
+ { \
+-  static GType g_define_type_id = 0; \
+-  if (G_UNLIKELY (g_define_type_id == 0)) \
++  static volatile gsize g_define_type_id__volatile = 0; \
++  if (g_once_init_enter (&g_define_type_id__volatile))  \
+     { \
+-      g_define_type_id = \
++      GType g_define_type_id = \
+         g_type_register_static_simple (TYPE_PARENT, \
+                                        g_intern_static_string (#TypeName), \
+                                        sizeof (TypeName##Class), \
+-                                       (GClassInitFunc)type_name##_class_intern_init, \
++                                       (GClassInitFunc) type_name##_class_intern_init, \
+                                        sizeof (TypeName), \
+-                                       (GInstanceInitFunc)type_name##_init, \
++                                       (GInstanceInitFunc) type_name##_init, \
+                                        (GTypeFlags) flags); \
+       { /* custom code follows */
+ #define _G_DEFINE_TYPE_EXTENDED_END()	\
+         /* following custom code */	\
+       }					\
++      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
+     }					\
+-  return g_define_type_id;		\
++  return g_define_type_id__volatile;	\
+ } /* closes type_name##_get_type() */
+ 
+