11
0

Accepting request 1270910 from home:sfalken:branches:X11:LXQt

- Updated to version 0.2.0:
  * Added manpages
  * Support default compositor and screenlocker
  * Search for compositor setting in fallback dirs
  * Use predefined build values in the startup script
  * Support full path of compositor
  * R emoved obsolete mozilla env var
  * Corrected D-Bus error message
- Refactor 0003-configuration-changes-for-default-niri-session.patch
- Refactor 0005-configuration-changes-for-default-hyprland-session.patch
- Refactor 0007-configuration-changes-for-default-sway-session.patch

OBS-URL: https://build.opensuse.org/request/show/1270910
OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-wayland-session?expand=0&rev=23
This commit is contained in:
2025-04-18 22:00:22 +00:00
committed by Git OBS Bridge
parent 2b5d05b392
commit f6e9f6ad78
13 changed files with 72 additions and 55 deletions

View File

@@ -1,4 +1,4 @@
From e5727489a86e277978c8d34fc930a67bfb81167f Mon Sep 17 00:00:00 2001
From 007181a21a5cfc57edd5028f1675cf0b60e4218b Mon Sep 17 00:00:00 2001
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
Date: Wed, 8 Jan 2025 09:24:02 -0800
Subject: [PATCH 1/7] configuration changes for default labwc session
@@ -30,10 +30,10 @@ index fa49741..a756d24 100644
# Faster startup for GTK apps:
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY > /dev/null 2>&1 &
diff --git a/configurations/labwc/rc.xml b/configurations/labwc/rc.xml
index 41d628c..07acc3c 100644
index d30f842..b8ffd86 100644
--- a/configurations/labwc/rc.xml
+++ b/configurations/labwc/rc.xml
@@ -607,7 +607,7 @@
@@ -662,7 +662,7 @@
<device category="default">
<naturalScroll></naturalScroll>
<leftHanded></leftHanded>
@@ -43,10 +43,10 @@ index 41d628c..07acc3c 100644
<tap>yes</tap>
<tapButtonMap></tapButtonMap>
diff --git a/startlxqtwayland.in b/startlxqtwayland.in
index 64a2986..a1e0d1b 100644
index ca713c5..dda2ee5 100644
--- a/startlxqtwayland.in
+++ b/startlxqtwayland.in
@@ -96,10 +96,10 @@ if [ -z "$COMPOSITOR" ]; then
@@ -97,10 +97,10 @@ if [ -z "$COMPOSITOR" ]; then
elif [ "$COMPOSITOR" = "labwc" ]; then
# Copy default configuration if not existing and set keyboard layout if different from us
@@ -60,7 +60,7 @@ index 64a2986..a1e0d1b 100644
fi
fi
@@ -109,7 +109,9 @@ elif [ "$COMPOSITOR" = "labwc" ]; then
@@ -110,7 +110,9 @@ elif [ "$COMPOSITOR" = "labwc" ]; then
echo "Running on virtualized hardware"
fi

View File

@@ -1,4 +1,4 @@
From 08847ebc3937ac11f491d319dd33391c81b05700 Mon Sep 17 00:00:00 2001
From dd91a6500cd5218f257779640f11b6adc4b1efa4 Mon Sep 17 00:00:00 2001
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
Date: Wed, 8 Jan 2025 10:47:45 -0800
Subject: [PATCH 2/7] configuration changes for default wayfire session

View File

@@ -1,6 +1,6 @@
From 388430715c975de79b809763a3dbcc7573ae2f96 Mon Sep 17 00:00:00 2001
From 7cf4afac1275b2413f215f5adde676eaa075ecbd Mon Sep 17 00:00:00 2001
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
Date: Wed, 8 Jan 2025 10:51:06 -0800
Date: Thu, 17 Apr 2025 16:03:40 -0700
Subject: [PATCH 3/7] configuration changes for default niri session
Disables "natural scrolling" for scrollwheel in default session
@@ -9,13 +9,13 @@ Disables "natural scrolling" for scrollwheel in default session
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configurations/lxqt-niri.kdl b/configurations/lxqt-niri.kdl
index 845a4d0..883eeac 100644
index 9f2cc9d..59b51c3 100644
--- a/configurations/lxqt-niri.kdl
+++ b/configurations/lxqt-niri.kdl
@@ -28,7 +28,7 @@ input {
tap
@@ -29,7 +29,7 @@ input {
dwt
dwtp
// drag-lock
- natural-scroll
+ // natural-scroll
accel-speed 0.6

View File

@@ -1,4 +1,4 @@
From ddf7dbe4e2f952c65f5b9a240ea40531672373ef Mon Sep 17 00:00:00 2001
From f43d0b8fb35b07374ad3b1d623f107948ff3e431 Mon Sep 17 00:00:00 2001
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
Date: Thu, 16 Jan 2025 16:12:51 -0800
Subject: [PATCH 4/7] configuration adds miriway session
@@ -134,10 +134,10 @@ index 0000000..9f4cf9e
+ctrl-alt=BackSpace:@exit
+
diff --git a/startlxqtwayland.in b/startlxqtwayland.in
index a1e0d1b..3da48d6 100644
index dda2ee5..f349985 100644
--- a/startlxqtwayland.in
+++ b/startlxqtwayland.in
@@ -142,6 +142,16 @@ elif [ "$COMPOSITOR" = "kwin_wayland" ]; then
@@ -143,6 +143,16 @@ elif [ "$COMPOSITOR" = "kwin_wayland" ]; then
# WARNING: Option '--no-kactivities' can result in crashes with animations and corner actions.
exec ${COMPOSITOR}_wrapper --exit-with-session lxqt-session --xwayland

View File

@@ -1,6 +1,6 @@
From c6b2cd27f5c54b082106fd2cb8f8b6690e2db264 Mon Sep 17 00:00:00 2001
From 77369731b252276690d822d37b3b04c21f4a147a Mon Sep 17 00:00:00 2001
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
Date: Tue, 21 Jan 2025 15:56:25 -0800
Date: Thu, 17 Apr 2025 16:06:12 -0700
Subject: [PATCH 5/7] configuration changes for default hyprland session
- Set openSUSE background in default hyprland session
@@ -9,16 +9,16 @@ Subject: [PATCH 5/7] configuration changes for default hyprland session
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configurations/lxqt-hyprland.conf b/configurations/lxqt-hyprland.conf
index f5450c3..95ab07e 100644
index bc07fd1..24f40ec 100644
--- a/configurations/lxqt-hyprland.conf
+++ b/configurations/lxqt-hyprland.conf
@@ -39,7 +39,7 @@ env = QT_PLATFORM_PLUGIN,lxqt
env = XDG_MENU_PREFIX,lxqt-
# start and exit LXQt session:
-exec-once=swaybg -i /usr/share/lxqt/wallpapers/origami-dark.png
+exec-once=swaybg -i /usr/share/wallpapers/openSUSEdefault/contents/images/default.png
exec-once=lxqt-session && hyprctl dispatch exit
-exec-once = swaybg -i /usr/share/lxqt/wallpapers/origami-dark.png
+exec-once = swaybg -i /usr/share/wallpapers/openSUSEdefault/contents/images/default.png
exec-once = lxqt-session && hyprctl dispatch exit
# If not using lxqt-session uncomment components to autostart
--

View File

@@ -1,4 +1,4 @@
From 3c128d3d6e12ccca332ad66ecbec4f061f4c1ca3 Mon Sep 17 00:00:00 2001
From bd5e53d75d023e876b97a68578d3995e0b5201be Mon Sep 17 00:00:00 2001
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
Date: Tue, 21 Jan 2025 16:21:14 -0800
Subject: [PATCH 6/7] configuration changes for default river session

View File

@@ -1,32 +1,32 @@
From 155ef94ec514d97f6c46ddca71f89d92340ec6de Mon Sep 17 00:00:00 2001
From adf7005960c3fb941f0c6b848d1b1846602fb31b Mon Sep 17 00:00:00 2001
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
Date: Tue, 21 Jan 2025 17:23:47 -0800
Date: Thu, 17 Apr 2025 16:08:44 -0700
Subject: [PATCH 7/7] configuration changes for default sway session
- Set openSUSE desktop background in session
- Disable "include /etc/sway/config.d/*" It causes too many configs
- Disable "include /etc/sway/config.d/*" It causes too many configs
from openSUSEway to be pulled in, and creates a broken session
---
configurations/lxqt-sway.config | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/configurations/lxqt-sway.config b/configurations/lxqt-sway.config
index f30047c..97f910e 100644
index 3cd8c27..6c06321 100644
--- a/configurations/lxqt-sway.config
+++ b/configurations/lxqt-sway.config
@@ -38,6 +38,9 @@ set $term qterminal
# your displays after another 300 seconds, and turn your screens back on when
# resumed. It will also lock your screen before your computer goes to sleep.
@@ -17,6 +17,9 @@ set $right l
# Your preferred terminal emulator
set $term qterminal
+### Set background
+exec swaybg -i /usr/share/wallpapers/openSUSEdefault/contents/images/default.png
+
### Input configuration
### Output configuration
#
# Example configuration:
@@ -228,4 +231,4 @@ bindsym $mod+r mode "resize"
bindsym XF86AudioPrev exec playerctl previous
@@ -232,4 +235,4 @@ bindsym $mod+r mode "resize"
# Special key to take a screenshot with grim
bindsym Print exec grim
-include /etc/sway/config.d/*
+# include /etc/sway/config.d/*

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34e9441a7d4bdf243e4a380a10d00e746e4ef43a1a6ccda1c8e6c6bc3c513fbc
size 354728

View File

@@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmdDcwgVHHRzdWphbjIw
MDBAZ21haWwuY29tAAoJEL55MAetIt9+AfUQALc5ZrOf2UP0vmhX4WNqmwfavXJ2
hpmCx77iJ1bhrg2nlYZ/udAbsN7qb2apIopYVAYF0ohgN7wuv9JUWYEw7bZQ8QyU
PBGgMsLIhNMbl4T2Bl30xCb/667+diMm8S8ePvVIEoLIAk5ynmuyh5PDUVVUcOq6
2EKQ2fJ7yJJfnCslCo+QEmkPKDnJlBrznGojYJXR36o9uiWP1iu6+ycLe216mZr7
3X8+1vC75Awp1xo+sfzxf+GLtrefq5NnHhqT6GOM3rrgpWU9V+w9pCrRTGgjKYD9
hpgeJuoZIAk1OPe5meq0mnPKgFWXhPS70RW7EDEFnTgrlu0YCVcFJ01DUbfw/E5k
xcRneUTf/DuN+RgQdY60GvUT628nAPhW61tmQoLDlS+lUGDwuo4BotQCmey2VkVs
IE2LPyt2Bl3lsUuDe7fUhrhyxkqcdvrqNI1Vy+ZvO8NHEGRi05Hl9YCYHbn4QP/o
gO6lmGOhwa3zQZukQrOUCmV/Dxnp4ynO+PsmNjvRBJ2tkx3sWmAKt7llUKkg+E8X
d/NDHIVcts1beLb6apJVchrJvRliM6kNOsL4wLOYsdakD5nalFr5Nwgm+CVp1XVW
ukzTmWtottq8vFvQ0IpjqfXaQ7SUb5xuzP0d7b0AEtopbN6DtBL747NVnxY0Nw8C
z7mODHYHnW1yZXGv
=5Imx
-----END PGP SIGNATURE-----

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d7a88964fe705bcf40a6d04eb1d570c01a01d6dc5104dd393dc4effcb5a9cd28
size 358956

View File

@@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmgAyaEVHHRzdWphbjIw
MDBAZ21haWwuY29tAAoJEL55MAetIt9+6LEP/2uipNqPiJwLCSXzyt2ZvT8zNT3L
7dtXbH4zqNsq0xKQx2vtLYdUSj0SYL30BU5QiwJXdxI0AFWqeotVlKeiAq5Xz71w
EGYDKzVB0iOH1nETdSFoitHcwcoo14wuKGVfu1eip5/BA4X7jl4XYJSphhtwb7CE
ah4n+FJvXJEtZDblZMPDIhpVUE82NIMgLUgWH9W+eo7zbjjOMYtwWdkMIAHY+HDC
XGDp0rD5hBXDTpj2il66VzYCHqZ25m33iT4S4VgYWQrFdInafxKxSrCON4PvbDMm
BdOrR1OKwS8JjQtmK6/2Wp5JSBOYgLodfmhvJfX9/Iy5UQOkvmNAkrGTkg6dHAvb
CZdSeuPV+ZEU5trTY07Ho1b2uccH2UyHQJl4azYOZCqTguY2+FJgcRnUOQTnUwcN
cYfsYPhF9ymBurNIkHaOquPX/KEIDwa/xC3DEG/jmVjwdGTaAWgP+LokJq1J2LpM
5UsnJj3a3RaD9xaSH7dYYZCT9Cq40DzaxZAfLVkkXTgR4Yli0y1EoK1UMqajP0mH
8zCATBy/8lacLQCB0tE5tQ85pi2O1pH3K0K4+jYoVHQdqfD8mZJstljtXzPyIN0g
VhMcMCP8CcFg8iUwB2hegEucotyqak1XSirnbmAfKiQLvW6hLslLKsqE8YVwFdTh
VBGNfAZPcNjvRQ/w
=R5cw
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu Apr 17 23:17:24 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>
- Updated to version 0.2.0:
* Added manpages
* Support default compositor and screenlocker
* Search for compositor setting in fallback dirs
* Use predefined build values in the startup script
* Support full path of compositor
* R emoved obsolete mozilla env var
* Corrected D-Bus error message
- Refactor 0003-configuration-changes-for-default-niri-session.patch
- Refactor 0005-configuration-changes-for-default-hyprland-session.patch
- Refactor 0007-configuration-changes-for-default-sway-session.patch
-------------------------------------------------------------------
Sat Mar 29 19:06:36 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>

View File

@@ -18,7 +18,7 @@
Name: lxqt-wayland-session
Version: 0.1.1
Version: 0.2.0
Release: 0
Summary: Files needed for the LXQt Wayland Session
License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND MIT AND CC-BY-SA-4.0
@@ -41,7 +41,7 @@ Patch5: 0006-configuration-changes-for-default-river-session.patch
## PATCH-CONFIGURATION-openSUSE 0007-configuration-changes-for-default-sway-session.patch
Patch6: 0007-configuration-changes-for-default-sway-session.patch
BuildRequires: cmake
BuildRequires: cmake >= 3.5.0
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: git-core
@@ -179,6 +179,8 @@ compositor with LXQt
%{_bindir}/startlxqtwayland
%{_datadir}/lxqt/wayland/firstrun/autostart
%{_datadir}/wayland-sessions/lxqt-wayland.desktop
%{_mandir}/man?/%{name}.?%{?ext_man}
%{_mandir}/man?/startlxqtwayland.?%{?ext_man}
%files -n lxqt-hyprland-session
%license LICENSE.BSD