[arch-commits] Commit in gnome-shell/trunk (PKGBUILD fs33855.patch)

[Jan Steffens]

    Date: Thursday, February 21, 2013 @ 07:58:06
  Author: heftig
Revision: 178404

3.6.3.1

Modified:
  gnome-shell/trunk/PKGBUILD
Deleted:
  gnome-shell/trunk/fs33855.patch

---------------+
 PKGBUILD      |   11 +++------
 fs33855.patch |   65 --------------------------------------------------------
 2 files changed, 4 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-21 06:21:26 UTC (rev 178403)
+++ PKGBUILD	2013-02-21 06:58:06 UTC (rev 178404)
@@ -3,8 +3,8 @@
 # Contributor: Flamelab <panosfilip at gmail.com
 
 pkgname=gnome-shell
-pkgver=3.6.3
-pkgrel=2
+pkgver=3.6.3.1
+pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64)
 url="http://live.gnome.org/GnomeShell"
@@ -17,14 +17,11 @@
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fs33855.patch)
-sha256sums=('05b2341a0f84835644881743873d3eaccaed12f00aa7b424d876780e81723db2'
-            '259e69256ae597f1d04c7a0070c1c90cec20afbf494d6b89e72d86b8b9c7f0ba')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../fs33855.patch
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \

Deleted: fs33855.patch
===================================================================
--- fs33855.patch	2013-02-21 06:21:26 UTC (rev 178403)
+++ fs33855.patch	2013-02-21 06:58:06 UTC (rev 178404)
@@ -1,65 +0,0 @@
-From 9d931b5e013475be5733fc92bd105b3a691a4097 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna at 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