projects/aports·blob master · refs

105 lines · 3.9 KiB

1From 90732cdef6db316a8d9fbbcb18da85a766fef3fe Mon Sep 17 00:00:00 2001
2From: Achill Gilgenast <[email protected]>
3Date: Sun, 15 Mar 2026 11:04:47 +0100
4Subject: [PATCH] Revert "plugins: Drop .desktop files"
5
6This reverts commit 242752d489b40f7cac20fc244a76eac8572cd955.
7
8Signed-off-by: Achill Gilgenast <[email protected]>
9---
10 meson.build | 2 ++
11 plugins/meson.build | 25 +++++++++++++++++--
12 .../org.gnome.SettingsDaemon.Dummy.desktop.in | 7 ++++++
13 .../org.gnome.SettingsDaemon.Real.desktop.in | 10 ++++++++
14 4 files changed, 42 insertions(+), 2 deletions(-)
15 create mode 100644 plugins/org.gnome.SettingsDaemon.Dummy.desktop.in
16 create mode 100644 plugins/org.gnome.SettingsDaemon.Real.desktop.in
17
18diff --git a/meson.build b/meson.build
19index 09257cd514a8..55be97809c76 100644
20--- a/meson.build
21+++ b/meson.build
22@@ -37,6 +37,8 @@ gsd_pkglibdir = join_paths(gsd_libdir, gsd_api_name)
23
24 gsd_schemadir = join_paths(gsd_datadir, 'glib-2.0', 'schemas')
25
26+gsd_xdg_autostart = join_paths(gsd_sysconfdir, 'xdg', 'autostart')
27+
28 gsd_3_0_api_name = '@0@-@1@'.format(meson.project_name(), '3.0')
29 gsd_gtk_modules_directory = join_paths(gsd_libdir, gsd_3_0_api_name, 'gtk-modules')
30
31diff --git a/plugins/meson.build b/plugins/meson.build
32index d8881029cd13..27c2a7cbfc27 100644
33--- a/plugins/meson.build
34+++ b/plugins/meson.build
35@@ -82,15 +82,36 @@ foreach plugin: all_plugins
36 plugin_description = plugin[2]
37 plugin_dbus_name='org.gnome.SettingsDaemon.@0@'.format(plugin_name_case)
38
39+ desktop = 'org.gnome.SettingsDaemon.@[email protected]'.format(plugin[1])
40+
41+ if disabled_plugins.contains(plugin_name)
42+ desktop_in_file = files('org.gnome.SettingsDaemon.Dummy.desktop.in')
43+ else
44+ desktop_in_file = files('org.gnome.SettingsDaemon.Real.desktop.in')
45+ endif
46+
47 cflags = [
48 '-DG_LOG_DOMAIN="@0@-plugin"'.format(plugin_name),
49 '-DPLUGIN_NAME="@0@"'.format(plugin_name),
50 '-DPLUGIN_DBUS_NAME="@0@"'.format(plugin_dbus_name),
51 ] + plugins_cflags
52
53+ desktop = 'org.gnome.SettingsDaemon.@[email protected]'.format(plugin[1])
54+ desktop_conf = configuration_data()
55+ desktop_conf.set('libexecdir', gsd_libexecdir)
56+ desktop_conf.set('systemd_hidden', enable_systemd ? 'true' : 'false')
57+ desktop_conf.set('pluginname', plugin_name)
58+ desktop_conf.set('description', plugin_description)
59+ configure_file(
60+ input: desktop_in_file,
61+ output: desktop,
62+ configuration: desktop_conf,
63+ install_dir: gsd_xdg_autostart
64+ )
65+
66 if not disabled_plugins.contains(plugin_name)
67- user_target = 'org.gnome.SettingsDaemon.@[email protected]'.format(plugin_name_case)
68- user_service = 'org.gnome.SettingsDaemon.@[email protected]'.format(plugin_name_case)
69+ user_target = 'org.gnome.SettingsDaemon.@[email protected]'.format(plugin[1])
70+ user_service = 'org.gnome.SettingsDaemon.@[email protected]'.format(plugin[1])
71
72 unit_conf = configuration_data()
73 unit_conf.set('plugin_name', plugin_name)
74diff --git a/plugins/org.gnome.SettingsDaemon.Dummy.desktop.in b/plugins/org.gnome.SettingsDaemon.Dummy.desktop.in
75new file mode 100644
76index 000000000000..f4cc7a278093
77--- /dev/null
78+++ b/plugins/org.gnome.SettingsDaemon.Dummy.desktop.in
79@@ -0,0 +1,7 @@
80+[Desktop Entry]
81+Type=Application
82+Name=GNOME Settings Daemon's @pluginname@ dummy autostart file
83+Exec=false
84+OnlyShowIn=GNOME;
85+NoDisplay=true
86+Hidden=true
87diff --git a/plugins/org.gnome.SettingsDaemon.Real.desktop.in b/plugins/org.gnome.SettingsDaemon.Real.desktop.in
88new file mode 100644
89index 000000000000..3034e7125550
90--- /dev/null
91+++ b/plugins/org.gnome.SettingsDaemon.Real.desktop.in
92@@ -0,0 +1,10 @@
93+[Desktop Entry]
94+Type=Application
95+Name=@description@
96+Exec=@libexecdir@/gsd-@pluginname@
97+OnlyShowIn=GNOME;
98+NoDisplay=true
99+X-GNOME-Autostart-Phase=Initialization
100+X-GNOME-Autostart-Notify=true
101+X-GNOME-AutoRestart=true
102+X-GNOME-HiddenUnderSystemd=@systemd_hidden@
103--
1042.53.0
105