536 dirty fix

3 files changed, 44 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7868238e92d..5bad761d8abd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnome-shell-performance
 	pkgdesc = Next generation desktop shell
 	pkgver = 3.36.2+46+gb148a8bc6
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://wiki.gnome.org/Projects/GnomeShell
 	install = gnome-shell-performance.install
diff --git a/536-2.diff b/536-2.diff
new file mode 100644
index 000000000000..bb1dcc8ca73f
--- /dev/null
+++ b/536-2.diff
@@ -0,0 +1,32 @@
+--- a/src/st/st-theme.c
++++ b/src/st/st-theme.c
+@@ -303,16 +303,16 @@
+                             GFile      *file)
+ {
+   CRStyleSheet *stylesheet;
++  StyleSheetData *stylesheet_data;
+ 
+   stylesheet = g_hash_table_lookup (theme->stylesheets_by_file, file);
+-  if (!stylesheet)
++  if (!stylesheet || !stylesheet->app_data)
+     return;
+ 
+-  if (!g_slist_find (theme->custom_stylesheets, stylesheet))
++  stylesheet_data = stylesheet->app_data;
++  if (!stylesheet_data->extension_stylesheet)
+     return;
+ 
+-  theme->custom_stylesheets = g_slist_remove (theme->custom_stylesheets, stylesheet);
+-
+   g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
+ 
+   /* We need to remove the entry from the hashtable after emitting the signal
+@@ -320,8 +320,6 @@
+    * _st_theme_resolve_url() during the signal emission.
+    */
+   g_hash_table_remove (theme->stylesheets_by_file, file);
+-  g_hash_table_remove (theme->files_by_stylesheet, stylesheet);
+-  cr_stylesheet_unref (stylesheet);
+ }
+ 
+ /**
diff --git a/PKGBUILD b/PKGBUILD
index 0dbd0bdbc427..39a7291a228f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ _merge_requests_to_use=() # safe pick
 pkgname=gnome-shell-performance
 _pkgname=gnome-shell
 pkgver=3.36.2+46+gb148a8bc6
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Next generation desktop shell"
 url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -113,7 +113,16 @@ prepare() {
   # Type: 2
   # Status: 1
   # Comment: Crash fix for st_theme_get_custom_stylesheets
-  pick_mr '536'
+  # 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 || true
+      patch -Np1 -i ../../536-2.diff # dirty fix
+      break
+    fi
+  done
 
   # Title: Some fixes for setting key focus of the closeDialog
   # URL: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/786