From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 97BF213888F for ; Tue, 13 Oct 2015 03:28:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DA91E07D4; Tue, 13 Oct 2015 03:28:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CFF2CE07D4 for ; Tue, 13 Oct 2015 03:28:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B35FE34080E for ; Tue, 13 Oct 2015 03:28:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F22AF96 for ; Tue, 13 Oct 2015 03:28:03 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1444706641.c9a77e1ab93d5af9968d3e449569832aff61c2df.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/glib/files/, dev-libs/glib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch dev-libs/glib/glib-2.44.1-r1.ebuild X-VCS-Directories: dev-libs/glib/files/ dev-libs/glib/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: c9a77e1ab93d5af9968d3e449569832aff61c2df X-VCS-Branch: master Date: Tue, 13 Oct 2015 03:28:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f67a06f8-81a1-4337-b68d-dde41f9f8883 X-Archives-Hash: 6e84a460384ebb5cea0174ae35d4cac3 commit: c9a77e1ab93d5af9968d3e449569832aff61c2df Author: Mike Frysinger gentoo org> AuthorDate: Tue Oct 13 03:23:40 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Oct 13 03:24:01 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a77e1a dev-libs/glib: fix builds w/newer bionic versions dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch | 15 +++++++++++++++ dev-libs/glib/glib-2.44.1-r1.ebuild | 2 ++ 2 files changed, 17 insertions(+) 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 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 d5302bc..25be870 100644 --- 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