From 2926cb8500865e6b0eca6333c796e81d2ba5e199 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 11 Oct 2025 21:22:27 +0300 Subject: [PATCH] Fix error while building with Qt 6.10 --- source-files/qt-6.10.patch | 42 ++++++++++++++++++++++++++++++++++++++ source.sh | 7 +++++++ 2 files changed, 49 insertions(+) create mode 100644 source-files/qt-6.10.patch diff --git a/source-files/qt-6.10.patch b/source-files/qt-6.10.patch new file mode 100644 index 0000000..6b7cef3 --- /dev/null +++ b/source-files/qt-6.10.patch @@ -0,0 +1,42 @@ +From 5ddfcb694bf80d3272a65192404c14e3506ff6c2 Mon Sep 17 00:00:00 2001 +From: EnumDev +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 + diff --git a/source.sh b/source.sh index a884126..201e53e 100644 --- a/source.sh +++ b/source.sh @@ -2,6 +2,13 @@ # 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() {