Sync to gnome-43 (fmuellner/gnome-shell:for-43) & remove a merged PR

Signed-off-by: Mingi Sung <FiestaLake@protonmail.com>

2 files changed, 10 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ea96ae7e3bf..636878172138 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnome-shell-performance
 	pkgdesc = Next generation desktop shell | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync
-	pkgver = 43.1+4+ga2cd818c8
-	pkgrel = 2
+	pkgver = 43.1+28+g9956f5ea5
+	pkgrel = 1
 	epoch = 1
 	url = https://wiki.gnome.org/Projects/GnomeShell
 	arch = x86_64
@@ -42,10 +42,10 @@ pkgbase = gnome-shell-performance
 	optdepends = gst-plugin-pipewire: Screen recording
 	optdepends = gnome-bluetooth-3.0: Bluetooth support
 	provides = gnome-shell
-	provides = gnome-shell=43.1+4+ga2cd818c8
-	provides = gnome-shell=1:43.1+4+ga2cd818c8
+	provides = gnome-shell=43.1+28+g9956f5ea5
+	provides = gnome-shell=1:43.1+28+g9956f5ea5
 	conflicts = gnome-shell
-	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=a2cd818c8c4d6a81d565099b01920b8815dea355
+	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=9956f5ea52305273cc1394ee8c0a19c2fd6f908d
 	source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7057d7debf05..052b74f701e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,16 +11,16 @@
 
 ### MERGE REQUESTS SELECTION
 
-# available MR: (2536)
-_merge_requests_to_use=(2536)
+# available MR: ()
+_merge_requests_to_use=()
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 
 pkgname=gnome-shell-performance
 _pkgname=gnome-shell
-pkgver=43.1+4+ga2cd818c8
-pkgrel=2
+pkgver=43.1+28+g9956f5ea5
+pkgrel=1
 epoch=1
 pkgdesc="Next generation desktop shell | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync"
 url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -41,7 +41,7 @@ optdepends=('gnome-control-center: System settings'
 groups=(gnome)
 provides=(gnome-shell gnome-shell=$pkgver gnome-shell=$epoch:$pkgver)
 conflicts=(gnome-shell)
-_commit=a2cd818c8c4d6a81d565099b01920b8815dea355  # tags/43.1^4
+_commit=9956f5ea52305273cc1394ee8c0a19c2fd6f908d  # tags/43.1^28 (fmuellner/gnome-shell:for-43)
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
         "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
 sha256sums=('SKIP'
@@ -119,13 +119,6 @@ prepare() {
   #
   # Generally, a MR status oscillate between 2 and 3 and then becomes 4.
 
-  # Title: appDisplay: Connect to hidden signal after content initialization
-  # URL: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2536
-  # Type: 3
-  # Status: 4
-  # Comment: Fix pageNumber being able to be clamped to -1.
-  pick_mr 2536 merge
-
   git submodule init
   git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
   git -c protocol.file.allow=always submodule update