[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     32b0eb364f75bb849c3902f6a44df8f9d3f14eab
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Oct 17 16:59:56 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct 17 19:07:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=32b0eb36

x11-libs/gtk+: 3.2.0 → 3.2.1

Bump with numerous accessibility- and osx-related fixes.

Disable /TreeView/scrolling/after-realize/constant-height/path-995
and bug-111500 tests; see bug #384855 and
https://bugzilla.gnome.org/show_bug.cgi?id=660931)

Add missing selectors.errors file (needed for the css parser test).

Disable reftests (many of them fail when building from portage, but
strangely enough succeed when building from my home directory; need to
investigate why).

Disable a11y picker test (result depends on the look of
GtkFileChooserButton, which in turn depends on the list of mounted
filesystems).

---
 x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch |   25 ++++++++++++++++++++
 x11-libs/gtk+/files/gtk+-3.2.1-selector.errors     |    1 +
 .../gtk+/{gtk+-3.2.0.ebuild => gtk+-3.2.1.ebuild}  |   16 ++++++++++++
 x11-libs/gtk+/gtk+-9999.ebuild                     |   16 ++++++++++++
 4 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch b/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch
new file mode 100644
index 0000000..ca7c896
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch
@@ -0,0 +1,25 @@
+Skip failing tests. See bug #384855 and https://bugzilla.gnome.org/show_bug.cgi?id=660931
+
+diff --git a/gtk/tests/treeview-scrolling.c b/gtk/tests/treeview-scrolling.c
+index 63bf429..0f8bafd 100644
+--- a/gtk/tests/treeview-scrolling.c
++++ b/gtk/tests/treeview-scrolling.c
+@@ -1300,7 +1300,6 @@ add_tests (gboolean mixed,
+ 	add_test ("750", mixed, test_type, use_align, row_align, setup, scroll_func);
+ 	add_test ("990", mixed, test_type, use_align, row_align, setup, scroll_func);
+ 	add_test ("991", mixed, test_type, use_align, row_align, setup, scroll_func);
+-	add_test ("995", mixed, test_type, use_align, row_align, setup, scroll_func);
+ 	add_test ("997", mixed, test_type, use_align, row_align, setup, scroll_func);
+ 	add_test ("999", mixed, test_type, use_align, row_align, setup, scroll_func);
+ }
+@@ -1491,10 +1490,6 @@ main (int argc, char **argv)
+ 		    ScrollFixture, NULL,
+ 		    scroll_fixture_tree_setup, test_bug93584,
+ 		    scroll_fixture_teardown);
+-	g_test_add ("/TreeView/scrolling/specific/bug-111500",
+-		    ScrollFixture, NULL,
+-		    scroll_fixture_tree_setup, test_bug111500,
+-		    scroll_fixture_teardown);
+ 	g_test_add ("/TreeView/scrolling/specific/bug-111500-mixed",
+ 		    ScrollFixture, NULL,
+ 		    scroll_fixture_mixed_tree_setup, test_bug111500_mixed,

diff --git a/x11-libs/gtk+/files/gtk+-3.2.1-selector.errors b/x11-libs/gtk+/files/gtk+-3.2.1-selector.errors
new file mode 100644
index 0000000..42cc16e
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.2.1-selector.errors
@@ -0,0 +1 @@
+selector.css:201: error: GTK_CSS_PROVIDER_ERROR_SYNTAX

diff --git a/x11-libs/gtk+/gtk+-3.2.0.ebuild b/x11-libs/gtk+/gtk+-3.2.1.ebuild
similarity index 89%
rename from x11-libs/gtk+/gtk+-3.2.0.ebuild
rename to x11-libs/gtk+/gtk+-3.2.1.ebuild
index 0cfe730..d2495e8 100644
--- a/x11-libs/gtk+/gtk+-3.2.0.ebuild
+++ b/x11-libs/gtk+/gtk+-3.2.1.ebuild
@@ -99,6 +99,22 @@ src_prepare() {
 	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
 		-i gtk/tests/recentmanager.c || die "sed 2 failed"
 
+	# Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
+	cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
+		tests/css/parser/selector.errors || die "cp failed"
+
+	# FIXME: multiple reftests fail when run from portage (but succeed when
+	# run from a manual compile in a temp directory)
+	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
+		-i tests/Makefile.* || die "sed 3 failed"
+
+	# Test results depend on the list of mounted filesystems!
+	rm tests/a11y/pickers.{ui,txt} || die "rm failed"
+
+	# Failing treeview scrolling tests; bug #384855,
+	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
+	epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
+
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 0cfe730..d2495e8 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -99,6 +99,22 @@ src_prepare() {
 	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
 		-i gtk/tests/recentmanager.c || die "sed 2 failed"
 
+	# Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
+	cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
+		tests/css/parser/selector.errors || die "cp failed"
+
+	# FIXME: multiple reftests fail when run from portage (but succeed when
+	# run from a manual compile in a temp directory)
+	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
+		-i tests/Makefile.* || die "sed 3 failed"
+
+	# Test results depend on the list of mounted filesystems!
+	rm tests/a11y/pickers.{ui,txt} || die "rm failed"
+
+	# Failing treeview scrolling tests; bug #384855,
+	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
+	epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
+
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am