From c3da0d8281e24ad8fa1af7e06a16330cc6b41eb3 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 14 Oct 2004 09:39:25 +0000
Subject: Update a few packages

---
 package/libglib12/libglib12.mk                 |   3 +--
 package/libglib12/libglib_configure-patch.bz2  | Bin 0 -> 8884 bytes
 package/libglib12/libglib_configure_1.2.10.bz2 | Bin 8884 -> 0 bytes
 package/libglib12/libglib_gcc3-patch           |  25 +++++++++++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 package/libglib12/libglib_configure-patch.bz2
 delete mode 100644 package/libglib12/libglib_configure_1.2.10.bz2
 create mode 100644 package/libglib12/libglib_gcc3-patch

(limited to 'package/libglib12')

diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk
index 5d2235adc..587399cf9 100644
--- a/package/libglib12/libglib12.mk
+++ b/package/libglib12/libglib12.mk
@@ -8,7 +8,6 @@ LIBGLIB12_SITE:=ftp://ftp.gtk.org/pub/gtk/v1.2
 LIBGLIB12_CAT:=zcat
 LIBGLIB12_DIR:=$(BUILD_DIR)/glib-1.2.10
 LIBGLIB12_BINARY:=libglib.a
-LIBGLIB12_PATCH:=libglib_configure_1.2.10.bz2
 
 
 $(DL_DIR)/$(LIBGLIB12_SOURCE):
@@ -18,7 +17,7 @@ libglib12-source: $(DL_DIR)/$(LIBGLIB12_SOURCE)
 
 $(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE)
 	$(LIBGLIB12_CAT) $(DL_DIR)/$(LIBGLIB12_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ $(LIBGLIB12_PATCH)
+	toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ *-patch*
 	touch $(LIBGLIB12_DIR)/.unpacked
 
 $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked
diff --git a/package/libglib12/libglib_configure-patch.bz2 b/package/libglib12/libglib_configure-patch.bz2
new file mode 100644
index 000000000..883a8009d
Binary files /dev/null and b/package/libglib12/libglib_configure-patch.bz2 differ
diff --git a/package/libglib12/libglib_configure_1.2.10.bz2 b/package/libglib12/libglib_configure_1.2.10.bz2
deleted file mode 100644
index 883a8009d..000000000
Binary files a/package/libglib12/libglib_configure_1.2.10.bz2 and /dev/null differ
diff --git a/package/libglib12/libglib_gcc3-patch b/package/libglib12/libglib_gcc3-patch
new file mode 100644
index 000000000..3a2b44d81
--- /dev/null
+++ b/package/libglib12/libglib_gcc3-patch
@@ -0,0 +1,25 @@
+--- glib-1.2.10/glib.orig.h	2004-10-14 01:11:45.000000000 -0600
++++ glib-1.2.10/glib.h	2004-10-14 01:12:02.000000000 -0600
+@@ -271,14 +271,15 @@
+ 
+ /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
+  * macros, so we can refer to them as strings unconditionally.
++ * usage not-recommended since gcc-3.0
+  */
+-#ifdef	__GNUC__
+-#define	G_GNUC_FUNCTION		__FUNCTION__
+-#define	G_GNUC_PRETTY_FUNCTION	__PRETTY_FUNCTION__
+-#else	/* !__GNUC__ */
+-#define	G_GNUC_FUNCTION		""
+-#define	G_GNUC_PRETTY_FUNCTION	""
+-#endif	/* !__GNUC__ */
++#if defined (__GNUC__) && (__GNUC__ < 3)
++#define G_GNUC_FUNCTION         __FUNCTION__
++#define G_GNUC_PRETTY_FUNCTION  __PRETTY_FUNCTION__
++#else   /* !__GNUC__ */
++#define G_GNUC_FUNCTION         ""
++#define G_GNUC_PRETTY_FUNCTION  ""
++#endif  /* !__GNUC__ */
+ 
+ /* we try to provide a usefull equivalent for ATEXIT if it is
+  * not defined, but use is actually abandoned. people should
-- 
cgit v1.2.3