Fix tests when ran against gtk+-2.14

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 23 insertions, 4 deletions

diff --git a/gnome-base/libglade/ChangeLog b/gnome-base/libglade/ChangeLog
index 9c92fb9917b4..c1a91b16ad45 100644
--- a/gnome-base/libglade/ChangeLog
+++ b/gnome-base/libglade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libglade
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.114 2008/08/19 08:28:51 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.115 2008/09/27 14:08:02 leio Exp $
+
+  27 Sep 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/libglade-2.6.3-fix_tests-page_size.patch, libglade-2.6.3.ebuild:
+  Fix tests when ran against gtk+-2.14
 
 *libglade-2.6.3 (19 Aug 2008)
 
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 98cdb3c115a1..6013b722866c 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -1,9 +1,10 @@
 AUX Makefile.in.am-2.4.2-xmlcatalog.patch 1331 RMD160 d47a94fb8ef65dbb6974936e0284fc691dc9c54f SHA1 c8bf1cf951f32de6b2f05176cf197e3d4b0ca6f9 SHA256 e1bb6b353fcacb54948ecbb3886dfa8a9a199370bef53cf38868bf744f02f0a0
+AUX libglade-2.6.3-fix_tests-page_size.patch 370 RMD160 260e1116a6fe2fdfc42bf525ab9f6a258b85411d SHA1 20913ad146f3c9f7db71ddadfeb9877c65891a4f SHA256 9e7cf985bf07128da18b2e49d10e5d7cf1eaa8923fc6648e413249a210842b4a
 DIST libglade-2.6.1.tar.bz2 346536 RMD160 74c546e68c479f59b3100c6e267592d91539dcef SHA1 ad44ddb46ae0127f3d026683cb0862d277dd03a7 SHA256 94c33ffe748c849021358c1e9f758c1fd5f1abda00ba6776975837f42c730cf2
 DIST libglade-2.6.2.tar.bz2 351755 RMD160 d6b25114cdbcc5c74412186a9a5a2cc9a140c4e7 SHA1 99ffcf33bcd0fdd67191c99b117a0cefc26b84bc SHA256 7c79a2afaef4fd6726bad0530e29d2bc19689e07720a05c3ad32012e5aed3138
 DIST libglade-2.6.3.tar.bz2 358989 RMD160 73b00932c5a5ea1dfa25b2677783f5e52202ce8e SHA1 0af8b3263f241d4495243282e64b9aa43fecb618 SHA256 ee9ffee149523aac49ddff37c0fbaa968b6ff9787fa841d65a7084201e46ab90
 EBUILD libglade-2.6.1.ebuild 1369 RMD160 e43ae723ca4a364d477b1ea8cbd6dc57161bdc2c SHA1 c64600485d787ba43026e48c018047fe92277c60 SHA256 81989311a106727ae284ee9a89536c777f8a54e5b7800e07fe2150644189ff1b
 EBUILD libglade-2.6.2.ebuild 1370 RMD160 38eaf0ff05a5d322d108f861bf6f7fcb4f273a8b SHA1 26e011881726fadcd08b2b5650dfa02e40b6769c SHA256 31e345c93ecdb63069af173f3b01e7d64a5f08bfebba0f7927a1337755e75ce0
-EBUILD libglade-2.6.3.ebuild 1377 RMD160 044afa8df8b553c181b55d8b4b1a5ec5eab683a9 SHA1 d9928747507e8abc5df82a3af81054d37cb2e815 SHA256 b35d0006f9412beff3b260081268295ec4875b49baac4c33cbf82dbc7e99b776
-MISC ChangeLog 13748 RMD160 1c6591aaea36e69cf050a2238a42beff8cbb509e SHA1 20859ef1c9cfe735fba6769670de4fdda2643407 SHA256 e5d8a31d285446aa2473a64967c4645b6efa911e55318050486dec278eff977d
+EBUILD libglade-2.6.3.ebuild 1513 RMD160 97ecbed4dd32da404e4afc48c49524b866c19cfc SHA1 58dea9396ef4b8969d51f8b1c06eaa97d5378099 SHA256 c81e0e10103553918cdbc76c68109364c7739196efc4c2518990bdadd65e5453
+MISC ChangeLog 13909 RMD160 b2f5b15a9dc63607391fcea2e1440b41a505026d SHA1 4a46e32f7db47681cd392f94f1875ce21e8f5804 SHA256 e2a19328cfe85bc1396047056c9359abf1a36f484f116f1db8b0925139dc9a21
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch
new file mode 100644
index 000000000000..c26ff83d9c15
--- /dev/null
+++ b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch
@@ -0,0 +1,11 @@
+--- tests/test-libglade-gtk.glade.orig	2008-09-27 16:50:40.164242312 +0300
++++ tests/test-libglade-gtk.glade	2008-09-27 16:50:43.460908927 +0300
+@@ -470,7 +470,7 @@
+ 	  <upper>100</upper>
+ 	  <step>1</step>
+ 	  <page>10</page>
+-	  <page_size>10</page_size>
++	  <page_size>0</page_size>
+ 	  <child>
+ 	    <left_attach>1</left_attach>
+ 	    <right_attach>2</right_attach>
diff --git a/gnome-base/libglade/libglade-2.6.3.ebuild b/gnome-base/libglade/libglade-2.6.3.ebuild
index b73e4d72f77c..2e703de075e2 100644
--- a/gnome-base/libglade/libglade-2.6.3.ebuild
+++ b/gnome-base/libglade/libglade-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.3.ebuild,v 1.1 2008/08/19 08:28:51 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.3.ebuild,v 1.2 2008/09/27 14:08:02 leio Exp $
 
 # FIXME : catalog stuff
 inherit eutils gnome2
@@ -29,6 +29,9 @@ src_compile() {
 	# because we do it ourselves in postinst()
 	epatch "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch
 
+	# patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort
+	epatch "${FILESDIR}/${P}-fix_tests-page_size.patch"
+
 	gnome2_src_compile
 }