Control: tags 1127890 + patch Control: tags 1127890 + pending Dear maintainer,
I've prepared an NMU for maliit-framework (versioned as 2.3.0-8.1) and uploaded it to DELAYED/1. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for maliit-framework-2.3.0 maliit-framework-2.3.0 changelog | 7 +++++++ patches/qt6.10.patch | 33 +++++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 41 insertions(+) diff -Nru maliit-framework-2.3.0/debian/changelog maliit-framework-2.3.0/debian/changelog --- maliit-framework-2.3.0/debian/changelog 2026-01-08 10:05:56.000000000 +0200 +++ maliit-framework-2.3.0/debian/changelog 2026-03-25 14:34:57.000000000 +0200 @@ -1,3 +1,10 @@ +maliit-framework (2.3.0-8.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with Qt 6.10. (Closes: #1127890) + + -- Adrian Bunk <[email protected]> Wed, 25 Mar 2026 14:34:57 +0200 + maliit-framework (2.3.0-8) unstable; urgency=medium * debian/control: diff -Nru maliit-framework-2.3.0/debian/patches/qt6.10.patch maliit-framework-2.3.0/debian/patches/qt6.10.patch --- maliit-framework-2.3.0/debian/patches/qt6.10.patch 1970-01-01 02:00:00.000000000 +0200 +++ maliit-framework-2.3.0/debian/patches/qt6.10.patch 2026-03-25 14:34:57.000000000 +0200 @@ -0,0 +1,33 @@ +Description: Fix FTBFS with Qt 6.10 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1127890 + +--- maliit-framework-2.3.0.orig/CMakeLists.txt ++++ maliit-framework-2.3.0/CMakeLists.txt +@@ -65,7 +65,7 @@ pkg_check_modules(DBus REQUIRED IMPORTED + + if(enable-wayland) + if (Qt6_FOUND) +- find_package(Qt6 REQUIRED COMPONENTS WaylandClient WaylandGlobalPrivate) ++ find_package(Qt6 REQUIRED COMPONENTS WaylandClient WaylandGlobalPrivate WaylandClientPrivate) + else() + find_package(Qt5 5.14 REQUIRED COMPONENTS WaylandClient XkbCommonSupport) + endif() +@@ -138,7 +138,7 @@ endif() + + add_library(maliit-connection STATIC ${CONNECTION_SOURCES}) + target_link_libraries(maliit-connection +- Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::DBus Qt${QT_VERSION_MAJOR}::Gui maliit-common) ++ Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::DBus Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::GuiPrivate maliit-common) + target_link_libraries(maliit-connection PkgConfig::DBus) + if(enable-wayland) + target_link_libraries(maliit-connection Wayland::Client PkgConfig::XKBCOMMON) +@@ -348,7 +348,7 @@ if(enable-wayland) + add_library(inputpanel-shell MODULE ${INPUT_PANEL_SHELL_SOURCES}) + target_link_libraries(inputpanel-shell Qt${QT_VERSION_MAJOR}::WaylandClient PkgConfig::XKBCOMMON Wayland::Client) + if (Qt6_FOUND) +- target_link_libraries(inputpanel-shell Qt${QT_VERSION_MAJOR}::WaylandGlobalPrivate) ++ target_link_libraries(inputpanel-shell Qt${QT_VERSION_MAJOR}::WaylandGlobalPrivate Qt${QT_VERSION_MAJOR}::WaylandClientPrivate) + target_include_directories(inputpanel-shell PRIVATE ${Qt6WaylandClient_PRIVATE_INCLUDE_DIRS} ${Qt6WaylandGlobalPrivate_PRIVATE_INCLUDE_DIRS} ${Qt6XkbCommonSupport_PRIVATE_INCLUDE_DIRS}) + else() + target_include_directories(inputpanel-shell PRIVATE ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS} ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS}) diff -Nru maliit-framework-2.3.0/debian/patches/series maliit-framework-2.3.0/debian/patches/series --- maliit-framework-2.3.0/debian/patches/series 2026-01-08 10:00:00.000000000 +0200 +++ maliit-framework-2.3.0/debian/patches/series 2026-03-25 14:34:57.000000000 +0200 @@ -20,3 +20,4 @@ 0020-Adapt-DBus-service-exec-call-to-maliit-server-name.patch 0021-Port-signalmapper-connection-to-Qt6.patch 2001-obey-lomiri-focus.patch +qt6.10.patch
