From 162ece422725a35c05bcd969d979ef10a985fede Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Mar 2025 23:24:53 +0000
Subject: [PATCH] =?UTF-8?q?gnome-shell:=2048.beta=20=E2=86=92=2048.rc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/48.beta...48.rc

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-shell/fix-paths.patch | 18 +++++++++---------
 pkgs/by-name/gn/gnome-shell/package.nix     |  8 +++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-shell/fix-paths.patch b/pkgs/by-name/gn/gnome-shell/fix-paths.patch
index a87f5129152f..56e716148326 100644
--- a/pkgs/by-name/gn/gnome-shell/fix-paths.patch
+++ b/pkgs/by-name/gn/gnome-shell/fix-paths.patch
@@ -10,10 +10,10 @@ index de91167c5..1c9965678 100644
 +ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true
  Restart=no
 diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
-index 197cc1c1c..dd74aa167 100644
+index 53fd92846..89533cedc 100644
 --- a/js/ui/extensionDownloader.js
 +++ b/js/ui/extensionDownloader.js
-@@ -110,7 +110,7 @@ async function extractExtensionArchive(bytes, dir) {
+@@ -124,7 +124,7 @@ async function extractExtensionArchive(bytes, dir) {
      stream.close_async(GLib.PRIORITY_DEFAULT, null);
  
      const unzip = Gio.Subprocess.new(
@@ -22,7 +22,7 @@ index 197cc1c1c..dd74aa167 100644
          Gio.SubprocessFlags.NONE);
      await unzip.wait_check_async(null);
  
-@@ -132,7 +132,7 @@ async function extractExtensionArchive(bytes, dir) {
+@@ -146,7 +146,7 @@ async function extractExtensionArchive(bytes, dir) {
      }
  
      const compileSchema = Gio.Subprocess.new(
@@ -32,15 +32,15 @@ index 197cc1c1c..dd74aa167 100644
  
      try {
 diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
-index fff4e73c2..92859b099 100644
+index 1b43e1051..a31b0a304 100644
 --- a/js/ui/status/keyboard.js
 +++ b/js/ui/status/keyboard.js
-@@ -1092,6 +1092,6 @@ class InputSourceIndicator extends PanelMenu.Button {
-         if (xkbVariant.length > 0)
-             description = `${description}\t${xkbVariant}`;
+@@ -1104,6 +1104,6 @@ class InputSourceIndicator extends PanelMenu.Button {
+     _showLayout() {
+         Main.overview.hide();
  
--        Util.spawn(['tecla', description]);
-+        Util.spawn(['@tecla@', description]);
+-        Util.spawn(['tecla']);
++        Util.spawn(['@tecla@']);
      }
  });
 diff --git a/subprojects/extensions-tool/src/command-install.c b/subprojects/extensions-tool/src/command-install.c
diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index f112a9709889..676d2a3e3eef 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -69,7 +69,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell";
-  version = "48.beta";
+  version = "48.rc";
 
   outputs = [
     "out"
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4MK+4aFnTGIoR/NTyuWew2v7Ei0sEXg0r/EgRF18Wys=";
+    hash = "sha256-3Vscc9RggZymg6quDK8fEmu9VfYavIctRMim/NW1m8c=";
   };
 
   patches = [
@@ -183,7 +183,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    patchShebangs src/data-to-c.py
+    patchShebangs \
+      src/data-to-c.py \
+      meson/generate-app-list.py
 
     # We can generate it ourselves.
     rm -f man/gnome-shell.1