From 0ed8c5474b6d5033fef536500cfc4d64c6debc66 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 24 Feb 2011 13:37:24 +0100
Subject: update to latest upstream version

 * fix compile for cris architecture
 * fix compile under Cygwin. A full glib host build is
   required for glib-compile-schema and glib-genmarshal
---
 package/glib/Makefile                     | 17 ++++++-----------
 package/glib/patches/patch-glib_gatomic_c | 10 ++++++++++
 2 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 package/glib/patches/patch-glib_gatomic_c

(limited to 'package/glib')

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 3c8045392..d3b4dbd9b 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,15 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.27.5
+PKG_VERSION:=		2.28.1
+PKG_EXTRAVER:=		2.28
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ad9c80adb624a1ffe3d9753bab8a578a
+PKG_MD5SUM:=		9f6e85e1e38490c3956f4415bcd33e6e
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libintl libiconv libpthread
 PKG_BUILDDEP:=		gettext libiconv
 PKG_URL:=		http://www.gtk.org/
-PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/2.27/
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
@@ -39,15 +40,9 @@ pre-configure:
 ifneq ($(OStype),Darwin)
 	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
 		./configure --prefix=$(STAGING_HOST_DIR) \
-			--with-libiconv=gnu \
-			--enable-debug=no \
-			--with-threads=posix \
 	);
-	env CFLAGS="-static" LDFLAGS="-static -liconv" ${MAKE} -C ${WRKBUILD}/glib
-	env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gthread
-	env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gio glib-compile-schemas
-	env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gobject glib-genmarshal
-	$(CP) ${WRKBUILD}/gio/glib-compile-schemas ${STAGING_HOST_DIR}/bin
+	env CFLAGS="-static" LDFLAGS="-static -liconv" ${MAKE} -C ${WRKBUILD}
+	$(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin
 	$(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin
 	${MAKE} -C ${WRKBUILD} clean
 endif
diff --git a/package/glib/patches/patch-glib_gatomic_c b/package/glib/patches/patch-glib_gatomic_c
new file mode 100644
index 000000000..42d41196b
--- /dev/null
+++ b/package/glib/patches/patch-glib_gatomic_c
@@ -0,0 +1,10 @@
+--- glib-2.27.5.orig/glib/gatomic.c	2010-09-05 06:20:56.000000000 +0200
++++ glib-2.27.5/glib/gatomic.c	2011-02-18 20:52:37.703561782 +0100
+@@ -882,6 +882,7 @@ g_atomic_pointer_compare_and_exchange (v
+ 
+ #ifdef DEFINE_WITH_MUTEXES
+ /* We have to use the slow, but safe locking method */
++#include "gthread.h"
+ static GMutex *g_atomic_mutex; 
+ 
+ /**
-- 
cgit v1.2.3