summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-05-06 16:51:27 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-05-06 16:51:27 +0000
commitcf729d7ce55827c0b9d27ec78ac4f3648345ac5f (patch)
tree6ccdf7ae9747a3c58e8711be9d2da90c2d06e1f0 /x11-libs/gtk+
parentia64/s390/sh/sparc stable wrt #395735 (diff)
downloadgentoo-2-cf729d7ce55827c0b9d27ec78ac4f3648345ac5f.tar.gz
gentoo-2-cf729d7ce55827c0b9d27ec78ac4f3648345ac5f.tar.bz2
gentoo-2-cf729d7ce55827c0b9d27ec78ac4f3648345ac5f.zip
Fix compilation on non-solaris
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/gtk+')
-rw-r--r--x11-libs/gtk+/ChangeLog6
-rw-r--r--x11-libs/gtk+/gtk+-3.4.2.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 225d37352525..6bf7fb7bf7d7 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/gtk+
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.589 2012/05/06 14:55:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.590 2012/05/06 16:51:27 chithanh Exp $
+
+ 06 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ gtk+-3.4.2.ebuild:
+ Fix compilation on non-solaris
06 May 2012; Fabian Groffen <grobian@gentoo.org> gtk+-3.4.2.ebuild:
Fix compilation on Solaris
diff --git a/x11-libs/gtk+/gtk+-3.4.2.ebuild b/x11-libs/gtk+/gtk+-3.4.2.ebuild
index dd98ec3d7563..b5f7552eccde 100644
--- a/x11-libs/gtk+/gtk+-3.4.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.2.ebuild,v 1.3 2012/05/06 14:55:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.2.ebuild,v 1.4 2012/05/06 16:51:27 chithanh Exp $
EAPI="4"
@@ -104,8 +104,9 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
- [[ ${CHOST} == *-solaris* ]] && \
+ if [[ ${CHOST} == *-solaris* ]]; then
sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die
+ fi
# Non-working test in gentoo's env
sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \