diff options
| -rw-r--r-- | gnome-base/gnome-shell/ChangeLog | 10 | ||||
| -rw-r--r-- | gnome-base/gnome-shell/files/gnome-shell-3.8.0-suspend.patch | 55 | ||||
| -rw-r--r-- | gnome-base/gnome-shell/gnome-shell-3.8.4.ebuild (renamed from gnome-base/gnome-shell/gnome-shell-3.8.3-r1.ebuild) | 30 |
3 files changed, 27 insertions, 68 deletions
diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog index 3d4c7d0984c5..0e2e91083281 100644 --- a/gnome-base/gnome-shell/ChangeLog +++ b/gnome-base/gnome-shell/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-base/gnome-shell # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.43 2013/07/29 20:24:45 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.44 2013/07/31 03:35:45 tetromino Exp $ + +*gnome-shell-3.8.4 (31 Jul 2013) + + 31 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + -gnome-shell-3.8.3-r1.ebuild, +gnome-shell-3.8.4.ebuild, + -files/gnome-shell-3.8.0-suspend.patch: + Version bump, includes patches from 3.8.3-r2 and a few additional bugfixes. + Drop old. 29 Jul 2013; Pacho Ramos <pacho@gentoo.org> gnome-shell-3.8.3-r2.ebuild: Inherit systemd (#478670 by Alphat-PC) diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.8.0-suspend.patch b/gnome-base/gnome-shell/files/gnome-shell-3.8.0-suspend.patch deleted file mode 100644 index 9f7f5229fe75..000000000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.8.0-suspend.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b91d9c2867952520e685d689f75bc019befcaaf3 Mon Sep 17 00:00:00 2001 -From: Florian Müllner <fmuellner@gnome.org> -Date: Sun, 03 Feb 2013 20:53:33 +0000 -Subject: loginManager: Make suspend() a NOP in the ConsoleKit path - -UPower will remove its suspend support eventually, and g-s-d already -depends on logind for power management. - -https://bugzilla.gnome.org/show_bug.cgi?id=693162 - -Index: gnome-shell-3.7.90/js/misc/loginManager.js -=================================================================== ---- gnome-shell-3.7.90.orig/js/misc/loginManager.js 2013-02-23 15:17:56.532244380 -0500 -+++ gnome-shell-3.7.90/js/misc/loginManager.js 2013-02-23 15:19:29.800240480 -0500 -@@ -5,6 +5,7 @@ - const Lang = imports.lang; - const Mainloop = imports.mainloop; - const Shell = imports.gi.Shell; -+const UPowerGlib = imports.gi.UPowerGlib; - const Signals = imports.signals; - - const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'> -@@ -137,12 +138,10 @@ - }, - - canSuspend: function(asyncCallback) { -- this._proxy.CanSuspendRemote(function(result, error) { -- if (error) -- asyncCallback(false); -- else -- asyncCallback(result[0] != 'no'); -- }); -+ Mainloop.idle_add(Lang.bind(this, function() { -+ asyncCallback(this._upClient.get_can_suspend()); -+ return false; -+ })); - }, - - listSessions: function(asyncCallback) { -@@ -199,6 +198,7 @@ - this._proxy = new ConsoleKitManager(Gio.DBus.system, - 'org.freedesktop.ConsoleKit', - '/org/freedesktop/ConsoleKit/Manager'); -+ this._upClient = new UPowerGlib.Client(); - }, - - // Having this function is a bit of a hack since the Systemd and ConsoleKit -@@ -252,6 +252,7 @@ - suspend: function() { - this.emit('prepare-for-sleep', true); - this.emit('prepare-for-sleep', false); -+ this._upClient.suspend_sync(null); - }, - - inhibit: function(reason, callback) { diff --git a/gnome-base/gnome-shell/gnome-shell-3.8.3-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.8.4.ebuild index cc5255502819..849bb26bf94b 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.8.3-r1.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.8.4.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.3-r1.ebuild,v 1.2 2013/06/14 18:57:27 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.4.ebuild,v 1.1 2013/07/31 03:35:45 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" PYTHON_COMPAT=( python2_{6,7} ) -inherit autotools eutils gnome2 multilib pax-utils python-r1 +inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" HOMEPAGE="http://live.gnome.org/GnomeShell" @@ -15,7 +15,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell" LICENSE="GPL-2+ LGPL-2+" SLOT="0" IUSE="+bluetooth +i18n +networkmanager" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" # libXfixes-5.0 needed for pointer barriers # TODO: gstreamer support is currently automagical: @@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" # gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3 # https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html COMMON_DEPEND=" + app-crypt/libsecret >=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] @@ -33,7 +34,7 @@ COMMON_DEPEND=" >=x11-libs/gtk+-3.7.9:3[introspection] >=media-libs/clutter-1.13.4:1.0[introspection] >=dev-libs/json-glib-0.13.2 - >=dev-libs/libcroco-0.6.2:0.6 + >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.7.4 >=gnome-base/gnome-keyring-3.3.90 @@ -74,10 +75,11 @@ COMMON_DEPEND=" # 2. Introspection stuff needed via imports.gi.* # 3. gnome-session is needed for gnome-session-quit # 4. Control shell settings -# 5. xdg-utils needed for xdg-open, used by extension tool -# 6. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows -# 7. IBus is needed for i18n integration -# 8. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c +# 5. Systemd needed for suspending support +# 6. xdg-utils needed for xdg-open, used by extension tool +# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows +# 8. IBus is needed for i18n integration +# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c RDEPEND="${COMMON_DEPEND} >=sys-auth/polkit-0.101[introspection] @@ -92,12 +94,13 @@ RDEPEND="${COMMON_DEPEND} >=gnome-base/gnome-settings-daemon-3.8.3 >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?] + >=sys-apps/systemd-31 + x11-misc/xdg-utils media-fonts/dejavu x11-themes/gnome-icon-theme-symbolic - || ( sys-auth/consolekit >=sys-apps/systemd-31 ) i18n? ( >=app-i18n/ibus-1.4.99[dconf,gtk3,introspection] ) networkmanager? ( net-misc/mobile-broadband-provider-info @@ -124,9 +127,6 @@ src_prepare() { # Make networkmanager optional, bug #398593 epatch "${FILESDIR}/${PN}-3.8.3-networkmanager-flag.patch" - # Revert suspend break, upstream bug #693162 (from Debian) - epatch "${FILESDIR}/${PN}-3.8.0-suspend.patch" - # Re-lock the screen if we're restarted from a previously crashed shell (from 'master') epatch "${FILESDIR}/${PN}-3.8.3-relock-screen.patch" @@ -209,4 +209,10 @@ pkg_postinst() { ewarn "You will need to emerge media-libs/mesa with USE=classic." fi fi + + if ! systemd_is_booted; then + ewarn "${PN} needs Systemd to be *running* for working" + ewarn "properly. Please follow the this guide to migrate:" + ewarn "http://wiki.gentoo.org/wiki/Systemd" + fi } |