summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoé Lopez <noelopez@free.fr>2026-04-15 08:35:24 +0200
committerNoé Lopez <noelopez@free.fr>2026-08-25 01:15:32 +0200
commit26c07cb8d61ba4ca102ec92acc5535a11df73f14 (patch)
tree7b8d87e9c8836d1585a40c617077066c9c439b94
parent48b01ca8dad948a6b0e49dc33b5aa02c92acd6a9 (diff)
gnu: gnome-settings-daemon: Restore desktop files.
* gnu/packages/patches/gnome-settings-daemon-restore-desktop-files.patch: New file. * gnu/local.mk: Register it. * gnu/packages/gnome.scm (gnome-settings-daemon)[source]: Add it. Change-Id: I95597e1b9f5710e0ae1ebd4d5984d22d71b68459 Signed-off-by: Noé Lopez <noelopez@free.fr>
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/gnome.scm3
-rw-r--r--gnu/packages/patches/gnome-settings-daemon-restore-desktop-files.patch103
3 files changed, 106 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 175318f045e..98fb7fd97ee 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1528,6 +1528,7 @@ dist_patch_DATA = \
1528 %D%/packages/patches/gnome-dictionary-meson-i18n.patch \ 1528 %D%/packages/patches/gnome-dictionary-meson-i18n.patch \
1529 %D%/packages/patches/gnome-recipes-rest-in-soup.patch \ 1529 %D%/packages/patches/gnome-recipes-rest-in-soup.patch \
1530 %D%/packages/patches/gnome-settings-daemon-gc.patch \ 1530 %D%/packages/patches/gnome-settings-daemon-gc.patch \
1531 %D%/packages/patches/gnome-settings-daemon-restore-desktop-files.patch \
1531 %D%/packages/patches/gnome-session-support-elogind.patch \ 1532 %D%/packages/patches/gnome-session-support-elogind.patch \
1532 %D%/packages/patches/gnome-tweaks-search-paths.patch \ 1533 %D%/packages/patches/gnome-tweaks-search-paths.patch \
1533 %D%/packages/patches/gnulib-bootstrap.patch \ 1534 %D%/packages/patches/gnulib-bootstrap.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 44b453231a3..895f8ea385a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5905,7 +5905,8 @@ services for numerous locations.")
5905 (sha256 5905 (sha256
5906 (base32 5906 (base32
5907 "1hf1dip78sjfsi28w80wkh6i51glprwl2j29gc9bkhwi9zy5g69a")) 5907 "1hf1dip78sjfsi28w80wkh6i51glprwl2j29gc9bkhwi9zy5g69a"))
5908 (patches (search-patches "gnome-settings-daemon-gc.patch")))) 5908 (patches (search-patches "gnome-settings-daemon-gc.patch"
5909 "gnome-settings-daemon-restore-desktop-files.patch"))))
5909 (build-system meson-build-system) 5910 (build-system meson-build-system)
5910 (arguments 5911 (arguments
5911 (list 5912 (list
diff --git a/gnu/packages/patches/gnome-settings-daemon-restore-desktop-files.patch b/gnu/packages/patches/gnome-settings-daemon-restore-desktop-files.patch
new file mode 100644
index 00000000000..d9bf07ba836
--- /dev/null
+++ b/gnu/packages/patches/gnome-settings-daemon-restore-desktop-files.patch
@@ -0,0 +1,103 @@
1From 6eefa4ef615e24688d20847afcb5fddb31a69774 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?No=C3=A9=20Lopez?= <noelopez@free.fr>
3Date: Wed, 15 Apr 2026 08:34:03 +0200
4Subject: [PATCH] Revert "plugins: Drop .desktop files"
5
6This reverts commit 242752d489b40f7cac20fc244a76eac8572cd955.
7---
8 meson.build | 2 ++
9 plugins/meson.build | 25 +++++++++++++++++--
10 .../org.gnome.SettingsDaemon.Dummy.desktop.in | 7 ++++++
11 .../org.gnome.SettingsDaemon.Real.desktop.in | 10 ++++++++
12 4 files changed, 42 insertions(+), 2 deletions(-)
13 create mode 100644 plugins/org.gnome.SettingsDaemon.Dummy.desktop.in
14 create mode 100644 plugins/org.gnome.SettingsDaemon.Real.desktop.in
15
16diff --git a/meson.build b/meson.build
17index b1d5c53c..b69e3e1d 100644
18--- a/meson.build
19+++ b/meson.build
20@@ -37,6 +37,8 @@ gsd_pkglibdir = join_paths(gsd_libdir, gsd_api_name)
21
22 gsd_schemadir = join_paths(gsd_datadir, 'glib-2.0', 'schemas')
23
24+gsd_xdg_autostart = join_paths(gsd_sysconfdir, 'xdg', 'autostart')
25+
26 gsd_3_0_api_name = '@0@-@1@'.format(meson.project_name(), '3.0')
27 gsd_gtk_modules_directory = join_paths(gsd_libdir, gsd_3_0_api_name, 'gtk-modules')
28
29diff --git a/plugins/meson.build b/plugins/meson.build
30index fae3fc9e..68c79410 100644
31--- a/plugins/meson.build
32+++ b/plugins/meson.build
33@@ -82,15 +82,36 @@ foreach plugin: all_plugins
34 plugin_description = plugin[2]
35 plugin_dbus_name='org.gnome.SettingsDaemon.@0@'.format(plugin_name_case)
36
37+ desktop = 'org.gnome.SettingsDaemon.@0@.desktop'.format(plugin[1])
38+
39+ if disabled_plugins.contains(plugin_name)
40+ desktop_in_file = files('org.gnome.SettingsDaemon.Dummy.desktop.in')
41+ else
42+ desktop_in_file = files('org.gnome.SettingsDaemon.Real.desktop.in')
43+ endif
44+
45 cflags = [
46 '-DG_LOG_DOMAIN="@0@-plugin"'.format(plugin_name),
47 '-DPLUGIN_NAME="@0@"'.format(plugin_name),
48 '-DPLUGIN_DBUS_NAME="@0@"'.format(plugin_dbus_name),
49 ] + plugins_cflags
50
51+ desktop = 'org.gnome.SettingsDaemon.@0@.desktop'.format(plugin[1])
52+ desktop_conf = configuration_data()
53+ desktop_conf.set('libexecdir', gsd_libexecdir)
54+ desktop_conf.set('systemd_hidden', enable_systemd ? 'true' : 'false')
55+ desktop_conf.set('pluginname', plugin_name)
56+ desktop_conf.set('description', plugin_description)
57+ configure_file(
58+ input: desktop_in_file,
59+ output: desktop,
60+ configuration: desktop_conf,
61+ install_dir: gsd_xdg_autostart
62+ )
63+
64 if not disabled_plugins.contains(plugin_name)
65- user_target = 'org.gnome.SettingsDaemon.@0@.target'.format(plugin_name_case)
66- user_service = 'org.gnome.SettingsDaemon.@0@.service'.format(plugin_name_case)
67+ user_target = 'org.gnome.SettingsDaemon.@0@.target'.format(plugin[1])
68+ user_service = 'org.gnome.SettingsDaemon.@0@.service'.format(plugin[1])
69
70 unit_conf = configuration_data()
71 unit_conf.set('plugin_name', plugin_name)
72diff --git a/plugins/org.gnome.SettingsDaemon.Dummy.desktop.in b/plugins/org.gnome.SettingsDaemon.Dummy.desktop.in
73new file mode 100644
74index 00000000..f4cc7a27
75--- /dev/null
76+++ b/plugins/org.gnome.SettingsDaemon.Dummy.desktop.in
77@@ -0,0 +1,7 @@
78+[Desktop Entry]
79+Type=Application
80+Name=GNOME Settings Daemon's @pluginname@ dummy autostart file
81+Exec=false
82+OnlyShowIn=GNOME;
83+NoDisplay=true
84+Hidden=true
85diff --git a/plugins/org.gnome.SettingsDaemon.Real.desktop.in b/plugins/org.gnome.SettingsDaemon.Real.desktop.in
86new file mode 100644
87index 00000000..3034e712
88--- /dev/null
89+++ b/plugins/org.gnome.SettingsDaemon.Real.desktop.in
90@@ -0,0 +1,10 @@
91+[Desktop Entry]
92+Type=Application
93+Name=@description@
94+Exec=@libexecdir@/gsd-@pluginname@
95+OnlyShowIn=GNOME;
96+NoDisplay=true
97+X-GNOME-Autostart-Phase=Initialization
98+X-GNOME-Autostart-Notify=true
99+X-GNOME-AutoRestart=true
100+X-GNOME-HiddenUnderSystemd=@systemd_hidden@
101--
1022.52.0
103