From 9a73830b782298a3572f9acba04778a054b0603a Mon Sep 17 00:00:00 2001 From: EnumDev Date: Tue, 14 Oct 2025 17:27:36 +0300 Subject: [PATCH] Add patch for qt 6.10 --- pkg.info | 2 +- source-files/qt-6.10.patch | 53 ++++++++++++++++++++++++++++++++++++++ source.sh | 7 +++++ 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 source-files/qt-6.10.patch diff --git a/pkg.info b/pkg.info index f885191..e96ed9b 100644 --- a/pkg.info +++ b/pkg.info @@ -1,7 +1,7 @@ name: lxqt-qtplugin description: LXQt Qt platform integration plugin version: 2.2.0 -revision: 1 +revision: 2 url: https://github.com/lxqt/lxqt-qtplugin license: LGPL2.1-or-later architecture: any diff --git a/source-files/qt-6.10.patch b/source-files/qt-6.10.patch new file mode 100644 index 0000000..656acdd --- /dev/null +++ b/source-files/qt-6.10.patch @@ -0,0 +1,53 @@ +From 90473945206dbf21816a00dfba27426a5b5a9e25 Mon Sep 17 00:00:00 2001 +From: Chiitoo +Date: Wed, 8 Oct 2025 19:46:22 +0300 +Subject: [PATCH] cmake: fix build with Qt 6.10 (#100) + +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 +++++ + src/CMakeLists.txt | 11 +++++++---- + 2 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39b136d..cecc546 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,6 +23,11 @@ find_package(Qt6DBus ${QT_MINIMUM_VERSION} REQUIRED) + find_package(Qt6LinguistTools ${QT_MINIMUM_VERSION} REQUIRED) + find_package(Qt6Widgets ${QT_MINIMUM_VERSION} REQUIRED) + find_package(Qt6XdgIconLoader ${QTXDG_MINIMUM_VERSION} REQUIRED) ++ ++if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0") ++ find_package(Qt6GuiPrivate REQUIRED) ++endif() ++ + find_package(lxqt2-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) + find_package(dbusmenu-lxqt ${DBUSMENU_MINIMUM_VERSION} REQUIRED) + find_package(fm-qt6 ${FMQT_MINIMUM_VERSION} REQUIRED) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 008e2be..6bcd84e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -33,10 +33,13 @@ target_compile_definitions(qtlxqt + ) + + target_link_libraries(qtlxqt +- Qt6::Widgets +- Qt6::DBus +- dbusmenu-lxqt +- Qt6XdgIconLoader ++ PRIVATE ++ Qt6::GuiPrivate ++ PUBLIC ++ Qt6::Widgets ++ Qt6::DBus ++ dbusmenu-lxqt ++ Qt6XdgIconLoader + ) + + lxqt_query_qt(_QT_PLUGINS_DIR QT_INSTALL_PLUGINS) diff --git a/source.sh b/source.sh index bb097a1..19e5080 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() {