Fix tests, bug 285698

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64

4 files changed, 32 insertions, 4 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+/Manifest b/x11-libs/gtk+/Manifest
index 3e534fd1d367..895866269419 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -16,6 +16,7 @@ AUX gtk+-2.14.7-filechooser.patch 13798 RMD160 0c1ef9582cb82693bb2cf0e80478b3027
 AUX gtk+-2.14.7-ignore-gtkcurve.patch 4458 RMD160 c74312ebe9febae6449f61d757e587d30d237ce0 SHA1 ee0fe90c1c2262d94e67ca5e6561591a52e82e72 SHA256 748d23b31c29b93f168599b579bbb2ee7beba518f18a8e12b69f62d4835c35b7
 AUX gtk+-2.14.7-uncertain-mime.patch 770 RMD160 141ed81f793a74e193f814b6f118e926e10a0f93 SHA1 fd5e6282f7fca578de521011e2b1b2d3a35a533b SHA256 767d0c2d8a5d63b1ae63868e731c7e21cdae57f1f5930a62c7385ef98869fa43
 AUX gtk+-2.16.5-jpeg-backward-compatibility.patch 937 RMD160 f72974e2c5b6f7d0f9ad453b2770e394edc483c0 SHA1 6919f1b87172341693152165f6912fc81dd557fe SHA256 7be9129b2b259b4c5be0150d55eb1e5b7c6ef6f1db4f188a48f2c8cb9a72de8f
+AUX gtk+-2.16.6-fix-pltcheck-test.patch 567 RMD160 5f17d717cd7479fb477c8be407ce41f99b5e537f SHA1 49f802b744dc5775d889902c168f669a7710d432 SHA256 67b3649bc2e57de17af2919d49d759a0e358da878cb36f8d7b083dec2738ca5d
 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd
 AUX gtk+-2.8.10-xinerama.patch 1083 RMD160 499801f3be2289bdc656563bb5c96797d14512f7 SHA1 7817e3c2bbec1058192d524d68e78635fa48beca SHA256 7786691d5f89588abc7174e97cbd374d8cbe98b4e8dfd27005eade03b047aa2d
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
@@ -29,6 +30,6 @@ EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9b
 EBUILD gtk+-2.12.11.ebuild 4958 RMD160 940e8c7b465316386f7878590a274ce3b74b4593 SHA1 db01e240a5e17bc78c616c47f27b2bab8bbb0f23 SHA256 ac75435bc30144c72351b7075140719deeb9ba78bb1ae575d453ed337706e9d7
 EBUILD gtk+-2.12.12.ebuild 4964 RMD160 96178ab4ded53396ba6c17fa8ed6d8d858046e61 SHA1 c8a3e1340574f3603f1a4ff335be2bbac802c20b SHA256 712d43258904b8254aab79598c1d9d25a92f5b8e671fdc3ce39063b60a352ca9
 EBUILD gtk+-2.14.7-r2.ebuild 4837 RMD160 d4756b6e99afefee642f0939e645c9382983e1db SHA1 d32b99bbcf345438c3f812f755eca0a0e92f46ba SHA256 8dc785991f9cd614edf3b6f0e3c4adfcd2691dcc4ef963727ffaefb4eafaf0aa
-EBUILD gtk+-2.16.6.ebuild 4750 RMD160 1bea18a64bbd654de569b586c75cd6c3f0a0fea6 SHA1 544bcb0e45ece26480675d6b38141f6640cf75af SHA256 31b8e2d868b6a8ce0e99d9da464d943f354159e6a84e2f3719d2d9943e963ed0
-MISC ChangeLog 62697 RMD160 fc0d3a14eac8cced595df18ab65b26a6cd0e824e SHA1 597492c5f4ad0ee092e3df2b97d65670de86d5e3 SHA256 5bd73af519b4f55db017f40098b613e4a0affc784683f5b1e8648d93704c9276
+EBUILD gtk+-2.16.6.ebuild 4836 RMD160 9b0eb448617dc6933f4536f158f9da83e1b50f1b SHA1 94d3a831b8fd7ff8abe183c6499cd53eb27caa3c SHA256 59858c29a000210280812d276b2f8b7053b7739ab567edab30dc486a5aebfdfb
+MISC ChangeLog 62835 RMD160 4127e2da4225ab88d9eea15b615db714520485b6 SHA1 19f3be9c25481b62db0c5d30a593a8a2a957216c SHA256 9c3c8b0865dda316fd43c3b19aa806fb74ed3a8e57076182b2f5af601bebb8a5
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
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