fix(x11/lxqt-panel): fix build with Qt 6.10

- From https://github.com/lxqt/lxqt-panel/pull/2306
This commit is contained in:
termux-pacman-bot
2025-10-27 20:37:38 +00:00
parent 24c93e6405
commit 805c74bc3c
2 changed files with 31 additions and 1 deletions

View File

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="The LXQt desktop panel"
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.2.2"
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL="https://github.com/lxqt/lxqt-panel/releases/download/${TERMUX_PKG_VERSION}/lxqt-panel-${TERMUX_PKG_VERSION}.tar.xz"
TERMUX_PKG_SHA256=5d150e7a4e8818715b8f4eec7f4bb26c98f740cd56f972199b35fc7c81da1969
TERMUX_PKG_DEPENDS="kf6-kwindowsystem, layer-shell-qt, libc++, libdbusmenu-lxqt, liblxqt, libqtxdg, libsysstat, libxcb, libxkbcommon, libxtst, libx11, lxqt-globalkeys, lxqt-menu-data, pulseaudio, qt6-qtbase, xcb-util, xcb-util-image"

View File

@@ -0,0 +1,30 @@
From c483abd7fae24a152b0ba7edb81c7c5af4a1c4db Mon Sep 17 00:00:00 2001
From: Jimi Huotari <chiitoo@gentoo.org>
Date: Sat, 28 Jun 2025 16:46:55 +0300
Subject: [PATCH] cmake: fix build with Qt 6.10
The 'Qt6FooPrivate' targets have been split into separate CMake files
in Qt 6.9, and require a 'find_package(Qt6FooPrivate)' call starting
with Qt 6.10.
See also: https://bugreports.qt.io/browse/QTBUG-87776
---
CMakeLists.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 241166ad4..ecb283c82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,11 @@ find_package(lxqt-menu-data ${LXQT_MINIMUM_VERSION} REQUIRED)
find_package(LayerShellQt REQUIRED)
+if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0")
+ find_package(Qt6GuiPrivate REQUIRED)
+ find_package(Qt6WaylandClientPrivate REQUIRED)
+endif()
+
# Patch Version
set(LXQT_PANEL_PATCH_VERSION 2)
set(LXQT_PANEL_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PANEL_PATCH_VERSION})