From 9184fdb2218ed460f431335d2311910794e70ecd Mon Sep 17 00:00:00 2001 From: lenemter Date: Tue, 25 Jul 2023 02:47:50 +0900 Subject: [PATCH 01/11] Fix autostart file symlink --- data/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/meson.build b/data/meson.build index bc55550e..9635a895 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,12 +1,12 @@ install_data( 'autostart.desktop', - install_dir: join_paths(get_option('datadir'), 'applications'), + install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'applications'), rename: meson.project_name() + '.desktop' ) meson.add_install_script( symlink, - join_paths(get_option('datadir'), 'applications', meson.project_name() + '.desktop'), + join_paths(get_option('prefix'), get_option('datadir'), 'applications', meson.project_name() + '.desktop'), join_paths(get_option('sysconfdir'), 'xdg', 'autostart', meson.project_name() + '.desktop'), ) From ce72d7cde00544868de6412eb68768fc3386d2d9 Mon Sep 17 00:00:00 2001 From: lenemter Date: Tue, 25 Jul 2023 02:50:08 +0900 Subject: [PATCH 02/11] Update metainfo --- data/settings-daemon.metainfo.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/settings-daemon.metainfo.xml.in b/data/settings-daemon.metainfo.xml.in index 357bd276..0d6650b6 100644 --- a/data/settings-daemon.metainfo.xml.in +++ b/data/settings-daemon.metainfo.xml.in @@ -30,6 +30,12 @@ contact_at_elementary.io + + + Auto switch to dark theme stopped working + + +

New features:

From 2ab7fa54cce4e1f5ac23affedd22b253a2647fda Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 25 Jul 2023 03:25:19 +0900 Subject: [PATCH 03/11] Update data/meson.build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Danielle Foré --- data/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/meson.build b/data/meson.build index 9635a895..347e79fe 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,6 +1,6 @@ install_data( 'autostart.desktop', - install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'applications'), + install_dir: prefix / data_dir / 'applications', rename: meson.project_name() + '.desktop' ) From fb9b9493b65ddfd081c7b37e75286fd7159c6df0 Mon Sep 17 00:00:00 2001 From: lenemter Date: Tue, 25 Jul 2023 03:27:38 +0900 Subject: [PATCH 04/11] Use `install_symlink` --- data/meson.build | 10 +++++----- meson.build | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/meson.build b/data/meson.build index 347e79fe..eec3621e 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,13 +1,13 @@ install_data( 'autostart.desktop', - install_dir: prefix / data_dir / 'applications', + install_dir: datadir / 'applications', rename: meson.project_name() + '.desktop' ) -meson.add_install_script( - symlink, - join_paths(get_option('prefix'), get_option('datadir'), 'applications', meson.project_name() + '.desktop'), - join_paths(get_option('sysconfdir'), 'xdg', 'autostart', meson.project_name() + '.desktop'), +install_symlink( + meson.project_name() + '.desktop', + install_dir: get_option('sysconfdir') / 'xdg' / 'autostart', + pointing_to: datadir / 'applications' / meson.project_name() + '.desktop' ) dbus_dep = dependency('dbus-1') diff --git a/meson.build b/meson.build index 69bfd963..611bc32d 100644 --- a/meson.build +++ b/meson.build @@ -2,6 +2,7 @@ project('io.elementary.settings-daemon', 'c', 'vala', version: '1.3.0', license: 'GPL3', + meson_version: '>=0.61.0' ) fwupd_dep = dependency('fwupd') @@ -45,7 +46,7 @@ config_dep = declare_dependency( ) prefix = get_option('prefix') -datadir = join_paths(prefix, get_option('datadir')) +datadir = prefix / get_option('datadir') symlink = join_paths(meson.current_source_dir (), 'meson', 'create-symlink.sh') From 795115968b53cf4eb94b9657b200fec7f077a72b Mon Sep 17 00:00:00 2001 From: lenemter Date: Tue, 25 Jul 2023 03:30:47 +0900 Subject: [PATCH 05/11] Use `datadir` and `prefix` variables --- data/meson.build | 4 ++-- meson.build | 8 ++++---- settings-portal/meson.build | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/meson.build b/data/meson.build index eec3621e..4252b82e 100644 --- a/data/meson.build +++ b/data/meson.build @@ -59,12 +59,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 diff --git a/meson.build b/meson.build index 611bc32d..95ebd6f0 100644 --- a/meson.build +++ b/meson.build @@ -28,11 +28,14 @@ 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') + 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', @@ -45,9 +48,6 @@ config_dep = declare_dependency( include_directories: include_directories('.') ) -prefix = get_option('prefix') -datadir = prefix / get_option('datadir') - symlink = join_paths(meson.current_source_dir (), 'meson', 'create-symlink.sh') subdir('data') diff --git a/settings-portal/meson.build b/settings-portal/meson.build index 93ea855c..e7508287 100644 --- a/settings-portal/meson.build +++ b/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_pkgconfig_variable('systemduserunitdir', define_variable: ['prefix', prefix]) endif configure_file( @@ -40,7 +40,7 @@ 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( @@ -48,5 +48,5 @@ configure_file( 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' ) From 5900b66ef76bc81d4ebcc49ce667523c3e274528 Mon Sep 17 00:00:00 2001 From: lenemter Date: Tue, 25 Jul 2023 03:32:32 +0900 Subject: [PATCH 06/11] Fix deprecations --- data/meson.build | 6 +++--- po/meson.build | 2 +- settings-portal/meson.build | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/meson.build b/data/meson.build index 4252b82e..e50ad9c1 100644 --- a/data/meson.build +++ b/data/meson.build @@ -11,7 +11,7 @@ install_symlink( ) 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', @@ -19,7 +19,7 @@ install_data( ) 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 +42,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', diff --git a/po/meson.build b/po/meson.build index c296095a..c5bd751e 100644 --- a/po/meson.build +++ b/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 ) diff --git a/settings-portal/meson.build b/settings-portal/meson.build index e7508287..a79dd147 100644 --- a/settings-portal/meson.build +++ b/settings-portal/meson.build @@ -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', prefix]) + systemd_systemduserunitdir = systemd_dep.get_variable('systemduserunitdir', pkgconfig_define: ['prefix', prefix]) endif configure_file( From ee7a6109a1b060342044231e9df41536e7ca820f Mon Sep 17 00:00:00 2001 From: lenemter Date: Tue, 25 Jul 2023 03:35:48 +0900 Subject: [PATCH 07/11] Try to fix CI --- data/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/meson.build b/data/meson.build index e50ad9c1..ee2dcdc6 100644 --- a/data/meson.build +++ b/data/meson.build @@ -7,7 +7,7 @@ install_data( install_symlink( meson.project_name() + '.desktop', install_dir: get_option('sysconfdir') / 'xdg' / 'autostart', - pointing_to: datadir / 'applications' / meson.project_name() + '.desktop' + pointing_to: get_option('prefix') / get_option('datadir') / 'applications' / meson.project_name() + '.desktop' ) dbus_dep = dependency('dbus-1') From 00f18bccce552e93b079c6adb0dd659302531947 Mon Sep 17 00:00:00 2001 From: lenemter Date: Tue, 25 Jul 2023 03:37:38 +0900 Subject: [PATCH 08/11] ? --- data/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/meson.build b/data/meson.build index ee2dcdc6..e50ad9c1 100644 --- a/data/meson.build +++ b/data/meson.build @@ -7,7 +7,7 @@ install_data( install_symlink( meson.project_name() + '.desktop', install_dir: get_option('sysconfdir') / 'xdg' / 'autostart', - pointing_to: get_option('prefix') / get_option('datadir') / 'applications' / meson.project_name() + '.desktop' + pointing_to: datadir / 'applications' / meson.project_name() + '.desktop' ) dbus_dep = dependency('dbus-1') From fb78ab864a1e860fb8a43788df83b0642bf3f9d9 Mon Sep 17 00:00:00 2001 From: lenemter Date: Tue, 25 Jul 2023 12:55:34 +0900 Subject: [PATCH 09/11] Use add_install_script --- data/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/meson.build b/data/meson.build index e50ad9c1..592eb7bf 100644 --- a/data/meson.build +++ b/data/meson.build @@ -4,10 +4,10 @@ install_data( rename: meson.project_name() + '.desktop' ) -install_symlink( - meson.project_name() + '.desktop', - install_dir: get_option('sysconfdir') / 'xdg' / 'autostart', - pointing_to: datadir / 'applications' / meson.project_name() + '.desktop' +meson.add_install_script( + symlink, + datadir / 'applications' / meson.project_name() + '.desktop', + get_option('sysconfdir') / 'xdg' / 'autostart' / meson.project_name() + '.desktop', ) dbus_dep = dependency('dbus-1') From 4dbe1539fe232d843395f21e798da1cc52dba1f6 Mon Sep 17 00:00:00 2001 From: lenemter Date: Tue, 25 Jul 2023 12:56:37 +0900 Subject: [PATCH 10/11] Add #75 --- data/meson.build | 3 ++- meson.build | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/meson.build b/data/meson.build index 592eb7bf..972c300c 100644 --- a/data/meson.build +++ b/data/meson.build @@ -4,10 +4,11 @@ install_data( rename: meson.project_name() + '.desktop' ) +fs = import('fs') meson.add_install_script( symlink, datadir / 'applications' / meson.project_name() + '.desktop', - get_option('sysconfdir') / 'xdg' / 'autostart' / meson.project_name() + '.desktop', + (fs.is_absolute(sysconfdir) ? sysconfdir : (prefix / sysconfdir)) / 'xdg' / 'autostart' / meson.project_name() + '.desktop', ) dbus_dep = dependency('dbus-1') diff --git a/meson.build b/meson.build index 95ebd6f0..baf598de 100644 --- a/meson.build +++ b/meson.build @@ -30,6 +30,7 @@ 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()) From 565fb6076afda302048556a7c114adfd3b6bd754 Mon Sep 17 00:00:00 2001 From: lenemter Date: Tue, 25 Jul 2023 13:40:29 +0900 Subject: [PATCH 11/11] Lower meson version --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index baf598de..35fc9f31 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('io.elementary.settings-daemon', 'c', 'vala', version: '1.3.0', license: 'GPL3', - meson_version: '>=0.61.0' + meson_version: '>=0.58.0' ) fwupd_dep = dependency('fwupd')