summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2009-09-20 23:08:01 +0000
committerMart Raudsepp <leio@gentoo.org>2009-09-20 23:08:01 +0000
commitd4ed523d493688976541321eeee11636a0d3ee5a (patch)
tree6cb17536705d5ca44a9a000b0137c98076ffa36e /x11-libs
parentfix setools QA issues. (diff)
downloadgentoo-2-d4ed523d493688976541321eeee11636a0d3ee5a.tar.gz
gentoo-2-d4ed523d493688976541321eeee11636a0d3ee5a.tar.bz2
gentoo-2-d4ed523d493688976541321eeee11636a0d3ee5a.zip
Fix tests, bug 285698
(Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtk+/ChangeLog6
-rw-r--r--x11-libs/gtk+/files/gtk+-2.16.6-fix-pltcheck-test.patch20
-rw-r--r--x11-libs/gtk+/gtk+-2.16.6.ebuild5
3 files changed, 29 insertions, 2 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 60621399f1ab..11196b2f0305 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/gtk+
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.426 2009/09/20 10:45:44 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.427 2009/09/20 23:08:01 leio Exp $
+
+ 20 Sep 2009; Mart Raudsepp <leio@gentoo.org>
+ +files/gtk+-2.16.6-fix-pltcheck-test.patch, gtk+-2.16.6.ebuild:
+ Fix tests, bug 285698
20 Sep 2009; Mart Raudsepp <leio@gentoo.org> -gtk+-2.16.1.ebuild,
-gtk+-2.16.5.ebuild, -gtk+-2.16.5-r1.ebuild:
diff --git a/x11-libs/gtk+/files/gtk+-2.16.6-fix-pltcheck-test.patch b/x11-libs/gtk+/files/gtk+-2.16.6-fix-pltcheck-test.patch
new file mode 100644
index 000000000000..b21d224b608b
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.16.6-fix-pltcheck-test.patch
@@ -0,0 +1,20 @@
+commit 05d39e4085d70d0693af1afb24ad08dee14b3d99
+Author: Matthias Clasen <mclasen@redhat.com>
+Date: Wed Sep 2 22:14:47 2009 -0400
+
+ Add a missing include
+
+ This was reported in bug 593606.
+
+diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
+index 4b25289..dedbfda 100644
+--- a/gtk/gtkcellrendereraccel.c
++++ b/gtk/gtkcellrendereraccel.c
+@@ -24,6 +24,7 @@
+ #include "gtkcellrendereraccel.h"
+ #include "gtklabel.h"
+ #include "gtkeventbox.h"
++#include "gtkmain.h"
+ #include "gtkprivate.h"
+ #include "gdk/gdkkeysyms.h"
+ #include "gtkalias.h"
diff --git a/x11-libs/gtk+/gtk+-2.16.6.ebuild b/x11-libs/gtk+/gtk+-2.16.6.ebuild
index 93be6d0750c4..0635064c859e 100644
--- a/x11-libs/gtk+/gtk+-2.16.6.ebuild
+++ b/x11-libs/gtk+/gtk+-2.16.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.16.6.ebuild,v 1.2 2009/09/19 19:15:46 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.16.6.ebuild,v 1.3 2009/09/20 23:08:01 leio Exp $
EAPI="2"
@@ -72,6 +72,9 @@ src_prepare() {
# bug #588740, gentoo bug #282744.
epatch "${FILESDIR}/${PN}-2.16.5-jpeg-backward-compatibility.patch"
+ # Fix pltcheck.sh test, bug 285698
+ epatch "${FILESDIR}/${P}-fix-pltcheck-test.patch"
+
# -O3 and company cause random crashes in applications. Bug #133469
replace-flags -O3 -O2
strip-flags