summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/glib/ChangeLog5
-rw-r--r--dev-libs/glib/glib-2.28.6.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index af2316733d7c..99258134aa3c 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/glib
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.465 2011/05/21 19:19:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.466 2011/05/28 17:25:47 armin76 Exp $
+
+ 28 May 2011; Raúl Porcel <armin76@gentoo.org> glib-2.28.6.ebuild:
+ Add patch to fix bug 368275 again
*glib-2.28.7 (21 May 2011)
diff --git a/dev-libs/glib/glib-2.28.6.ebuild b/dev-libs/glib/glib-2.28.6.ebuild
index 5c9070ad252d..518e276945be 100644
--- a/dev-libs/glib/glib-2.28.6.ebuild
+++ b/dev-libs/glib/glib-2.28.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.6.ebuild,v 1.9 2011/05/20 08:00:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.6.ebuild,v 1.10 2011/05/28 17:25:47 armin76 Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -51,6 +51,9 @@ src_prepare() {
fi
fi
+ # Fix compilation on several arches, bug #351387
+ epatch "${FILESDIR}/${PN}-2.26.1-gatomic-header.patch"
+
# Don't fail gio tests when ran without userpriv, upstream bug 552912
# This is only a temporary workaround, remove as soon as possible
epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"