gnome.gnome-shell: 45.alpha → 45.beta.1

https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/45.alpha...45.beta.1

Replace gkbd-keyboard-display with tecla:

https://github.com/GNOME/gnome-shell/commit/04aaa4b67bffbfe6d472e7f25c8e892f43151ed2

New default-on camera_monitor meson option, tested the indicator using snapshot:

https://github.com/GNOME/gnome-shell/commit/d09d24666a28d834c0baef0dd4ded7e02af05cdf

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>

3 files changed, 29 insertions, 11 deletions

diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix
index 58f4621e8d6a9..f828af82111e0 100644
--- a/pkgs/desktops/gnome/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix
@@ -37,7 +37,6 @@
 , upower
 , ibus
 , libnma-gtk4
-, libgnomekbd
 , gnome-desktop
 , gsettings-desktop-schemas
 , gnome-keyring
@@ -57,6 +56,7 @@
 , gnome-clocks
 , gnome-settings-daemon
 , gnome-autoar
+, gnome-tecla
 , asciidoc
 , bash-completion
 , mesa
@@ -67,22 +67,22 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gnome-shell";
-  version = "45.alpha";
+  version = "45.beta.1";
 
   outputs = [ "out" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "fBXgRyi3oykhH/SJODTbPJlX8PIGHkAoyFCYYR6x97I=";
+    sha256 = "sf/3O3k4UJIpL7jpsH5xdDRuW7XTqV9cgFn/y1UGJpU=";
   };
 
   patches = [
     # Hardcode paths to various dependencies so that they can be found at runtime.
     (substituteAll {
       src = ./fix-paths.patch;
-      gkbd_keyboard_display = "${lib.getBin libgnomekbd}/bin/gkbd-keyboard-display";
       glib_compile_schemas = "${glib.dev}/bin/glib-compile-schemas";
       gsettings = "${glib.bin}/bin/gsettings";
+      tecla = "${lib.getBin gnome-tecla}/bin/tecla";
       unzip = "${lib.getBin unzip}/bin/unzip";
     })
 
@@ -95,11 +95,8 @@ stdenv.mkDerivation rec {
 
     # Fix greeter logo being too big.
     # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2591
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/ffb8bd5fa7704ce70ce7d053e03549dd15dce5ae.patch";
-      revert = true;
-      sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl";
-    })
+    # Reverts https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1101
+    ./greeter-logo-size.patch
 
     # Work around failing fingerprint auth
     (fetchpatch {
diff --git a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch
index e70c4851e9d59..e27847378bb21 100644
--- a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch
@@ -39,8 +39,8 @@ index fff4e73c2..92859b099 100644
          if (xkbVariant.length > 0)
              description = `${description}\t${xkbVariant}`;
  
--        Util.spawn(['gkbd-keyboard-display', '-l', description]);
-+        Util.spawn(['@gkbd_keyboard_display@', '-l', description]);
+-        Util.spawn(['tecla', description]);
++        Util.spawn(['@tecla@', description]);
      }
  });
 diff --git a/subprojects/extensions-tool/src/command-install.c b/subprojects/extensions-tool/src/command-install.c
diff --git a/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch b/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch
new file mode 100644
index 0000000000000..e58610ddc2b29
--- /dev/null
+++ b/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch
@@ -0,0 +1,21 @@
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index a3e4372b4..36f6c1f47 100644
+--- a/js/gdm/loginDialog.js
++++ b/js/gdm/loginDialog.js
+@@ -43,6 +43,7 @@ import * as UserWidget from '../ui/userWidget.js';
+ const _FADE_ANIMATION_TIME = 250;
+ const _SCROLL_ANIMATION_TIME = 500;
+ const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
++const _LOGO_ICON_HEIGHT = 48;
+ 
+ export const UserListItem = GObject.registerClass({
+     Signals: {'activate': {}},
+@@ -839,7 +840,7 @@ export const LoginDialog = GObject.registerClass({
+             const scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+             const texture = this._textureCache.load_file_async(
+                 this._logoFile,
+-                -1, -1,
++                -1, _LOGO_ICON_HEIGHT,
+                 scaleFactor, resourceScale);
+             this._logoBin.add_child(texture);
+         }