Sync to gnome-3-38, Improve pick_mr(), Add !1440, misc cleanup

3 files changed, 33 insertions, 119 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c6cfc860ca8..608b66d5eab9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnome-shell-performance
 	pkgdesc = Next generation desktop shell
-	pkgver = 3.36.6
+	pkgver = 3.38.1+9+g610db2703
 	pkgrel = 1
 	epoch = 1
 	url = https://wiki.gnome.org/Projects/GnomeShell
@@ -39,15 +39,13 @@ pkgbase = gnome-shell-performance
 	optdepends = gnome-control-center: System settings
 	optdepends = evolution-data-server: Evolution calendar integration
 	provides = gnome-shell
-	provides = gnome-shell=3.36.6
-	provides = gnome-shell=1:3.36.6
+	provides = gnome-shell=3.38.1+9+g610db2703
+	provides = gnome-shell=1:3.38.1+9+g610db2703
 	conflicts = gnome-shell
-	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=682d4588bc6b2c1826013f98c52cc0b5afccea29
+	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=610db2703e5495d468d9b9370c587d0bd9c8b7bc
 	source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
-	source = 1126.diff
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 32661c22298d0c4af9b6b6bb718480ce192f528367f853d9709f74c146b2f8d4
 
 pkgname = gnome-shell-performance
 	depends = accountsservice
@@ -69,5 +67,5 @@ pkgname = gnome-shell-performance
 	depends = libibus
 	depends = gnome-autoar
 	depends = gnome-disk-utility
-	depends = libmutter-6.so
+	depends = libmutter-7.so
 
diff --git a/1126.diff b/1126.diff
deleted file mode 100644
index c7f0199bd93f..000000000000
--- a/1126.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/js/ui/calendar.js b/js/ui/calendar.js
-index 99641841768fca6ef96bb41197fce1c75040fbc2..286aac1e10ee9bd966a98a86eb10cb7210ff3ff6 100644
---- a/js/ui/calendar.js
-+++ b/js/ui/calendar.js
-@@ -199,46 +199,47 @@ class DBusEventSource extends EventSourceBase {
- 
-         this._initialized = false;
-         this._dbusProxy = new CalendarServer();
--        this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, (object, result) => {
--            let loaded = false;
--
--            try {
--                this._dbusProxy.init_finish(result);
--                loaded = true;
--            } catch (e) {
--                if (e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) {
--                    // Ignore timeouts and install signals as normal, because with high
--                    // probability the service will appear later on, and we will get a
--                    // NameOwnerChanged which will finish loading
--                    //
--                    // (But still _initialized to false, because the proxy does not know
--                    // about the HasCalendars property and would cause an exception trying
--                    // to read it)
--                } else {
--                    log('Error loading calendars: %s'.format(e.message));
--                    return;
--                }
-+        this._initProxy();
-+    }
-+
-+    async _initProxy() {
-+        let loaded = false;
-+
-+        try {
-+            await this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null);
-+            loaded = true;
-+        } catch (e) {
-+            // Ignore timeouts and install signals as normal, because with high
-+            // probability the service will appear later on, and we will get a
-+            // NameOwnerChanged which will finish loading
-+            //
-+            // (But still _initialized to false, because the proxy does not know
-+            // about the HasCalendars property and would cause an exception trying
-+            // to read it)
-+            if (!e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) {
-+                log('Error loading calendars: %s'.format(e.message));
-+                return;
-             }
-+        }
- 
--            this._dbusProxy.connectSignal('Changed', this._onChanged.bind(this));
--
--            this._dbusProxy.connect('notify::g-name-owner', () => {
--                if (this._dbusProxy.g_name_owner)
--                    this._onNameAppeared();
--                else
--                    this._onNameVanished();
--            });
--
--            this._dbusProxy.connect('g-properties-changed', () => {
--                this.notify('has-calendars');
--            });
-+        this._dbusProxy.connectSignal('Changed', this._onChanged.bind(this));
- 
--            this._initialized = loaded;
--            if (loaded) {
--                this.notify('has-calendars');
-+        this._dbusProxy.connect('notify::g-name-owner', () => {
-+            if (this._dbusProxy.g_name_owner)
-                 this._onNameAppeared();
--            }
-+            else
-+                this._onNameVanished();
-+        });
-+
-+        this._dbusProxy.connect('g-properties-changed', () => {
-+            this.notify('has-calendars');
-         });
-+
-+        this._initialized = loaded;
-+        if (loaded) {
-+            this.notify('has-calendars');
-+            this._onNameAppeared();
-+        }
-     }
- 
-     destroy() {
diff --git a/PKGBUILD b/PKGBUILD
index aeaaf847c31e..3e7c04a80e87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Patched package maintainer: Saren Arterius <saren@wtako.net>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
@@ -6,15 +6,15 @@
 
 ### MERGE REQUESTS SELECTION
 
-# available MR: ('536' '786' '923')
-_merge_requests_to_use=('536') # safe pick
+# available MR: ('536' '786' '923' '1440')
+_merge_requests_to_use=('536' '1440') # safe pick
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 
 pkgname=gnome-shell-performance
 _pkgname=gnome-shell
-pkgver=3.36.6
+pkgver=3.38.1+9+g610db2703
 pkgrel=1
 epoch=1
 pkgdesc="Next generation desktop shell"
@@ -32,13 +32,11 @@ groups=(gnome)
 provides=(gnome-shell gnome-shell=$pkgver gnome-shell=$epoch:$pkgver)
 conflicts=(gnome-shell)
 install=$pkgname.install
-_commit=682d4588bc6b2c1826013f98c52cc0b5afccea29  # tags/3.36.6^0
+_commit=610db2703e5495d468d9b9370c587d0bd9c8b7bc  # tags/3.38.1^9
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-	"1126.diff")
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
 sha256sums=('SKIP'
-            'SKIP'
-            '32661c22298d0c4af9b6b6bb718480ce192f528367f853d9709f74c146b2f8d4')
+            'SKIP')
 
 pkgver() {
   cd $_pkgname
@@ -56,8 +54,14 @@ pick_mr() {
         echo "Reverting $1..."
         git revert "$2" --no-commit
       elif [ "$3" = "patch" ]; then
-        echo "Patching with $2..."
-        patch -Np1 -i ../"$2"
+      	if [ -e ../"$2" ]; then 
+          echo "Patching with $2..."
+          patch -Np1 -i ../"$2"
+        else
+          echo "Downloading $mr as $2 then patching..."
+          curl -O "https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/$mr.diff" -o "$2"
+          patch -Np1 -i "$2"
+        fi
       else
         echo "ERROR: wrong argument given: $2"
       fi
@@ -77,10 +81,10 @@ prepare() {
 
   # git remote add verde https://gitlab.gnome.org/verdre/gnome-shell.git || true
   # git fetch verde
-  #git remote add 3v1n0 https://gitlab.gnome.org/3v1n0/gnome-shell || true
-  #git fetch 3v1n0
-  #git remote add vanvugt https://gitlab.gnome.org/vanvugt/gnome-shell.git || true
-  #git fetch vanvugt
+  # git remote add 3v1n0 https://gitlab.gnome.org/3v1n0/gnome-shell || true
+  # git fetch 3v1n0
+  # git remote add vanvugt https://gitlab.gnome.org/vanvugt/gnome-shell.git || true
+  # git fetch vanvugt
 
   ### Merge Requests
 
@@ -112,15 +116,7 @@ prepare() {
   # Type: 2
   # Status: 1
   # Comment: Crash fix for st_theme_get_custom_stylesheets
-  # pick_mr '536'
-  for mr in "${_merge_requests_to_use[@]}"; do
-    if [ "536" = "$mr" ]; then
-      echo "Downloading then Merging 536..."
-      curl -O "https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/536.diff"
-      patch -Np1 -i 536.diff
-      break
-    fi
-  done
+  pick_mr '536' '536.diff' 'patch' 
 
   # Title: Some fixes for setting key focus of the closeDialog
   # URL: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/786
@@ -136,6 +132,13 @@ prepare() {
   # Comment: Unlock freezes, it hits me too.
   pick_mr '923'
 
+  # Avoid missing/broken app launch animations
+  # URL: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1440
+  # Type: 3
+  # Status: 2
+  # Comment:
+  pick_mr '1440'
+
   git submodule init
   git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
   git submodule update
@@ -147,6 +150,6 @@ build() {
 }
 
 package() {
-  depends+=(libmutter-6.so)
+  depends+=(libmutter-7.so)
   DESTDIR="$pkgdir" meson install -C build
 }