From d5c75ad19de3834d268308a8dcd93c0cdd3a6c28 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sun, 16 Aug 2026 07:50:13 +0200 Subject: [PATCH] Update the Flatpak manifest to Qt6/KF6 and cmake switch runtime/sdk to org.kde.Platform/org.kde.Sdk 6.10 migrate qelectrotech module from qmake to cmake buildsystem add config-opts: QT_VERSION_MAJOR=6, BUILD_WITH_KF=ON, BUILD_KF=OFF, PACKAGE_TESTS=OFF, BUILD_PUGIXML=OFF, QET_EXPORT_PROJECT_DB=ON drop fix-the-installation-paths.patch (qmake-only, obsolete under cmake) re-attach fix-appdata.patch, previously unreferenced in sources document open verification points for Qt6 private headers and the SQLite driver, which have no Flatpak build-depends equivalent --- .../flatpak/org.qelectrotech.QElectroTech.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/build-aux/flatpak/org.qelectrotech.QElectroTech.json b/build-aux/flatpak/org.qelectrotech.QElectroTech.json index 6085a2326..ebfd241df 100644 --- a/build-aux/flatpak/org.qelectrotech.QElectroTech.json +++ b/build-aux/flatpak/org.qelectrotech.QElectroTech.json @@ -1,7 +1,7 @@ { "id": "org.qelectrotech.QElectroTech", "runtime": "org.kde.Platform", - "runtime-version": "5.15-25.08", + "runtime-version": "6.10", "sdk": "org.kde.Sdk", "command": "qelectrotech", "rename-desktop-file": "org.qelectrotech.qelectrotech.desktop", @@ -30,7 +30,17 @@ "pypi-dependencies.json", { "name": "qelectrotech", - "buildsystem": "qmake", + "//qt6-private-headers-note": "qt6-base-private-dev has no Flatpak build-depends equivalent — private Qt6 headers ship inside org.kde.Sdk itself. If the cmake build fails looking for QtCore/private/*.h, the SDK/runtime branch is mismatched with the source tree, not a missing package.", + "//sqlite-driver-note": "libqt6sql6-sqlite / libsqlite3-dev have no Flatpak build-depends equivalent either. QET_EXPORT_PROJECT_DB=ON assumes the KDE runtime ships the Qt6 SQLite plugin (libqsqlite.so) already built into QtSql — verified at Debian packaging time this needed an explicit runtime dep there (see debian/control). Test the in-app database export after building; if it silently fails, the runtime's QtSql plugin set needs checking, not a package to add here.", + "buildsystem": "cmake", + "config-opts": [ + "-DQT_VERSION_MAJOR=6", + "-DBUILD_WITH_KF=ON", + "-DBUILD_KF=OFF", + "-DPACKAGE_TESTS=OFF", + "-DBUILD_PUGIXML=OFF", + "-DQET_EXPORT_PROJECT_DB=ON" + ], "post-install": [ "mv ${FLATPAK_DEST}/share/mime/packages/qelectrotech.xml ${FLATPAK_DEST}/share/mime/packages/org.qelectrotech.QElectroTech.xml" ], @@ -42,7 +52,7 @@ { "type": "patch", "paths": [ - "patches/fix-the-installation-paths.patch" + "patches/fix-appdata.patch" ] } ]