summaryrefslogtreecommitdiff
path: root/package/libglib2/libglib2-optional-ipv6.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-10-29 13:50:02 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-10-29 13:50:02 +0200
commit6b3406a975954f40dec35ea19613b89c3f93d4d5 (patch)
tree49f93082fa469e2c3ff178e9f894d6b851e3a674 /package/libglib2/libglib2-optional-ipv6.patch
parent19e306338e7fa8fb840f93eccdce897e387739c5 (diff)
parent376dcb23adf6ff60884bd4393d1f3e2f79bc3602 (diff)
Merge branch 'for-2010.11/gtk-bump' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/libglib2/libglib2-optional-ipv6.patch')
-rw-r--r--package/libglib2/libglib2-optional-ipv6.patch12
1 files changed, 6 insertions, 6 deletions
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);
}