git: 53c9479cc9f1 - main - devel/zeal: Update to 0.7.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Mon, 04 Dec 2023 22:39:35 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=53c9479cc9f133ad89c2b512bf15adb2326fa307

commit 53c9479cc9f133ad89c2b512bf15adb2326fa307
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-12-02 17:52:57 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-12-04 22:39:26 +0000

    devel/zeal: Update to 0.7.0
    
    Remove DEPRECATED/EXPIRATION_DATE. Port now builds against Qt6 and
    the WebEngine module.
    
    Pet portlint(1) and portclippy(1).
    
    https://github.com/zealdocs/zeal/releases/tag/v0.7.0
    
    PR:             274750
    Reported by:    Bartek Jasicki <thindil@laeran.pl.eu.org>
    Approved by:    rakuco (maintainer)
---
 devel/zeal/Makefile                                | 28 ++++++++++------------
 devel/zeal/distinfo                                |  8 ++++---
 .../files/patch-src_libs_ui_searchitemdelegate.cpp | 10 --------
 devel/zeal/pkg-plist                               |  4 ++--
 4 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/devel/zeal/Makefile b/devel/zeal/Makefile
index 7789271d9c25..06a890d5fb61 100644
--- a/devel/zeal/Makefile
+++ b/devel/zeal/Makefile
@@ -1,31 +1,29 @@
 PORTNAME=	zeal
-PORTVERSION=	0.6.1
-PORTREVISION=	5
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.7.0
 CATEGORIES=	devel
 
+PATCH_SITES=	https://github.com/zealdocs/zeal/commit/
+PATCHFILES+=	9630cc94c155d87295e51b41fbab2bd5798f8229.patch:-p1 # Fix build with Qt >= 6.6.0
+
 MAINTAINER=	rakuco@FreeBSD.org
 COMMENT=	Offline documentation browser
 WWW=		https://zealdocs.org
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=		Depends on deprecated www/qt5-webkit
-EXPIRATION_DATE=	2023-12-31
-
 LIB_DEPENDS=	libxcb.so:x11/libxcb \
-		libxcb-keysyms.so:x11/xcb-util-keysyms
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxkbcommon.so:x11/libxkbcommon
 
-USES=		cmake compiler:c++11-lib desktop-file-utils gl gnome kde:5 \
-		libarchive pkgconfig qt:5 sqlite xorg
-USE_GL=		gl  # Dependency added by qt5-gui.
+USES=		cmake compiler:c++17-lang desktop-file-utils gl kde:5 \
+		libarchive pkgconfig qt:6 sqlite xorg
 USE_GITHUB=	yes
+GH_ACCOUNT=	zealdocs
+USE_GL=		opengl
 USE_KDE=	ecm
-USE_QT=		concurrent core gui network webkit widgets x11extras \
-		buildtools:build qmake:build
+USE_QT=		base declarative positioning webchannel webengine
 USE_XORG=	ice sm x11 xcb xext
 
-GH_ACCOUNT=	zealdocs
-
 .include <bsd.port.mk>
diff --git a/devel/zeal/distinfo b/devel/zeal/distinfo
index df8d1c11c3cc..53c6a2b9b68e 100644
--- a/devel/zeal/distinfo
+++ b/devel/zeal/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1543666801
-SHA256 (zealdocs-zeal-v0.6.1_GH0.tar.gz) = 095c08f9903071849d5c79878abd48237ce1615f16d324afff1873ab6b5f0026
-SIZE (zealdocs-zeal-v0.6.1_GH0.tar.gz) = 1063963
+TIMESTAMP = 1701538800
+SHA256 (zealdocs-zeal-v0.7.0_GH0.tar.gz) = 937cbfe3ca49a7ee2d908baa3c5b008f425ae88cf2dade0abb2651b14f0f89ca
+SIZE (zealdocs-zeal-v0.7.0_GH0.tar.gz) = 1201193
+SHA256 (9630cc94c155d87295e51b41fbab2bd5798f8229.patch) = e40cef29bd63cd68831f0b4b27429c88dd3249aadf00b2559cc326bb3daeae61
+SIZE (9630cc94c155d87295e51b41fbab2bd5798f8229.patch) = 4768
diff --git a/devel/zeal/files/patch-src_libs_ui_searchitemdelegate.cpp b/devel/zeal/files/patch-src_libs_ui_searchitemdelegate.cpp
deleted file mode 100644
index 44f7cdf4ca9c..000000000000
--- a/devel/zeal/files/patch-src_libs_ui_searchitemdelegate.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libs/ui/searchitemdelegate.cpp.orig	2020-05-21 11:29:50 UTC
-+++ src/libs/ui/searchitemdelegate.cpp
-@@ -27,6 +27,7 @@
- #include <QFontMetrics>
- #include <QHelpEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QToolTip>
- 
- using namespace Zeal::WidgetUi;
diff --git a/devel/zeal/pkg-plist b/devel/zeal/pkg-plist
index 97517951b6f6..94389472f603 100644
--- a/devel/zeal/pkg-plist
+++ b/devel/zeal/pkg-plist
@@ -1,8 +1,8 @@
 bin/zeal
-share/applications/org.zealdocs.Zeal.desktop
-share/metainfo/org.zealdocs.Zeal.appdata.xml
+share/applications/org.zealdocs.zeal.desktop
 share/icons/hicolor/128x128/apps/zeal.png
 share/icons/hicolor/16x16/apps/zeal.png
 share/icons/hicolor/24x24/apps/zeal.png
 share/icons/hicolor/32x32/apps/zeal.png
 share/icons/hicolor/64x64/apps/zeal.png
+share/metainfo/org.zealdocs.zeal.appdata.xml