public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ole Reifschneider" <tranquility@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
Date: Fri, 25 Mar 2016 00:56:15 +0000 (UTC)	[thread overview]
Message-ID: <1458867162.7d64fc2c829f9bc2aabbe26af6fd5af16f36be91.tranquility@gentoo> (raw)

commit:     7d64fc2c829f9bc2aabbe26af6fd5af16f36be91
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 16:34:53 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 00:52:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7d64fc2c

x11-libs/gtk+: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 .../{gtk+-3.18.0.ebuild => gtk+-3.20.0.ebuild}     | 25 ++++++----------------
 x11-libs/gtk+/gtk+-9999.ebuild                     |  7 +++---
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.18.0.ebuild b/x11-libs/gtk+/gtk+-3.20.0.ebuild
similarity index 87%
rename from x11-libs/gtk+/gtk+-3.18.0.ebuild
rename to x11-libs/gtk+/gtk+-3.20.0.ebuild
index b70ecdf..27481f2 100644
--- a/x11-libs/gtk+/gtk+-3.18.0.ebuild
+++ b/x11-libs/gtk+/gtk+-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # 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)
@@ -40,7 +40,8 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
 	wayland? (
-		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.0.0[${MULTILIB_USEDEP}]
 		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
 		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
@@ -50,7 +51,7 @@ COMMON_DEPEND="
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
@@ -88,10 +89,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<x11-libs/vte-0.31.0:2.90
 	>=x11-themes/adwaita-icon-theme-3.14
 	X? ( !<x11-base/xorg-server-1.11.4 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
 "
 # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
 PDEPEND="
@@ -177,24 +174,14 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
 
-	unset DBUS_SESSION_BUS_ADDRESS
 	unset DISPLAY #527682
 	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
 }
 
 multilib_src_install() {
 	gnome2_src_install
-
-	# add -framework Carbon to the .pc files, bug #???
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
 }
 
 multilib_src_install_all() {
@@ -239,7 +226,7 @@ pkg_postinst() {
 pkg_postrm() {
 	gnome2_pkg_postrm
 
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
 		multilib_pkg_postrm() {
 			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
 		}

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 5536c9e..7c73fa4 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -48,7 +48,8 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
 	wayland? (
-		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.0.0[${MULTILIB_USEDEP}]
 		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
 		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
@@ -58,7 +59,7 @@ COMMON_DEPEND="
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXcomposite[${MULTILIB_USEDEP}]


             reply	other threads:[~2016-03-25  0:56 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-25  0:56 Ole Reifschneider [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
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-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=1458867162.7d64fc2c829f9bc2aabbe26af6fd5af16f36be91.tranquility@gentoo \
    --to=tranquility@gentoo.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