Accepting request 1238362 from X11:LXQt
OBS-URL: https://build.opensuse.org/request/show/1238362 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-panel?expand=0&rev=36
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
f2f908da13
25
0001-fix-plugin-loader.patch
Normal file
25
0001-fix-plugin-loader.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From f5dc088d432b2aa45e448828a825e4791a4ac33b Mon Sep 17 00:00:00 2001
|
||||
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
|
||||
Date: Thu, 16 Jan 2025 09:40:20 -0800
|
||||
Subject: [PATCH 1/3] fix plugin loader
|
||||
|
||||
---
|
||||
panel/CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt
|
||||
index b9ba8f1..b512d30 100644
|
||||
--- a/panel/CMakeLists.txt
|
||||
+++ b/panel/CMakeLists.txt
|
||||
@@ -94,6 +94,8 @@ lxqt_translate_ts(QM_FILES SOURCES
|
||||
|
||||
lxqt_app_translation_loader(SOURCES ${PROJECT_NAME})
|
||||
|
||||
+set(CMAKE_EXECUTABLE_ENABLE_EXPORTS TRUE)
|
||||
+
|
||||
add_executable(${PROJECT}
|
||||
${PUB_HEADERS}
|
||||
${PRIV_HEADERS}
|
||||
--
|
||||
2.48.0
|
||||
|
||||
29
0002-panel-conf-branding.patch
Normal file
29
0002-panel-conf-branding.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 4d8f90e8f087d6259e55a955a75312afb7f9cb79 Mon Sep 17 00:00:00 2001
|
||||
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
|
||||
Date: Thu, 16 Jan 2025 09:42:29 -0800
|
||||
Subject: [PATCH 2/3] panel conf branding
|
||||
|
||||
---
|
||||
panel/resources/panel.conf | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/panel/resources/panel.conf b/panel/resources/panel.conf
|
||||
index 2c0799c..c7aadea 100644
|
||||
--- a/panel/resources/panel.conf
|
||||
+++ b/panel/resources/panel.conf
|
||||
@@ -8,6 +8,12 @@ desktop=0
|
||||
[fancymenu]
|
||||
type=fancymenu
|
||||
alignment=Left
|
||||
+buttonsAtTop=false
|
||||
+categoriesAtRight=false
|
||||
+icon=/usr/share/lxqt/graphics/opensuse-green.svg
|
||||
+ownIcon=true
|
||||
+showText=true
|
||||
+text=" openSUSE"
|
||||
filterClear=true
|
||||
autoSel=true
|
||||
autoSelDelay=150
|
||||
--
|
||||
2.48.0
|
||||
|
||||
35
0003-use-wlroots-backend-with-unknown-compositors.patch
Normal file
35
0003-use-wlroots-backend-with-unknown-compositors.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From aaea8c090aa7af9c3ac8e73122dbf7cb3cad1d04 Mon Sep 17 00:00:00 2001
|
||||
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
|
||||
Date: Thu, 16 Jan 2025 09:45:41 -0800
|
||||
Subject: [PATCH 3/3] use wlroots backend with unknown compositors
|
||||
|
||||
The description of the LXQtPanelApplicationPrivate::loadBackend() method
|
||||
already states that if we cannot identify the correct backend for a
|
||||
Wayland session, we should fall back to the wlroots backend module. This
|
||||
is reasonable given how broadly the wlr protocols are implemented.
|
||||
However, this was not happening due to a small error where we checked for
|
||||
the wlroots string in XDG_CURRENT_DESKTOP, which is not a valid option.
|
||||
|
||||
This change fixes this by checking XDG_SESSION_TYPE for "wayland" instead.
|
||||
As this is fallback logic, this is safe as the preferred backend logic
|
||||
using XDG_CURRENT_DESKTOP still wins over this.
|
||||
---
|
||||
panel/lxqtpanelapplication.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/panel/lxqtpanelapplication.cpp b/panel/lxqtpanelapplication.cpp
|
||||
index c8948cc..baf37a0 100644
|
||||
--- a/panel/lxqtpanelapplication.cpp
|
||||
+++ b/panel/lxqtpanelapplication.cpp
|
||||
@@ -263,7 +263,7 @@ void LXQtPanelApplicationPrivate::loadBackend()
|
||||
}
|
||||
}
|
||||
|
||||
- if ( preferredBackend.isEmpty() && xdgCurrentDesktops.contains( QStringLiteral("wlroots") ) )
|
||||
+ if ( preferredBackend.isEmpty() && xdgSessionType == ( QStringLiteral("wayland") ) )
|
||||
{
|
||||
qDebug() << "Specialized backend unavailable. Falling back to generic wlroots";
|
||||
preferredBackend = QStringLiteral("wlroots");
|
||||
--
|
||||
2.48.0
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt
|
||||
index 556d2212..d9fe784b 100644
|
||||
--- a/panel/CMakeLists.txt
|
||||
+++ b/panel/CMakeLists.txt
|
||||
@@ -91,6 +91,8 @@ lxqt_translate_ts(QM_FILES SOURCES
|
||||
|
||||
lxqt_app_translation_loader(SOURCES ${PROJECT_NAME})
|
||||
|
||||
+set(CMAKE_EXECUTABLE_ENABLE_EXPORTS TRUE)
|
||||
+
|
||||
add_executable(${PROJECT}
|
||||
${PUB_HEADERS}
|
||||
${PRIV_HEADERS}
|
||||
@ -1,15 +0,0 @@
|
||||
--- lxqt-panel-2.0.1/panel/resources/panel.conf 2024-05-08 19:37:39.000000000 +0300
|
||||
+++ lxqt-panel-2.0.1.new/panel/resources/panel.conf 2024-05-21 20:28:13.029086928 +0300
|
||||
@@ -8,6 +8,12 @@
|
||||
[fancymenu]
|
||||
type=fancymenu
|
||||
alignment=Left
|
||||
+buttonsAtTop=false
|
||||
+categoriesAtRight=false
|
||||
+icon=/usr/share/lxqt/graphics/opensuse-green.svg
|
||||
+ownIcon=true
|
||||
+showText=true
|
||||
+text=" openSUSE"
|
||||
filterClear=true
|
||||
autoSel=true
|
||||
autoSelDelay=150
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 16 17:55:45 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>
|
||||
|
||||
- Updated package to use git_am style patches
|
||||
- Dropped:
|
||||
* 001-fix-plugin-loader.patch
|
||||
* 002-panel-conf-branding.patch
|
||||
- Added:
|
||||
* 0001-fix-plugin-loader.patch
|
||||
* 0002-panel-conf-branding.patch
|
||||
* 0003-use-wlroots-backend-with-unknown-compositors.patch
|
||||
(https://github.com/lxqt/lxqt-panel/pull/2161)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 11 21:26:50 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>
|
||||
|
||||
|
||||
@ -25,14 +25,23 @@ URL: https://github.com/lxqt/lxqt-panel
|
||||
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
|
||||
Source1: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
|
||||
Source2: %{name}.keyring
|
||||
Patch1: 001-fix-plugin-loader.patch
|
||||
Patch2: 002-panel-conf-branding.patch
|
||||
%dnl Patch1: 001-fix-plugin-loader.patch
|
||||
%dnl Patch2: 002-panel-conf-branding.patch
|
||||
#PATCH-FIX-OPENSUSE 0001-fix-plugin-loader.patch
|
||||
Patch0: 0001-fix-plugin-loader.patch
|
||||
#PATCH-CONFIGURATION-OPENSUSE 0002-panel-conf-branding.patch
|
||||
Patch1: 0002-panel-conf-branding.patch
|
||||
#PATCH-FIX-UPSTREAM 0003-use-wlroots-backend-with-unknown-compositors.patch
|
||||
#https://github.com/lxqt/lxqt-panel/pull/2161
|
||||
Patch2: 0003-use-wlroots-backend-with-unknown-compositors.patch
|
||||
BuildRequires: cmake >= 3.27.0
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: git-core
|
||||
BuildRequires: libsensors4-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: qt6-gui-private-devel
|
||||
|
||||
BuildRequires: cmake(KF6Solid)
|
||||
BuildRequires: cmake(KF6WindowSystem)
|
||||
BuildRequires: cmake(LayerShellQt) >= 6.0.0
|
||||
@ -44,6 +53,7 @@ BuildRequires: cmake(Qt6Widgets)
|
||||
BuildRequires: cmake(Qt6Xml)
|
||||
BuildRequires: cmake(lxqt-menu-data) >= 2.1.0
|
||||
BuildRequires: cmake(lxqt2-build-tools)
|
||||
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(dbusmenu-lxqt)
|
||||
BuildRequires: pkgconfig(libmenu-cache)
|
||||
@ -65,6 +75,7 @@ BuildRequires: pkgconfig(xcomposite)
|
||||
BuildRequires: pkgconfig(xkbcommon)
|
||||
BuildRequires: pkgconfig(xkbcommon-x11)
|
||||
BuildRequires: pkgconfig(xtst)
|
||||
|
||||
Requires: %{name}-branding = %{version}-%{release}
|
||||
Requires: lxqt-menu-data
|
||||
Requires: menu-cache
|
||||
@ -95,7 +106,7 @@ BuildArch: noarch
|
||||
This package provides the upstream look and feel for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup -p1 -S git_am
|
||||
|
||||
%build
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user