Remove unnecessary patch

This commit is contained in:
2025-10-12 18:58:03 +03:00
parent 2926cb8500
commit e874faaa07
3 changed files with 1 additions and 50 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
name: liblxqt
description: Core utility library for all LXQt components
version: 2.2.0
revision: 1
revision: 2
url: https://github.com/lxqt/liblxqt
license: LGPL2.1-or-later
architecture: any
-42
View File
@@ -1,42 +0,0 @@
From 5ddfcb694bf80d3272a65192404c14e3506ff6c2 Mon Sep 17 00:00:00 2001
From: EnumDev <[email protected]>
Date: Sat, 11 Oct 2025 21:11:58 +0300
Subject: [PATCH] Fix error while building with Qt 6.10
---
CMakeLists.txt | 4 ++++
cmake/lxqt-config.cmake.in | 3 +++
2 files changed, 7 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a15eea8..ed161b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,10 @@ find_package(Qt6 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Widgets DBus LinguistTool
find_package(Qt6Xdg ${QTXDG_MINIMUM_VERSION} REQUIRED)
find_package(KF6WindowSystem ${KF6_MINIMUM_VERSION} REQUIRED)
+if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0")
+ find_package(Qt6GuiPrivate REQUIRED)
+endif()
+
if (BUILD_BACKLIGHT_LINUX_BACKEND)
find_package(PolkitQt6-1 REQUIRED)
endif (BUILD_BACKLIGHT_LINUX_BACKEND)
diff --git a/cmake/lxqt-config.cmake.in b/cmake/lxqt-config.cmake.in
index fe350e7..51dab1b 100644
--- a/cmake/lxqt-config.cmake.in
+++ b/cmake/lxqt-config.cmake.in
@@ -16,6 +16,9 @@ find_dependency(KF6WindowSystem)
find_dependency(lxqt2-build-tools @LXQTBT_MINIMUM_VERSION@)
include(LXQtConfigVars)
+if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0")
+ find_dependency(Qt6GuiPrivate @QT_MINIMUM_VERSION@)
+endif()
# - Set version informations
set(LXQT_MAJOR_VERSION "@LXQT_MAJOR_VERSION@")
--
2.51.0
-7
View File
@@ -2,13 +2,6 @@
# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
# The prepare function is executed in the root of the temp directory
# This function is used for putting downloaded files to the correct location or applying patches
prepare() {
cd "$BPM_SOURCE"
patch -Np1 -i "$BPM_WORKDIR"/qt-6.10.patch
}
# The build function is executed in the source directory
# This function is used to compile the source code
build() {