Hi ports@,
Here is a diff to update zeal to 0.8.1, which builds fine with LLVM 22
installed from ports@.
Lightly tested on amd64.
MAINTAINER is CC'ed.
Comments? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/zeal/Makefile,v
diff -u -p -r1.23 Makefile
--- Makefile 19 Jan 2026 10:48:22 -0000 1.23
+++ Makefile 28 May 2026 10:30:30 -0000
@@ -2,14 +2,8 @@ USE_NOBTCFI = Yes
COMMENT = simple offline API documentation browser
-V = 0.7.0
+V = 0.8.1
DISTNAME = zeal-${V}
-REVISION = 0
-
-# fix build with Qt6
-SITES.qt = https://github.com/zealdocs/zeal/commit/
-PATCHFILES.qt = 9630cc94c155d87295e51b41fbab2bd5798f8229.patch
-PATCH_DIST_STRIP = -p1
CATEGORIES = devel
@@ -44,20 +38,6 @@ LIB_DEPENDS = archivers/libarchive \
CONFIGURE_ARGS = -DZEAL_RELEASE_BUILD=ON
-FIX_CRLF_FILES = src/libs/registry/*.cpp \
- src/libs/ui/qxtglobalshortcut/*.cpp \
- src/libs/ui/*.cpp
-
NO_TEST = Yes
-
-# XXX FIX_CRLF_FILES runs after distpatch, but patch(1) and gpatch(1) won't
-# apply PATCHFILES due to wrong line endings
-post-extract:
- @cd ${WRKDIST} && perl -i -pe 's/\r$$//' -- \
- src/libs/registry/docset.cpp \
- src/libs/registry/docsetmetadata.cpp \
- src/libs/registry/docsetregistry.cpp \
- src/libs/ui/docsetsdialog.cpp \
- src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/zeal/distinfo,v
diff -u -p -r1.8 distinfo
--- distinfo 14 Feb 2024 07:52:30 -0000 1.8
+++ distinfo 28 May 2026 10:30:30 -0000
@@ -1,4 +1,2 @@
-SHA256 (9630cc94c155d87295e51b41fbab2bd5798f8229.patch) =
5AzvKb1jzWiDHwtLJ0KciN0ySarfALJVnMMmuz2urmE=
-SHA256 (zeal-0.7.0.tar.xz) = Qs7+iydnvZTly3ANpKN9mM+xhp3W8EOxD3cx3zGcr0w=
-SIZE (9630cc94c155d87295e51b41fbab2bd5798f8229.patch) = 4768
-SIZE (zeal-0.7.0.tar.xz) = 784204
+SHA256 (zeal-0.8.1.tar.xz) = PGHwMmo5zfAWv8TEHCGizXhNK8BkyiZpeaV/G8qjZIs=
+SIZE (zeal-0.8.1.tar.xz) = 684456
Index: patches/patch-src_libs_ui_docsetsdialog_cpp
===================================================================
RCS file: patches/patch-src_libs_ui_docsetsdialog_cpp
diff -N patches/patch-src_libs_ui_docsetsdialog_cpp
--- patches/patch-src_libs_ui_docsetsdialog_cpp 10 Dec 2025 08:45:23 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-https://github.com/zealdocs/zeal/commit/11f6a85bb5f314ba8e1dbdc7654ef2647b75161e
-Index: src/libs/ui/docsetsdialog.cpp
---- src/libs/ui/docsetsdialog.cpp.orig
-+++ 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,
- 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);
- }
-
Index: patches/patch-src_libs_ui_qxtglobalshortcut_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_libs_ui_qxtglobalshortcut_CMakeLists_txt
diff -N patches/patch-src_libs_ui_qxtglobalshortcut_CMakeLists_txt
--- patches/patch-src_libs_ui_qxtglobalshortcut_CMakeLists_txt 10 Dec 2025
08:45:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-https://github.com/zealdocs/zeal/commit/11f6a85bb5f314ba8e1dbdc7654ef2647b75161e
-Index: src/libs/ui/qxtglobalshortcut/CMakeLists.txt
---- src/libs/ui/qxtglobalshortcut/CMakeLists.txt.orig
-+++ src/libs/ui/qxtglobalshortcut/CMakeLists.txt
-@@ -21,7 +21,7 @@ endif()
-
- add_library(QxtGlobalShortcut STATIC ${QxtGlobalShortcut_SOURCES})
-
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED)
-+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui GuiPrivate REQUIRED)
- target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::Gui)
-
- if(APPLE)
