From: Nirbheek Chauhan Date: Fri, 30 Sep 2011 19:43:33 +0000 (+0000) Subject: Add GNOME Shell from the gnome overlay, for GNOME 3 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8aa6b66ae5947815e4db6e610a8e719ab98a7e23;p=gentoo.git Add GNOME Shell from the gnome overlay, for GNOME 3 Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog new file mode 100644 index 000000000000..9148585fc424 --- /dev/null +++ b/gnome-base/gnome-shell/ChangeLog @@ -0,0 +1,12 @@ +# 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.1 2011/09/30 19:43:33 nirbheek Exp $ + +*gnome-shell-3.0.2-r1 (30 Sep 2011) + + 30 Sep 2011; Nirbheek Chauhan + +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, +metadata.xml: + Add GNOME Shell from the gnome overlay, for GNOME 3 + diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest new file mode 100644 index 000000000000..8419b2008afa --- /dev/null +++ b/gnome-base/gnome-shell/Manifest @@ -0,0 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +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 +DIST gnome-shell-3.0.2.tar.bz2 1073613 RMD160 c94b73f53189026684a98aaa0ee301680fa54a92 SHA1 1dcdbb2fd77641edfb222fa9aad6efa1eaff9895 SHA256 a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95 +EBUILD gnome-shell-3.0.2-r1.ebuild 4076 RMD160 97ceb012b617ea5fe78d2fc919590da949d56054 SHA1 c58e249c6a3462d536bf15a92e9a62628fea0adf SHA256 619ad5ea8a07b236a0f35dc1f0d01b8686fb3f326c233c01513ff46127a12df7 +MISC ChangeLog 523 RMD160 a1b66e29bc62e12339e504f6babceaa9f0d92fd8 SHA1 b7c5dacbfa625c184944e2f5dde7ccfdb2d99ff6 SHA256 191d4c7292335f8029fc9009cadb6d9c7ffce5ed2ae6ddf4d94d864ccf069dc6 +MISC metadata.xml 344 RMD160 73c8f7dc01392af4b61b7e07158fc7a5873203f8 SHA1 00777bd2a77b1e7ecfd0615ae6351ff1252c3eab SHA256 cfc3dec563e033cb293df843e2ccb5fe123cfda6080641908f312ca53f63608b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBAgAGBQJOhhvoAAoJEO/kOhxWD91kP54P/R9FSIe8fHIRM0We8dFDUy6N +IjNDST13zGvy+DU7R9sTXT4AIUxpa9p6tGGiFU9nax2iq8pQz5KOJy2lwVI879Mv +Fd7JUSBV0+Ssid3aOTawd9ouxMGZ1kdcPkwfxmFZR6ffFmpQRS06LV09vpN4TIkf +G5PNNrzAwxOri1mxEHjDuUD55WTANNAVbIV4XY1qcqrHz2yByChnb98l/+PYr+xY +6/4OOdpRLWtEmkOBNaw5CEFtg1mvFPuf8o+Y5yJ9gUf4FirsK7LQlGXvBEds2Q3a +h/rz5YdLTTuLSEG49EfuYoLFqs/CMNBVGFd6cDa/PaotlHxQJkLVoWsbiD7XLS+b +PwzWrOtfUJX+c1zZAFvs0GLOsWpYC0sd6BCPQTva+8xQSkZdc19eeAL6VIA4qZRM +l/Hl1JKuEDO2vIZTm7dgeFrLlX5TjHEPCB0DHQ4KZM88o/FboOoi7cCAVyO1gvf9 +X9hkih2xGW0IFCOLmRuc6kIvRaDiIkU8motCvz4HPo///aUdlmVpuEtJ44UjGkRC +8gLXtU01TkgagEJY8hyDOPMS9+d7g1eu1wA1rBV463lCMGOPssIVz31Gaz1l1qfS +5XpY7HSg4cST5uKB81p+IdLaOCaNEM+36+4Wl5Q0TBpd5Wsi9UmldjOerBCZprZq +eLp6mn46yL5gdBT1E2KP +=Yx9O +-----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-unbreak-extension-css.patch b/gnome-base/gnome-shell/files/gnome-shell-3.0.2-unbreak-extension-css.patch new file mode 100644 index 000000000000..75c6aee62d62 --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.0.2-unbreak-extension-css.patch @@ -0,0 +1,93 @@ +From 2674d96e547b27ed5c377804c1059bdfd926086e Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +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 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch b/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch new file mode 100644 index 000000000000..adae1f0cb5b9 --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch @@ -0,0 +1,33 @@ +From 9a7f3dbd2030a5e1b54297f1aa7cf228eccafb27 Mon Sep 17 00:00:00 2001 +From: Ray Strode +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 diff --git a/gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild new file mode 100644 index 000000000000..4442c3e4b002 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild @@ -0,0 +1,125 @@ +# 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.1 2011/09/30 19:43:33 nirbheek 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 +} + +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 +} diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml new file mode 100644 index 000000000000..03af788d5366 --- /dev/null +++ b/gnome-base/gnome-shell/metadata.xml @@ -0,0 +1,10 @@ + + + + gnome + + Pull in an automagic dependency on + gnome-extra/nm-applet and + net-misc/networkmanager, should be removed soon + +