guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit d381c838b3f95a7ae54b70d40214bdbc2864a4ad
Author: Noé Lopez <[email protected]>
AuthorDate: Wed Apr 15 08:32:19 2026 +0200
gnu: gnome-shell: Restore desktop files.
* gnu/packages/patches/gnome-shell-restore-desktop-file.patch:
New file.
* gnu/local.mk: Register it.
* gnu/packages/gnome.scm (gnome-shell)[source]: Add it.
Change-Id: I564ba39cda7874b6f27863f175cd226960e4e893
Signed-off-by: Noé Lopez <[email protected]>
---
gnu/local.mk | 1 +
gnu/packages/gnome.scm | 4 +-
.../patches/gnome-shell-restore-desktop-file.patch | 79 ++++++++++++++++++++++
3 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index ecffd2d2b4..df56978e8d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1529,6 +1529,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gnome-recipes-rest-in-soup.patch \
%D%/packages/patches/gnome-settings-daemon-gc.patch \
%D%/packages/patches/gnome-settings-daemon-restore-desktop-files.patch
\
+ %D%/packages/patches/gnome-shell-restore-desktop-file.patch \
%D%/packages/patches/gnome-session-support-elogind.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnulib-bootstrap.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c1e865084c..feb4904fb0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9630,7 +9630,9 @@ properties, screen resolution, and other GNOME
parameters.")
name "-" version ".tar.xz"))
(sha256
(base32
- "022vb4y0ri7ws6l1ghx63vxi9xhi6r0hfrsg257i230ly2i0qvwx"))))
+ "022vb4y0ri7ws6l1ghx63vxi9xhi6r0hfrsg257i230ly2i0qvwx"))
+ (patches
+ (search-patches "gnome-shell-restore-desktop-file.patch"))))
(outputs '("out" "debug"))
(build-system meson-build-system)
(arguments
diff --git a/gnu/packages/patches/gnome-shell-restore-desktop-file.patch
b/gnu/packages/patches/gnome-shell-restore-desktop-file.patch
new file mode 100644
index 0000000000..0afa3f2cc3
--- /dev/null
+++ b/gnu/packages/patches/gnome-shell-restore-desktop-file.patch
@@ -0,0 +1,79 @@
+From 7618e53c3193bc44da5ecb81bcad12f104d36262 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?No=C3=A9=20Lopez?= <[email protected]>
+Date: Wed, 15 Apr 2026 08:31:05 +0200
+Subject: [PATCH] Revert "data: Drop org.gnome.Shell.desktop"
+
+This reverts commit f3911151da7b0e3c630011cb26bd85f719e531d2.
+---
+ data/meson.build | 13 ++++++++++++-
+ ....in => org.gnome.Shell.Extensions.desktop.in.in} | 0
+ ...n => org.gnome.Shell.PortalHelper.desktop.in.in} | 0
+ data/org.gnome.Shell.desktop.in.in | 13 +++++++++++++
+ 4 files changed, 25 insertions(+), 1 deletion(-)
+ rename data/{org.gnome.Shell.Extensions.desktop.in =>
org.gnome.Shell.Extensions.desktop.in.in} (100%)
+ rename data/{org.gnome.Shell.PortalHelper.desktop.in =>
org.gnome.Shell.PortalHelper.desktop.in.in} (100%)
+ create mode 100644 data/org.gnome.Shell.desktop.in.in
+
+diff --git a/data/meson.build b/data/meson.build
+index bc1c6ab2d..2fa16b97b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,7 @@
+ data_builddir = meson.current_build_dir()
+
+ desktop_files = [
++ 'org.gnome.Shell.desktop',
+ 'org.gnome.Shell.Extensions.desktop',
+ ]
+ service_files = []
+@@ -10,9 +11,19 @@ if have_portal_helper
+ service_files += 'org.gnome.Shell.PortalHelper.service'
+ endif
+
++desktopconf = configuration_data()
++# We substitute in bindir so it works as an autostart
++# file when built in a non-system prefix
++desktopconf.set('bindir', bindir)
++desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
++
+ foreach desktop_file : desktop_files
+ i18n.merge_file(
+- input: desktop_file + '.in',
++ input: configure_file(
++ input: desktop_file + '.in.in',
++ output: desktop_file + '.in',
++ configuration: desktopconf
++ ),
+ output: desktop_file,
+ po_dir: po_dir,
+ install: true,
+diff --git a/data/org.gnome.Shell.Extensions.desktop.in
b/data/org.gnome.Shell.Extensions.desktop.in.in
+similarity index 100%
+rename from data/org.gnome.Shell.Extensions.desktop.in
+rename to data/org.gnome.Shell.Extensions.desktop.in.in
+diff --git a/data/org.gnome.Shell.PortalHelper.desktop.in
b/data/org.gnome.Shell.PortalHelper.desktop.in.in
+similarity index 100%
+rename from data/org.gnome.Shell.PortalHelper.desktop.in
+rename to data/org.gnome.Shell.PortalHelper.desktop.in.in
+diff --git a/data/org.gnome.Shell.desktop.in.in
b/data/org.gnome.Shell.desktop.in.in
+new file mode 100644
+index 000000000..59d1cd2fe
+--- /dev/null
++++ b/data/org.gnome.Shell.desktop.in.in
+@@ -0,0 +1,13 @@
++[Desktop Entry]
++Type=Application
++Name=GNOME Shell
++Comment=Window management and application launching
++Exec=@bindir@/gnome-shell
++Categories=GNOME;GTK;Core;
++OnlyShowIn=GNOME;
++NoDisplay=true
++X-GNOME-Autostart-Phase=DisplayServer
++X-GNOME-Provides=panel;windowmanager;
++X-GNOME-Autostart-Notify=true
++X-GNOME-AutoRestart=false
++X-GNOME-HiddenUnderSystemd=@systemd_hidden@
+--
+2.52.0
+
