Control: tags 1127885 + patch Control: tags 1127885 + pending Dear maintainer,
I've prepared an NMU for zeal (versioned as 1:0.7.2-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for zeal-0.7.2 zeal-0.7.2 changelog | 11 ++++ control | 19 ++----- patches/0001-fix-fix-build-with-Qt-6.10-1728.patch | 53 +++++++++++++++++++++ patches/series | 1 rules | 7 -- 5 files changed, 72 insertions(+), 19 deletions(-) diff -Nru zeal-0.7.2/debian/changelog zeal-0.7.2/debian/changelog --- zeal-0.7.2/debian/changelog 2025-03-18 17:51:03.000000000 +0200 +++ zeal-0.7.2/debian/changelog 2026-03-23 21:45:03.000000000 +0200 @@ -1,3 +1,14 @@ +zeal (1:0.7.2-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with Qt 6.10, thanks to + Patrick Franz. (Closes: #1127885) + * Remove special case for removed mips64el. + * Architecture: any instead of hardcoding architectures + with qt6-webengine. + + -- Adrian Bunk <[email protected]> Mon, 23 Mar 2026 21:45:03 +0200 + zeal (1:0.7.2-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru zeal-0.7.2/debian/control zeal-0.7.2/debian/control --- zeal-0.7.2/debian/control 2025-03-18 15:10:26.000000000 +0200 +++ zeal-0.7.2/debian/control 2026-03-23 21:45:03.000000000 +0200 @@ -11,14 +11,10 @@ libcpp-httplib-dev, libsqlite3-dev, libxcb-keysyms1-dev, - qt6-base-dev [amd64 arm64 armhf i386], - qt6-base-private-dev [amd64 arm64 armhf i386], - qt6-webchannel-dev [amd64 arm64 armhf i386], - qt6-webengine-dev [amd64 arm64 armhf i386], - libqt5x11extras5-dev [mips64el], - qtbase5-dev [mips64el], - qtbase5-private-dev [mips64el], - qtwebengine5-dev [mips64el], + qt6-base-dev, + qt6-base-private-dev, + qt6-webchannel-dev, + qt6-webengine-dev, xmlto, Standards-Version: 4.6.1 Rules-Requires-Root: no @@ -27,13 +23,10 @@ Homepage: https://zealdocs.org/ Package: zeal -Architecture: amd64 arm64 armhf i386 mips64el -# qt6-webengine is available only on amd64 arm64 armhf i386 -# qtwebengine5-dev is available on the same + mips64el +Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - libqt6sql6-sqlite [amd64 arm64 armhf i386], - libqt5sql5-sqlite [mips64el], + libqt6sql6-sqlite, Description: Simple offline API documentation browser Zeal is a simple offline API documentation browser inspired by Dash (OS X app), available for Linux and Windows. diff -Nru zeal-0.7.2/debian/patches/0001-fix-fix-build-with-Qt-6.10-1728.patch zeal-0.7.2/debian/patches/0001-fix-fix-build-with-Qt-6.10-1728.patch --- zeal-0.7.2/debian/patches/0001-fix-fix-build-with-Qt-6.10-1728.patch 1970-01-01 02:00:00.000000000 +0200 +++ zeal-0.7.2/debian/patches/0001-fix-fix-build-with-Qt-6.10-1728.patch 2026-03-23 21:45:03.000000000 +0200 @@ -0,0 +1,53 @@ +From 731d9607a2d262fd27bb164b8b20ace01f0bc302 Mon Sep 17 00:00:00 2001 +From: Jaime Marquínez Ferrándiz <[email protected]> +Date: Mon, 10 Nov 2025 15:42:49 +0100 +Subject: fix: fix build with Qt 6.10 (#1728) + +* Use the return value of QTemporaryFile::open. It is marked with [[nodiscard]] on Qt 6.10. +* Fix linking with Qt::GuiPrivate on Qt 6.10 +--- + src/libs/ui/docsetsdialog.cpp | 6 ++++-- + src/libs/ui/qxtglobalshortcut/CMakeLists.txt | 3 +++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp +index 8c9fe63..6e2ccfe 100644 +--- a/src/libs/ui/docsetsdialog.cpp ++++ b/src/libs/ui/docsetsdialog.cpp +@@ -360,7 +360,8 @@ void DocsetsDialog::downloadCompleted() + QTemporaryFile *tmpFile = m_tmpFiles[docsetName]; + if (!tmpFile) { + tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this); +- tmpFile->open(); ++ if (!tmpFile->open()) ++ return; + m_tmpFiles.insert(docsetName, tmpFile); + } + +@@ -403,7 +404,8 @@ void DocsetsDialog::downloadProgress(qint64 received, qint64 total) + QTemporaryFile *tmpFile = m_tmpFiles[docsetName]; + if (!tmpFile) { + tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this); +- tmpFile->open(); ++ if (!tmpFile->open()) ++ return; + m_tmpFiles.insert(docsetName, tmpFile); + } + +diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt +index 476c2f5..cd2a25f 100644 +--- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt ++++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt +@@ -42,6 +42,9 @@ elseif(UNIX AND X11_FOUND) + find_package(Qt5 COMPONENTS X11Extras REQUIRED) + target_link_libraries(QxtGlobalShortcut Qt5::X11Extras) + else() ++ if(Qt6Core_VERSION VERSION_GREATER_EQUAL 6.10) ++ find_package(Qt6 COMPONENTS GuiPrivate REQUIRED) ++ endif() + target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::GuiPrivate) + endif() + +-- +2.47.3 + diff -Nru zeal-0.7.2/debian/patches/series zeal-0.7.2/debian/patches/series --- zeal-0.7.2/debian/patches/series 2025-03-18 15:06:41.000000000 +0200 +++ zeal-0.7.2/debian/patches/series 2026-03-23 21:45:03.000000000 +0200 @@ -2,3 +2,4 @@ disable-check-for-update.patch reproducible-build.patch system-cpp-httplib.patch # only needed with the next upstream release +0001-fix-fix-build-with-Qt-6.10-1728.patch diff -Nru zeal-0.7.2/debian/rules zeal-0.7.2/debian/rules --- zeal-0.7.2/debian/rules 2025-03-18 15:06:41.000000000 +0200 +++ zeal-0.7.2/debian/rules 2026-03-23 21:45:03.000000000 +0200 @@ -2,12 +2,7 @@ export DEB_BUILD_MAINT_OPTIONS := hardening=+all -qt6_arch := amd64 arm64 armhf i386 -ifneq ($(filter $(DEB_TARGET_ARCH),$(strip $(qt6_arch))),) - export QT_SELECT := qt6 -else - export QT_SELECT := qt5 -endif +export QT_SELECT := qt6 DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk
