Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions data/autostart.desktop

This file was deleted.

12 changes: 12 additions & 0 deletions data/io.elementary.settings-daemon.service.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Unit]
Description=Settings Daemon
After=gnome-session-initialized.target

[Install]
WantedBy=gnome-session-initialized.target

[Service]
Type=exec
ExecStart=@bindir@/io.elementary.settings-daemon
Restart=on-failure
Slice=session.slice
24 changes: 8 additions & 16 deletions data/meson.build
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
i18n.merge_file(
input: 'autostart.desktop',
output: meson.project_name() + '.desktop',
po_dir: meson.project_source_root() / 'po',
type: 'desktop',
install: true,
install_dir: datadir / 'applications'
)

fs = import('fs')
meson.add_install_script(
symlink,
datadir / 'applications' / meson.project_name() + '.desktop',
(fs.is_absolute(sysconfdir) ? sysconfdir : (prefix / sysconfdir)) / 'xdg' / 'autostart' / meson.project_name() + '.desktop',
)

dbus_dep = dependency('dbus-1')
dbus_interfaces_dir = dbus_dep.get_variable('interfaces_dir', pkgconfig_define: ['datadir', datadir])

Expand Down Expand Up @@ -63,6 +47,7 @@ if systemd_system_unit_dir != 'no' and systemd_user_unit_dir != 'no'

service_config = configuration_data()
service_config.set('busctl_path', busctl_path)
service_config.set('bindir', bindir)

configure_file(
input: meson.project_name() + '.check-for-firmware-updates.service.in',
Expand All @@ -87,4 +72,11 @@ if systemd_system_unit_dir != 'no' and systemd_user_unit_dir != 'no'
meson.project_name() + '.system-update.timer',
install_dir: systemd_user_unit_dir
)

configure_file(
input: meson.project_name() + '.service.in',
output: meson.project_name() + '.service',
configuration: service_config,
install_dir: systemd_user_unit_dir
)
endif
5 changes: 2 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ libgeoclue_dep = dependency ('libgeoclue-2.0')

prefix = get_option('prefix')
datadir = prefix / get_option('datadir')
sysconfdir = get_option('sysconfdir')
bindir = prefix / get_option('bindir')

conf_data = configuration_data()
conf_data.set('PROJECT_NAME', meson.project_name())
Expand All @@ -59,6 +59,5 @@ subdir('src')
subdir('settings-portal')

gnome.post_install(
glib_compile_schemas: true,
update_desktop_database: true
glib_compile_schemas: true
)
1 change: 0 additions & 1 deletion po/POTFILES
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
data/autostart.desktop
data/settings-daemon.metainfo.xml.in
src/Application.vala
src/Backends/SystemUpdate.vala
Expand Down