From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
Date: Wed, 7 Mar 2012 00:32:18 +0000 (UTC) [thread overview]
Message-ID: <1331079955.ce57a84690c31c024c193ca866f7783d3b91c8e5.tetromino@gentoo> (raw)
commit: ce57a84690c31c024c193ca866f7783d3b91c8e5
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 7 00:25:55 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Mar 7 00:25:55 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ce57a846
x11-libs/gtk+: 3.3.16 → 3.3.18
Instead of restricting tests, we should simply skip them if a new enough
version of gnome-themes-standard is not installed.
---
.../{gtk+-3.3.16.ebuild => gtk+-3.3.18.ebuild} | 15 ++++++++++-----
x11-libs/gtk+/gtk+-9999.ebuild | 15 ++++++++++-----
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/x11-libs/gtk+/gtk+-3.3.16.ebuild b/x11-libs/gtk+/gtk+-3.3.18.ebuild
similarity index 92%
rename from x11-libs/gtk+/gtk+-3.3.16.ebuild
rename to x11-libs/gtk+/gtk+-3.3.18.ebuild
index 10fe626..d82c7c6 100644
--- a/x11-libs/gtk+/gtk+-3.3.16.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.18.ebuild
@@ -26,10 +26,6 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
-# Testing is broken badly:
-# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-RESTRICT="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 eautoreconf)
# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
@@ -53,7 +49,7 @@ COMMON_DEPEND="!aqua? (
>=x11-libs/gdk-pixbuf-2.25.2:2[introspection?]
)
xinerama? ( x11-libs/libXinerama )
- >=dev-libs/glib-2.31.18
+ >=dev-libs/glib-2.31.20
>=x11-libs/pango-1.29.0[introspection?]
>=dev-libs/atk-2.1.5[introspection?]
>=x11-libs/gtk+-2.24:2
@@ -154,6 +150,15 @@ src_configure() {
}
src_test() {
+ # Tests require a new gnome-themes-standard, but adding it to DEPEND
+ # would result in circular dependencies.
+ # https://bugzilla.gnome.org/show_bug.cgi?id=669562
+ if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then
+ ewarn "Tests will be skipped beecause >=gnome-themes-standard-3.3.90"
+ ewarn "is not installed. Please re-run tests after installing the"
+ ewarn "required version of gnome-themes-standard."
+ return 0
+ fi
unset DBUS_SESSION_BUS_ADDRESS
# Exporting HOME fixes tests using XDG directories spec since all defaults
# are based on $HOME. It is also backward compatible with functions not
diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 10fe626..d82c7c6 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -26,10 +26,6 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
-# Testing is broken badly:
-# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-RESTRICT="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 eautoreconf)
# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
@@ -53,7 +49,7 @@ COMMON_DEPEND="!aqua? (
>=x11-libs/gdk-pixbuf-2.25.2:2[introspection?]
)
xinerama? ( x11-libs/libXinerama )
- >=dev-libs/glib-2.31.18
+ >=dev-libs/glib-2.31.20
>=x11-libs/pango-1.29.0[introspection?]
>=dev-libs/atk-2.1.5[introspection?]
>=x11-libs/gtk+-2.24:2
@@ -154,6 +150,15 @@ src_configure() {
}
src_test() {
+ # Tests require a new gnome-themes-standard, but adding it to DEPEND
+ # would result in circular dependencies.
+ # https://bugzilla.gnome.org/show_bug.cgi?id=669562
+ if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then
+ ewarn "Tests will be skipped beecause >=gnome-themes-standard-3.3.90"
+ ewarn "is not installed. Please re-run tests after installing the"
+ ewarn "required version of gnome-themes-standard."
+ return 0
+ fi
unset DBUS_SESSION_BUS_ADDRESS
# Exporting HOME fixes tests using XDG directories spec since all defaults
# are based on $HOME. It is also backward compatible with functions not
next reply other threads:[~2012-03-07 0:32 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-07 0:32 Alexandre Restovtsev [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-01-12 14:59 [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/ Dennis Lamm
2016-04-09 9:48 Ole Reifschneider
2016-03-25 0:56 Ole Reifschneider
2015-10-11 20:46 Ole Reifschneider
2015-06-09 9:16 Gilles Dartiguelongue
2015-05-25 2:23 Alexandre Rostovtsev
2015-05-14 13:39 Gilles Dartiguelongue
2015-05-12 19:31 Gilles Dartiguelongue
2015-04-25 18:52 Alexandre Rostovtsev
2014-12-14 22:46 Gilles Dartiguelongue
2014-12-14 22:46 Gilles Dartiguelongue
2014-11-23 23:51 Remi Cardona
2014-11-23 23:51 Remi Cardona
2014-11-03 23:24 Gilles Dartiguelongue
2014-10-25 21:07 Gilles Dartiguelongue
2014-10-13 21:51 Gilles Dartiguelongue
2014-04-25 23:35 Gilles Dartiguelongue
2014-04-22 21:27 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2014-02-12 23:48 Gilles Dartiguelongue
2013-12-22 20:26 Gilles Dartiguelongue
2013-12-18 19:16 Priit Laes
2013-12-12 23:20 Gilles Dartiguelongue
2013-12-02 15:30 Priit Laes
2013-12-01 14:28 Gilles Dartiguelongue
2013-03-20 5:55 Priit Laes
2013-03-08 14:39 Priit Laes
2012-10-10 7:51 Alexandre Rostovtsev
2012-09-22 15:54 Nirbheek Chauhan
2012-09-10 6:22 Nirbheek Chauhan
2012-09-05 16:43 Nirbheek Chauhan
2012-09-05 15:48 Nirbheek Chauhan
2012-07-22 4:41 Priit Laes
2012-07-13 10:21 Priit Laes
2012-05-06 18:15 Alexandre Restovtsev
2012-03-14 4:48 Alexandre Restovtsev
2012-03-08 18:19 Alexandre Restovtsev
2012-03-07 16:45 Alexandre Restovtsev
2012-02-08 7:52 Priit Laes
2012-02-03 8:32 Priit Laes
2012-01-23 21:29 Priit Laes
2012-01-23 19:23 Priit Laes
2012-01-17 11:30 Priit Laes
2012-01-11 4:36 Nirbheek Chauhan
2011-12-25 0:43 Nirbheek Chauhan
2011-12-14 19:51 Alexandre Restovtsev
2011-10-21 19:25 Alexandre Restovtsev
2011-10-06 11:51 Alexandre Restovtsev
2011-04-05 0:57 Nirbheek Chauhan
2011-03-26 1:58 Nirbheek Chauhan
2011-03-23 22:24 Nirbheek Chauhan
2011-03-22 1:18 Nirbheek Chauhan
2011-03-19 23:23 Nirbheek Chauhan
2011-02-22 0:31 Nirbheek Chauhan
2011-02-12 9:30 Nirbheek Chauhan
2011-02-12 9:30 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331079955.ce57a84690c31c024c193ca866f7783d3b91c8e5.tetromino@gentoo \
--to=tetromino@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox