From: Jens Muecke <jens@nons.de>
Date: Thu, 8 May 2008 21:54:27 +0000 (+0000)
Subject: update glib from 2.12.12 to 2.15.4
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=53bd5e90551d4469059c39175fa59cd6cabeddb0;ds=sidebyside

update glib from 2.12.12 to 2.15.4

SVN-Revision: 11088
---

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 5737b06302..36e4affc25 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
-PKG_VERSION:=2.12.12
+PKG_VERSION:=2.15.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/glib/2.12/
-PKG_MD5SUM:=6c6a61e4b08fb4b110ca7953f71c8b5e
+PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/glib/2.15/
+PKG_MD5SUM:=14c3ce0d2e9befe607bae0c514500e9e
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
 
diff --git a/libs/glib2/patches/001-no_docs_and_tests.patch b/libs/glib2/patches/001-no_docs_and_tests.patch
index b145954e96..4a73031163 100644
--- a/libs/glib2/patches/001-no_docs_and_tests.patch
+++ b/libs/glib2/patches/001-no_docs_and_tests.patch
@@ -1,12 +1,12 @@
-diff -ruN glib-2.12.12-old/Makefile.in glib-2.12.12-new/Makefile.in
---- glib-2.12.12-old/Makefile.in	2007-05-02 01:20:29.000000000 +0200
-+++ glib-2.12.12-new/Makefile.in	2007-08-18 22:02:49.000000000 +0200
-@@ -239,7 +239,7 @@
- 
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -338,7 +338,7 @@ EXTRA_DIST = ChangeLog.pre-2-14 ChangeLog.pre-2-12 ChangeLog.pre-2-10 \
+ 	gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
+ TEST_PROGS = 
  AUTOMAKE_OPTIONS = 1.7
- 
--SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
-+SUBDIRS = . m4macros glib gobject gmodule gthread build po
- 
+-SUBDIRS = . m4macros glib gobject gmodule gthread gio tests po docs
++SUBDIRS = . m4macros glib gobject gmodule gthread gio po
+ DIST_SUBDIRS = $(SUBDIRS) build
  bin_SCRIPTS = glib-gettextize
- 
+ AM_CPPFLAGS = \
diff --git a/libs/glib2/patches/002-libtool_fixes.patch b/libs/glib2/patches/002-libtool_fixes.patch
deleted file mode 100644
index 84fe08ca0d..0000000000
--- a/libs/glib2/patches/002-libtool_fixes.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: glib-2.12.12/glib/Makefile.in
-===================================================================
---- glib-2.12.12.orig/glib/Makefile.in	2008-01-14 22:10:34.000000000 +0100
-+++ glib-2.12.12/glib/Makefile.in	2008-01-14 22:17:51.000000000 +0100
-@@ -514,10 +514,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/gwin32.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(libglib_2_0_la_SOURCES) $(EXTRA_libglib_2_0_la_SOURCES) \
- 	gspawn-win32-helper.c gspawn-win32-helper-console.c
-Index: glib-2.12.12/glib/gnulib/Makefile.in
-===================================================================
---- glib-2.12.12.orig/glib/gnulib/Makefile.in	2008-01-14 22:10:52.000000000 +0100
-+++ glib-2.12.12/glib/gnulib/Makefile.in	2008-01-14 22:18:34.000000000 +0100
-@@ -279,10 +279,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/vasnprintf.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(libgnulib_la_SOURCES)
- DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
-Index: glib-2.12.12/gmodule/Makefile.in
-===================================================================
---- glib-2.12.12.orig/gmodule/Makefile.in	2008-01-14 22:11:55.000000000 +0100
-+++ glib-2.12.12/gmodule/Makefile.in	2008-01-14 22:19:43.000000000 +0100
-@@ -310,10 +310,10 @@
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gmodule.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(libgmodule_2_0_la_SOURCES)
- DATA = $(noinst_DATA)
-Index: glib-2.12.12/gobject/Makefile.in
-===================================================================
---- glib-2.12.12.orig/gobject/Makefile.in	2008-01-14 22:12:34.000000000 +0100
-+++ glib-2.12.12/gobject/Makefile.in	2008-01-14 22:19:10.000000000 +0100
-@@ -463,10 +463,10 @@
- @AMDEP_TRUE@	./$(DEPDIR)/testgobject.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(libgobject_2_0_la_SOURCES) $(glib_genmarshal_SOURCES) \
- 	$(gobject_query_SOURCES) $(testgobject_SOURCES)
-Index: glib-2.12.12/gthread/Makefile.in
-===================================================================
---- glib-2.12.12.orig/gthread/Makefile.in	2008-01-14 22:11:40.000000000 +0100
-+++ glib-2.12.12/gthread/Makefile.in	2008-01-14 22:19:29.000000000 +0100
-@@ -297,10 +297,10 @@
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gthread-impl.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(libgthread_2_0_la_SOURCES)
- DATA = $(noinst_DATA)
-Index: glib-2.12.12/glib/libcharset/Makefile.in
-===================================================================
---- glib-2.12.12.orig/glib/libcharset/Makefile.in	2008-01-14 22:18:47.000000000 +0100
-+++ glib-2.12.12/glib/libcharset/Makefile.in	2008-01-14 22:18:52.000000000 +0100
-@@ -287,7 +287,7 @@
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(libcharset_la_SOURCES)
- DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am