diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2013-10-22 20:18:06 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2013-10-22 20:18:06 +0000 |
| commit | 5813b6be4c0c6259a967d6202a7b96fd4adee7cf (patch) | |
| tree | 7d2248c05016925b5130f5dfeb75176909d014a3 /dev-libs/glib | |
| parent | Upstream migrated to git. (diff) | |
| download | gentoo-2-5813b6be4c0c6259a967d6202a7b96fd4adee7cf.tar.gz gentoo-2-5813b6be4c0c6259a967d6202a7b96fd4adee7cf.tar.bz2 gentoo-2-5813b6be4c0c6259a967d6202a7b96fd4adee7cf.zip | |
fixed build on Darwin (bug #488500)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.36.4-r1.ebuild | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 225e8f7de129..2486555196de 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.580 2013/10/17 20:34:35 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.581 2013/10/22 20:18:06 ottxor Exp $ + + 22 Oct 2013; Christoph Junghans <ottxor@gentoo.org> glib-2.36.4-r1.ebuild: + fixed build on Darwin (bug #488500) 17 Oct 2013; Markus Meier <maekke@gentoo.org> glib-2.34.3-r1.ebuild: arm stable, bug #476364 diff --git a/dev-libs/glib/glib-2.36.4-r1.ebuild b/dev-libs/glib/glib-2.36.4-r1.ebuild index 4016a6b48ea5..6bba7aa99ab7 100644 --- a/dev-libs/glib/glib-2.36.4-r1.ebuild +++ b/dev-libs/glib/glib-2.36.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.4-r1.ebuild,v 1.5 2013/10/13 20:17:01 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.4-r1.ebuild,v 1.6 2013/10/22 20:18:06 ottxor Exp $ EAPI="5" PYTHON_COMPAT=( python2_{6,7} ) @@ -79,6 +79,9 @@ src_prepare() { # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die + # #488500 gets autogenerated, but get distributed with Linux-only header + rm "${S}"/gio/gnetworking.h || die + # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626 epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch |