Accepting request 1244264 from X11:LXQt
- Added: * 0003-add-option-for-miriway.patch (https://github.com/lxqt/lxqt-session/pull/571) - Dropped: * lxqt-session-default_wm.patch - Added: * 0001-set-default-wm.patch (Replaces Dropped Patch) * 0002-fix-xdg-desktop-portal-lxqt.patch (boo#1226394) - Updated to git_am style patches OBS-URL: https://build.opensuse.org/request/show/1244264 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-session?expand=0&rev=35
This commit is contained in:
commit
cbdebbd3fa
22
0001-set-default-wm.patch
Normal file
22
0001-set-default-wm.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
From 291019ea38392a6a129e4853718e536abb295d6d Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
|
||||||
|
Date: Sat, 11 Jan 2025 21:19:39 -0800
|
||||||
|
Subject: [PATCH 1/3] set default wm
|
||||||
|
|
||||||
|
---
|
||||||
|
config/session.conf | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/config/session.conf b/config/session.conf
|
||||||
|
index a9d06d6..ded6aa8 100644
|
||||||
|
--- a/config/session.conf
|
||||||
|
+++ b/config/session.conf
|
||||||
|
@@ -1,4 +1,5 @@
|
||||||
|
[General]
|
||||||
|
+window_manager=openbox
|
||||||
|
leave_confirmation=true
|
||||||
|
|
||||||
|
[Environment]
|
||||||
|
--
|
||||||
|
2.48.0
|
||||||
|
|
30
0002-fix-xdg-desktop-portal-lxqt.patch
Normal file
30
0002-fix-xdg-desktop-portal-lxqt.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
From 80f5eabac1b6f48ec8642b905bab2def40664633 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
|
||||||
|
Date: Sat, 11 Jan 2025 21:29:09 -0800
|
||||||
|
Subject: [PATCH 2/3] fix xdg desktop portal lxqt
|
||||||
|
|
||||||
|
xdg-desktop-portal-lxqt isn't being started by xdg-desktop-portal on
|
||||||
|
login, running "/usr/libexec/xdg-desktop-portal --replace" after login
|
||||||
|
via this desktop file ensures that the lxqt portal is running
|
||||||
|
|
||||||
|
See: https://bugzilla.opensuse.org/show_bug.cgi?id=1226394
|
||||||
|
---
|
||||||
|
autostart/lxqt-desktop-portal-autostart.desktop.in | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
create mode 100644 autostart/lxqt-desktop-portal-autostart.desktop.in
|
||||||
|
|
||||||
|
diff --git a/autostart/lxqt-desktop-portal-autostart.desktop.in b/autostart/lxqt-desktop-portal-autostart.desktop.in
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..637ddb4
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/autostart/lxqt-desktop-portal-autostart.desktop.in
|
||||||
|
@@ -0,0 +1,6 @@
|
||||||
|
+[Desktop Entry]
|
||||||
|
+Type=Application
|
||||||
|
+Version=1.0
|
||||||
|
+TryExec=/usr/libexec/xdg-desktop-portal
|
||||||
|
+Exec=/usr/libexec/xdg-desktop-portal --replace
|
||||||
|
+OnlyShowIn=LXQt;
|
||||||
|
--
|
||||||
|
2.48.0
|
||||||
|
|
30
0003-add-option-for-miriway.patch
Normal file
30
0003-add-option-for-miriway.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
From ccd9bb7936f4e9bcb41179c8ff4ba96d1a204591 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
|
||||||
|
Date: Thu, 16 Jan 2025 10:39:28 -0800
|
||||||
|
Subject: [PATCH 3/3] add option for miriway
|
||||||
|
|
||||||
|
Miriway is a new generic compositor built on the Mir compositor library that
|
||||||
|
is designed to be used as part of composable desktop environments.
|
||||||
|
|
||||||
|
See: https://github.com/lxqt/lxqt-session/pull/571
|
||||||
|
---
|
||||||
|
config/waylandwindowmanagers.conf | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/config/waylandwindowmanagers.conf b/config/waylandwindowmanagers.conf
|
||||||
|
index e727f43..e0ddbb2 100644
|
||||||
|
--- a/config/waylandwindowmanagers.conf
|
||||||
|
+++ b/config/waylandwindowmanagers.conf
|
||||||
|
@@ -9,6 +9,9 @@ kwin_wayland/Comment=Window manager of the KDE Software Compilation
|
||||||
|
labwc/Name=Labwc
|
||||||
|
labwc/Comment=wlroots-based window-stacking compositor, inspired by openbox
|
||||||
|
|
||||||
|
+miriway/Name=Miriway
|
||||||
|
+miriway/Comment=Simple Wayland compositor built on Mir for building desktop environments
|
||||||
|
+
|
||||||
|
niri/Name=niri
|
||||||
|
niri/Comment=A scrollable-tiling Wayland compositor
|
||||||
|
|
||||||
|
--
|
||||||
|
2.48.0
|
||||||
|
|
@ -1,9 +0,0 @@
|
|||||||
diff -urEbwB lxqt-session-0.14.0/config/session.conf lxqt-session-0.14.0.new/config/session.conf
|
|
||||||
--- lxqt-session-0.14.0/config/session.conf 2019-01-24 23:05:42.000000000 +0100
|
|
||||||
+++ lxqt-session-0.14.0.new/config/session.conf 2019-02-27 11:29:12.615726091 +0100
|
|
||||||
@@ -1,4 +1,5 @@
|
|
||||||
[General]
|
|
||||||
+window_manager=openbox
|
|
||||||
leave_confirmation=true
|
|
||||||
|
|
||||||
[Environment]
|
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 16 18:45:33 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>
|
||||||
|
|
||||||
|
- Added:
|
||||||
|
* 0003-add-option-for-miriway.patch
|
||||||
|
(https://github.com/lxqt/lxqt-session/pull/571)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jan 12 05:39:00 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>
|
||||||
|
|
||||||
|
- Dropped:
|
||||||
|
* lxqt-session-default_wm.patch
|
||||||
|
- Added:
|
||||||
|
* 0001-set-default-wm.patch (Replaces Dropped Patch)
|
||||||
|
* 0002-fix-xdg-desktop-portal-lxqt.patch (boo#1226394)
|
||||||
|
- Updated to git_am style patches
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Dec 23 19:03:33 UTC 2024 - Shawn Dunn <sfalken@opensuse.org>
|
Mon Dec 23 19:03:33 UTC 2024 - Shawn Dunn <sfalken@opensuse.org>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package lxqt-session
|
# spec file for package lxqt-session
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC
|
||||||
# Copyright (c) 2024 Shawn W Dunn <sfalken@opensuse.org>
|
# Copyright (c) 2024 Shawn W Dunn <sfalken@opensuse.org>
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
@ -22,19 +22,25 @@ Version: 2.1.1
|
|||||||
Release: 0
|
Release: 0
|
||||||
Summary: LXQt Session Manager
|
Summary: LXQt Session Manager
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
Group: System/GUI/Other
|
|
||||||
URL: https://github.com/lxqt/lxqt-session
|
URL: https://github.com/lxqt/lxqt-session
|
||||||
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
|
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
|
||||||
Source1: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
|
Source1: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
|
||||||
Source2: %{name}.keyring
|
Source2: %{name}.keyring
|
||||||
# mvetter@suse.com bsc#1127043 - Use Openbox as default WM
|
# mvetter@suse.com bsc#1127043 - Use Openbox as default WM
|
||||||
Patch1: %{name}-default_wm.patch
|
Patch1: 0001-set-default-wm.patch
|
||||||
|
# PATCH-FIX-openSUSE boo#1226394 sfalken@opensuse.org
|
||||||
|
Patch2: 0002-fix-xdg-desktop-portal-lxqt.patch
|
||||||
|
# PATCH-FEATURE-UPSTREAM https://github.com/lxqt/lxqt-session/pull/571
|
||||||
|
Patch3: 0003-add-option-for-miriway.patch
|
||||||
|
|
||||||
BuildRequires: cmake >= 3.18.0
|
BuildRequires: cmake >= 3.18.0
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: git-core
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: qtxdg-tools >= 4.1.0
|
BuildRequires: qtxdg-tools >= 4.1.0
|
||||||
BuildRequires: xdg-user-dirs
|
BuildRequires: xdg-user-dirs
|
||||||
|
|
||||||
BuildRequires: cmake(KF6WindowSystem)
|
BuildRequires: cmake(KF6WindowSystem)
|
||||||
BuildRequires: cmake(LayerShellQt) >= 6.0.0
|
BuildRequires: cmake(LayerShellQt) >= 6.0.0
|
||||||
BuildRequires: cmake(Qt6DBus)
|
BuildRequires: cmake(Qt6DBus)
|
||||||
@ -42,10 +48,12 @@ BuildRequires: cmake(Qt6LinguistTools)
|
|||||||
BuildRequires: cmake(Qt6Widgets)
|
BuildRequires: cmake(Qt6Widgets)
|
||||||
BuildRequires: cmake(lxqt2-build-tools)
|
BuildRequires: cmake(lxqt2-build-tools)
|
||||||
BuildRequires: cmake(qtxdg-tools)
|
BuildRequires: cmake(qtxdg-tools)
|
||||||
|
|
||||||
BuildRequires: pkgconfig(libproc2) >= 4.0.0
|
BuildRequires: pkgconfig(libproc2) >= 4.0.0
|
||||||
BuildRequires: pkgconfig(libudev)
|
BuildRequires: pkgconfig(libudev)
|
||||||
BuildRequires: pkgconfig(lxqt) >= 2.1.0
|
BuildRequires: pkgconfig(lxqt) >= 2.1.0
|
||||||
BuildRequires: pkgconfig(x11)
|
BuildRequires: pkgconfig(x11)
|
||||||
|
|
||||||
Requires(post): update-alternatives
|
Requires(post): update-alternatives
|
||||||
Requires(postun): update-alternatives
|
Requires(postun): update-alternatives
|
||||||
Requires: %{name}-branding = %{version}-%{release}
|
Requires: %{name}-branding = %{version}-%{release}
|
||||||
@ -73,7 +81,7 @@ BuildArch: noarch
|
|||||||
This package provides the upstream look and feel for %{name}.
|
This package provides the upstream look and feel for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1 -S git_am
|
||||||
sed -i 's/^\(Type=\).*/\1XSession/' xsession/lxqt.desktop.in
|
sed -i 's/^\(Type=\).*/\1XSession/' xsession/lxqt.desktop.in
|
||||||
sed -i '/^Categories/s/\(LXQt\;\)/X-\1/' lxqt-config-session/lxqt-config-session.desktop.in
|
sed -i '/^Categories/s/\(LXQt\;\)/X-\1/' lxqt-config-session/lxqt-config-session.desktop.in
|
||||||
|
|
||||||
@ -113,6 +121,7 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadi
|
|||||||
%{_datadir}/applications/lxqt-*.desktop
|
%{_datadir}/applications/lxqt-*.desktop
|
||||||
%{_mandir}/man?/lxqt-*%{?ext_man}
|
%{_mandir}/man?/lxqt-*%{?ext_man}
|
||||||
%config %{_sysconfdir}/xdg/autostart/lxqt-xscreensaver-autostart.desktop
|
%config %{_sysconfdir}/xdg/autostart/lxqt-xscreensaver-autostart.desktop
|
||||||
|
%config %{_sysconfdir}/xdg/autostart/lxqt-desktop-portal-autostart.desktop
|
||||||
%{_bindir}/startlxqt
|
%{_bindir}/startlxqt
|
||||||
%{_mandir}/man1/startlxqt.1%{?ext_man}
|
%{_mandir}/man1/startlxqt.1%{?ext_man}
|
||||||
%{_datadir}/xsessions/lxqt.desktop
|
%{_datadir}/xsessions/lxqt.desktop
|
||||||
|
Loading…
x
Reference in New Issue
Block a user