Fix autostart file symlink

data/meson.build

@@ -1,25 +1,26 @@
 install_data(
     'autostart.desktop',
-    install_dir: join_paths(get_option('datadir'), 'applications'),
+    install_dir: datadir / 'applications',
     rename: meson.project_name() + '.desktop'
 )
 
+fs = import('fs')
 meson.add_install_script(
     symlink,
-    join_paths(get_option('datadir'), 'applications', meson.project_name() + '.desktop'),
-    join_paths(get_option('sysconfdir'), 'xdg', 'autostart', meson.project_name() + '.desktop'),
+    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_pkgconfig_variable('interfaces_dir', define_variable: ['datadir', datadir])
+dbus_interfaces_dir = dbus_dep.get_variable('interfaces_dir', pkgconfig_define: ['datadir', datadir])
 
 install_data(
     'io.elementary.SettingsDaemon.AccountsService.xml',
     install_dir: dbus_interfaces_dir
 )
 
 act_dep = dependency('accountsservice')
-act_interfacesdir = act_dep.get_pkgconfig_variable('interfacesdir', define_variable: ['datadir', datadir], default: datadir /'accountsservice' / 'interfaces')
+act_interfacesdir = act_dep.get_variable('interfacesdir', pkgconfig_define: ['datadir', datadir], default_value: datadir /'accountsservice' / 'interfaces')
 
 meson.add_install_script(
     symlink,
@@ -42,7 +43,7 @@ i18n.merge_file(
 )
 
 systemd = dependency('systemd')
-systemd_system_unit_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+systemd_system_unit_dir = systemd.get_variable('systemdsystemunitdir')
 
 install_data(
     meson.project_name() + '.check-for-firmware-updates.service',
@@ -59,12 +60,12 @@ icon_sizes = ['24', '32', '48', '64', '128']
 foreach i : icon_sizes
     install_data(
         join_paths('icons', i + '.svg'),
-        install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps'),
+        install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps',
         rename: meson.project_name() + '.svg'
     )
     install_data(
         join_paths('icons', i + '.svg'),
-        install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2', 'apps'),
+        install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i + '@2' / 'apps',
         rename: meson.project_name() + '.svg'
     )
 endforeach

data/settings-daemon.metainfo.xml.in

@@ -30,6 +30,12 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
+    <release version="1.3.1" date="2023-07-24" urgency="medium">
+      <issues>
+        <issue url="https://github.com/elementary/settings-daemon/issues/76">Auto switch to dark theme stopped working</issue>
+      </issues>
+    </release>
+
     <release version="1.3.0" date="2023-07-20" urgency="medium">
       <description>
         <p>New features:</p>

meson.build

@@ -2,6 +2,7 @@ project('io.elementary.settings-daemon',
     'c', 'vala',
     version: '1.3.0',
     license: 'GPL3',
+    meson_version: '>=0.58.0'
 )
 
 fwupd_dep = dependency('fwupd')
@@ -27,11 +28,15 @@ cc = meson.get_compiler('c')
 m_dep = cc.find_library('m', required : false)
 libgeoclue_dep = dependency ('libgeoclue-2.0')
 
+prefix = get_option('prefix')
+datadir = prefix / get_option('datadir')
+sysconfdir = get_option('sysconfdir')
+
 conf_data = configuration_data()
 conf_data.set('PROJECT_NAME', meson.project_name())
 conf_data.set('VERSION', meson.project_version())
 conf_data.set('GETTEXT_PACKAGE', gettext_package)
-conf_data.set('LOCALEDIR', join_paths (get_option('prefix'), get_option('localedir')))
+conf_data.set('LOCALEDIR', prefix / get_option('localedir'))
 
 config_file = configure_file(
     input: 'config.vala.in',
@@ -44,9 +49,6 @@ config_dep = declare_dependency(
     include_directories: include_directories('.')
 )
 
-prefix = get_option('prefix')
-datadir = join_paths(prefix, get_option('datadir'))
-
 symlink = join_paths(meson.current_source_dir (), 'meson', 'create-symlink.sh')
 
 subdir('data')

po/meson.build

@@ -1,5 +1,5 @@
 i18n.gettext('extra',
-    args: '--directory=' + meson.source_root(),
+    args: '--directory=' + meson.project_source_root(),
     preset: 'glib',
     install: false
 )

settings-portal/meson.build

@@ -1,4 +1,4 @@
-libexec_dir = join_paths(get_option('prefix'), get_option ('libexecdir'))
+libexec_dir = prefix / get_option ('libexecdir')
 
 portal_sources = files(
     'Main.vala',
@@ -26,7 +26,7 @@ if systemd_systemduserunitdir != 'no'
   if systemd_systemduserunitdir == ''
     systemd_dep = dependency('systemd', version: '>= 206', required: false)
     assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
-    systemd_systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', define_variable: ['prefix', get_option('prefix')])
+    systemd_systemduserunitdir = systemd_dep.get_variable('systemduserunitdir', pkgconfig_define: ['prefix', prefix])
   endif
 
   configure_file(
@@ -40,13 +40,13 @@ endif
 
 install_data(
     'io.elementary.settings-daemon.portal',
-    install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'xdg-desktop-portal', 'portals')
+    install_dir: datadir / 'xdg-desktop-portal' / 'portals'
 )
 
 configure_file(
     input: 'org.freedesktop.impl.portal.desktop.elementary.settings-daemon.service.in',
     output: '@BASENAME@',
     configuration: portal_conf_data,
     install: true,
-    install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'dbus-1', 'services')
+    install_dir: datadir / 'dbus-1' / 'services'
 )