From e05fb7b3e36c052baf0dd607ddeb22c0a2b5cbde Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 19:47:04 +0200 Subject: Adding upstream version 43.2. Signed-off-by: Daniel Baumann --- data/20-gnome-initial-setup.rules.in | 29 +++++ data/gnome-initial-setup-copy-worker.desktop.in.in | 10 ++ data/gnome-initial-setup-copy-worker.service.in | 15 +++ data/gnome-initial-setup-first-login.desktop.in.in | 13 +++ data/gnome-initial-setup-first-login.service.in | 16 +++ data/gnome-initial-setup.conf | 3 + data/gnome-initial-setup.desktop.in.in | 12 ++ data/gnome-initial-setup.service.in | 13 +++ data/gnome-initial-setup.session.conf.in | 8 ++ data/gnome-initial-setup.session.in | 4 + data/initial-setup.json | 8 ++ data/meson-add-wants.sh | 30 +++++ data/meson.build | 130 +++++++++++++++++++++ 13 files changed, 291 insertions(+) create mode 100644 data/20-gnome-initial-setup.rules.in create mode 100644 data/gnome-initial-setup-copy-worker.desktop.in.in create mode 100644 data/gnome-initial-setup-copy-worker.service.in create mode 100644 data/gnome-initial-setup-first-login.desktop.in.in create mode 100644 data/gnome-initial-setup-first-login.service.in create mode 100644 data/gnome-initial-setup.conf create mode 100644 data/gnome-initial-setup.desktop.in.in create mode 100644 data/gnome-initial-setup.service.in create mode 100644 data/gnome-initial-setup.session.conf.in create mode 100644 data/gnome-initial-setup.session.in create mode 100644 data/initial-setup.json create mode 100755 data/meson-add-wants.sh create mode 100644 data/meson.build (limited to 'data') diff --git a/data/20-gnome-initial-setup.rules.in b/data/20-gnome-initial-setup.rules.in new file mode 100644 index 0000000..02fd21d --- /dev/null +++ b/data/20-gnome-initial-setup.rules.in @@ -0,0 +1,29 @@ +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- +// +// DO NOT EDIT THIS FILE, it will be overwritten on update. +// +// Allow the gnome-initial-setup user to do certain actions without +// being interrupted by password dialogs + +polkit.addRule(function(action, subject) { + if (subject.user !== 'gnome-initial-setup') + return undefined; + + var actionMatches = (action.id.indexOf('org.freedesktop.hostname1.') === 0 || + action.id.indexOf('org.freedesktop.NetworkManager.') === 0 || + action.id.indexOf('org.freedesktop.locale1.') === 0 || + action.id.indexOf('org.freedesktop.accounts.') === 0 || + action.id.indexOf('org.freedesktop.timedate1.') === 0 || + action.id.indexOf('org.freedesktop.realmd.') === 0 || + action.id.indexOf('com.endlessm.ParentalControls.') === 0 || + action.id.indexOf('org.fedoraproject.thirdparty.') === 0); + + if (actionMatches) { + if (subject.local) + return 'yes'; + else + return 'auth_admin'; + } + + return undefined; +}); diff --git a/data/gnome-initial-setup-copy-worker.desktop.in.in b/data/gnome-initial-setup-copy-worker.desktop.in.in new file mode 100644 index 0000000..7e4b2a4 --- /dev/null +++ b/data/gnome-initial-setup-copy-worker.desktop.in.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=GNOME Initial Setup Copy Worker +Type=Application +Exec=@LIBEXECDIR@/gnome-initial-setup-copy-worker +OnlyShowIn=GNOME; +NoDisplay=true +X-GNOME-AutoRestart=false +X-GNOME-Autostart-Phase=EarlyInitialization +AutostartCondition=unless-exists gnome-initial-setup-done +X-GNOME-HiddenUnderSystemd=@systemd_hidden@ diff --git a/data/gnome-initial-setup-copy-worker.service.in b/data/gnome-initial-setup-copy-worker.service.in new file mode 100644 index 0000000..ee3c0d0 --- /dev/null +++ b/data/gnome-initial-setup-copy-worker.service.in @@ -0,0 +1,15 @@ +[Unit] +Description=GNOME Initial Setup Copy Worker + +# Make sure we run really early +Before=gnome-session-pre.target graphical-session-pre.target + +# Never run in GDM +ConditionUser=!@system + +ConditionPathExists=!%E/gnome-initial-setup-done + +[Service] +Type=oneshot +ExecStart=@libexecdir@/gnome-initial-setup-copy-worker +Restart=no diff --git a/data/gnome-initial-setup-first-login.desktop.in.in b/data/gnome-initial-setup-first-login.desktop.in.in new file mode 100644 index 0000000..f3d0df7 --- /dev/null +++ b/data/gnome-initial-setup-first-login.desktop.in.in @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Initial Setup +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=preferences-system +Exec=@LIBEXECDIR@/gnome-initial-setup --existing-user +Terminal=false +Type=Application +StartupNotify=true +Categories=GNOME;GTK;System; +OnlyShowIn=GNOME; +NoDisplay=true +AutostartCondition=unless-exists gnome-initial-setup-done +X-GNOME-HiddenUnderSystemd=@systemd_hidden@ diff --git a/data/gnome-initial-setup-first-login.service.in b/data/gnome-initial-setup-first-login.service.in new file mode 100644 index 0000000..45e6c80 --- /dev/null +++ b/data/gnome-initial-setup-first-login.service.in @@ -0,0 +1,16 @@ +[Unit] +Description=GNOME Initial Setup + +BindsTo=gnome-session.target +After=gnome-session.target + +# Never run in GDM +Conflicts=gnome-session@gnome-login.target + +Conflicts=gnome-session@gnome-initial-setup.target +ConditionPathExists=!%E/gnome-initial-setup-done + +[Service] +Type=oneshot +ExecStart=@libexecdir@/gnome-initial-setup --existing-user +Restart=no diff --git a/data/gnome-initial-setup.conf b/data/gnome-initial-setup.conf new file mode 100644 index 0000000..452b2ad --- /dev/null +++ b/data/gnome-initial-setup.conf @@ -0,0 +1,3 @@ +# sysusers.d snippet for creating the gnome-inital-setup system user. See +# sysusers.d(5) for details. +u gnome-initial-setup - "GNOME Initial Setup" /run/gnome-initial-setup diff --git a/data/gnome-initial-setup.desktop.in.in b/data/gnome-initial-setup.desktop.in.in new file mode 100644 index 0000000..e7aa666 --- /dev/null +++ b/data/gnome-initial-setup.desktop.in.in @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Initial Setup +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=preferences-system +Exec=@LIBEXECDIR@/gnome-initial-setup +Terminal=false +Type=Application +StartupNotify=true +Categories=GNOME;GTK;System; +OnlyShowIn=GNOME; +NoDisplay=true +X-GNOME-HiddenUnderSystemd=@systemd_hidden@ diff --git a/data/gnome-initial-setup.service.in b/data/gnome-initial-setup.service.in new file mode 100644 index 0000000..bb0af2e --- /dev/null +++ b/data/gnome-initial-setup.service.in @@ -0,0 +1,13 @@ +[Unit] +Description=GNOME Initial Setup +RefuseManualStart=true +RefuseManualStop=true + +BindsTo=gnome-session.target +After=gnome-session.target + +[Service] +Type=simple +ExecStart=@libexecdir@/gnome-initial-setup +ExecStopPost=-@libexecdir@/gnome-session-ctl --shutdown +Restart=no diff --git a/data/gnome-initial-setup.session.conf.in b/data/gnome-initial-setup.session.conf.in new file mode 100644 index 0000000..5c28f74 --- /dev/null +++ b/data/gnome-initial-setup.session.conf.in @@ -0,0 +1,8 @@ +[Unit] +# Must be in sync with @this_component@.session +@wants_required_components@ + +Requires=@requires_component@.target + +# Only difference to a standard GNOME session is the @this_component@ service +Requires=@this_component@.service diff --git a/data/gnome-initial-setup.session.in b/data/gnome-initial-setup.session.in new file mode 100644 index 0000000..e8d1890 --- /dev/null +++ b/data/gnome-initial-setup.session.in @@ -0,0 +1,4 @@ +[GNOME Session] +Name=GNOME Initial Setup +# Must be in sync with gnome-session@@this_component@.target.d/session.conf drop-in +RequiredComponents=@gnome_session_required_components@; diff --git a/data/initial-setup.json b/data/initial-setup.json new file mode 100644 index 0000000..35fae95 --- /dev/null +++ b/data/initial-setup.json @@ -0,0 +1,8 @@ +{ + "hasWindows": true, + "components": ["networkAgent"], + "panel": { "left": [], + "center": [], + "right": ["a11y", "keyboard", "quickSettings"] + } +} diff --git a/data/meson-add-wants.sh b/data/meson-add-wants.sh new file mode 100755 index 0000000..c33d1b4 --- /dev/null +++ b/data/meson-add-wants.sh @@ -0,0 +1,30 @@ +#!/bin/sh +set -eu + +# Script copied from systemd + +unitdir="$1" +target="$2" +unit="$3" + +case "$target" in + */?*) # a path, but not just a slash at the end + dir="${DESTDIR:-}${target}" + ;; + *) + dir="${DESTDIR:-}${unitdir}/${target}" + ;; +esac + +unitpath="${DESTDIR:-}${unitdir}/${unit}" + +case "$target" in + */) + mkdir -vp -m 0755 "$dir" + ;; + *) + mkdir -vp -m 0755 "$(dirname "$dir")" + ;; +esac + +ln -vfs --relative "$unitpath" "$dir" diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000..ba8d78e --- /dev/null +++ b/data/meson.build @@ -0,0 +1,130 @@ +autostart_files = [ + 'gnome-initial-setup-copy-worker.desktop', + 'gnome-initial-setup-first-login.desktop', +] + +gis_shell_component = 'org.gnome.Shell' +gis_gnome_session_required_components = [ + 'org.gnome.SettingsDaemon.A11ySettings', + 'org.gnome.SettingsDaemon.Color', + 'org.gnome.SettingsDaemon.Datetime', + 'org.gnome.SettingsDaemon.Housekeeping', + 'org.gnome.SettingsDaemon.Keyboard', + 'org.gnome.SettingsDaemon.MediaKeys', + 'org.gnome.SettingsDaemon.Power', + 'org.gnome.SettingsDaemon.PrintNotifications', + 'org.gnome.SettingsDaemon.Rfkill', + 'org.gnome.SettingsDaemon.ScreensaverProxy', + 'org.gnome.SettingsDaemon.Sharing', + 'org.gnome.SettingsDaemon.Smartcard', + 'org.gnome.SettingsDaemon.Sound', + 'org.gnome.SettingsDaemon.UsbProtection', + 'org.gnome.SettingsDaemon.Wacom', + 'org.gnome.SettingsDaemon.XSettings', +] + +gis_user_session_wanted_components = gis_gnome_session_required_components + +desktop_conf = configuration_data() +desktop_conf.set('LIBEXECDIR', libexec_dir) +desktop_conf.set('systemd_hidden', enable_systemd ? 'true' : 'false') + +foreach desktop_file: autostart_files + i18n.merge_file( + input: configure_file( + input: files(desktop_file + '.in.in'), + output: desktop_file + '.in', + configuration: desktop_conf + ), + output: desktop_file, + install_dir: join_paths(get_option('sysconfdir'), 'xdg', 'autostart'), + po_dir: po_dir, + install: true, + type: 'desktop' + ) +endforeach + +i18n.merge_file( + input: configure_file( + input: files('gnome-initial-setup.desktop.in.in'), + output: 'gnome-initial-setup.desktop.in', + configuration: desktop_conf + ), + output: 'gnome-initial-setup.desktop', + install_dir: join_paths(data_dir, 'applications'), + po_dir: po_dir, + install: true, + type: 'desktop' +) + +data_conf = configuration_data() +data_conf.set('bindir', bin_dir) +data_conf.set('libexecdir', libexec_dir) + +if enable_systemd + unit_files = { + 'gnome-initial-setup-first-login.service' : [ 'gnome-session.target.wants/' ], + 'gnome-initial-setup-copy-worker.service' : [ 'gnome-session.target.wants/' ], + } + + foreach unit, wants: unit_files + configure_file( + input: unit + '.in', + output: unit, + configuration: data_conf, + install_dir: systemd_userunitdir + ) + + foreach target: wants + meson.add_install_script('meson-add-wants.sh', systemd_userunitdir, target, unit) + endforeach + endforeach + + gis_user_session_wanted_targets = [] + foreach component: gis_user_session_wanted_components + gis_user_session_wanted_targets += 'Wants=@0@.target'.format(component) + endforeach + + configure_file( + input: '@0@.session.conf.in'.format(meson.project_name()), + output: 'session.conf', + configuration: { + 'this_component': meson.project_name(), + 'requires_component': gis_shell_component, + 'wants_required_components': '\n'.join( + gis_user_session_wanted_targets), + }, + install_dir: systemd_userunitdir / 'gnome-session@@0@.target.d'.format( + meson.project_name()), + ) + + install_data('gnome-initial-setup.conf', install_dir: systemd_sysusersdir) +endif + + +rules_dir = join_paths(data_dir, 'polkit-1', 'rules.d') +configure_file( + input: '20-gnome-initial-setup.rules.in', + output: '20-gnome-initial-setup.rules', + install: true, + install_dir: rules_dir, + configuration: data_conf, +) + +session_dir = join_paths(data_dir, 'gnome-session', 'sessions') +configure_file( + input: '@0@.session.in'.format(meson.project_name()), + output: '@BASENAME@', + configuration: { + 'this_component': meson.project_name(), + 'gnome_session_required_components': ';'.join([ + gis_shell_component, + meson.project_name(), + ] + + gis_gnome_session_required_components), + }, + install_dir: session_dir, +) + +mode_dir = join_paths(data_dir, 'gnome-shell', 'modes') +install_data('initial-setup.json', install_dir: mode_dir) -- cgit v1.2.3