Commit 862b4ca1 authored by Lionel Landwerlin's avatar Lionel Landwerlin Committed by Peter Korsgaard
Browse files

libglib2: bump to 2.22.4 



[Peter: updated to 2.22.4 instead which is so far only on ftp.gnome.org,
 fixed build without IPv6 support]
Signed-off-by: default avatarLionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 21ebd572

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
	Updated/fixed packages: at, autoconf, bash, bind, binutils, bootutils,

	busybox, directfb, dnsmasq, e2fsprogs, gstreamer, gperf,

	gst-plugins-bad, flex, hal, iptables, iw, jpeg, kismet, libfuse,

	libpcap, libungif, lighttpd, mesa, mpg123, mtd-utils, neon,

	libglib2, libpcap, libungif, lighttpd, mesa, mpg123, mtd-utils, neon,

	netstat-nat, openvpn, pcre, qt, rpm, sdl, sdl_ttf, ser2net, sqlite,

	sshfs, tremor, u-boot, usb_modeswitch, usbutils, webkit,

	wpa_supplicant, xfsprogs

package/libglib2/libglib2-optional-ipv6.patch

0 → 100644
+53 −0
Original line number Diff line number Diff line 
[PATCH]: fix build on uClibc without IPv6 support



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

===================================================================

--- glib-2.22.4.orig/gio/ginetaddress.c

+++ glib-2.22.4/gio/ginetaddress.c

@@ -21,6 +21,7 @@

  *          Samuel Cormier-Iijima <sciyoshi@gmail.com>

  */

 

+#include <features.h>

 #include <config.h>

 

 #include <string.h>

@@ -435,7 +436,11 @@ g_inet_address_new_from_string (const gc

   return NULL;

 }

 

+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)

+#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET)

+#else

 #define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)

+#endif

 

 /**

  * g_inet_address_new_from_bytes:

@@ -484,8 +489,10 @@ g_inet_address_new_loopback (GSocketFami

 

       return g_inet_address_new_from_bytes (addr, family);

     }

+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))

   else

     return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);

+#endif

 }

 

 /**

@@ -511,8 +518,10 @@ g_inet_address_new_any (GSocketFamily fa

 

       return g_inet_address_new_from_bytes (addr, family);

     }

+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))

   else

     return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);

+#endif

 }

package/libglib2/libglib2.mk

+3 −3
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 
# libglib2

#

#############################################################

LIBGLIB2_VERSION_MAJOR = 2.20

LIBGLIB2_VERSION_MINOR = 5

LIBGLIB2_VERSION_MAJOR = 2.22

LIBGLIB2_VERSION_MINOR = 4

LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)

LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2

LIBGLIB2_SITE = http://ftp.gtk.org/pub/glib/$(LIBGLIB2_VERSION_MAJOR)

LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)



LIBGLIB2_AUTORECONF = NO

LIBGLIB2_LIBTOOL_PATCH = NO