4 files changed, 18 insertions, 64 deletions
diff --git a/package/libglib2/libglib2-fix-clock-gettime-check.patch b/package/libglib2/libglib2-fix-clock-gettime-check.patch
deleted file mode 100644
index da2e4856c..000000000
--- a/package/libglib2/libglib2-fix-clock-gettime-check.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Rework clock_gettime() test
-
-The test for clock_gettime() in configure.in doesn't work properly
-when a previous package has loaded the shared configuration cache with
-informations about the availability of clock_gettime. A package such
-as ctorrent does so, which means that compiling ctorrent *then*
-libglib2 currently fails.
-
-According to people on the Autoconf mailing list, the libglib2 test is
-likely the one that needs to be fixed. The problem is that the
-AC_CHECK_FUNCS() test assumes that if it finds clock_gettime() it
-means that there's no need to add any -lrt flag to the
-build. Unfortunately, due to the shared configuration cache, this test
-is already done with -lrt, so the test succeeds, and libglib2 does not
-know that it needs to add -lrt to G_THREAD_LIBS and
-G_THREAD_LIBS_FOR_GTHREAD.
-
-So instead, we remplace the test with an AC_SEARCH_LIBS() test,
-followed by a test on the result of this AC_SEARCH_LIBS() test to add
-the necessary -lrt to G_THREAD_LIBS and
-G_THREAD_LIBS_FOR_GTHREAD. Therefore, even if the result for the
-AC_SEARCH_LIBS() test is cached due to the prior execution ctorrent
-./configure script, libglib2 ./configure will properly add -lrt to the
-appropriate variables.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: glib-2.24.1/configure.in
-===================================================================
---- glib-2.24.1.orig/configure.in	2010-08-11 19:29:20.530916023 +0200
-+++ glib-2.24.1/configure.in	2010-08-11 19:46:41.308866269 +0200
-@@ -2392,13 +2392,14 @@
- 	LIBS="$glib_save_LIBS"
- fi
- 
--AC_CHECK_FUNCS(clock_gettime, [], [
--  AC_CHECK_LIB(rt, clock_gettime, [
--    AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
-+AC_SEARCH_LIBS([clock_gettime], [rt], [
-+    AC_DEFINE(HAVE_CLOCK_GETTIME, 1,[Have clock_gettime])
-+])
-+
-+if test "$ac_cv_search_clock_gettime" = "-lrt"; then
-     G_THREAD_LIBS="$G_THREAD_LIBS -lrt"
-     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS_FOR_GTHREAD -lrt"
--  ])
--])
-+fi
- 
- AC_CACHE_CHECK(for monotonic clocks,
-     glib_cv_monotonic_clock,AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
diff --git a/package/libglib2/libglib2-mkenums-nowarn.patch b/package/libglib2/libglib2-mkenums-nowarn.patch
index 1ab6e379c..d92183e7a 100644
--- a/package/libglib2/libglib2-mkenums-nowarn.patch
+++ b/package/libglib2/libglib2-mkenums-nowarn.patch
@@ -1,8 +1,14 @@
---- 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
+---
+ gobject/glib-mkenums.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: glib-2.26.0/gobject/glib-mkenums.in
+===================================================================
+--- glib-2.26.0.orig/gobject/glib-mkenums.in
++++ glib-2.26.0/gobject/glib-mkenums.in
 @@ -1,4 +1,4 @@
 -#!@PERL_PATH@ -w
 +#!@PERL_PATH@
  
- # glib-mkenums.pl 
- # Information about the current enumeration
+ use File::Basename;
+ use Safe;
diff --git a/package/libglib2/libglib2-optional-ipv6.patch b/package/libglib2/libglib2-optional-ipv6.patch
index 7c511a312..8e7b418a0 100644
--- a/package/libglib2/libglib2-optional-ipv6.patch
+++ b/package/libglib2/libglib2-optional-ipv6.patch
@@ -5,10 +5,10 @@ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  gio/ginetaddress.c |    9 +++++++++
  1 file changed, 9 insertions(+)
 
-Index: glib-2.22.4/gio/ginetaddress.c
+Index: glib-2.26.0/gio/ginetaddress.c
 ===================================================================
---- glib-2.22.4.orig/gio/ginetaddress.c
-+++ glib-2.22.4/gio/ginetaddress.c
+--- glib-2.26.0.orig/gio/ginetaddress.c
++++ glib-2.26.0/gio/ginetaddress.c
 @@ -21,6 +21,7 @@
   *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
   */
@@ -17,7 +17,7 @@ Index: glib-2.22.4/gio/ginetaddress.c
  #include <config.h>
  
  #include <string.h>
-@@ -435,7 +436,11 @@ g_inet_address_new_from_string (const gc
+@@ -434,7 +435,11 @@
    return NULL;
  }
  
@@ -29,7 +29,7 @@ Index: glib-2.22.4/gio/ginetaddress.c
  
  /**
   * g_inet_address_new_from_bytes:
-@@ -484,8 +489,10 @@ g_inet_address_new_loopback (GSocketFami
+@@ -483,8 +488,10 @@
  
        return g_inet_address_new_from_bytes (addr, family);
      }
@@ -40,7 +40,7 @@ Index: glib-2.22.4/gio/ginetaddress.c
  }
  
  /**
-@@ -511,8 +518,10 @@ g_inet_address_new_any (GSocketFamily fa
+@@ -510,8 +517,10 @@
  
        return g_inet_address_new_from_bytes (addr, family);
      }
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 61e8c1c38..0d44d7162 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -3,13 +3,12 @@
 # libglib2
 #
 #############################################################
-LIBGLIB2_VERSION_MAJOR = 2.24
-LIBGLIB2_VERSION_MINOR = 1
+LIBGLIB2_VERSION_MAJOR = 2.26
+LIBGLIB2_VERSION_MINOR = 0
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
 
-LIBGLIB2_AUTORECONF = YES
 LIBGLIB2_LIBTOOL_PATCH = NO
 LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_TARGET = YES