From 715747e55cbc2dde890f3d16ff71c260bb34999a Mon Sep 17 00:00:00 2001 From: Tracker-Friendly Date: Tue, 12 Sep 2023 19:34:30 +0100 Subject: [PATCH] Fixed evolution-desktop xwayland --- srcpkgs/evolution-desktop/files/bin/enabledesktop | 2 ++ .../evolution-desktop/files/etc/dinit.d/evolution-desktop | 5 +++++ .../files/etc/dinit.d/evolution-desktop.sh | 4 ++++ srcpkgs/evolution-desktop/template | 6 ++++-- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/evolution-desktop/files/etc/dinit.d/evolution-desktop create mode 100755 srcpkgs/evolution-desktop/files/etc/dinit.d/evolution-desktop.sh diff --git a/srcpkgs/evolution-desktop/files/bin/enabledesktop b/srcpkgs/evolution-desktop/files/bin/enabledesktop index c21a35e..8cac500 100755 --- a/srcpkgs/evolution-desktop/files/bin/enabledesktop +++ b/srcpkgs/evolution-desktop/files/bin/enabledesktop @@ -10,6 +10,7 @@ help() { if [[ "$1" = "" ]]; then drunner ln -s /etc/dinit.d/greetd /etc/dinit.d/boot.d/greetd + ln -s /etc/dinit.d/evolution-desktop /etc/dinit.d/boot.d/evolution-desktop echo "Evolution-Desktop will now start at launch." elif [[ "$1" = "-h" ]]; then help @@ -17,6 +18,7 @@ elif [[ "$1" = "--help" ]]; then help elif [[ "$1" = "-r" ]]; then rm -f /etc/dinit.d/boot.d/greetd + rm -f /etc/dinit.d/boot.d/evolution-desktop echo "Evolution-Desktop will no longer start at launch" else echo "Unregonised option. Use --help for help." diff --git a/srcpkgs/evolution-desktop/files/etc/dinit.d/evolution-desktop b/srcpkgs/evolution-desktop/files/etc/dinit.d/evolution-desktop new file mode 100644 index 0000000..cb7a966 --- /dev/null +++ b/srcpkgs/evolution-desktop/files/etc/dinit.d/evolution-desktop @@ -0,0 +1,5 @@ +waits-for = greetd +type = scripted +command = /etc/dinit.d/evolution-desktop.sh +logfile = /var/log/rcboot.log +restart = false diff --git a/srcpkgs/evolution-desktop/files/etc/dinit.d/evolution-desktop.sh b/srcpkgs/evolution-desktop/files/etc/dinit.d/evolution-desktop.sh new file mode 100755 index 0000000..b55ae40 --- /dev/null +++ b/srcpkgs/evolution-desktop/files/etc/dinit.d/evolution-desktop.sh @@ -0,0 +1,4 @@ +#!/bin/sh +mkdir /tmp/.X11-unix +chown root /tmp/.X11-unix +chmod 1777 /tmp/.X11-unix diff --git a/srcpkgs/evolution-desktop/template b/srcpkgs/evolution-desktop/template index fc76bdc..aa683aa 100644 --- a/srcpkgs/evolution-desktop/template +++ b/srcpkgs/evolution-desktop/template @@ -1,12 +1,12 @@ pkgname=evolution-desktop version=1.1 -revision=12 +revision=13 build_style=meta maintainer="Tracker-Friendly " short_desc="Desktop and Greeter for EvolutionOS" license="GPL-3.0" homepage="https://evolutionos.codeberg.page" -depends="wayfire greetd wf-shell wcm mesa mesa-dri elogind polkit mate-polkit greetd-gtkgreet gtkloadspinner dbus dconf nautilus alacritty pipewire wireplumber slurp grim alsa-pipewire gnome-system-monitor upower brightnessctl gnome-themes-extra dejavu-fonts-ttf xdg-desktop-portal-wlr xdg-desktop-portal-gtk swaylock swayidle wpa_supplicant wpa-cute evolution-theme-switcher" +depends="wayfire greetd wf-shell wcm mesa mesa-dri elogind polkit mate-polkit greetd-gtkgreet gtkloadspinner dbus dconf nautilus alacritty pipewire wireplumber slurp grim alsa-pipewire gnome-system-monitor upower brightnessctl gnome-themes-extra dejavu-fonts-ttf xdg-desktop-portal-wlr xdg-desktop-portal-gtk swaylock swayidle wpa_supplicant wpa-cute evolution-theme-switcher xorg-server-xwayland gvfs" conf_files="/usr/bin/Wayfire /usr/bin/startsession" do_install() { @@ -14,6 +14,8 @@ do_install() { mkdir -p ${DESTDIR}/etc/runit/runsvdir/default cp -r ${FILESDIR}/var/service/* ${DESTDIR}/etc/runit/runsvdir/default/ + mkdir -p ${DESTDIR}/etc/dinit.d/ + cp -r ${FILESDIR}/etc/dinit.d/* ${DESTDIR}/etc/dinit.d/ vbin ${FILESDIR}/bin/Wayfire vbin ${FILESDIR}/bin/startsession vbin ${FILESDIR}/bin/audioctl