Skip to content
Snippets Groups Projects

fix for phosh under gnome-session 46

Closed Ghost User requested to merge (removed):phosh-session-fix into main
2 files
+ 139
4
Compare changes
  • Side-by-side
  • Inline
Files
2
From 047835b6174e012960c7a4dc98e3e02ad44f45a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sat, 30 Mar 2024 20:42:27 +0100
Subject: [PATCH 0001/0001] treewide: Drop support for --builtin session
fallback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Always use systemd as gnome 46's gnome-session doesn't support anything
else.
Thanks dhjg2000 for figuring this out
Signed-off-by: Guido Günther <agx@sigxcpu.org>
---
data/meson.build | 11 -----------
data/phosh-session.in | 2 +-
data/sm.puri.Phosh.desktop.in.in | 2 +-
data/systemd/meson.build | 3 ---
debian/rules | 2 +-
meson.build | 1 -
meson_options.txt | 4 ----
7 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index d76391f4..5bcf7d31 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -26,11 +26,6 @@ desktopconf = configuration_data()
desktopconf.set('bindir', bindir)
desktopconf.set('libexecdir', libexecdir)
desktopconf.set('required_components', ';'.join(desktop_required_components) + ';')
-if get_option('systemd')
- desktopconf.set('hidden_under_systemd', 'X-GNOME-HiddenUnderSystemd=true')
-else
- desktopconf.set('hidden_under_systemd', '')
-endif
desktop_utils = find_program('desktop-file-validate', required: false)
desktop_files = {
@@ -85,12 +80,6 @@ runconf.set('version', meson.project_version())
runconf.set('wlrootsdir', join_paths(libexecdir, 'wlroots'))
runconf.set('compositor', get_option('compositor'))
-if get_option('systemd')
- runconf.set('session_manager', '--systemd')
-else
- runconf.set('session_manager', '--builtin')
-endif
-
configure_file(
input: 'phosh-session.in',
output: 'phosh-session',
diff --git a/data/phosh-session.in b/data/phosh-session.in
index 6c295ab8..9b951b6c 100755
--- a/data/phosh-session.in
+++ b/data/phosh-session.in
@@ -54,4 +54,4 @@ fi
# variables from /etc/profile.d (XDG_*)
[ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput
export WLR_BACKENDS
-exec "${COMPOSITOR}" -S -C "${PHOC_INI}" -E "bash -lc 'exec ${GNOME_SESSION} --disable-acceleration-check --session=phosh @session_manager@'"
+exec "${COMPOSITOR}" -S -C "${PHOC_INI}" -E "bash -lc 'exec ${GNOME_SESSION} --disable-acceleration-check --session=phosh'"
diff --git a/data/sm.puri.Phosh.desktop.in.in b/data/sm.puri.Phosh.desktop.in.in
index d777bccc..51d8a784 100644
--- a/data/sm.puri.Phosh.desktop.in.in
+++ b/data/sm.puri.Phosh.desktop.in.in
@@ -11,5 +11,5 @@ X-GNOME-Autostart-Phase=DisplayServer
X-GNOME-Provides=panel;windowmanager;
X-GNOME-Autostart-Notify=true
X-GNOME-AutoRestart=true
+X-GNOME-HiddenUnderSystemd=true
X-Phosh-UsesFeedback=true
-@hidden_under_systemd@
diff --git a/data/systemd/meson.build b/data/systemd/meson.build
index 5a11df87..bc3c4738 100644
--- a/data/systemd/meson.build
+++ b/data/systemd/meson.build
@@ -1,5 +1,3 @@
-if get_option('systemd')
-
gsd_wants = ''
foreach component : gsd_required_components
gsd_wants += 'Wants=' + component + '.target\n'
@@ -34,4 +32,3 @@ configure_file(
install_data('sm.puri.Phosh.target', install_dir: systemduserdir)
-endif
diff --git a/debian/rules b/debian/rules
index 6439a08c..4917d65b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-CONFIGURE_OPTS=-Dphoc_tests=disabled -Dsystemd=true
+CONFIGURE_OPTS=-Dphoc_tests=disabled
ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
CONFIGURE_OPTS+=-Dgtk_doc=true -Dman=true
diff --git a/meson.build b/meson.build
index d300d39b..6ece185c 100644
--- a/meson.build
+++ b/meson.build
@@ -261,7 +261,6 @@ summary({
summary({
'Compositor:': get_option('compositor'),
- 'Systemd for session': get_option('systemd'),
},
bool_yn: true,
section: 'Runtime',
diff --git a/meson_options.txt b/meson_options.txt
index 2320bd75..685357c3 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,10 +14,6 @@ option('man',
type: 'boolean', value : false,
description : 'generate man pages (requires rst2man)')
-option('systemd',
- type: 'boolean', value: false,
- description: 'Whether to generate systemd user units')
-
option('compositor',
type: 'string', value: '/usr/bin/phoc',
description: 'Path to the Phoc compositor for use in the launcher script')
--
2.44.0
Loading