[arch-commits] Commit in gnome-shell/repos (16 files)

Jan Steffens heftig at archlinux.org
Sat Oct 17 17:37:14 UTC 2015


    Date: Saturday, October 17, 2015 @ 19:37:14
  Author: heftig
Revision: 249467

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gnome-shell/repos/extra-i686/PKGBUILD
    (from rev 249466, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-i686/fs1.patch
    (from rev 249466, gnome-shell/trunk/fs1.patch)
  gnome-shell/repos/extra-i686/fs2.patch
    (from rev 249466, gnome-shell/trunk/fs2.patch)
  gnome-shell/repos/extra-i686/gnome-shell.install
    (from rev 249466, gnome-shell/trunk/gnome-shell.install)
  gnome-shell/repos/extra-i686/nm-libexecdir.patch
    (from rev 249466, gnome-shell/trunk/nm-libexecdir.patch)
  gnome-shell/repos/extra-x86_64/PKGBUILD
    (from rev 249466, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-x86_64/fs1.patch
    (from rev 249466, gnome-shell/trunk/fs1.patch)
  gnome-shell/repos/extra-x86_64/fs2.patch
    (from rev 249466, gnome-shell/trunk/fs2.patch)
  gnome-shell/repos/extra-x86_64/gnome-shell.install
    (from rev 249466, gnome-shell/trunk/gnome-shell.install)
  gnome-shell/repos/extra-x86_64/nm-libexecdir.patch
    (from rev 249466, gnome-shell/trunk/nm-libexecdir.patch)
Deleted:
  gnome-shell/repos/extra-i686/PKGBUILD
  gnome-shell/repos/extra-i686/gnome-shell.install
  gnome-shell/repos/extra-i686/nm-libexecdir.patch
  gnome-shell/repos/extra-x86_64/PKGBUILD
  gnome-shell/repos/extra-x86_64/gnome-shell.install
  gnome-shell/repos/extra-x86_64/nm-libexecdir.patch

----------------------------------+
 /PKGBUILD                        |  116 +++++++++++++++++++++++++++++++++++++
 /gnome-shell.install             |   38 ++++++++++++
 /nm-libexecdir.patch             |   24 +++++++
 extra-i686/PKGBUILD              |   52 ----------------
 extra-i686/fs1.patch             |   44 ++++++++++++++
 extra-i686/fs2.patch             |   51 ++++++++++++++++
 extra-i686/gnome-shell.install   |   19 ------
 extra-i686/nm-libexecdir.patch   |   12 ---
 extra-x86_64/PKGBUILD            |   52 ----------------
 extra-x86_64/fs1.patch           |   44 ++++++++++++++
 extra-x86_64/fs2.patch           |   51 ++++++++++++++++
 extra-x86_64/gnome-shell.install |   19 ------
 extra-x86_64/nm-libexecdir.patch |   12 ---
 13 files changed, 368 insertions(+), 166 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-10-17 17:36:02 UTC (rev 249466)
+++ extra-i686/PKGBUILD	2015-10-17 17:37:14 UTC (rev 249467)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Flamelab <panosfilip at gmail.com
-
-pkgname=gnome-shell
-pkgver=3.18.1
-pkgrel=1
-pkgdesc="The next generation GNOME Shell"
-arch=(i686 x86_64)
-url="http://live.gnome.org/GnomeShell"
-license=(GPL2)
-depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower
-         gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
-         libcanberra-pulse libcroco libgdm libsecret mutter nm-connection-editor
-         telepathy-logger telepathy-mission-control unzip gstreamer)
-makedepends=(intltool gtk-doc gnome-control-center evolution-data-server python gobject-introspection)
-optdepends=('gnome-control-center: System settings'
-            'evolution-data-server: Evolution calendar integration')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-        nm-libexecdir.patch)
-sha256sums=('14a15215b3e29a25b94f69c58a6565e3a8cb2259b1ca242b906af78172bf3845'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # FS#30747 FS#32730 Problems due to libexecdir different from NM
-  patch -Np1 -i ../nm-libexecdir.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Must exist; FS#37412
-  mkdir -p "$pkgdir/usr/share/gnome-shell/modes"
-}

Copied: gnome-shell/repos/extra-i686/PKGBUILD (from rev 249466, gnome-shell/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-10-17 17:37:14 UTC (rev 249467)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.18.1
+pkgrel=2
+pkgdesc="The next generation GNOME Shell"
+arch=(i686 x86_64)
+url="http://live.gnome.org/GnomeShell"
+license=(GPL2)
+depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower
+         gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
+         libcanberra-pulse libcroco libgdm libsecret mutter nm-connection-editor
+         telepathy-logger telepathy-mission-control unzip gstreamer)
+makedepends=(intltool gtk-doc gnome-control-center evolution-data-server python gobject-introspection)
+optdepends=('gnome-control-center: System settings'
+            'evolution-data-server: Evolution calendar integration')
+install=gnome-shell.install
+groups=(gnome)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        nm-libexecdir.patch fs1.patch fs2.patch)
+sha256sums=('14a15215b3e29a25b94f69c58a6565e3a8cb2259b1ca242b906af78172bf3845'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+            '0d2f143362ff47bfd3dcbb94d903b51b9a998f2ff97c6320f0e3fe3599089e34'
+            '19f39002be34f035c7f5f8f20bad50ab38fb8ff0f023e91e832feecc54fcdc60')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fullscreen animation issues
+  patch -Np1 -i ../fs1.patch
+  patch -Np1 -i ../fs2.patch
+
+  # FS#30747 FS#32730 Problems due to libexecdir different from NM
+  patch -Np1 -i ../nm-libexecdir.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/gnome-shell \
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Must exist; FS#37412
+  mkdir -p "$pkgdir/usr/share/gnome-shell/modes"
+}

Copied: gnome-shell/repos/extra-i686/fs1.patch (from rev 249466, gnome-shell/trunk/fs1.patch)
===================================================================
--- extra-i686/fs1.patch	                        (rev 0)
+++ extra-i686/fs1.patch	2015-10-17 17:37:14 UTC (rev 249467)
@@ -0,0 +1,44 @@
+From ab2ca17b766556eec7c5c47c4d75ef6ff45a31a7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Fri, 16 Oct 2015 15:36:33 +0200
+Subject: windowManager: Fix fullscreen animations on dualscreen
+
+The translation should describe the difference between the fullscreened
+and unfullscreened position of the window - however we are currently
+assuming a fullscreen position of (0, 0) instead of the monitor's origin,
+which causes glitches on dualscreen setups.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756697
+---
+ js/ui/windowManager.js | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
+index 2ee99e3..c8996d8 100644
+--- a/js/ui/windowManager.js
++++ b/js/ui/windowManager.js
+@@ -1235,15 +1235,17 @@ const WindowManager = new Lang.Class({
+     },
+ 
+     _fullscreenWindow: function(shellwm, actor, oldFrameRect, oldBufferRect) {
+-        actor.translation_x = oldFrameRect.x;
+-        actor.translation_y = oldFrameRect.y;
++        let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
++        actor.translation_x = oldFrameRect.x - monitor.x;
++        actor.translation_y = oldFrameRect.y - monitor.y;
+         this._fullscreenAnimation(shellwm, actor, oldFrameRect);
+     },
+ 
+     _unfullscreenWindow: function(shellwm, actor, oldFrameRect, oldBufferRect) {
+         let targetRect = actor.meta_window.get_frame_rect();
+-        actor.translation_x = -targetRect.x;
+-        actor.translation_y = -targetRect.y;
++        let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
++        actor.translation_x = -(targetRect.x - monitor.x);
++        actor.translation_y = -(targetRect.y - monitor.y);
+         this._fullscreenAnimation(shellwm, actor, oldFrameRect);
+     },
+ 
+-- 
+cgit v0.11.2
+

Copied: gnome-shell/repos/extra-i686/fs2.patch (from rev 249466, gnome-shell/trunk/fs2.patch)
===================================================================
--- extra-i686/fs2.patch	                        (rev 0)
+++ extra-i686/fs2.patch	2015-10-17 17:37:14 UTC (rev 249467)
@@ -0,0 +1,51 @@
+From 8ae0c69ccf9dede2770ca8e74945e29b8c528aa5 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Fri, 16 Oct 2015 13:45:09 -0700
+Subject: windowManager: fix fullscreen clone being left around
+
+If we get another effect on the same actor, we should make sure to
+remove the clone through the "overwrite" methods provided by Tweener, or
+there will be a race that might end up with a stray clone being left
+around.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756714
+---
+ js/ui/windowManager.js | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
+index c8996d8..32b8c0f 100644
+--- a/js/ui/windowManager.js
++++ b/js/ui/windowManager.js
+@@ -1296,7 +1296,10 @@ const WindowManager = new Lang.Class({
+                            transition: 'easeOutQuad',
+                            onComplete: this._sizeChangeWindowDone,
+                            onCompleteScope: this,
+-                           onCompleteParams: [shellwm, actor]
++                           onCompleteParams: [shellwm, actor],
++                           onOverwrite: this._sizeChangeWindowOverwritten,
++                           onOverwriteScope: this,
++                           onOverwriteParams: [shellwm, actor]
+                          });
+ 
+         // Now unfreeze actor updates, to get it to the new size.
+@@ -1321,6 +1324,16 @@ const WindowManager = new Lang.Class({
+         }
+     },
+ 
++    _sizeChangeWindowOverwritten: function(shellwm, actor) {
++        if (this._removeEffect(this._resizing, actor)) {
++            let actorClone = actor.__fullscreenClone;
++            if (actorClone) {
++                actorClone.destroy();
++                delete actor.__fullscreenClone;
++            }
++        }
++    },
++
+     _hasAttachedDialogs: function(window, ignoreWindow) {
+         var count = 0;
+         window.foreach_transient(function(win) {
+-- 
+cgit v0.11.2
+

Deleted: extra-i686/gnome-shell.install
===================================================================
--- extra-i686/gnome-shell.install	2015-10-17 17:36:02 UTC (rev 249466)
+++ extra-i686/gnome-shell.install	2015-10-17 17:37:14 UTC (rev 249467)
@@ -1,19 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: gnome-shell/repos/extra-i686/gnome-shell.install (from rev 249466, gnome-shell/trunk/gnome-shell.install)
===================================================================
--- extra-i686/gnome-shell.install	                        (rev 0)
+++ extra-i686/gnome-shell.install	2015-10-17 17:37:14 UTC (rev 249467)
@@ -0,0 +1,19 @@
+pkgname=gnome-shell
+
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        gconfpkg --uninstall $pkgname
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-i686/nm-libexecdir.patch
===================================================================
--- extra-i686/nm-libexecdir.patch	2015-10-17 17:36:02 UTC (rev 249466)
+++ extra-i686/nm-libexecdir.patch	2015-10-17 17:37:14 UTC (rev 249467)
@@ -1,12 +0,0 @@
-diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
---- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js	2013-02-20 20:31:03.000000000 +0100
-+++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js	2013-03-10 17:13:46.120907065 +0100
-@@ -686,7 +686,7 @@
-                     } catch(e) { } // ignore errors if key does not exist
-                     let path = binary;
-                     if (!GLib.path_is_absolute(path)) {
--                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
-+                        path = GLib.build_filenamev(["/usr/lib/networkmanager", path]);
-                     }
- 
-                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Copied: gnome-shell/repos/extra-i686/nm-libexecdir.patch (from rev 249466, gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- extra-i686/nm-libexecdir.patch	                        (rev 0)
+++ extra-i686/nm-libexecdir.patch	2015-10-17 17:37:14 UTC (rev 249467)
@@ -0,0 +1,12 @@
+diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
+--- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js	2013-02-20 20:31:03.000000000 +0100
++++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js	2013-03-10 17:13:46.120907065 +0100
+@@ -686,7 +686,7 @@
+                     } catch(e) { } // ignore errors if key does not exist
+                     let path = binary;
+                     if (!GLib.path_is_absolute(path)) {
+-                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
++                        path = GLib.build_filenamev(["/usr/lib/networkmanager", path]);
+                     }
+ 
+                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-10-17 17:36:02 UTC (rev 249466)
+++ extra-x86_64/PKGBUILD	2015-10-17 17:37:14 UTC (rev 249467)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Flamelab <panosfilip at gmail.com
-
-pkgname=gnome-shell
-pkgver=3.18.1
-pkgrel=1
-pkgdesc="The next generation GNOME Shell"
-arch=(i686 x86_64)
-url="http://live.gnome.org/GnomeShell"
-license=(GPL2)
-depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower
-         gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
-         libcanberra-pulse libcroco libgdm libsecret mutter nm-connection-editor
-         telepathy-logger telepathy-mission-control unzip gstreamer)
-makedepends=(intltool gtk-doc gnome-control-center evolution-data-server python gobject-introspection)
-optdepends=('gnome-control-center: System settings'
-            'evolution-data-server: Evolution calendar integration')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-        nm-libexecdir.patch)
-sha256sums=('14a15215b3e29a25b94f69c58a6565e3a8cb2259b1ca242b906af78172bf3845'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # FS#30747 FS#32730 Problems due to libexecdir different from NM
-  patch -Np1 -i ../nm-libexecdir.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Must exist; FS#37412
-  mkdir -p "$pkgdir/usr/share/gnome-shell/modes"
-}

Copied: gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 249466, gnome-shell/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-10-17 17:37:14 UTC (rev 249467)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.18.1
+pkgrel=2
+pkgdesc="The next generation GNOME Shell"
+arch=(i686 x86_64)
+url="http://live.gnome.org/GnomeShell"
+license=(GPL2)
+depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower
+         gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
+         libcanberra-pulse libcroco libgdm libsecret mutter nm-connection-editor
+         telepathy-logger telepathy-mission-control unzip gstreamer)
+makedepends=(intltool gtk-doc gnome-control-center evolution-data-server python gobject-introspection)
+optdepends=('gnome-control-center: System settings'
+            'evolution-data-server: Evolution calendar integration')
+install=gnome-shell.install
+groups=(gnome)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        nm-libexecdir.patch fs1.patch fs2.patch)
+sha256sums=('14a15215b3e29a25b94f69c58a6565e3a8cb2259b1ca242b906af78172bf3845'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+            '0d2f143362ff47bfd3dcbb94d903b51b9a998f2ff97c6320f0e3fe3599089e34'
+            '19f39002be34f035c7f5f8f20bad50ab38fb8ff0f023e91e832feecc54fcdc60')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fullscreen animation issues
+  patch -Np1 -i ../fs1.patch
+  patch -Np1 -i ../fs2.patch
+
+  # FS#30747 FS#32730 Problems due to libexecdir different from NM
+  patch -Np1 -i ../nm-libexecdir.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/gnome-shell \
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Must exist; FS#37412
+  mkdir -p "$pkgdir/usr/share/gnome-shell/modes"
+}

Copied: gnome-shell/repos/extra-x86_64/fs1.patch (from rev 249466, gnome-shell/trunk/fs1.patch)
===================================================================
--- extra-x86_64/fs1.patch	                        (rev 0)
+++ extra-x86_64/fs1.patch	2015-10-17 17:37:14 UTC (rev 249467)
@@ -0,0 +1,44 @@
+From ab2ca17b766556eec7c5c47c4d75ef6ff45a31a7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Fri, 16 Oct 2015 15:36:33 +0200
+Subject: windowManager: Fix fullscreen animations on dualscreen
+
+The translation should describe the difference between the fullscreened
+and unfullscreened position of the window - however we are currently
+assuming a fullscreen position of (0, 0) instead of the monitor's origin,
+which causes glitches on dualscreen setups.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756697
+---
+ js/ui/windowManager.js | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
+index 2ee99e3..c8996d8 100644
+--- a/js/ui/windowManager.js
++++ b/js/ui/windowManager.js
+@@ -1235,15 +1235,17 @@ const WindowManager = new Lang.Class({
+     },
+ 
+     _fullscreenWindow: function(shellwm, actor, oldFrameRect, oldBufferRect) {
+-        actor.translation_x = oldFrameRect.x;
+-        actor.translation_y = oldFrameRect.y;
++        let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
++        actor.translation_x = oldFrameRect.x - monitor.x;
++        actor.translation_y = oldFrameRect.y - monitor.y;
+         this._fullscreenAnimation(shellwm, actor, oldFrameRect);
+     },
+ 
+     _unfullscreenWindow: function(shellwm, actor, oldFrameRect, oldBufferRect) {
+         let targetRect = actor.meta_window.get_frame_rect();
+-        actor.translation_x = -targetRect.x;
+-        actor.translation_y = -targetRect.y;
++        let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
++        actor.translation_x = -(targetRect.x - monitor.x);
++        actor.translation_y = -(targetRect.y - monitor.y);
+         this._fullscreenAnimation(shellwm, actor, oldFrameRect);
+     },
+ 
+-- 
+cgit v0.11.2
+

Copied: gnome-shell/repos/extra-x86_64/fs2.patch (from rev 249466, gnome-shell/trunk/fs2.patch)
===================================================================
--- extra-x86_64/fs2.patch	                        (rev 0)
+++ extra-x86_64/fs2.patch	2015-10-17 17:37:14 UTC (rev 249467)
@@ -0,0 +1,51 @@
+From 8ae0c69ccf9dede2770ca8e74945e29b8c528aa5 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Fri, 16 Oct 2015 13:45:09 -0700
+Subject: windowManager: fix fullscreen clone being left around
+
+If we get another effect on the same actor, we should make sure to
+remove the clone through the "overwrite" methods provided by Tweener, or
+there will be a race that might end up with a stray clone being left
+around.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756714
+---
+ js/ui/windowManager.js | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
+index c8996d8..32b8c0f 100644
+--- a/js/ui/windowManager.js
++++ b/js/ui/windowManager.js
+@@ -1296,7 +1296,10 @@ const WindowManager = new Lang.Class({
+                            transition: 'easeOutQuad',
+                            onComplete: this._sizeChangeWindowDone,
+                            onCompleteScope: this,
+-                           onCompleteParams: [shellwm, actor]
++                           onCompleteParams: [shellwm, actor],
++                           onOverwrite: this._sizeChangeWindowOverwritten,
++                           onOverwriteScope: this,
++                           onOverwriteParams: [shellwm, actor]
+                          });
+ 
+         // Now unfreeze actor updates, to get it to the new size.
+@@ -1321,6 +1324,16 @@ const WindowManager = new Lang.Class({
+         }
+     },
+ 
++    _sizeChangeWindowOverwritten: function(shellwm, actor) {
++        if (this._removeEffect(this._resizing, actor)) {
++            let actorClone = actor.__fullscreenClone;
++            if (actorClone) {
++                actorClone.destroy();
++                delete actor.__fullscreenClone;
++            }
++        }
++    },
++
+     _hasAttachedDialogs: function(window, ignoreWindow) {
+         var count = 0;
+         window.foreach_transient(function(win) {
+-- 
+cgit v0.11.2
+

Deleted: extra-x86_64/gnome-shell.install
===================================================================
--- extra-x86_64/gnome-shell.install	2015-10-17 17:36:02 UTC (rev 249466)
+++ extra-x86_64/gnome-shell.install	2015-10-17 17:37:14 UTC (rev 249467)
@@ -1,19 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: gnome-shell/repos/extra-x86_64/gnome-shell.install (from rev 249466, gnome-shell/trunk/gnome-shell.install)
===================================================================
--- extra-x86_64/gnome-shell.install	                        (rev 0)
+++ extra-x86_64/gnome-shell.install	2015-10-17 17:37:14 UTC (rev 249467)
@@ -0,0 +1,19 @@
+pkgname=gnome-shell
+
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        gconfpkg --uninstall $pkgname
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-x86_64/nm-libexecdir.patch
===================================================================
--- extra-x86_64/nm-libexecdir.patch	2015-10-17 17:36:02 UTC (rev 249466)
+++ extra-x86_64/nm-libexecdir.patch	2015-10-17 17:37:14 UTC (rev 249467)
@@ -1,12 +0,0 @@
-diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
---- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js	2013-02-20 20:31:03.000000000 +0100
-+++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js	2013-03-10 17:13:46.120907065 +0100
-@@ -686,7 +686,7 @@
-                     } catch(e) { } // ignore errors if key does not exist
-                     let path = binary;
-                     if (!GLib.path_is_absolute(path)) {
--                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
-+                        path = GLib.build_filenamev(["/usr/lib/networkmanager", path]);
-                     }
- 
-                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Copied: gnome-shell/repos/extra-x86_64/nm-libexecdir.patch (from rev 249466, gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- extra-x86_64/nm-libexecdir.patch	                        (rev 0)
+++ extra-x86_64/nm-libexecdir.patch	2015-10-17 17:37:14 UTC (rev 249467)
@@ -0,0 +1,12 @@
+diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
+--- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js	2013-02-20 20:31:03.000000000 +0100
++++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js	2013-03-10 17:13:46.120907065 +0100
+@@ -686,7 +686,7 @@
+                     } catch(e) { } // ignore errors if key does not exist
+                     let path = binary;
+                     if (!GLib.path_is_absolute(path)) {
+-                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
++                        path = GLib.build_filenamev(["/usr/lib/networkmanager", path]);
+                     }
+ 
+                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))



More information about the arch-commits mailing list