diff --git a/0001-Adjust-labwc-pointerspeed.patch b/0001-Adjust-labwc-pointerspeed.patch deleted file mode 100644 index 8886b14..0000000 --- a/0001-Adjust-labwc-pointerspeed.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6b750dde263fc94f102be28b5333e7f2db7ca65e Mon Sep 17 00:00:00 2001 -From: "Shawn W. Dunn" -Date: Mon, 30 Dec 2024 09:00:42 -0800 -Subject: [PATCH] Adjust labwc pointerspeed - -Default pointerspeed of 1 from upstream results in an incredibly twitchy -mouse pointer, moving to 0.0, results in a much more managable pointer -speed as a default ---- - configurations/labwc/rc.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configurations/labwc/rc.xml b/configurations/labwc/rc.xml -index 41d628c..07acc3c 100644 ---- a/configurations/labwc/rc.xml -+++ b/configurations/labwc/rc.xml -@@ -607,7 +607,7 @@ - - - -- 1 -+ 0.0 - - yes - --- -2.47.1 - diff --git a/0001-configuration-changes-for-default-labwc-session.patch b/0001-configuration-changes-for-default-labwc-session.patch new file mode 100644 index 0000000..1513a59 --- /dev/null +++ b/0001-configuration-changes-for-default-labwc-session.patch @@ -0,0 +1,42 @@ +From 66b3dc4aafd8a97a08564bd460e6742582d69432 Mon Sep 17 00:00:00 2001 +From: "Shawn W. Dunn" +Date: Wed, 8 Jan 2025 09:24:02 -0800 +Subject: [PATCH] configuration changes for default labwc session + +Combines two prior patches into one, as they're both for the labwc +session. Sets openSUSE background for labwc session, and adjusts +the pointerspeed to make the default mouse pointer less twitchy +--- + configurations/labwc/autostart | 2 +- + configurations/labwc/rc.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configurations/labwc/autostart b/configurations/labwc/autostart +index fa49741..a756d24 100644 +--- a/configurations/labwc/autostart ++++ b/configurations/labwc/autostart +@@ -3,7 +3,7 @@ + # Preferred place for starting wayland-only applications + + # Set background color or image (below the desktop): +-swaybg -i /usr/share/lxqt/wallpapers/origami-dark-labwc.png >/dev/null 2>&1 & ++swaybg -i /usr/share/wallpapers/openSUSEdefault/contents/images/default.png >/dev/null 2>&1 & + + # 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 +--- a/configurations/labwc/rc.xml ++++ b/configurations/labwc/rc.xml +@@ -607,7 +607,7 @@ + + + +- 1 ++ 0.0 + + yes + +-- +2.47.1 + diff --git a/001-labwc-autostart-swaybg.patch b/001-labwc-autostart-swaybg.patch deleted file mode 100644 index fc2a654..0000000 --- a/001-labwc-autostart-swaybg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lxqt-wayland-session-0.1.0/configurations/labwc/autostart 2024-11-05 08:26:19.000000000 +0300 -+++ lxqt-wayland-session-0.1.0.new/configurations/labwc/autostart 2024-11-08 20:53:59.939622663 +0300 -@@ -3,7 +3,7 @@ - # Preferred place for starting wayland-only applications - - # Set background color or image (below the desktop): --swaybg -i /usr/share/lxqt/wallpapers/origami-dark-labwc.png >/dev/null 2>&1 & -+swaybg -i /usr/share/wallpapers/openSUSEdefault/contents/images/default.png >/dev/null 2>&1 & - - # Faster startup for GTK apps: - dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY > /dev/null 2>&1 & diff --git a/lxqt-wayland-session.changes b/lxqt-wayland-session.changes index 0d9c5d3..fad5bea 100644 --- a/lxqt-wayland-session.changes +++ b/lxqt-wayland-session.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Jan 8 17:29:38 UTC 2025 - Shawn Dunn + +- Drop: + * 0001-Adjust-labwc-pointerspeed.patch + * 001-labwc-autostart-swaybg.patch +- Add: + * 0001-configuration-changes-for-default-labwc-session.patch + - Combines both dropped patches to a git_am style patch + * Recommends for labwc session (Quality of Life Improvements) + - labwc-tweaks (some GUI labwc configuration options) + - wdisplays (GUI settings of displays under wayland) + - sddm-conf (GUI configuration for sddm) + ------------------------------------------------------------------- Mon Dec 30 17:08:33 UTC 2024 - Shawn Dunn diff --git a/lxqt-wayland-session.spec b/lxqt-wayland-session.spec index fb42fe0..58ebe32 100644 --- a/lxqt-wayland-session.spec +++ b/lxqt-wayland-session.spec @@ -1,7 +1,7 @@ # # spec file for package lxqt-wayland-session # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,12 +25,12 @@ URL: https://github.com/lxqt/lxqt-wayland-session Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring -Patch1: 001-labwc-autostart-swaybg.patch -## PATCH-FIX-openSUSE 0001-Adjust-labwc-pointerspeed.patch -Patch2: 0001-Adjust-labwc-pointerspeed.patch +## PATCH-CONFIGURATION-openSUSE 0001-configuration-changes-for-default-labwc-session.patch +Patch0: 0001-configuration-changes-for-default-labwc-session.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: git-core BuildRequires: pkgconfig BuildRequires: xdg-user-dirs BuildRequires: cmake(KF6WindowSystem) @@ -97,6 +97,8 @@ Summary: Session files for LXQt-wayfire License: MIT Requires: %{name} = %{version} Requires: wayfire +Recommends: sddm-conf +Recommends: wcm Supplements: (%{name} and wayfire) %description -n lxqt-wayfire-session @@ -111,6 +113,9 @@ Requires: labwc >= 0.7.2 Requires: swaybg Requires: swayidle Requires: swaylock +Recommends: labwc-tweaks +Recommends: sddm-conf +Recommends: wdisplays Supplements: (%{name} and labwc) Conflicts: labwc-theme-vent <= %{version} @@ -118,7 +123,7 @@ Conflicts: labwc-theme-vent <= %{version} This package contains the openbox themes and other files for labwc. %prep -%autosetup -p1 +%autosetup -p1 -S git_am %build %cmake @@ -153,7 +158,7 @@ This package contains the openbox themes and other files for labwc. %files -n lxqt-river-session %license COPYING -%{_datadir}/lxqt/wayland/lxqt-river-init +%attr(0755,root,root)%{_datadir}/lxqt/wayland/lxqt-river-init %files -n lxqt-sway-session %license LICENSE.MIT