Also, drop old 3.0 version.
Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64
# ChangeLog for gnome-base/gnome-shell
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.3 2011/11/05 07:51:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.4 2011/11/13 10:07:07 tetromino Exp $
+
+ 13 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+ -gnome-shell-3.0.2-r1.ebuild,
+ -files/gnome-shell-3.0.2-unbreak-extension-css.patch,
+ -files/gnome-shell-3.0.2-user-removed-signals.patch,
+ gnome-shell-3.2.1-r1.ebuild, metadata.xml:
+ Depend on accountsservice[introspection] (bug #390361, thanks to Cesko Voeten
+ <cvoeten@gmail.com> for reporting).
+ Also, drop old 3.0 version.
*gnome-shell-3.2.1-r1 (05 Nov 2011)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX gnome-shell-3.0.2-unbreak-extension-css.patch 3156 RMD160 bedd16d40e5c2ca63641878aab09f520cd7d1aef SHA1 4726b88a5ec797e827848dd1bcde518ead81bf8f SHA256 00f501167401bb98125c0df84340c3e15a60514fdb2f7fb83e60e3b7ec9ad615
-AUX gnome-shell-3.0.2-user-removed-signals.patch 1252 RMD160 74eeaa734afa678a03ab6aa108197871a076d504 SHA1 f419c8d6c69dc3a7232345e2730a1f34605227f7 SHA256 6ce72c46e9abbfa21e58abaeea872202df0609aaaa1233822f53758cfd901348
AUX gnome-shell-3.2.1-messageTray-reduce-fade.patch 1625 RMD160 b525fe9d41b758d11b6372bd8294f5f6db94a9d6 SHA1 b417bd0a71be60caf553f34567c9ed1cb0376803 SHA256 a041beacbda9b85ed745911e1e2b28f0e3a9d4518dac7f329a1c342bc3fdc417
AUX gnome-shell-3.2.1-theme-lighten-sent-message.patch 1181 RMD160 15dc31a7b5e5421c7a6a58befedf8222b87e9ea1 SHA1 e4f0d05ad3198b60be16cf8352a3cd7e3aeade9c SHA256 82495b9a76a70d0a81bbb1d6a01f4390a0de8b2ebe975fdf571ea5fb7312d278
-DIST gnome-shell-3.0.2.tar.bz2 1073613 RMD160 c94b73f53189026684a98aaa0ee301680fa54a92 SHA1 1dcdbb2fd77641edfb222fa9aad6efa1eaff9895 SHA256 a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95
DIST gnome-shell-3.2.1.tar.xz 1115744 RMD160 b56647fe0dc322110872ee8853d9253c7b870500 SHA1 62bcebbd7f274c6808212b85ad56d2edf894ecec SHA256 ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb
-EBUILD gnome-shell-3.0.2-r1.ebuild 4300 RMD160 c1e9857d9474225c13e45fe225467924fcc7bf7d SHA1 564a2c5577cbe936a095855ab8c1a46b1c632143 SHA256 e81bb356460a6bf4ddb06f16097acd55bb4918ecc475782fdbe79d3d5e8c1167
-EBUILD gnome-shell-3.2.1-r1.ebuild 4583 RMD160 a09f96f4c1bf425b1f1f6cdcb5cf0972618e1ae0 SHA1 7ab9f57c2182c5ebf6f5ec986e547c72170a1ac7 SHA256 77ab987c43ed8ee0ac78ebd592197835c8d062ecd825ca9a565cf67b490c3447
-MISC ChangeLog 1259 RMD160 cd93ea89e0069260dc9a8e3ada63d90c1f903b0c SHA1 412522d64e3a511fbb05a0ab13f24aae01943d6a SHA256 d1bbc505acc7b55ddd58cbbf10801c8e71fefb8db0feccc8fb5057c8ddfb3751
-MISC metadata.xml 344 RMD160 73c8f7dc01392af4b61b7e07158fc7a5873203f8 SHA1 00777bd2a77b1e7ecfd0615ae6351ff1252c3eab SHA256 cfc3dec563e033cb293df843e2ccb5fe123cfda6080641908f312ca53f63608b
+EBUILD gnome-shell-3.2.1-r1.ebuild 4598 RMD160 54541df0bf5ce152063c33f5b1fb4c87bca6890a SHA1 7f4d88a7afd300ac64e8f8ba165478df98e3fd13 SHA256 16df39db623b14eea02172ba8faa14e55bae2f42d99b394bd104345e85fdebbd
+MISC ChangeLog 1655 RMD160 40ea89ceb527e32b7178a7863402bbf4d4e8ea39 SHA1 8e18ba149ef3ea70db599df61c20edb858c5e489 SHA256 2d5f9009235bd2150d0db4075bc7dce4fefa7d3ea334e927efc435f5a32a72a1
+MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk606yIACgkQdjK8w9WeBnBNEAD+KzOUR7nRt6tJwPVlyUcNQ/BA
-ETTr0ULHe5vsrPX1y+UA/1ZdNl2ygokTPQrQQZ+4ijd59A6RmMBR4VXgI2SZ7VEU
-=0S40
+iF4EAREIAAYFAk6/ltEACgkQdjK8w9WeBnAACwEApEaFf17UKQe42QS/4anAF2uS
+dN2QmRjaspM3vmZDesUBAIRqSNs7kibPFLkMB81q4KpR2kHKG3VzQTR6fHarFqqD
+=oDrG
-----END PGP SIGNATURE-----
+++ /dev/null
-From 2674d96e547b27ed5c377804c1059bdfd926086e Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Thu, 02 Jun 2011 15:05:08 +0000
-Subject: StTheme: retrive the list of custom stylesheets and use it in loadTheme()
-
-Using the list of stylesheets loaded with st_theme_load_stylesheet(),
-one can build an StTheme that is completely identical to the previous
-one, except for one property (application-stylesheet).
-This allows rt and the user-theme extension to work while respecting
-the theming of other extensions.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650971
----
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 1d27b4c..c0f4845 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -393,12 +393,21 @@ function setThemeStylesheet(cssStylesheet)
- */
- function loadTheme() {
- let themeContext = St.ThemeContext.get_for_stage (global.stage);
-+ let previousTheme = themeContext.get_theme();
-
- let cssStylesheet = _defaultCssStylesheet;
- if (_cssStylesheet != null)
- cssStylesheet = _cssStylesheet;
-
- let theme = new St.Theme ({ application_stylesheet: cssStylesheet });
-+
-+ if (previousTheme) {
-+ let customStylesheets = previousTheme.get_custom_stylesheets();
-+
-+ for (let i = 0; i < customStylesheets.length; i++)
-+ theme.load_stylesheet(customStylesheets[i]);
-+ }
-+
- themeContext.set_theme (theme);
- }
-
-diff --git a/src/st/st-theme.c b/src/st/st-theme.c
-index 326d9de..2058e32 100644
---- a/src/st/st-theme.c
-+++ b/src/st/st-theme.c
-@@ -256,6 +256,30 @@ st_theme_unload_stylesheet (StTheme *theme,
- cr_stylesheet_unref (stylesheet);
- }
-
-+/**
-+ * st_theme_get_custom_stylesheets:
-+ * @theme: an #StTheme
-+ *
-+ * Returns: (transfer full) (element-type utf8): the list of stylesheet filenames
-+ * that were loaded with st_theme_load_stylesheet()
-+ */
-+GSList*
-+st_theme_get_custom_stylesheets (StTheme *theme)
-+{
-+ GSList *result = NULL;
-+ GSList *iter;
-+
-+ for (iter = theme->custom_stylesheets; iter; iter = iter->next)
-+ {
-+ CRStyleSheet *stylesheet = iter->data;
-+ gchar *filename = g_hash_table_lookup (theme->filenames_by_stylesheet, stylesheet);
-+
-+ result = g_slist_prepend (result, g_strdup (filename));
-+ }
-+
-+ return result;
-+}
-+
- static GObject *
- st_theme_constructor (GType type,
- guint n_construct_properties,
-diff --git a/src/st/st-theme.h b/src/st/st-theme.h
-index 003c2a7..0a044bf 100644
---- a/src/st/st-theme.h
-+++ b/src/st/st-theme.h
-@@ -51,9 +51,9 @@ StTheme *st_theme_new (const char *application_stylesheet,
- const char *theme_stylesheet,
- const char *default_stylesheet);
-
--gboolean st_theme_load_stylesheet (StTheme *theme, const char *path, GError **error);
--
--void st_theme_unload_stylesheet (StTheme *theme, const char *path);
-+gboolean st_theme_load_stylesheet (StTheme *theme, const char *path, GError **error);
-+void st_theme_unload_stylesheet (StTheme *theme, const char *path);
-+GSList *st_theme_get_custom_stylesheets (StTheme *theme);
-
- G_END_DECLS
-
---
-cgit v0.9.0.2
+++ /dev/null
-From 9a7f3dbd2030a5e1b54297f1aa7cf228eccafb27 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 24 May 2011 22:15:10 -0400
-Subject: [PATCH] gdm: ignore user-removed signals for untracked users
-
-If we don't know about a user, we don't care if it goes away,
-and we shouldn't try to remove it from the book keeping.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647893
----
- src/gdmuser/gdm-user-manager.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
-index e7ca833..561be32 100644
---- a/src/gdmuser/gdm-user-manager.c
-+++ b/src/gdmuser/gdm-user-manager.c
-@@ -887,6 +887,13 @@ on_user_removed_in_accounts_service (DBusGProxy *proxy,
-
- user = g_hash_table_lookup (manager->priv->users_by_object_path, object_path);
-
-+ if (user == NULL) {
-+ g_debug ("GdmUserManager: ignoring untracked user %s", object_path);
-+ return;
-+ } else {
-+ g_debug ("GdmUserManager: tracked user %s removed from accounts service", object_path);
-+ }
-+
- manager->priv->new_users = g_slist_remove (manager->priv->new_users, user);
-
- remove_user (manager, user);
---
-1.7.5.1
\ No newline at end of file
+++ /dev/null
-# Copyright 1999-2011 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.0.2-r1.ebuild,v 1.2 2011/10/21 02:22:11 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+nm-applet"
-KEYWORDS="~amd64 ~x86"
-
-# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
-# FIXME: Automagic gnome-bluetooth[introspection] support.
-# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
-# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
-# libXfixes-5.0 needed for pointer barriers
-COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
- >=dev-libs/gjs-0.7.11
- >=dev-libs/gobject-introspection-0.10.1
- x11-libs/gdk-pixbuf:2[introspection]
- >=x11-libs/gtk+-3.0.0:3[introspection]
- >=media-libs/clutter-1.5.15:1.0[introspection]
- >=gnome-base/gnome-desktop-2.91.2:3
- >=gnome-base/gsettings-desktop-schemas-2.91.91
- >=gnome-extra/evolution-data-server-2.32.0
- >=media-libs/gstreamer-0.10.16:0.10
- >=media-libs/gst-plugins-base-0.10.16:0.10
- >=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.13.12[introspection]
- >=net-wireless/gnome-bluetooth-2.90.0[introspection]
- >=sys-auth/polkit-0.100[introspection]
- >=x11-wm/mutter-3.0.0[introspection]
-
- dev-libs/dbus-glib
- dev-libs/libxml2:2
- x11-libs/pango[introspection]
- dev-libs/libcroco:0.6
-
- gnome-base/gconf:2[introspection]
- gnome-base/gnome-menus
- gnome-base/librsvg
- media-libs/libcanberra
- media-sound/pulseaudio
-
- x11-libs/startup-notification
- x11-libs/libX11
- >=x11-libs/libXfixes-5.0
- x11-apps/mesa-progs"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 1. Pull in polkit-0.101 for pretty authorization dialogs
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager
-# 6. nm-applet is needed for auth prompting and the wireless connection dialog
-RDEPEND="${COMMON_DEPEND}
- >=sys-auth/polkit-0.101[introspection]
-
- >=gnome-base/dconf-0.4.1
- >=gnome-base/libgnomekbd-2.91.4[introspection]
- sys-power/upower[introspection]
-
- >=gnome-base/gnome-session-2.91.91
-
- >=gnome-base/gnome-settings-daemon-2.91
- >=gnome-base/gnome-control-center-2.91.92-r1
-
- >=sys-apps/accountsservice-0.6.12
-
- nm-applet? (
- >=gnome-extra/nm-applet-0.8.999
- >=net-misc/networkmanager-0.8.999[introspection] )"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
- >=dev-util/pkgconfig-0.22
- >=dev-util/intltool-0.26
- gnome-base/gnome-common
- !!=dev-lang/spidermonkey-1.8.2*"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-pkg_setup() {
- DOCS="AUTHORS README"
- # Don't error out on warnings
- G2CONF="${G2CONF}
- --enable-compile-warnings=maximum
- --disable-schemas-compile
- --disable-jhbuild-wrapper-script"
-}
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=647893
- # can trigger the crash even with accountsservice-0.6.12
- epatch "${FILESDIR}/${PN}-3.0.2-user-removed-signals.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=650971
- # Don't clobber extensions' styles
- epatch "${FILESDIR}/${PN}-3.0.2-unbreak-extension-css.patch"
- gnome2_src_prepare
-
- # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
- # Note: sed Makefile.in because it is generated from several Makefile.ams
- sed -e 's/-DG_DISABLE_DEPRECATED//g' -i src/Makefile.in || die "sed failed"
-}
-
-src_install() {
- gnome2_src_install
- python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
- ! has_version 'media-plugins/gst-plugins-vp8'; then
- ewarn "To make use of GNOME Shell's built-in screen recording utility,"
- ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23"
- ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change"
- ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
- fi
-}
# Copyright 1999-2011 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.2.1-r1.ebuild,v 1.1 2011/11/05 07:51:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild,v 1.2 2011/11/13 10:07:07 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
>=gnome-base/gnome-settings-daemon-2.91
>=gnome-base/gnome-control-center-2.91.92-r1
- >=sys-apps/accountsservice-0.6.14
+ >=sys-apps/accountsservice-0.6.14[introspection]
>=app-accessibility/caribou-0.3"
DEPEND="${COMMON_DEPEND}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <use>
- <flag name="nm-applet">Pull in an automagic dependency on
- <pkg>gnome-extra/nm-applet</pkg> and
- <pkg>net-misc/networkmanager</pkg>, should be removed soon</flag>
- </use>
+<herd>gnome</herd>
</pkgmetadata>
projects / gentoo.git / commitdiff