diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2015-10-20 13:21:54 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-10-20 13:21:54 +0300 |
| commit | 89995e8a30a37efe560c7b87d2e2b2ae6e643592 (patch) | |
| tree | 7ab6b755eac08d1b0774c62032834fbcce53f84c | |
| parent | 7dcde21f48e9e17c9763fd6882aa41022d443a23 (diff) | |
glib: Remove Android L patch that was merged upstream in a different way
| -rw-r--r-- | recipes/build-tools/glib-tools.recipe | 3 | ||||
| -rw-r--r-- | recipes/glib.recipe | 3 | ||||
| -rw-r--r-- | recipes/glib/0016-gio-Fix-build-on-Android-Lollipop.patch | 35 |
3 files changed, 2 insertions, 39 deletions
diff --git a/recipes/build-tools/glib-tools.recipe b/recipes/build-tools/glib-tools.recipe index 4cdac8a7..d805567f 100644 --- a/recipes/build-tools/glib-tools.recipe +++ b/recipes/build-tools/glib-tools.recipe @@ -19,8 +19,7 @@ class Recipe(recipe.Recipe): "../glib/0008-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch", "../glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch", '../glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch', - '../glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch', - '../glib/0016-gio-Fix-build-on-Android-Lollipop.patch' + '../glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch' ] def prepare(self): diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 2994defc..b0c77e51 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -35,8 +35,7 @@ class Recipe(recipe.Recipe): "glib/0008-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch", "glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch", 'glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch', - 'glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch', - 'glib/0016-gio-Fix-build-on-Android-Lollipop.patch' + 'glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch' ] files_libs = [ diff --git a/recipes/glib/0016-gio-Fix-build-on-Android-Lollipop.patch b/recipes/glib/0016-gio-Fix-build-on-Android-Lollipop.patch deleted file mode 100644 index 439ec5f3..00000000 --- a/recipes/glib/0016-gio-Fix-build-on-Android-Lollipop.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 32f26819f765cce5c69917a8184dd470623bd200 Mon Sep 17 00:00:00 2001 -From: Edward Hervey <bilboed@bilboed.com> -Date: Tue, 27 Jan 2015 16:27:13 +0100 -Subject: [PATCH] gio: Fix build on Android Lollipop - -The various nameser headers are public headers starting from Android L -(target arch 21). ---- - gio/gthreadedresolver.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c -index 2ba42f1..a70e8df 100644 ---- a/gio/gthreadedresolver.c -+++ b/gio/gthreadedresolver.c -@@ -263,7 +263,7 @@ lookup_by_address_finish (GResolver *resolver, - - #if defined(G_OS_UNIX) - --#if defined __BIONIC__ && !defined BIND_4_COMPAT -+#if defined __BIONIC__ && !defined BIND_4_COMPAT && __ANDROID_API__ < 21 - /* Copy from bionic/libc/private/arpa_nameser_compat.h - * and bionic/libc/private/arpa_nameser.h */ - typedef struct { -@@ -801,7 +801,6 @@ free_records (GList *records) - - #if defined(G_OS_UNIX) - #ifdef __BIONIC__ --#define C_IN 1 - int res_query(const char *, int, int, u_char *, int); - #endif - #endif --- -2.6.1 - |