pool/gnome-shell
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 155415 from GNOME:Factory

Browse Source 
Update to 3.6.3 - Stable branch - contains most our patches and fixes, which makes it clearer that what we ship is the same version... Wanted for 12.3

OBS-URL: https://build.opensuse.org/request/show/155415
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=70
This commit is contained in:
Stephan Kulow 2013-02-14 19:38:36 +00:00 committed by Git OBS Bridge
commit cd8eb8180f
8 changed files with 114 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
g-s-fix-notification-expansion.patch Normal file
View File

@ -0,0 +1,66 @@
From 9d931b5e013475be5733fc92bd105b3a691a4097 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Fri, 30 Nov 2012 15:05:38 +0000
Subject: MessageTray: fix notification height expansion
MessageTray._tween removes all tweens now, so it removes also
those setting the height to expanded for critical notifications.
This is a regression from 1a27d7dfc02c06bd0ccf4258a9108207b8832ce4
https://bugzilla.gnome.org/show_bug.cgi?id=689295
---
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index ce61e25..ef0cc02 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2200,40 +2200,28 @@ const MessageTray = new Lang.Class({
_updateShowingNotification: function() {
this._notification.acknowledged = true;
- Tweener.removeTweens(this._notificationWidget);
-
// We auto-expand notifications with CRITICAL urgency.
- // We use Tweener.removeTweens() to remove a tween that was hiding the notification we are
- // updating, in case that notification was in the process of being hidden. However,
- // Tweener.removeTweens() would also remove a tween that was updating the position of the
- // notification we are updating, in case that notification was already expanded and its height
- // changed. Therefore we need to call this._expandNotification() for expanded notifications
- // to make sure their position is updated.
- if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
+ if (this._notification.urgency == Urgency.CRITICAL)
this._expandNotification(true);
// We tween all notifications to full opacity. This ensures that both new notifications and
// notifications that might have been in the process of hiding get full opacity.
//
- // We tween any notification showing in the banner mode to banner height
- // (this._notificationWidget.y = -this._notificationWidget.height).
+ // We tween any notification showing in the banner mode to the appropriate height
+ // (which is banner height or expanded height, depending on the notification state)
// This ensures that both new notifications and notifications in the banner mode that might
- // have been in the process of hiding are shown with the banner height.
+ // have been in the process of hiding are shown with the correct height.
//
// We use this._showNotificationCompleted() onComplete callback to extend the time the updated
// notification is being shown.
- //
- // We don't set the y parameter for the tween for expanded notifications because
- // this._expandNotification() will result in getting this._notificationWidget.y set to the appropriate
- // fully expanded value.
+
let tweenParams = { opacity: 255,
+ y: -this._notificationWidget.height,
time: ANIMATION_TIME,
transition: 'easeOutQuad',
onComplete: this._showNotificationCompleted,
onCompleteScope: this
};
- if (!this._notification.expanded)
- tweenParams.y = -this._notificationWidget.height;
this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
},
--
cgit v0.9.0.2

41
g-s-honor-lock-delay-GSettings.patch
View File

@ -1,41 +0,0 @@
From db1aea210969e3c9558dd672620d8df2ebab0a4b Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Tue, 25 Dec 2012 00:13:52 +0000
Subject: ScreenShield: honor lock-delay GSettings key
org.gnome.desktop.screensaver.lock-delay contains the grace period
of the screensaver: if deactivated within that many seconds from the
start of the idle period, the shell should not prompt for a password.
This setting correspond to the "Lock screen after" combo in screen
and privacy panels.
https://bugzilla.gnome.org/show_bug.cgi?id=690766
---
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 988e191..94fc2b5 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -26,6 +26,7 @@ const Util = imports.misc.util;
const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
const LOCK_ENABLED_KEY = 'lock-enabled';
+const LOCK_DELAY_KEY = 'lock-delay';
const CURTAIN_SLIDE_TIME = 0.3;
// fraction of screen height the arrow must reach before completing
@@ -582,7 +583,11 @@ const ScreenShield = new Lang.Class({
let lightboxWasShown = this._lightbox.shown;
this._lightbox.hide();
- let shouldLock = lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY);
+ // GLib.get_monotonic_time() returns microseconds, convert to seconds
+ let elapsedTime = (GLib.get_monotonic_time() - this._activationTime) / 1000000;
+ let shouldLock = lightboxWasShown &&
+ this._settings.get_boolean(LOCK_ENABLED_KEY) &&
+ (elapsedTime >= this._settings.get_boolean(LOCK_DELAY_KEY));
if (shouldLock || this._isLocked) {
this.lock(false);
} else if (this._isActive) {
--
cgit v0.9.0.2

26
g-s-use-the-right-getter.patch
View File

@ -1,26 +0,0 @@
From d339d2db09052b42960250ab713cc4f885f1155f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 05 Jan 2013 03:00:06 +0000
Subject: Use the right getter
org.gnome.desktop.screensaver lock-delay is an integer, not
a boolean, so don't use get_bool() on it.
https://bugzilla.gnome.org/show_bug.cgi?id=691170
---
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 94fc2b5..d2754df 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -587,7 +587,7 @@ const ScreenShield = new Lang.Class({
let elapsedTime = (GLib.get_monotonic_time() - this._activationTime) / 1000000;
let shouldLock = lightboxWasShown &&
this._settings.get_boolean(LOCK_ENABLED_KEY) &&
- (elapsedTime >= this._settings.get_boolean(LOCK_DELAY_KEY));
+ (elapsedTime >= this._settings.get_int(LOCK_DELAY_KEY));
if (shouldLock || this._isLocked) {
this.lock(false);
} else if (this._isActive) {
--
cgit v0.9.0.2

3
gnome-shell-3.6.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86cff93ade1bf6a67ebd339c017d567c7dc849ff8b256a3803306f44c24b44f0
size 1396196

3
gnome-shell-3.6.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05b2341a0f84835644881743873d3eaccaed12f00aa7b424d876780e81723db2
size 1407776

38
gnome-shell-nmlibexecdir.patch
View File

@ -9,11 +9,11 @@ Date: Mon Feb 11 14:00:52 2013 +0100
Not specifying it results in no change in behaviour. Not specifying it results in no change in behaviour.
diff --git a/configure.ac b/configure.ac Index: gnome-shell-3.6.3/configure.ac
index 0ed832d..d0895f3 100644 ===================================================================
--- a/configure.ac --- gnome-shell-3.6.3.orig/configure.ac
+++ b/configure.ac +++ gnome-shell-3.6.3/configure.ac
@@ -181,6 +181,13 @@ AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script @@ -256,6 +256,13 @@ AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIP
BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}" BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to]) AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
@ -27,11 +27,11 @@ index 0ed832d..d0895f3 100644
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
data/Makefile data/Makefile
diff --git a/js/Makefile.am b/js/Makefile.am Index: gnome-shell-3.6.3/js/Makefile.am
index 323cd1b..5ae77be 100644 ===================================================================
--- a/js/Makefile.am --- gnome-shell-3.6.3.orig/js/Makefile.am
+++ b/js/Makefile.am +++ gnome-shell-3.6.3/js/Makefile.am
@@ -12,6 +12,7 @@ misc/config.js: misc/config.js.in Makefile @@ -12,6 +12,7 @@ misc/config.js: misc/config.js.in Makefi
-e "s|[@]datadir@|$(datadir)|g" \ -e "s|[@]datadir@|$(datadir)|g" \
-e "s|[@]libexecdir@|$(libexecdir)|g" \ -e "s|[@]libexecdir@|$(libexecdir)|g" \
-e "s|[@]sysconfdir@|$(sysconfdir)|g" \ -e "s|[@]sysconfdir@|$(sysconfdir)|g" \
@ -39,10 +39,10 @@ index 323cd1b..5ae77be 100644
$< > $@ $< > $@
jsdir = $(pkgdatadir)/js jsdir = $(pkgdatadir)/js
diff --git a/js/misc/config.js.in b/js/misc/config.js.in Index: gnome-shell-3.6.3/js/misc/config.js.in
index 9769104..192299f 100644 ===================================================================
--- a/js/misc/config.js.in --- gnome-shell-3.6.3.orig/js/misc/config.js.in
+++ b/js/misc/config.js.in +++ gnome-shell-3.6.3/js/misc/config.js.in
@@ -13,3 +13,6 @@ const LOCALEDIR = '@datadir@/locale'; @@ -13,3 +13,6 @@ const LOCALEDIR = '@datadir@/locale';
/* other standard directories */ /* other standard directories */
const LIBEXECDIR = '@libexecdir@'; const LIBEXECDIR = '@libexecdir@';
@ -50,11 +50,11 @@ index 9769104..192299f 100644
+ +
+/* Some distros use different libexecdir for NM than for gnome-shell */ +/* Some distros use different libexecdir for NM than for gnome-shell */
+const NMLIBEXECDIR = '@nmlibexecdir@'; +const NMLIBEXECDIR = '@nmlibexecdir@';
diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js Index: gnome-shell-3.6.3/js/ui/components/networkAgent.js
index e214cd8..2602444 100644 ===================================================================
--- a/js/ui/components/networkAgent.js --- gnome-shell-3.6.3.orig/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js +++ gnome-shell-3.6.3/js/ui/components/networkAgent.js
@@ -688,7 +688,7 @@ const NetworkAgent = new Lang.Class({ @@ -686,7 +686,7 @@ const NetworkAgent = new Lang.Class({
} catch(e) { } // ignore errors if key does not exist } catch(e) { } // ignore errors if key does not exist
let path = binary; let path = binary;
if (!GLib.path_is_absolute(path)) { if (!GLib.path_is_absolute(path)) {

22
gnome-shell.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Thu Feb 14 02:25:31 UTC 2013 - badshah400@gmail.com
- Add g-s-fix-notification-expansion.patch: fix notification not
expanding to the right height into the screen, regression
intrduced in version 3.6.3 (bgo#689295).
-------------------------------------------------------------------
Tue Feb 12 19:59:40 UTC 2013 - badshah400@gmail.com
- Update to version 3.6.3 (bnc#801797):
+ recorder: Set frame duration to fix broken video headers
(bgo#688487)
+ Block cancellation of unlock dialog during drags (bgo#686800)
+ Honor lock-delay GSettings key (bgo#690766,bgo#691170)
+ Fix reentrancy problem causing the tray to disappear
(bgo#683986)
- Drop the following patches, which have been merged upstream:
+ g-s-honor-lock-delay-GSettings.patch
+ g-s-use-the-right-getter.patch
- Rebase gnome-shell-nmlibexecdir.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 11 18:41:23 UTC 2013 - dimstar@opensuse.org Mon Feb 11 18:41:23 UTC 2013 - dimstar@opensuse.org

11
gnome-shell.spec
View File

@ -17,7 +17,7 @@
Name: gnome-shell Name: gnome-shell
Version: 3.6.2 Version: 3.6.3
Release: 0 Release: 0
Summary: GNOME Shell Summary: GNOME Shell
License: GPL-2.0+ License: GPL-2.0+
@ -26,12 +26,10 @@ Url: http://live.gnome.org/GnomeShell
Source: http://download.gnome.org/sources/gnome-shell/3.6/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gnome-shell/3.6/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized # PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized
Patch1: gnome-shell-private-connection.patch Patch1: gnome-shell-private-connection.patch
# PATCH-FIX-UPSTREAM g-s-honor-lock-delay-GSettings.patch bgo#690766 zaitor@opensuse.org -- This setting correspond to the "Lock screen after" combo in screen and privacy panels.
Patch2: g-s-honor-lock-delay-GSettings.patch
# PATCH-FIX-UPSTREAM g-s-use-the-right-getter.patch bgo#691170 zaitor@opensuse.org -- org.gnome.desktop.screensaver lock-delay is an integer, not a boolean, so don't use get_bool() on it.
Patch3: g-s-use-the-right-getter.patch
# PATCH-FIX-UPSTREAM gnome-shell-nmlibexecdir.patch bgo#693590 dimstar@opensuse.org -- Allow NetworkManager installation to use different libexecdir than gnome-shell # PATCH-FIX-UPSTREAM gnome-shell-nmlibexecdir.patch bgo#693590 dimstar@opensuse.org -- Allow NetworkManager installation to use different libexecdir than gnome-shell
Patch4: gnome-shell-nmlibexecdir.patch Patch2: gnome-shell-nmlibexecdir.patch
# PATCH-FIX-UPSTREAM g-s-fix-notification-expansion.patch bgo#689295 badshah400@gmail.com -- Fix notification not expanding into tray, a regression due to earlier commits; patch taken from upstream git
Patch3: g-s-fix-notification-expansion.patch
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
# Needed for patch4 # Needed for patch4
BuildRequires: gnome-common BuildRequires: gnome-common
@ -140,7 +138,6 @@ to enable, disable and install them.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
translation-update-upstream translation-update-upstream
%build %build