Sync to gnome-3-36, add missing dep, remove backported !1205

3 files changed, 12 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd45b4591a84..8c43a019de55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnome-shell-performance
 	pkgdesc = Next generation desktop shell
-	pkgver = 3.36.2+4+gdff855942
+	pkgver = 3.36.2+14+g881d330bc
 	pkgrel = 1
 	epoch = 1
 	url = https://wiki.gnome.org/Projects/GnomeShell
@@ -35,21 +35,20 @@ pkgbase = gnome-shell-performance
 	depends = gstreamer
 	depends = libibus
 	depends = gnome-autoar
+	depends = gnome-disk-utility
 	optdepends = gnome-control-center: System settings
 	optdepends = evolution-data-server: Evolution calendar integration
 	optdepends = gjs-git: Needed if using MR !1164
 	provides = gnome-shell
-	provides = gnome-shell=3.36.2+4+gdff855942
-	provides = gnome-shell=1:3.36.2+4+gdff855942
+	provides = gnome-shell=3.36.2+14+g881d330bc
+	provides = gnome-shell=1:3.36.2+14+g881d330bc
 	conflicts = gnome-shell
-	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=dff855942e6e48901f0fb3abfefb655ef6beae10
+	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=881d330bc0bb3735853dd6c522fcc6fed4646f1f
 	source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
 	source = 1126.diff
-	source = 1205.diff
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 32661c22298d0c4af9b6b6bb718480ce192f528367f853d9709f74c146b2f8d4
-	sha256sums = f384ca71ce47052e244811cfdfced7fab7752600de6d5b96380e92cc5fd335e1
 
 pkgname = gnome-shell-performance
 	depends = accountsservice
@@ -70,5 +69,6 @@ pkgname = gnome-shell-performance
 	depends = gstreamer
 	depends = libibus
 	depends = gnome-autoar
+	depends = gnome-disk-utility
 	depends = libmutter-6.so
 
diff --git a/1205.diff b/1205.diff
deleted file mode 100644
index fc9996708e62..000000000000
--- a/1205.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
-index fffdc786d..b734d5035 100644
---- a/js/ui/messageTray.js
-+++ b/js/ui/messageTray.js
-@@ -136,29 +136,22 @@ var FocusGrabber = class FocusGrabber {
- var NotificationPolicy = GObject.registerClass({
-     Properties: {
-         'enable': GObject.ParamSpec.boolean(
--            'enable', 'enable', 'enable',
--            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
--            true),
-+            'enable', 'enable', 'enable', GObject.ParamFlags.READABLE, true),
-         'enable-sound': GObject.ParamSpec.boolean(
-             'enable-sound', 'enable-sound', 'enable-sound',
--            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
--            true),
-+            GObject.ParamFlags.READABLE, true),
-         'show-banners': GObject.ParamSpec.boolean(
-             'show-banners', 'show-banners', 'show-banners',
--            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
--            true),
-+            GObject.ParamFlags.READABLE, true),
-         'force-expanded': GObject.ParamSpec.boolean(
-             'force-expanded', 'force-expanded', 'force-expanded',
--            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
--            false),
-+            GObject.ParamFlags.READABLE, false),
-         'show-in-lock-screen': GObject.ParamSpec.boolean(
-             'show-in-lock-screen', 'show-in-lock-screen', 'show-in-lock-screen',
--            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
--            false),
-+            GObject.ParamFlags.READABLE, false),
-         'details-in-lock-screen': GObject.ParamSpec.boolean(
-             'details-in-lock-screen', 'details-in-lock-screen', 'details-in-lock-screen',
--            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
--            false),
-+            GObject.ParamFlags.READABLE, false),
-     },
- }, class NotificationPolicy extends GObject.Object {
-     // Do nothing for the default policy. These methods are only useful for the
-@@ -169,24 +162,28 @@ var NotificationPolicy = GObject.registerClass({
-         this.run_dispose();
-     }
- 
-+    get enable() {
-+        return true;
-+    }
-+    
-     get enableSound() {
--        return this.enable_sound;
-+        return true;
-     }
- 
-     get showBanners() {
--        return this.show_banners;
-+        return true;
-     }
- 
-     get forceExpanded() {
--        return this.force_expanded;
-+        return false;
-     }
- 
-     get showInLockScreen() {
--        return this.show_in_lock_screen;
-+        return false;
-     }
- 
-     get detailsInLockScreen() {
--        return this.details_in_lock_screen;
-+        return false;
-     }
- });
- 
diff --git a/PKGBUILD b/PKGBUILD
index 5b63c3174969..ed6f90de6a75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 ### MERGE REQUESTS SELECTION
 
-# available MR: ('536' '786' '923' '1126 '1164' '1192' '1205' )
+# available MR: ('536' '786' '923' '1126 '1164' '1192')
 _merge_requests_to_use=() # safe pick
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
@@ -14,7 +14,7 @@ _merge_requests_to_use=() # safe pick
 
 pkgname=gnome-shell-performance
 _pkgname=gnome-shell
-pkgver=3.36.2+4+gdff855942
+pkgver=3.36.2+14+g881d330bc
 pkgrel=1
 epoch=1
 pkgdesc="Next generation desktop shell"
@@ -23,7 +23,7 @@ arch=(x86_64)
 license=(GPL2)
 depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gnome-settings-daemon
          gnome-themes-extra gsettings-desktop-schemas libcanberra-pulse libgdm libsecret
-         mutter nm-connection-editor unzip gstreamer libibus gnome-autoar)
+         mutter nm-connection-editor unzip gstreamer libibus gnome-autoar  gnome-disk-utility)
 makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson
              sassc asciidoc bash-completion)
 optdepends=('gnome-control-center: System settings'
@@ -33,15 +33,13 @@ groups=(gnome)
 provides=(gnome-shell gnome-shell=$pkgver gnome-shell=$epoch:$pkgver)
 conflicts=(gnome-shell)
 install=$pkgname.install
-_commit=dff855942e6e48901f0fb3abfefb655ef6beae10  # tags/3.36.2^4
+_commit=881d330bc0bb3735853dd6c522fcc6fed4646f1f  # tags/3.36.2^14
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
         "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-	"1126.diff"
-	"1205.diff")
+	"1126.diff")
 sha256sums=('SKIP'
             'SKIP'
-            '32661c22298d0c4af9b6b6bb718480ce192f528367f853d9709f74c146b2f8d4'
-            'f384ca71ce47052e244811cfdfced7fab7752600de6d5b96380e92cc5fd335e1')
+            '32661c22298d0c4af9b6b6bb718480ce192f528367f853d9709f74c146b2f8d4')
 
 pkgver() {
   cd $_pkgname
@@ -137,12 +135,10 @@ prepare() {
   # Status: 4
   # Comment: Depends on 1126 that requires gjs>=1.65.1
   pick_mr '1126' '1126.diff' 'patch'
-  pick_mr '1205' '1205.diff' 'patch' #fixes some gjs warnings
   pick_mr '1192'
   pick_mr '1164'
 
 
-
   git submodule init
   git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
   git submodule update