From b881826a1feb17606953d14a63788cad267fb5aa9f8afb9c793ef06c4422f7af Mon Sep 17 00:00:00 2001 From: Shawn Dunn Date: Thu, 2 Jan 2025 21:07:17 +0000 Subject: [PATCH] - Added Requires: hyprland-qtutils to hyprland session, provides further integration/support with the Qt toolkit to hyprland - Added: * 0001-Adjust-labwc-pointerspeed.patch Adjusts default pointer speed in labwc session OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-wayland-session?expand=0&rev=11 --- .gitattributes | 23 ++++ .gitignore | 1 + 0001-Adjust-labwc-pointerspeed.patch | 28 ++++ 001-labwc-autostart-swaybg.patch | 11 ++ lxqt-wayland-session-0.1.1.tar.xz | 3 + lxqt-wayland-session-0.1.1.tar.xz.asc | 17 +++ lxqt-wayland-session.changes | 42 ++++++ lxqt-wayland-session.keyring | 52 ++++++++ lxqt-wayland-session.spec | 183 ++++++++++++++++++++++++++ 9 files changed, 360 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 0001-Adjust-labwc-pointerspeed.patch create mode 100644 001-labwc-autostart-swaybg.patch create mode 100644 lxqt-wayland-session-0.1.1.tar.xz create mode 100644 lxqt-wayland-session-0.1.1.tar.xz.asc create mode 100644 lxqt-wayland-session.changes create mode 100644 lxqt-wayland-session.keyring create mode 100644 lxqt-wayland-session.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/0001-Adjust-labwc-pointerspeed.patch b/0001-Adjust-labwc-pointerspeed.patch new file mode 100644 index 0000000..8886b14 --- /dev/null +++ b/0001-Adjust-labwc-pointerspeed.patch @@ -0,0 +1,28 @@ +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/001-labwc-autostart-swaybg.patch b/001-labwc-autostart-swaybg.patch new file mode 100644 index 0000000..fc2a654 --- /dev/null +++ b/001-labwc-autostart-swaybg.patch @@ -0,0 +1,11 @@ +--- 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-0.1.1.tar.xz b/lxqt-wayland-session-0.1.1.tar.xz new file mode 100644 index 0000000..adc0909 --- /dev/null +++ b/lxqt-wayland-session-0.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34e9441a7d4bdf243e4a380a10d00e746e4ef43a1a6ccda1c8e6c6bc3c513fbc +size 354728 diff --git a/lxqt-wayland-session-0.1.1.tar.xz.asc b/lxqt-wayland-session-0.1.1.tar.xz.asc new file mode 100644 index 0000000..25c7037 --- /dev/null +++ b/lxqt-wayland-session-0.1.1.tar.xz.asc @@ -0,0 +1,17 @@ +-----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----- diff --git a/lxqt-wayland-session.changes b/lxqt-wayland-session.changes new file mode 100644 index 0000000..0d9c5d3 --- /dev/null +++ b/lxqt-wayland-session.changes @@ -0,0 +1,42 @@ +------------------------------------------------------------------- +Mon Dec 30 17:08:33 UTC 2024 - Shawn Dunn + +- Added Requires: hyprland-qtutils to hyprland session, provides + further integration/support with the Qt toolkit to hyprland + +------------------------------------------------------------------- +Mon Dec 30 17:05:50 UTC 2024 - Shawn Dunn + +- Added: + * 0001-Adjust-labwc-pointerspeed.patch Adjusts default pointer + speed in labwc session + +------------------------------------------------------------------- +Mon Nov 25 18:24:00 UTC 2024 - Shawn Dunn + +- Update to version 0.1.1: + * Fixed the issue which happened when full paths were used + instead of the compositor's executable name + * Updated lxqt-hyprland.conf for Hyprland v.0.45 + * Activated xdg-activation by default in Wayfire's config + +------------------------------------------------------------------- +Wed Nov 13 15:34:49 UTC 2024 - Shawn Dunn + +- Add Conflicts: labwc-theme-vent + +------------------------------------------------------------------- +Wed Nov 13 00:26:21 UTC 2024 - Shawn Dunn + +- Added Supplements: for subpackages + +------------------------------------------------------------------- +Tue Nov 12 18:35:22 UTC 2024 - Shawn Dunn + +- Specfile cleanup, and splitting out the various compositors into + reasonable subpackages + +------------------------------------------------------------------- +Wed Nov 6 22:07:18 UTC 2024 - Андрей Алыпов + +- initial package (version 0.1.0) for openSUSE diff --git a/lxqt-wayland-session.keyring b/lxqt-wayland-session.keyring new file mode 100644 index 0000000..74b74f1 --- /dev/null +++ b/lxqt-wayland-session.keyring @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +sw== +=gSIv +-----END PGP PUBLIC KEY BLOCK----- diff --git a/lxqt-wayland-session.spec b/lxqt-wayland-session.spec new file mode 100644 index 0000000..fb42fe0 --- /dev/null +++ b/lxqt-wayland-session.spec @@ -0,0 +1,183 @@ +# +# spec file for package lxqt-wayland-session +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: lxqt-wayland-session +Version: 0.1.1 +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 +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 +BuildRequires: cmake +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: xdg-user-dirs +BuildRequires: cmake(KF6WindowSystem) +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(lxqt2-build-tools) +BuildRequires: pkgconfig(lxqt) >= 2.1.0 +Requires: layer-shell-qt6 >= 6.2.0 +Requires: lxqt-session >= 2.1.0 +Requires: xdg-user-dirs +BuildArch: noarch + +%description +Files needed for the LXQt Wayland Session: Wayland session start script, +its desktop entry for display managers and default configurations for +actually supported compositors. + +%package -n lxqt-hyprland-session +Summary: Session files for LXQt-Hyprland +License: BSD-3-Clause +Requires: %{name} = %{version} +Requires: hyprland +Requires: hyprland-qtutils +Supplements: (%{name} and hyprland) + +%description -n lxqt-hyprland-session +This package contains the files necessary to use Hyprland as the Wayland +compositor with LXQt + +%package -n lxqt-niri-session +Summary: Session files for LXQT-niri +License: GPL-3.0-or-later +Requires: %{name} = %{version} +Requires: niri +Supplements: (%{name} and niri) + +%description -n lxqt-niri-session +This package contains the files necessary to use niri as the Wayland compositor +for LXQt + +%package -n lxqt-river-session +Summary: Session files for LXQt-river +License: GPL-3.0-or-later +Requires: %{name} = %{version} +Requires: river +Supplements: (%{name} and river) + +%description -n lxqt-river-session +This package contains the files necessary to use river as the Wayland +compositor with LXQt + +%package -n lxqt-sway-session +Summary: Session files for LXQt-Sway +License: MIT +Requires: %{name} = %{version} +Requires: sway +Supplements: (%{name} and sway) + +%description -n lxqt-sway-session +This package contains the files necessary to use Sway as the Wayland compositor +with LXQt + +%package -n lxqt-wayfire-session +Summary: Session files for LXQt-wayfire +License: MIT +Requires: %{name} = %{version} +Requires: wayfire +Supplements: (%{name} and wayfire) + +%description -n lxqt-wayfire-session +This package contains the files necessary to use wayfire as the Wayland +compositor with LXQt + +%package -n lxqt-labwc-session +Summary: Session files and theme for labwc +License: CC-BY-SA-4.0 AND GPL-2.0-or-later +Requires: %{name} = %{version} +Requires: labwc >= 0.7.2 +Requires: swaybg +Requires: swayidle +Requires: swaylock +Supplements: (%{name} and labwc) +Conflicts: labwc-theme-vent <= %{version} + +%description -n lxqt-labwc-session +This package contains the openbox themes and other files for labwc. + +%prep +%autosetup -p1 + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%fdupes -s %{buildroot}%{_datadir}/themes/ + +%check +%ctest + +%files +%doc README.md +%license COPYING.LESSER LICENSE +%dir %{_datadir}/lxqt +%dir %{_datadir}/lxqt/wayland +%dir %{_datadir}/lxqt/wayland/firstrun +%dir %{_datadir}/wayland-sessions +%{_bindir}/startlxqtwayland +%{_datadir}/lxqt/wayland/firstrun/autostart +%{_datadir}/wayland-sessions/lxqt-wayland.desktop + +%files -n lxqt-hyprland-session +%license LICENSE.BSD +%{_datadir}/lxqt/wayland/lxqt-hyprland.conf + +%files -n lxqt-niri-session +%license COPYING +%{_datadir}/lxqt/wayland/lxqt-niri.kdl + +%files -n lxqt-river-session +%license COPYING +%{_datadir}/lxqt/wayland/lxqt-river-init + +%files -n lxqt-sway-session +%license LICENSE.MIT +%{_datadir}/lxqt/wayland/lxqt-sway.config + +%files -n lxqt-wayfire-session +%license LICENSE.MIT +%{_datadir}/lxqt/wayland/lxqt-wayfire.ini + +%files -n lxqt-labwc-session +%license LICENSE.GPLv2 +%dir %{_datadir}/lxqt/wallpapers +%dir %{_datadir}/lxqt/wayland/labwc +%dir %{_datadir}/lxqt/graphics +%{_datadir}/themes/Vent/ +%{_datadir}/themes/Vent-dark/ +%{_datadir}/lxqt/wallpapers/origami-dark-labwc.png +%{_datadir}/lxqt/wayland/labwc/README +%{_datadir}/lxqt/wayland/labwc/autostart +%{_datadir}/lxqt/wayland/labwc/environment +%{_datadir}/lxqt/wayland/labwc/menu.xml +%{_datadir}/lxqt/wayland/labwc/rc.xml +%{_datadir}/lxqt/wayland/labwc/themerc +%{_datadir}/lxqt/wayland/labwc/themerc-override +%{_datadir}/lxqt/graphics/lxqt-labwc.png + +%changelog