git: 9c026564885a - main - www/dooble: Fix build with upcoming Qt 6.6.0

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Fri, 03 Nov 2023 07:07:21 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9c026564885a4cf9b0e976b8adb810fd89ddc97c

commit 9c026564885a4cf9b0e976b8adb810fd89ddc97c
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-11-03 04:23:16 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-11-03 06:56:58 +0000

    www/dooble: Fix build with upcoming Qt 6.6.0
    
    This port builds with -Werror, and due to QSqlDataBase::exec() being
    finally marked as deprecated in Qt 6.6.0 [1], it fails to build due to
    deprecation warnings. Add upstreamed patch to fix this issue. [2] Port
    builds perfectly fine with previous versions of Qt, including 5.x, as it
    took 12 years for the soft deprecation in the API notes [3] to actually
    take effect. Upstream notes this was an automatic-completion error. [2]
    
    While here: clean up USE_QT for both the qt5 and qt6 flavors and
    remove checks for long unsupported (3+ years) versions of Qt 5.x. [4]
    
    [1] https://doc.qt.io/qt-6/qsqldatabase-obsolete.html
    [2] https://github.com/textbrowser/dooble/pull/199
    [3] https://doc.qt.io/qt-5/qsqldatabase.html
    
    Approved by:    portmgr (blanket)
    With hat:       kde@ [4]
---
 www/dooble/Makefile | 23 ++++++++++-------------
 www/dooble/distinfo |  4 +++-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/www/dooble/Makefile b/www/dooble/Makefile
index 1e266c545575..598c5eb6fdff 100644
--- a/www/dooble/Makefile
+++ b/www/dooble/Makefile
@@ -1,7 +1,11 @@
 PORTNAME=	dooble
 DISTVERSION=	2023.08.30
+PORTREVISION=	1
 CATEGORIES=	www
 
+PATCH_SITES=	https://github.com/textbrowser/dooble/commit/
+PATCHFILES+=	95c0d3277d714ea1dba658ff4433bde3eb29ef76.patch:-p1 # Fix build with Qt 6.6.0
+
 MAINTAINER=	eric@camachat.org
 COMMENT=	Dooble Web Browser
 WWW=		https://textbrowser.github.io/dooble/
@@ -21,11 +25,13 @@ GH_ACCOUNT=	textbrowser
 USE_GL=		gl
 .if ${FLAVOR} == qt5
 PKGNAMESUFFIX=	-${FLAVOR}
-USE_QT=		concurrent core declarative gui location network printsupport \
-		sql webchannel webengine widgets xml sql-sqlite3:run \
+USE_QT=		charts concurrent core declarative gui location network \
+		printsupport sql webchannel webengine widgets xml \
+		sql-sqlite3:run \
 		buildtools:build qmake:build
 . elif ${FLAVOR} == qt6
-USE_QT=		base charts sqldriver-sqlite webchannel webengine
+USE_QT=		base charts declarative positioning webchannel webengine \
+		sqldriver-sqlite:run
 .endif
 USE_XORG=	xcb
 
@@ -35,15 +41,6 @@ PLIST_FILES=	${PREFIX}/share/applications/${PORTNAME}.desktop \
 		${PREFIX}/share/pixmaps/${PORTNAME}.png \
 		bin/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${FLAVOR:U} == qt5
-QT5_VER_MINOR=	${QT5_VERSION:C/^[0-9]+\.//:C/\..+$//}
-.if ${QT5_VER_MINOR} < 15
-BROKEN=		Qt 5.15 or higher required, using 5.${QT5_VER_MINOR} now
-.endif
-.endif
-
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/Dooble ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
@@ -53,4 +50,4 @@ do-install:
 		desktop-file-edit --set-icon=${PREFIX}/share/pixmaps/${PORTNAME}.png ${WRKSRC}/${PORTNAME}.desktop
 		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/dooble/distinfo b/www/dooble/distinfo
index 991d0b0620d5..1d230049d02e 100644
--- a/www/dooble/distinfo
+++ b/www/dooble/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1693251481
+TIMESTAMP = 1698972535
 SHA256 (textbrowser-dooble-2023.08.30_GH0.tar.gz) = d430cbc8fcbe7627d7494bd995d7e88beb728cd94bf4d3039cb3718e685391a7
 SIZE (textbrowser-dooble-2023.08.30_GH0.tar.gz) = 90239922
+SHA256 (95c0d3277d714ea1dba658ff4433bde3eb29ef76.patch) = 44f46c147340cd0e883cda35b714e1ecb68535fd569c70052f1e57e5fba67705
+SIZE (95c0d3277d714ea1dba658ff4433bde3eb29ef76.patch) = 904