public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Priit Laes" <plaes@plaes.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
Date: Fri,  8 Mar 2013 14:39:44 +0000 (UTC)	[thread overview]
Message-ID: <1362753309.8e17626cab72f2dad44d0ccbe58ea0edc675d6fc.plaes@gentoo> (raw)

commit:     8e17626cab72f2dad44d0ccbe58ea0edc675d6fc
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Mar  8 14:35:09 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Mar  8 14:35:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8e17626c

x11-libs/gtk+: Add 3.7.12 to overlay

---
 .../gtk+/{gtk+-9999.ebuild => gtk+-3.7.12.ebuild}  |   30 +++++++++----------
 x11-libs/gtk+/gtk+-9999.ebuild                     |   30 +++++++++----------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-3.7.12.ebuild
similarity index 91%
copy from x11-libs/gtk+/gtk+-9999.ebuild
copy to x11-libs/gtk+/gtk+-3.7.12.ebuild
index 7aae8da..ca52583 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-3.7.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -19,7 +19,8 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-IUSE="aqua colord cups debug egl examples +introspection packagekit test vim-syntax wayland X xinerama"
+# TODO: avahi-browsing for >=cups-1.6
+IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
@@ -49,16 +50,15 @@ COMMON_DEPEND="X? (
 		xinerama? ( x11-libs/libXinerama )
 	)
 	wayland? (
-		>=dev-libs/wayland-0.95
-		media-libs/mesa[egl?,wayland]
-		x11-libs/libxkbcommon
-		egl? ( x11-libs/cairo[opengl] )
+		>=dev-libs/wayland-1.0.0
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2.0
 	)
-	>=dev-libs/glib-2.33.1
-	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/glib-2.35.3
+	>=x11-libs/pango-1.32.4[introspection?]
+	>=dev-libs/atk-2.7.5[introspection?]
 	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
 	>=x11-libs/gtk+-2.24:2
 	media-libs/fontconfig
 	x11-misc/shared-mime-info
@@ -108,8 +108,8 @@ src_prepare() {
 	replace-flags -O3 -O2
 	strip-flags
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
+	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
+	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
 	# Non-working test in gentoo's env
 	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
@@ -160,8 +160,6 @@ src_configure() {
 
 	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
 
-	use wayland && myconf="${myconf} $(use_enable egl wayland-cairo-gl)"
-
 	# Passing --disable-debug is not recommended for production use
 	use debug && myconf="${myconf} --enable-debug=yes"
 
@@ -174,8 +172,8 @@ 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.6[gtk3]'; then
-		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk3]"
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
+		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
 		ewarn "is not installed. Please re-run tests after installing the"
 		ewarn "required version of gnome-themes-standard."
 		return 0

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 7aae8da..ca52583 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -19,7 +19,8 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-IUSE="aqua colord cups debug egl examples +introspection packagekit test vim-syntax wayland X xinerama"
+# TODO: avahi-browsing for >=cups-1.6
+IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
@@ -49,16 +50,15 @@ COMMON_DEPEND="X? (
 		xinerama? ( x11-libs/libXinerama )
 	)
 	wayland? (
-		>=dev-libs/wayland-0.95
-		media-libs/mesa[egl?,wayland]
-		x11-libs/libxkbcommon
-		egl? ( x11-libs/cairo[opengl] )
+		>=dev-libs/wayland-1.0.0
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2.0
 	)
-	>=dev-libs/glib-2.33.1
-	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/glib-2.35.3
+	>=x11-libs/pango-1.32.4[introspection?]
+	>=dev-libs/atk-2.7.5[introspection?]
 	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
 	>=x11-libs/gtk+-2.24:2
 	media-libs/fontconfig
 	x11-misc/shared-mime-info
@@ -108,8 +108,8 @@ src_prepare() {
 	replace-flags -O3 -O2
 	strip-flags
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
+	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
+	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
 	# Non-working test in gentoo's env
 	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
@@ -160,8 +160,6 @@ src_configure() {
 
 	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
 
-	use wayland && myconf="${myconf} $(use_enable egl wayland-cairo-gl)"
-
 	# Passing --disable-debug is not recommended for production use
 	use debug && myconf="${myconf} --enable-debug=yes"
 
@@ -174,8 +172,8 @@ 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.6[gtk3]'; then
-		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk3]"
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
+		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
 		ewarn "is not installed. Please re-run tests after installing the"
 		ewarn "required version of gnome-themes-standard."
 		return 0


             reply	other threads:[~2013-03-08 14:39 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-08 14:39 Priit Laes [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
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-03-07  0:32 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=1362753309.8e17626cab72f2dad44d0ccbe58ea0edc675d6fc.plaes@gentoo \
    --to=plaes@plaes.org \
    --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