diff options
| author | Lionel Landwerlin <llandwerlin@gmail.com> | 2009-12-26 17:00:41 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-01-28 17:07:11 +0100 |
| commit | 862b4ca144c34115d451d9fa44afb3d4bd0a75ea (patch) | |
| tree | 674dcd97337ea17d351ebdc23c9bd002ee08c46d /package | |
| parent | 21ebd57287b4f17d3504f75b39c15bc959c7dd2f (diff) | |
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: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/libglib2/libglib2-optional-ipv6.patch | 53 | ||||
| -rw-r--r-- | package/libglib2/libglib2.mk | 6 |
2 files changed, 56 insertions, 3 deletions
diff --git a/package/libglib2/libglib2-optional-ipv6.patch b/package/libglib2/libglib2-optional-ipv6.patch new file mode 100644 index 000000000..7c511a312 --- /dev/null +++ b/package/libglib2/libglib2-optional-ipv6.patch @@ -0,0 +1,53 @@ +[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 + } + + diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 5ef7e2517..6e110f60b 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -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 |