From 4a9d0a18f7f893b147e72cd04efd967eda457e08 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Thu, 12 Jan 2012 03:32:00 +0000 Subject: [PATCH] Increase gtk+ dep to 3.1.10 (bug #398589, thanks to Jessica Leigh for reporting) and add missing cairo and gdk-pixbuf dependencies. Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- gnome-base/gnome-settings-daemon/ChangeLog | 9 +++++++-- gnome-base/gnome-settings-daemon/Manifest | 12 ++++++------ .../gnome-settings-daemon-3.2.2-r1.ebuild | 9 ++++++--- .../gnome-settings-daemon-3.2.2.ebuild | 9 ++++++--- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog index aa05a0d0d6f4..fc3664277049 100644 --- a/gnome-base/gnome-settings-daemon/ChangeLog +++ b/gnome-base/gnome-settings-daemon/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gnome-settings-daemon -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.100 2011/12/12 00:37:28 tetromino Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.101 2012/01/12 03:32:00 tetromino Exp $ + + 12 Jan 2012; Alexandre Rostovtsev + gnome-settings-daemon-3.2.2.ebuild, gnome-settings-daemon-3.2.2-r1.ebuild: + Increase gtk+ dep to 3.1.10 (bug #398589, thanks to Jessica Leigh for + reporting) and add missing cairo and gdk-pixbuf dependencies. *gnome-settings-daemon-3.2.2-r1 (12 Dec 2011) diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index c73c0f36d6e2..5dfe94fc0ddf 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -16,14 +16,14 @@ DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 RMD160 059 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 RMD160 71aef9419eeca5f9fa59bb55990327c307f9ca31 SHA1 f2550acb4a9fd8f96ead1263ba5739915c303f6e SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86 DIST gnome-settings-daemon-3.2.2.tar.xz 1417364 RMD160 89b5fe84d337fb241a26f658e6daa35faf1fddc1 SHA1 fd79b7f8d28a5d448839e11960c9e07f0cef6ae5 SHA256 d91cac869e23f36942720485f04c3029fd5286fafb6ad12b07377e527b1f6884 EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3945 RMD160 7b1a2738bfb1f3aa93beb2dd491d7a9d6baa4c85 SHA1 00d4145ea4860302867b95ee084214eb63461117 SHA256 bc133cd3e553fdda97e52479efdf29a100ae5941e8c39fb11bd36161af993c05 -EBUILD gnome-settings-daemon-3.2.2-r1.ebuild 4135 RMD160 47e19dfc6c5949b4e2066ab47586c6b97a605f34 SHA1 3e1c3247b24a94fa180fdc8347b8e6c3270b1af5 SHA256 75d044c6b516843a42644e79554b0ca524e6ab57c7955a53b495cdaaf8412fd2 -EBUILD gnome-settings-daemon-3.2.2.ebuild 3883 RMD160 1a869ae34e0e0c90270180bd812d499334bf0ca5 SHA1 0d8ee66f897be99a27f623d489426162dab375fa SHA256 400f6d0b3c20e3e328b8b3871fbed93a1c850cc30ef49a6f4c8473dd4a044862 -MISC ChangeLog 19946 RMD160 147a6a2594ebfdb08a2c5f2138bcf2b48efd394c SHA1 9e6116bfb958a7bfa9dc4f3721282aec2a0c77af SHA256 b06c644b9c78d6d612073bdb5b93e29d04ba83f34f1663348a381f090df47cf5 +EBUILD gnome-settings-daemon-3.2.2-r1.ebuild 4242 RMD160 9d6ef6f3a468ed7a3fa48e0cfa78daf156594001 SHA1 8553a8697d3a278a00c2ae68823061a32edb534b SHA256 86dde6bc9cd3dce868ebfd8059548b76af5a2dea05278d6d4f5efe5cd998867b +EBUILD gnome-settings-daemon-3.2.2.ebuild 3990 RMD160 02bb3685af7f2cff06aee11fb32dfd0416fb3b0b SHA1 b9e5f87342c637a2850180d41748de5d31d56495 SHA256 03b76ba0636707c29d4497b487d877437f9e46e7a54602ba000feb65378720f8 +MISC ChangeLog 20219 RMD160 dc80c9ed660ed871fe21ef3f200afa2457c9edc6 SHA1 62d3de06dbaf1596574438cf6d3d49828099d9f2 SHA256 538afc4cdd6e4431a2841af9b34f5c4a0da2417c3665e8f956502b52a8ae0e6c MISC metadata.xml 507 RMD160 da190ee6888fff3a8db0629c5c45ebd2235bf3fe SHA1 f7e7d8aa01ccdb946e6f7055992ac7f1da807815 SHA256 095c7487bf2ebadd2b70038c9f65724c2c4c6860a5b0da0096264e50a4e36480 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7lTNUACgkQdjK8w9WeBnAxKwEAtJJqh6SEbALRKqwg/P2bmmJ+ -hXCwDoyD+A9dpVkRGBIA/2Fc6OgEvB1NJ2g6jDRcOnvAU2ONtTnQEIlxM/7Ak/YM -=riIB +iF4EAREIAAYFAk8OVDUACgkQdjK8w9WeBnBjpQD8D63F459TcGwZX+QLNs6Uc6Ip +/Sejm8mzIyuxOf1U6iAA/RJMC4n0CenKf6czd+zm5MBvYhuxbKWlN/HO2pDmyOgg +=eag3 -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild index fd0042d995bc..1bd92b617c8d 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild,v 1.1 2011/12/12 00:37:28 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild,v 1.2 2012/01/12 03:32:00 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -16,13 +16,14 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard +udev" +# gtk+-3.1.10 needed for gdk_x11_device_manager_lookup, bug #398589 # Latest gsettings-desktop-schemas is needed due to commit e8d1de92 # Latest gnome-desktop needed to fix the DPMS timeout bug #385063 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice # upower-0.9.11 needed for UpSleepKind COMMON_DEPEND=">=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.14:2 - >=x11-libs/gtk+-2.99.3:3 + >=x11-libs/gtk+-3.1.10:3 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.2.0-r1:3 @@ -33,6 +34,8 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-0.9.16 >=sys-power/upower-0.9.11 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3 x11-libs/libX11 x11-libs/libXi diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild index c72f8777eb92..747daa5f2a38 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild,v 1.2 2011/11/28 18:18:26 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild,v 1.3 2012/01/12 03:32:00 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -16,13 +16,14 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard +udev" +# gtk+-3.1.10 needed for gdk_x11_device_manager_lookup, bug #398589 # Latest gsettings-desktop-schemas is needed due to commit e8d1de92 # Latest gnome-desktop needed to fix the DPMS timeout bug #385063 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice # upower-0.9.11 needed for UpSleepKind COMMON_DEPEND=">=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.14:2 - >=x11-libs/gtk+-2.99.3:3 + >=x11-libs/gtk+-3.1.10:3 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.2.0-r1:3 @@ -33,6 +34,8 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-0.9.16 >=sys-power/upower-0.9.11 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3 x11-libs/libX11 x11-libs/libXi -- 2.26.2