Do not enable !1164 by default, move gjs-git to optdepends

3 files changed, 87 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 731e2a502045..5b65e3d2e90e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,9 +35,9 @@ pkgbase = gnome-shell-performance
 	depends = gstreamer
 	depends = libibus
 	depends = gnome-autoar
-	depends = gjs-git
 	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.1+40+g890f5b591
 	provides = gnome-shell=1:3.36.1+40+g890f5b591
@@ -45,9 +45,11 @@ pkgbase = gnome-shell-performance
 	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=890f5b591fef3cc3af387675c53113a5226805d1
 	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
@@ -68,6 +70,5 @@ pkgname = gnome-shell-performance
 	depends = gstreamer
 	depends = libibus
 	depends = gnome-autoar
-	depends = gjs-git
 	depends = libmutter-6.so
 
diff --git a/1205.diff b/1205.diff
new file mode 100644
index 000000000000..fc9996708e62
--- /dev/null
+++ b/1205.diff
@@ -0,0 +1,74 @@
+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 b764b578c700..606ae3ef94ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 ### MERGE REQUESTS SELECTION
 
-# available MR: ('536' '786' '923')
-_merge_requests_to_use=('1205' '1126' '1192' '1164') # safe pick
+# available MR: ('536' '786' '923' '1126 '1164' '1192' '1205' )
+_merge_requests_to_use=() # safe pick
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
@@ -23,11 +23,12 @@ 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 'gjs-git')
+         mutter nm-connection-editor unzip gstreamer libibus gnome-autoar)
 makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson
              sassc asciidoc bash-completion)
 optdepends=('gnome-control-center: System settings'
-            'evolution-data-server: Evolution calendar integration')
+            'evolution-data-server: Evolution calendar integration'
+            'gjs-git: Needed if using MR !1164')
 groups=(gnome)
 provides=(gnome-shell gnome-shell=$pkgver gnome-shell=$epoch:$pkgver)
 conflicts=(gnome-shell)
@@ -35,10 +36,12 @@ install=$pkgname.install
 _commit=890f5b591fef3cc3af387675c53113a5226805d1  # tags/3.36.1^40
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
         "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-	"1126.diff")
+	"1126.diff"
+	"1205.diff")
 sha256sums=('SKIP'
             'SKIP'
-            '32661c22298d0c4af9b6b6bb718480ce192f528367f853d9709f74c146b2f8d4')
+            '32661c22298d0c4af9b6b6bb718480ce192f528367f853d9709f74c146b2f8d4'
+            'f384ca71ce47052e244811cfdfced7fab7752600de6d5b96380e92cc5fd335e1')
 
 pkgver() {
   cd $_pkgname
@@ -134,7 +137,7 @@ prepare() {
   # Status: 4
   # Comment: Depends on 1126 that requires gjs>=1.65.1
   pick_mr '1126' '1126.diff' 'patch'
-  pick_mr '1205'
+  pick_mr '1205' '1205.diff' 'patch' #fixes some gjs warnings
   pick_mr '1192'
   pick_mr '1164'