From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S1lVR-0000Bj-4k for garchives@archives.gentoo.org; Sun, 26 Feb 2012 21:19:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 828BCE13B5; Sun, 26 Feb 2012 21:19:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3C581E13B5 for ; Sun, 26 Feb 2012 21:19:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FAC01B400B for ; Sun, 26 Feb 2012 21:19:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DE8D9E53FD for ; Sun, 26 Feb 2012 21:19:34 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1330290760.db005457476b85432ddbe41503b823578aecc7f9.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch x11-libs/gtk+/files/gtk+-3.2.1-selector.errors x11-libs/gtk+/gtk+-3.3.14.ebuild x11-libs/gtk+/gtk+-3.3.16.ebuild x11-libs/gtk+/gtk+-9999.ebuild X-VCS-Directories: x11-libs/gtk+/files/ x11-libs/gtk+/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: db005457476b85432ddbe41503b823578aecc7f9 X-VCS-Branch: master Date: Sun, 26 Feb 2012 21:19:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: fc588156-78e9-4cd2-9b82-f687b6680355 X-Archives-Hash: 1725e50a01aeb6400d80e35f6a3ecb33 commit: db005457476b85432ddbe41503b823578aecc7f9 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sun Feb 26 20:44:22 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sun Feb 26 21:12:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Ddb005457 x11-libs/gtk+: 3.3.14 =E2=86=92 3.3.16 Drop unneeded patch, fix gnome2_src_prepare usage. --- x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch | 25 --------------= ------ x11-libs/gtk+/files/gtk+-3.2.1-selector.errors | 1 - .../{gtk+-3.3.14.ebuild =3D> gtk+-3.3.16.ebuild} | 10 ++----- x11-libs/gtk+/gtk+-9999.ebuild | 14 +++++----- 4 files changed, 10 insertions(+), 40 deletions(-) diff --git a/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch b/x11-lib= s/gtk+/files/gtk+-3.2.1-failing-tests.patch deleted file mode 100644 index ca7c896..0000000 --- a/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -Skip failing tests. See bug #384855 and https://bugzilla.gnome.org/show_= bug.cgi?id=3D660931 - -diff --git a/gtk/tests/treeview-scrolling.c b/gtk/tests/treeview-scrolli= ng.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/gt= k+/files/gtk+-3.2.1-selector.errors deleted file mode 100644 index 42cc16e..0000000 --- a/x11-libs/gtk+/files/gtk+-3.2.1-selector.errors +++ /dev/null @@ -1 +0,0 @@ -selector.css:201: error: GTK_CSS_PROVIDER_ERROR_SYNTAX diff --git a/x11-libs/gtk+/gtk+-3.3.14.ebuild b/x11-libs/gtk+/gtk+-3.3.16= .ebuild similarity index 95% rename from x11-libs/gtk+/gtk+-3.3.14.ebuild rename to x11-libs/gtk+/gtk+-3.3.16.ebuild index b2bdac9..10fe626 100644 --- a/x11-libs/gtk+/gtk+-3.3.14.ebuild +++ b/x11-libs/gtk+/gtk+-3.3.16.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D"4" =20 -inherit eutils flag-o-matic gnome.org gnome2 libtool virtualx +inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -53,7 +53,7 @@ COMMON_DEPEND=3D"!aqua? ( >=3Dx11-libs/gdk-pixbuf-2.25.2:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) - >=3Ddev-libs/glib-2.31.14 + >=3Ddev-libs/glib-2.31.18 >=3Dx11-libs/pango-1.29.0[introspection?] >=3Ddev-libs/atk-2.1.5[introspection?] >=3Dx11-libs/gtk+-2.24:2 @@ -113,10 +113,6 @@ src_prepare() { # Test results depend on the list of mounted filesystems! rm -v tests/a11y/pickers.{ui,txt} || die "rm failed" =20 - # Failing treeview scrolling tests; bug #384855, - # https://bugzilla.gnome.org/show_bug.cgi?id=3D660931 - 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 @@ -129,7 +125,7 @@ src_prepare() { [[ ${PV} !=3D 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in fi =20 - gnome2_src_prepare + [[ ${PV} =3D 9999 ]] && gnome2_src_prepare } =20 src_configure() { diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebu= ild index d73c294..10fe626 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D"4" =20 -inherit eutils flag-o-matic gnome.org gnome2 libtool virtualx +inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -26,6 +26,10 @@ else KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc= ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-ma= cos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi =20 +# Testing is broken badly: +# https://bugzilla.gnome.org/show_bug.cgi?id=3D669562 +RESTRICT=3D"test" + # FIXME: introspection data is built against system installation of gtk+= :3 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautor= econf) # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert @@ -49,7 +53,7 @@ COMMON_DEPEND=3D"!aqua? ( >=3Dx11-libs/gdk-pixbuf-2.25.2:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) - >=3Ddev-libs/glib-2.31.14 + >=3Ddev-libs/glib-2.31.18 >=3Dx11-libs/pango-1.29.0[introspection?] >=3Ddev-libs/atk-2.1.5[introspection?] >=3Dx11-libs/gtk+-2.24:2 @@ -109,10 +113,6 @@ src_prepare() { # Test results depend on the list of mounted filesystems! rm -v tests/a11y/pickers.{ui,txt} || die "rm failed" =20 - # Failing treeview scrolling tests; bug #384855, - # https://bugzilla.gnome.org/show_bug.cgi?id=3D660931 - 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 @@ -125,7 +125,7 @@ src_prepare() { [[ ${PV} !=3D 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in fi =20 - gnome2_src_prepare + [[ ${PV} =3D 9999 ]] && gnome2_src_prepare } =20 src_configure() {