summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-05-06 14:55:32 +0000
committerFabian Groffen <grobian@gentoo.org>2012-05-06 14:55:32 +0000
commit05fced12dd4765fd93e1499200e2dc055e2921c6 (patch)
treed7daee4661a274187fe8b2a7fc069ec7c6be6c62 /x11-libs/gtk+
parentRemove old (diff)
downloadhistorical-05fced12dd4765fd93e1499200e2dc055e2921c6.tar.gz
historical-05fced12dd4765fd93e1499200e2dc055e2921c6.tar.bz2
historical-05fced12dd4765fd93e1499200e2dc055e2921c6.zip
Fix compilation on Solaris, --force for non-existing? libxkbcommon dep
Package-Manager: portage-2.2.01.20430-prefix/cvs/SunOS i386 RepoMan-Options: --force
Diffstat (limited to 'x11-libs/gtk+')
-rw-r--r--x11-libs/gtk+/ChangeLog5
-rw-r--r--x11-libs/gtk+/Manifest14
-rw-r--r--x11-libs/gtk+/gtk+-3.4.2.ebuild6
3 files changed, 21 insertions, 4 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 743f84ce3378..225d37352525 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,9 @@
# 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.588 2012/05/05 03:52:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.589 2012/05/06 14:55:32 grobian Exp $
+
+ 06 May 2012; Fabian Groffen <grobian@gentoo.org> gtk+-3.4.2.ebuild:
+ Fix compilation on Solaris
05 May 2012; Jeff Horelick <jdhore@gentoo.org> gtk+-2.24.5-r1.ebuild,
gtk+-2.24.8-r1.ebuild, gtk+-2.24.9-r1.ebuild, gtk+-2.24.10-r1.ebuild,
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 6c285efef953..235d2aa8e830 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
AUX gtk+-1.2.10-automake.patch 3270 RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e SHA1 1ba127d50f7eddc86e07a37c819b9dd233d27926 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2
@@ -49,6 +52,13 @@ EBUILD gtk+-3.2.4-r1.ebuild 7010 RMD160 78e324b317bea6108d22ddbc9d5f59ca90b301cc
EBUILD gtk+-3.2.4.ebuild 6902 RMD160 3091f6cd25f61fcbc020b998b3dc16ccb4ff1674 SHA1 9165077fe3ae579e4c2a705fd67fe3cbc7934817 SHA256 b2aba078836967bf1479b807b09d815978991a186e5dc29c3c2114de987041b5
EBUILD gtk+-3.4.1-r1.ebuild 7126 RMD160 3711bd05b5d2cc0c63329c6601632094fcefdd48 SHA1 1909af84e98d2e0a6ea0e755a24e08e7b24b89b8 SHA256 2965cb0775769d3a488cee6e1b39f55c257615264161c1813c88267e13f23e9f
EBUILD gtk+-3.4.1.ebuild 6934 RMD160 6f91b98214aba215afad9b0b622d32801dc2a274 SHA1 35d6d32e68e37e1841256f3d95d2b152cddbf30d SHA256 03bc0da89fbf702fc404b01272596dda5de3b98a527059874a4cd86ac2e61892
-EBUILD gtk+-3.4.2.ebuild 6934 RMD160 d7a547d99c65b278afd89ffcd3bf2a2c7cb2c237 SHA1 70908cad4d281714060706d9161c1178bb0292ab SHA256 3b540e8e839da863a9e1c8620957eb2199a48f6a69ada0c8a86c4f1665c29661
-MISC ChangeLog 90956 RMD160 272bd63368b066b4706c4a7c4e2f0a31bffc867d SHA1 5f5cbe79fd95cc683e923307ab1b52253a1ed84c SHA256 6bf1d08fbbf58668b81a173b8bf3f3f07fc7fd82c94f124e02d8f5217607cdb5
+EBUILD gtk+-3.4.2.ebuild 7111 RMD160 49ca0ba851cc52ff4ad71249a133467b66c239a7 SHA1 f4f0108b0374295f697a93d4ef07bae5acd2cccf SHA256 f181cb56765247871fac8ec838cddf56b1e82244893543ed4580ab0dd706a49d
+MISC ChangeLog 91057 RMD160 a06e7acaecd974f719001d4cbf0e811d4b6b1a28 SHA1 d8a0c16745dcda867c2e9d0e8dee73f2bbc80556 SHA256 4ff86fde7658ece204378c77b3fde328173858a7e1f16eed763cfd8d5d2f106a
MISC metadata.xml 870 RMD160 a94fb5c6acb8fb9015e5f4c40c8b9b1eb3ddf9d8 SHA1 2769a95a236ce2a234c7d5bd75231de142345445 SHA256 90835d0edfdbbc25c781b0c7bcf9b7b6db82ce5f412082ec56d250891e1853ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (SunOS)
+
+iEYEARECAAYFAk+mkOkACgkQX3X2B8XHTomdSQCfXXDgap1fWaHrcZ8CzNdrMLGo
+EowAn0EvJEHIpvRyl/1OB5KnYwwzuA0d
+=gZa+
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.4.2.ebuild b/x11-libs/gtk+/gtk+-3.4.2.ebuild
index 5fb8c121dc5f..dd98ec3d7563 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.2 2012/05/05 03:52:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.2.ebuild,v 1.3 2012/05/06 14:55:32 grobian Exp $
EAPI="4"
@@ -103,6 +103,10 @@ src_prepare() {
# Apparently needed for new libxkbcommon headers; bug #408131
epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
+ # Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
+ [[ ${CHOST} == *-solaris* ]] && \
+ sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die
+
# Non-working test in gentoo's env
sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-i gtk/tests/testing.c || die "sed 1 failed"