Skip to content
Snippets Groups Projects
Commit e08479af authored by Guido Gunther's avatar Guido Gunther :zzz:
Browse files

Add wrapper to launch rootston and make it spawn gnome-session

gnome-session needs an X11 display so start rootston first and make it
spawn gnome-session (which will spawn phosh later on).
parent cf9f830f
No related branches found
No related tags found
1 merge request!83Start phosh via gnome-session
runconf = configuration_data()
runconf.set('bindir', bindir)
runconf.set('libexecdir', libexecdir)
runconf.set('pkgdatadir', pkgdatadir)
runconf.set('wlrootsdir', join_paths(libexecdir, 'wlroots'))
configure_file(
input: 'phosh.in',
output: 'phosh',
install_dir: bindir,
configuration: runconf,
install: true
)
schemas = ['sm.puri.phosh.gschema.xml']
compiled = gnome.compile_schemas(
build_by_default: true
......
#!/bin/sh
ROOTSTON="/usr/bin/rootston"
ROOTSTON_INI="@pkgdatadir@/rootston.ini"
if [ -x @wlrootsdir@/rootston ]; then
ROOTSTON=@wlrootsdir@/rootston
elif [ -x @bindir@/rootston ]; then
ROOTSTON=@bindir@/rootston
elif [ -x /usr/lib/wlroots/rootston ]; then
ROOTSTON=/usr/lib/wlroots/rootston
fi
if [ -f "/etc/phosh/rootston.ini" ]; then
ROOTSTON_INI=/etc/phosh/rootston.ini
fi
exec "${ROOTSTON}" -C "${ROOTSTON_INI}" -E "gnome-session --disable-acceleration-check --session=phosh"
......@@ -7,8 +7,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
override_dh_auto_install:
dh_auto_install
# Move phosh to arch indep dir
mv debian/phosh/usr/lib/*/phosh debian/phosh/usr/lib/phosh/phosh
cp rootston.ini debian/phosh/usr/share/phosh/
override_dh_installsystemd:
......
......@@ -5,6 +5,12 @@ project('phosh', 'c',
default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],
)
prefix = get_option('prefix')
bindir = join_paths(prefix, get_option('bindir'))
datadir = join_paths(prefix, get_option('datadir'))
libexecdir = join_paths(prefix, get_option('libexecdir'))
pkgdatadir = join_paths(datadir, meson.project_name())
config_h = configuration_data()
config_h.set_quoted('GETTEXT_PACKAGE', 'phosh')
config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
......
......@@ -87,6 +87,6 @@ phosh_deps = [
phosh = executable('phosh', phosh_sources,
dependencies: phosh_deps,
install: true,
install_dir: get_option('libexecdir'),
install_dir: libexecdir,
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment