Bump, fixes lots of crashes, rendering errrors, and memory leaks (in network menu, notifications, workspace thumbnails, icons, etc.) Also, mark gnome-shell executable to allow running under hardened/PaX (bug #398941, thanks to Orson Teodoro). Drop old.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

5 files changed, 32 insertions, 268 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index f28d47c54168..bd30c35c47e7 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.8 2012/01/13 09:57:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.9 2012/01/21 02:05:31 tetromino Exp $
+
+*gnome-shell-3.2.2.1 (21 Jan 2012)
+
+  21 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-shell-3.2.1-r1.ebuild, -gnome-shell-3.2.1-r2.ebuild,
+  -files/gnome-shell-3.2.1-messageTray-reduce-fade.patch,
+  -files/gnome-shell-3.2.1-theme-lighten-sent-message.patch,
+  +gnome-shell-3.2.2.1.ebuild:
+  Bump, fixes lots of crashes, rendering errrors, and memory leaks (in network
+  menu, notifications, workspace thumbnails, icons, etc.) Also, mark
+  gnome-shell executable to allow running under hardened/PaX (bug #398941,
+  thanks to Orson Teodoro). Drop old.
 
 *gnome-shell-3.2.1-r3 (13 Jan 2012)
 
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-messageTray-reduce-fade.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-messageTray-reduce-fade.patch
deleted file mode 100644
index 22a4ce33faa9..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-messageTray-reduce-fade.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 18541c447e30154e7bd5806e11e3fe70fb9d5887 Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@mecheye.net>
-Date: Thu, 27 Oct 2011 13:52:17 -0400
-Subject: [PATCH 2/2] messageTray: Reduce the scroll view fade
-
-https://bugzilla.gnome.org/show_bug.cgi?id=662226
----
- data/theme/gnome-shell.css |    1 +
- js/ui/messageTray.js       |    3 +--
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
-index 0e09866..ea81870 100644
---- a/data/theme/gnome-shell.css
-+++ b/data/theme/gnome-shell.css
-@@ -1217,6 +1217,7 @@ StTooltip StLabel {
- 
- #notification-scrollview {
-     max-height: 10em;
-+    -st-vfade-offset: 24px;
- }
- 
- #notification-scrollview > .top-shadow, #notification-scrollview > .bottom-shadow {
-diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
-index 75eb9f9..ca12fb1 100644
---- a/js/ui/messageTray.js
-+++ b/js/ui/messageTray.js
-@@ -597,8 +597,7 @@ Notification.prototype = {
-         this._table.add_style_class_name('multi-line-notification');
-         this._scrollArea = new St.ScrollView({ name: 'notification-scrollview',
-                                                vscrollbar_policy: this._scrollPolicy,
--                                               hscrollbar_policy: Gtk.PolicyType.NEVER,
--                                               style_class: 'vfade' });
-+                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
-         this._table.add(this._scrollArea, { row: 1,
-                                             col: 2 });
-         this._updateLastColumnSettings();
--- 
-1.7.3.4
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-theme-lighten-sent-message.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-theme-lighten-sent-message.patch
deleted file mode 100644
index 55052b757ad8..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-theme-lighten-sent-message.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3294a6e1a7d7a6bea1cb02ec671aaa0d350b57f5 Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@mecheye.net>
-Date: Fri, 2 Sep 2011 16:01:24 -0400
-Subject: [PATCH 1/2] theme: Lighten up the sent message color, clean up
-
-Properly apply "received" style and drop unused border-radius styles
-now that the messages have no background color
-
-https://bugzilla.gnome.org/show_bug.cgi?id=658096
----
- data/theme/gnome-shell.css |    7 ++-----
- 1 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
-index 4487159..0e09866 100644
---- a/data/theme/gnome-shell.css
-+++ b/data/theme/gnome-shell.css
-@@ -1329,9 +1329,8 @@ StTooltip StLabel {
-     padding: 8px 0;
- }
- 
--.chat-sent {
-+.chat-received {
-     padding-left: 4px;
--    border-radius: 4px;
- }
- 
- .chat-received:rtl {
-@@ -1341,8 +1340,7 @@ StTooltip StLabel {
- 
- .chat-sent {
-     padding-left: 18pt;
--    border-radius: 4px;
--    color: #7E7E7E;
-+    color: #959595;
- }
- 
- .chat-sent:rtl {
-@@ -1352,7 +1350,6 @@ StTooltip StLabel {
- 
- .chat-meta-message {
-     padding-left: 4px;
--    border-radius: 4px;
-     font-size: 9pt;
-     color: #bbbbbb;
- }
--- 
-1.7.3.4
-
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild
deleted file mode 100644
index 93028b2bb5da..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 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.5 2012/01/13 09:57:08 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 python
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-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-1.29.18
-	>=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.7.5:1.0[introspection]
-	app-misc/ca-certificates
-	>=dev-libs/folks-0.5.2
-	>=dev-libs/json-glib-0.13.2
-	>=gnome-base/gnome-desktop-2.91.2:3
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	gnome-base/libgnome-keyring
-	>=gnome-extra/evolution-data-server-2.91.6
-	>=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/libsoup:2.4[introspection]
-	>=net-libs/telepathy-glib-0.15.5[introspection]
-	>=net-misc/networkmanager-0.8.999[introspection]
-	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/mutter-3.2.1[introspection]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	x11-libs/pango[introspection]
-	>=dev-libs/libcroco-0.6.2:0.6
-
-	gnome-base/gconf:2[introspection]
-	>=gnome-base/gnome-menus-2.29.10:3[introspection]
-	gnome-base/librsvg
-	media-libs/libcanberra
-	media-sound/pulseaudio
-
-	>=x11-libs/startup-notification-0.11
-	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 (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-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.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	net-misc/mobile-broadband-provider-info
-	sys-libs/timezone-data"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
-	>=dev-util/pkgconfig-0.22
-	>=dev-util/intltool-0.40
-	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 NEWS README"
-	# Don't error out on warnings
-	G2CONF="${G2CONF}
-		--enable-compile-warnings=maximum
-		--disable-schemas-compile
-		--disable-jhbuild-wrapper-script
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	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 browser-plugin/Makefile.in || die "sed failed"
-
-	# Two chat messageTray fixes taken from git master, not in gnome-3-2 yet
-	epatch "${FILESDIR}/${PN}-3.2.1-theme-lighten-sent-message.patch"
-	epatch "${FILESDIR}/${PN}-3.2.1-messageTray-reduce-fade.patch"
-}
-
-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
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "GNOME Shell has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in"
-		ewarn "fallback mode, or switch to open-source drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]"; then
-		elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
-
-	if has_version "media-libs/mesa[video_cards_intel]"; then
-		elog "GNOME Shell is unstable under gallium-mode i915/i965 mesa drivers."
-		elog "Make sure that classic architecture for i915 and i965 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[classic]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=classic."
-		fi
-	fi
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.1-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
index 06c18a5ba476..ef967a7aef64 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.2.1-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 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-r2.ebuild,v 1.2 2012/01/13 09:57:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild,v 1.1 2012/01/21 02:05:31 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit autotools eutils gnome2 python
+inherit autotools eutils gnome2 pax-utils python
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="http://live.gnome.org/GnomeShell"
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluetooth"
+IUSE="+bluetooth +networkmanager"
 KEYWORDS="~amd64 ~x86"
 
 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
@@ -35,14 +35,12 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	>=dev-libs/json-glib-0.13.2
 	>=gnome-base/gnome-desktop-2.91.2:3
 	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	gnome-base/libgnome-keyring
 	>=gnome-extra/evolution-data-server-2.91.6
 	>=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/libsoup:2.4[introspection]
 	>=net-libs/telepathy-glib-0.15.5[introspection]
-	>=net-misc/networkmanager-0.8.999[introspection]
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-wm/mutter-3.2.1[introspection]
 
@@ -62,7 +60,10 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	>=x11-libs/libXfixes-5.0
 	x11-apps/mesa-progs
 
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )"
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[introspection] )"
 # Runtime-only deps are probably incomplete and approximate.
 # Each block:
 # 1. Pull in polkit-0.101 for pretty authorization dialogs
@@ -92,8 +93,9 @@ RDEPEND="${COMMON_DEPEND}
 
 	x11-misc/xdg-utils
 
-	net-misc/mobile-broadband-provider-info
-	sys-libs/timezone-data"
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
@@ -111,6 +113,7 @@ pkg_setup() {
 		--disable-schemas-compile
 		--disable-jhbuild-wrapper-script
 		$(use_with bluetooth)
+		$(use_enable networkmanager)
 		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
 	python_set_active_version 2
@@ -124,6 +127,9 @@ src_prepare() {
 	# Fix automagic gnome-bluetooth dep, bug #398145
 	epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch"
 
+	# Make networkmanager optional, bug #398593
+	epatch "${FILESDIR}/${PN}-3.2.1-optional-networkmanager.patch"
+
 	eautoreconf
 	gnome2_src_prepare
 
@@ -135,11 +141,15 @@ src_prepare() {
 
 src_install() {
 	gnome2_src_install
-	python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
+	python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool"
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/gnome-shell"
 }
 
 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,"