From ada6f649738afd5815ee23e09d9fafff7dc97ea1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 26 Dec 2008 22:29:19 +0000
Subject: libglib2: bump version

---
 package/libglib2/libglib2-2.15.4-mkenums-nowarn.patch |  8 --------
 package/libglib2/libglib2-2.15.4-pkgconfig-cc.patch   | 15 ---------------
 package/libglib2/libglib2-mkenums-nowarn.patch        |  8 ++++++++
 package/libglib2/libglib2-pkgconfig-cc.patch          | 15 +++++++++++++++
 package/libglib2/libglib2.mk                          |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 package/libglib2/libglib2-2.15.4-mkenums-nowarn.patch
 delete mode 100644 package/libglib2/libglib2-2.15.4-pkgconfig-cc.patch
 create mode 100644 package/libglib2/libglib2-mkenums-nowarn.patch
 create mode 100644 package/libglib2/libglib2-pkgconfig-cc.patch

(limited to 'package/libglib2')

diff --git a/package/libglib2/libglib2-2.15.4-mkenums-nowarn.patch b/package/libglib2/libglib2-2.15.4-mkenums-nowarn.patch
deleted file mode 100644
index 1ab6e379c..000000000
--- a/package/libglib2/libglib2-2.15.4-mkenums-nowarn.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- glib-2.6.5/gobject/glib-mkenums.in.orig	2006-06-15 21:28:23.436946024 -0600
-+++ glib-2.6.5/gobject/glib-mkenums.in	2006-06-15 21:28:35.417124760 -0600
-@@ -1,4 +1,4 @@
--#!@PERL_PATH@ -w
-+#!@PERL_PATH@
- 
- # glib-mkenums.pl 
- # Information about the current enumeration
diff --git a/package/libglib2/libglib2-2.15.4-pkgconfig-cc.patch b/package/libglib2/libglib2-2.15.4-pkgconfig-cc.patch
deleted file mode 100644
index 36a2487b3..000000000
--- a/package/libglib2/libglib2-2.15.4-pkgconfig-cc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/glib-2.0.pc.in	2007-01-16 18:24:39.000000000 -0500
-+++ b/glib-2.0.pc.in	2008-02-09 09:25:28.000000000 -0500
-@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
- 
--glib_genmarshal=glib-genmarshal
--gobject_query=gobject-query
--glib_mkenums=glib-mkenums
-+glib_genmarshal=/usr/bin/glib-genmarshal
-+gobject_query=/usr/bin/gobject-query
-+glib_mkenums=/usr/bin/glib-mkenums
- 
- Name: GLib
- Description: C Utility Library
diff --git a/package/libglib2/libglib2-mkenums-nowarn.patch b/package/libglib2/libglib2-mkenums-nowarn.patch
new file mode 100644
index 000000000..1ab6e379c
--- /dev/null
+++ b/package/libglib2/libglib2-mkenums-nowarn.patch
@@ -0,0 +1,8 @@
+--- glib-2.6.5/gobject/glib-mkenums.in.orig	2006-06-15 21:28:23.436946024 -0600
++++ glib-2.6.5/gobject/glib-mkenums.in	2006-06-15 21:28:35.417124760 -0600
+@@ -1,4 +1,4 @@
+-#!@PERL_PATH@ -w
++#!@PERL_PATH@
+ 
+ # glib-mkenums.pl 
+ # Information about the current enumeration
diff --git a/package/libglib2/libglib2-pkgconfig-cc.patch b/package/libglib2/libglib2-pkgconfig-cc.patch
new file mode 100644
index 000000000..36a2487b3
--- /dev/null
+++ b/package/libglib2/libglib2-pkgconfig-cc.patch
@@ -0,0 +1,15 @@
+--- a/glib-2.0.pc.in	2007-01-16 18:24:39.000000000 -0500
++++ b/glib-2.0.pc.in	2008-02-09 09:25:28.000000000 -0500
+@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-glib_genmarshal=glib-genmarshal
+-gobject_query=gobject-query
+-glib_mkenums=glib-mkenums
++glib_genmarshal=/usr/bin/glib-genmarshal
++gobject_query=/usr/bin/gobject-query
++glib_mkenums=/usr/bin/glib-mkenums
+ 
+ Name: GLib
+ Description: C Utility Library
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 6522f37b0..14dfbe97d 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -3,7 +3,7 @@
 # libglib2
 #
 #############################################################
-LIBGLIB2_VERSION = 2.15.4
+LIBGLIB2_VERSION = 2.16.6
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
 LIBGLIB2_SITE = http://ftp.gtk.org/pub/glib/2.15
 LIBGLIB2_AUTORECONF = NO
-- 
cgit v1.2.3