pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lxqt-wayland-session: fix startlxqtwayland
Module Name: pkgsrc-wip
Committed By: kikadf <kikadf.01%gmail.com@localhost>
Pushed By: kikadf
Date: Fri Apr 3 10:12:51 2026 +0200
Changeset: 6acb23204388b7766f67f9e12c24b4b34313ae70
Modified Files:
lxqt-wayland-session/Makefile
lxqt-wayland-session/distinfo
lxqt-wayland-session/patches/patch-CMakeLists.txt
Added Files:
lxqt-wayland-session/patches/patch-startlxqtwayland.in
Log Message:
lxqt-wayland-session: fix startlxqtwayland
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6acb23204388b7766f67f9e12c24b4b34313ae70
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lxqt-wayland-session/Makefile | 1 +
lxqt-wayland-session/distinfo | 3 +-
lxqt-wayland-session/patches/patch-CMakeLists.txt | 2 +-
.../patches/patch-startlxqtwayland.in | 97 ++++++++++++++++++++++
4 files changed, 101 insertions(+), 2 deletions(-)
diffs:
diff --git a/lxqt-wayland-session/Makefile b/lxqt-wayland-session/Makefile
index 8bb1188b22..61cfa9124a 100644
--- a/lxqt-wayland-session/Makefile
+++ b/lxqt-wayland-session/Makefile
@@ -29,4 +29,5 @@ DEPENDS+= lxqt-session-[0-9]*:../../x11/lxqt-session
.include "../../x11/plasma6-layer-shell-qt/buildlink3.mk"
.include "../../devel/cmake/build.mk"
+.include "../../wip/seatd/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lxqt-wayland-session/distinfo b/lxqt-wayland-session/distinfo
index 6a128829fb..ea9d2a5c7f 100644
--- a/lxqt-wayland-session/distinfo
+++ b/lxqt-wayland-session/distinfo
@@ -3,4 +3,5 @@ $NetBSD: distinfo,v 1.21 2025/11/11 03:06:15 gutteridge Exp $
BLAKE2s (lxqt-wayland-session-0.3.2.tar.xz) = 735daa82a0444a6c8bb22b78662453955f7b3370bf26135efb4d8fa459a7adb5
SHA512 (lxqt-wayland-session-0.3.2.tar.xz) = 163dddbce60f169132244e964ce1325d0abb433721eef3cfa99bd411401be9f7ca57ec2003d616205d8c5affd615d27b23eda1de09f2bc32f81eb6969ea35e15
Size (lxqt-wayland-session-0.3.2.tar.xz) = 362556 bytes
-SHA1 (patch-CMakeLists.txt) = ac056ec132567156f66544520b5f14d9c16b4e4a
+SHA1 (patch-CMakeLists.txt) = 811adcb99934f2c4dc239b898ceed3113abd1eb9
+SHA1 (patch-startlxqtwayland.in) = e8f3773dd18f20e8f83c1af2ee609a6048ab878b
diff --git a/lxqt-wayland-session/patches/patch-CMakeLists.txt b/lxqt-wayland-session/patches/patch-CMakeLists.txt
index 543bf54e3f..4dbb317a26 100644
--- a/lxqt-wayland-session/patches/patch-CMakeLists.txt
+++ b/lxqt-wayland-session/patches/patch-CMakeLists.txt
@@ -2,7 +2,7 @@ $NetBSD$
* Fix pathes, see x11/lxqt-session/patches/patch-CMakeLists.txt
---- CMakeLists.txt.orig 2026-04-02 14:23:43.220857863 +0000
+--- CMakeLists.txt.orig 2026-03-05 17:53:50.000000000 +0000
+++ CMakeLists.txt
@@ -43,8 +43,8 @@ set(PREDEF_XDG_DATA_DIRS "$XDG_DATA_HOME
if(NOT("${LXQT_DATA_DIR}" MATCHES "^/usr(/local)?/share$"))
diff --git a/lxqt-wayland-session/patches/patch-startlxqtwayland.in b/lxqt-wayland-session/patches/patch-startlxqtwayland.in
new file mode 100644
index 0000000000..5fb8997587
--- /dev/null
+++ b/lxqt-wayland-session/patches/patch-startlxqtwayland.in
@@ -0,0 +1,97 @@
+$NetBSD$
+
+* Set fallback XDG_RUNTIME_DIR and create if not exist
+* Launch to compositors with seatd-launch
+
+--- startlxqtwayland.in.orig 2026-04-03 07:03:01.439375253 +0000
++++ startlxqtwayland.in
+@@ -11,6 +11,14 @@ if [ -z "$XDG_DATA_HOME" ]; then
+ export XDG_DATA_HOME="$HOME/.local/share"
+ fi
+
++if [ -z "$XDG_RUNTIME_DIR" ]; then
++ export XDG_RUNTIME_DIR="/tmp/$(id -un)-runtime"
++fi
++
++if [ -d "$XDG_RUNTIME_DIR" ]; then
++ mkdir -p -m 700 "$XDG_RUNTIME_DIR"
++fi
++
+ if [ -z "$XDG_CONFIG_HOME" ]; then
+ export XDG_CONFIG_HOME="$HOME/.config"
+ fi
+@@ -96,7 +104,7 @@ if [ -z "$COMPOSITOR" ]; then
+ export WLR_NO_HARDWARE_CURSORS=1
+ echo "Running on virtualized hardware"
+ fi
+- exec $COMPOSITOR -C "$share_dir"/lxqt/wayland/firstrun -S lxqt-config-session
++ exec seatd-launch $COMPOSITOR -C "$share_dir"/lxqt/wayland/firstrun -S lxqt-config-session
+
+ elif [ "$COMPOSITOR" = "labwc" ]; then
+ # Copy default configuration if not existing and set keyboard layout if different from us
+@@ -113,14 +121,14 @@ elif [ "$COMPOSITOR" = "labwc" ]; then
+ echo "Running on virtualized hardware"
+ fi
+
+- exec $COMPOSITOR -C $XDG_CONFIG_HOME/labwc -S lxqt-session
++ exec seatd-launch $COMPOSITOR -C $XDG_CONFIG_HOME/labwc -S lxqt-session
+
+ elif [ "$COMPOSITOR" = "niri" ]; then
+ if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-niri.kdl" ]; then
+ cp -v "$share_dir"/lxqt/wayland/lxqt-niri.kdl "$XDG_CONFIG_HOME"/lxqt/wayland/
+ cp -av "$share_dir"/lxqt/wayland/niri "$XDG_CONFIG_HOME"/lxqt/wayland/
+ fi
+- exec $COMPOSITOR -c $XDG_CONFIG_HOME/lxqt/wayland/lxqt-niri.kdl
++ exec seatd-launch $COMPOSITOR -c $XDG_CONFIG_HOME/lxqt/wayland/lxqt-niri.kdl
+
+ elif [ "$COMPOSITOR" = "kwin_wayland" ]; then
+ # Style KDE's QML apps like systemsettings
+@@ -139,7 +147,7 @@ elif [ "$COMPOSITOR" = "kwin_wayland" ];
+ fi
+ fi
+ # WARNING: Option '--no-kactivities' can result in crashes with animations and corner actions.
+- exec ${COMPOSITOR}_wrapper --exit-with-session lxqt-session --xwayland
++ exec seatd-launch ${COMPOSITOR}_wrapper --exit-with-session lxqt-session --xwayland
+
+ elif [ "$COMPOSITOR" = "wayfire" ]; then
+ if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-wayfire.ini" ]; then
+@@ -150,7 +158,7 @@ elif [ "$COMPOSITOR" = "wayfire" ]; then
+ sed -i "/\[input\]/a $layout" $XDG_CONFIG_HOME/lxqt/wayland/lxqt-wayfire.ini
+ fi
+ fi
+- exec $COMPOSITOR -c $XDG_CONFIG_HOME/lxqt/wayland/lxqt-wayfire.ini
++ exec seatd-launch $COMPOSITOR -c $XDG_CONFIG_HOME/lxqt/wayland/lxqt-wayfire.ini
+
+ elif [ "$COMPOSITOR" = "sway" ]; then
+ if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-sway.config" ]; then
+@@ -161,7 +169,7 @@ elif [ "$COMPOSITOR" = "sway" ]; then
+ sed -i "/input \"type\:keyboard\"/a $layout" $XDG_CONFIG_HOME/lxqt/wayland/lxqt-sway.config
+ fi
+ fi
+- exec $COMPOSITOR -c $XDG_CONFIG_HOME/lxqt/wayland/lxqt-sway.config
++ exec seatd-launch $COMPOSITOR -c $XDG_CONFIG_HOME/lxqt/wayland/lxqt-sway.config
+
+ elif [ "$COMPOSITOR" = "Hyprland" ]; then
+ if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-hyprland.conf" ]; then
+@@ -174,7 +182,7 @@ elif [ "$COMPOSITOR" = "Hyprland" ]; the
+ # workaround for cursor
+ export X$(cat $XDG_CONFIG_HOME/lxqt/session.conf|grep cursor_size| tr 'a-z' 'A-Z')
+ export X$(cat $XDG_CONFIG_HOME/lxqt/session.conf|grep cursor_theme| tr 'a-z' 'A-Z')
+- exec start-hyprland -- -c $XDG_CONFIG_HOME/lxqt/wayland/lxqt-hyprland.conf
++ exec seatd-launch start-hyprland -- -c $XDG_CONFIG_HOME/lxqt/wayland/lxqt-hyprland.conf
+
+ elif [ "$COMPOSITOR" = "river" ]; then
+ if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-river-init" ]; then
+@@ -185,10 +193,10 @@ elif [ "$COMPOSITOR" = "river" ]; then
+ sed -i "s/riverctl keyboard-layout us/$layout/" "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-river-init"
+ fi
+ fi
+- exec $COMPOSITOR -c $XDG_CONFIG_HOME/lxqt/wayland/lxqt-river-init
++ exec seatd-launch $COMPOSITOR -c $XDG_CONFIG_HOME/lxqt/wayland/lxqt-river-init
+
+ # unknown compositor
+ else
+ echo "Trying to start $COMPOSITOR..."
+- exec $COMPOSITOR
++ exec seatd-launch $COMPOSITOR
+ fi
Home |
Main Index |
Thread Index |
Old Index