[gnome-shell-extensions/f16] - Update to 3.2.1 - Fix alternative-status-menu extension crash when login
Mohamed ElMorabity
melmorabity at fedoraproject.org
Wed Nov 30 01:24:13 UTC 2011
commit 6d1e4e6f3decb1ac072e8b95ccf411bf257537d9
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date: Wed Nov 30 02:24:03 2011 +0100
- Update to 3.2.1
- Fix alternative-status-menu extension crash when login
.gitignore | 1 +
...ll-extensions-3.2.0-fix_alternate_tab_3.2.patch | 146 --------------------
gnome-shell-extensions-3.2.0-fix_dock_3.2.patch | 41 ------
...ons-3.2.1-fix_alternative_status_menu_3.2.patch | 29 ++++
gnome-shell-extensions.spec | 36 +++--
sources | 2 +-
6 files changed, 51 insertions(+), 204 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 811d623..ae2bc38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/gnome-shell-extensions-3.1.91.tar.xz
/gnome-shell-extensions-e102c0c6.tar.xz
/gnome-shell-extensions-3.2.0.tar.xz
+/gnome-shell-extensions-3.2.1.tar.xz
diff --git a/gnome-shell-extensions-3.2.1-fix_alternative_status_menu_3.2.patch b/gnome-shell-extensions-3.2.1-fix_alternative_status_menu_3.2.patch
new file mode 100644
index 0000000..5212e5d
--- /dev/null
+++ b/gnome-shell-extensions-3.2.1-fix_alternative_status_menu_3.2.patch
@@ -0,0 +1,29 @@
+diff -up gnome-shell-extensions-3.2.0/extensions/alternative-status-menu/extension.js.orig gnome-shell-extensions-3.2.0/extensions/alternative-status-menu/extension.js
+--- gnome-shell-extensions-3.2.0/extensions/alternative-status-menu/extension.js.orig 2011-10-03 18:21:34.000000000 +0200
++++ gnome-shell-extensions-3.2.0/extensions/alternative-status-menu/extension.js 2011-11-22 00:19:45.376877924 +0100
+@@ -107,13 +107,14 @@ function reset(statusMenu) {
+ statusMenu._updateLogout();
+ statusMenu._updateLockScreen();
+
+- statusMenu._presence.getStatus(Lang.bind(statusMenu, statusMenu._updateSwitch));
+-
+- // HACK! Obtain the IMStatusChooserItem and force a _updateUser
+- statusMenu.menu._getMenuItems()[0]._updateUser();
++ statusMenu._updateSwitch(statusMenu._presence.status);
+ }
+
+ function enable() {
++ imports.mainloop.timeout_add(10000, function() { _enable(); });
++}
++
++function _enable() {
+ let statusMenu = Main.panel._statusArea.userMenu;
+ statusMenu.menu.removeAll();
+ createSubMenu.call(statusMenu);
+@@ -126,4 +127,4 @@ function disable() {
+ statusMenu.menu.removeAll();
+ statusMenu._createSubMenu();
+ reset(statusMenu);
+-}
+\ Pas de fin de ligne à la fin du fichier
++}
diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec
index 87a37ba..d67be50 100644
--- a/gnome-shell-extensions.spec
+++ b/gnome-shell-extensions.spec
@@ -1,26 +1,30 @@
%global pkg_prefix gnome-shell-extension
+%global major_version 3.2
Name: gnome-shell-extensions
-Version: 3.2.0
-Release: 2%{?dist}
+Version: %{major_version}.1
+Release: 1%{?dist}
Summary: Modify and extend GNOME Shell functionality and behavior
Group: User Interface/Desktops
License: GPLv2+
URL: http://live.gnome.org/GnomeShell/Extensions
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell-extensions/3.2/%{name}-%{version}.tar.xz
-# Make alternate tab extension with GNOME Shell 3.2.x (patch taken from
-# http://bugzilla.gnome.org/show_bug.cgi?id=661281)
-Patch0: %{name}-3.2.0-fix_alternate_tab_3.2.patch
-# Make dock extension with GNOME Shell 3.2.x (patch taken from
-# http://bugzilla-attachments.gnome.org/attachment.cgi?id=198832)
-Patch1: %{name}-3.2.0-fix_dock_3.2.patch
-
+# Using git archive since upstream hasn't released 3.2.1 yet
+# $ git clone git://git.gnome.org/gnome-shell-extensions/
+# $ cd gnome-shell-extensions/
+# $ git archive --format=tar --prefix=%{name}-%{version}/ %{version} | xz > ../%{name}-%{version}.tar.xz
+Source0: %{name}-%{version}.tar.xz
+# Make alternative-status-menu extension with GNOME Shell 3.2.x (patch taken
+# from upstream's VCS); it includes also a workaround to avoid GNOME Shell crash
+# when enabled at login, due to a race condition, by waiting 10 seconds after
+# login before really enabling the extension
+Patch0: %{name}-3.2.1-fix_alternative_status_menu_3.2.patch
BuildRequires: glib2-devel
+BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(libgtop-2.0)
-Requires: gnome-shell >= 3.2.1
+Requires: gnome-shell >= %{major_version}.1
BuildArch: noarch
%description
@@ -28,7 +32,6 @@ GNOME Shell Extensions is a collection of extensions providing additional
and optional functionality to GNOME Shell.
Enabled extensions:
-
* alternate-tab
* alternative-status-menu
* apps-menu
@@ -241,10 +244,7 @@ This extension adds a systems status menu for rotating monitors
%prep
%setup -q
-%patch0 -p1 -b .fix_alternate_tab
-%patch1 -p1 -b .fix_dock
-
-sed -i 's/$(PACKAGE_VERSION)/3.2.1/' extension.mk
+%patch0 -p1 -b .fix_alternative_status_menu_3.2
%build
@@ -380,6 +380,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%changelog
+* Wed Nov 30 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.2.1-1
+- Update to 3.2.1
+- Fix alternative-status-menu extension crash when login
+
* Wed Nov 09 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.2.0-2
- Fix dock and alternate-tab extensions
- Fix GNOME Shell version to work with GS 3.2.1
diff --git a/sources b/sources
index 3271cea..d2fad9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f67a451349d8b052e3801af6280f89e4 gnome-shell-extensions-3.2.0.tar.xz
+6cc87b75ddb901d861de65c96723cb54 gnome-shell-extensions-3.2.1.tar.xz
More information about the scm-commits
mailing list