summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2008-09-27 14:08:03 +0000
committerMart Raudsepp <leio@gentoo.org>2008-09-27 14:08:03 +0000
commitf178af9e50e0f62d3f161a354360eb225c4b48a1 (patch)
tree6d2ca1f6b5e54386649ea06e8b6a7de718fa7b00 /gnome-base
parentStable for HPPA (bug #238535). (diff)
downloadgentoo-2-f178af9e50e0f62d3f161a354360eb225c4b48a1.tar.gz
gentoo-2-f178af9e50e0f62d3f161a354360eb225c4b48a1.tar.bz2
gentoo-2-f178af9e50e0f62d3f161a354360eb225c4b48a1.zip
Fix tests when ran against gtk+-2.14
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/libglade/ChangeLog6
-rw-r--r--gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch11
-rw-r--r--gnome-base/libglade/libglade-2.6.3.ebuild5
3 files changed, 20 insertions, 2 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/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
}