dev-libs/glib: fix builds w/newer bionic versions

diff --git a/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch b/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch
new file mode 100644 (file)
index 0000000..259b572
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch
@@ -0,0 +1,15 @@
+https://bugzilla.gnome.org/756477
+
+fix build w/newer releases of bionic (android)
+
+--- a/gio/gthreadedresolver.c
++++ b/gio/gthreadedresolver.c
+@@ -263,7 +263,7 @@ lookup_by_address_finish (GResolver     *resolver,
+ 
+ #if defined(G_OS_UNIX)
+ 
+-#ifdef __BIONIC__
++#if defined __BIONIC__ && !defined BIND_4_COMPAT
+ /* Copy from bionic/libc/private/arpa_nameser_compat.h
+  * and bionic/libc/private/arpa_nameser.h */
+ typedef struct {

diff --git a/dev-libs/glib/glib-2.44.1-r1.ebuild b/dev-libs/glib/glib-2.44.1-r1.ebuild
index d5302bc47c264ccc7087263caa303b07a0cddaff..25be8706448d26f458477610aace1ab2f81cb442 100644 (file)
--- a/dev-libs/glib/glib-2.44.1-r1.ebuild
+++ b/dev-libs/glib/glib-2.44.1-r1.ebuild
@@ -151,6 +151,8 @@ src_prepare() {
        # gdbus-codegen is a separate package
        epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
 
+       epatch "${FILESDIR}/${PN}-2.44.1-bionic-nameser.patch"
+
        # leave python shebang alone
        sed -e '/${PYTHON}/d' \
                -i glib/Makefile.{am,in} || die