git: 743248cb4886 - main - www/dooble: update to 2023.11.30

From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Fri, 01 Dec 2023 07:56:29 UTC
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=743248cb4886aa3a2b920f6f64e5d2d285113831

commit 743248cb4886aa3a2b920f6f64e5d2d285113831
Author:     Eric Camachat <eric@camachat.org>
AuthorDate: 2023-11-29 08:13:38 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-12-01 07:56:14 +0000

    www/dooble: update to 2023.11.30
    
    Build only with Qt6.
    
    ChangeLog: https://github.com/textbrowser/dooble/releases/tag/2023.11.30
    
     * Added QSqlDatabase::exec() correction. Please see
       https://github.com//pull/199. This item will be included in future release
       notes.
     * Final LTS release of 2023!
     * Final Windows 7 release! Future requests will be accepted only with Patreon
       memberships.
     * New Address Widget Completer Mode. Please see Settings -> Display.
     * New Doxygen files.
     * Page translation via Google. GitHub ticket #200.
     * Qt 6.5.3 LTS everywhere, except for Windows 7.
    
    PR:             275380
    Reported by:    eric@camachat.org
---
 www/dooble/Makefile  | 40 +++++++++++------------------------
 www/dooble/distinfo  |  6 +++---
 www/dooble/pkg-plist | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 31 deletions(-)

diff --git a/www/dooble/Makefile b/www/dooble/Makefile
index 598c5eb6fdff..7997049b8c1b 100644
--- a/www/dooble/Makefile
+++ b/www/dooble/Makefile
@@ -1,11 +1,7 @@
 PORTNAME=	dooble
-DISTVERSION=	2023.08.30
-PORTREVISION=	1
+DISTVERSION=	2023.11.30
 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/
@@ -13,41 +9,29 @@ WWW=		https://textbrowser.github.io/dooble/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-FLAVORS=	qt6 qt5
-FLAVOR?=	${FLAVORS:[1]}
-qt5_CONFLICTS_INSTALL=	qt6
-qt6_CONFLICTS_INSTALL=	qt5
-
-USES=		compiler:c++17-lang desktop-file-utils gl gmake qmake qt:${FLAVOR:S/qt//} ssl \
+USES=		compiler:c++17-lang desktop-file-utils gl gmake qmake qt:6 ssl \
 		tar xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	textbrowser
 USE_GL=		gl
-.if ${FLAVOR} == qt5
-PKGNAMESUFFIX=	-${FLAVOR}
-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 declarative positioning webchannel webengine \
 		sqldriver-sqlite:run
-.endif
 USE_XORG=	xcb
 
-QMAKE_SOURCE_PATH=	${PORTNAME}.pro
+QMAKE_SOURCE_PATH=	dooble.pro
 
-PLIST_FILES=	${PREFIX}/share/applications/${PORTNAME}.desktop \
-		${PREFIX}/share/pixmaps/${PORTNAME}.png \
-		bin/${PORTNAME}
+QTWEBENGINE_DICTIONARIES=	${QT_DATADIR}/qtwebengine_dictionaries
+PLIST_SUB=	QTWEBENGINE_DICTIONARIES=${QTWEBENGINE_DICTIONARIES}
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/Dooble ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
-		${INSTALL_DATA} ${WRKSRC}/Icons/Logo/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
-		desktop-file-edit --remove-category=Web --add-category=Network --add-category=WebBrowser ${WRKSRC}/${PORTNAME}.desktop
-		desktop-file-edit --set-key=Exec --set-value="/usr/bin/env QTWEBENGINE_DICTIONARIES_PATH=${QT_DATADIR}/qtwebengine_dictionaries ${PREFIX}/bin/${PORTNAME}" ${WRKSRC}/${PORTNAME}.desktop
-		desktop-file-edit --set-icon=${PREFIX}/share/pixmaps/${PORTNAME}.png ${WRKSRC}/${PORTNAME}.desktop
-		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
+		${INSTALL_DATA} ${WRKSRC}/Icons/Logo/dooble.png ${STAGEDIR}${PREFIX}/share/pixmaps/dooble.png
+		${MKDIR} ${STAGEDIR}${QTWEBENGINE_DICTIONARIES}
+		${INSTALL_DATA} ${WRKSRC}/qtwebengine_dictionaries/*.bdic ${STAGEDIR}${QTWEBENGINE_DICTIONARIES}
+		desktop-file-edit --remove-category=Web --add-category=Network --add-category=WebBrowser ${WRKSRC}/Distributions/dooble.desktop
+		desktop-file-edit --set-key=Exec --set-value="/usr/bin/env QTWEBENGINE_DICTIONARIES_PATH=${QTWEBENGINE_DICTIONARIES} ${PREFIX}/bin/${PORTNAME}" ${WRKSRC}/Distributions/dooble.desktop
+		desktop-file-edit --set-icon=${PREFIX}/share/pixmaps/dooble.png ${WRKSRC}/Distributions/dooble.desktop
+		${INSTALL_DATA} ${WRKSRC}/Distributions/dooble.desktop ${STAGEDIR}${PREFIX}/share/applications/dooble.desktop
 
 .include <bsd.port.mk>
diff --git a/www/dooble/distinfo b/www/dooble/distinfo
index 1d230049d02e..984635be3291 100644
--- a/www/dooble/distinfo
+++ b/www/dooble/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698972535
-SHA256 (textbrowser-dooble-2023.08.30_GH0.tar.gz) = d430cbc8fcbe7627d7494bd995d7e88beb728cd94bf4d3039cb3718e685391a7
-SIZE (textbrowser-dooble-2023.08.30_GH0.tar.gz) = 90239922
+TIMESTAMP = 1701030124
+SHA256 (textbrowser-dooble-2023.11.30_GH0.tar.gz) = bc8d930f929111d8eb29e4d830b96ac9f2608be5d7a33e9a24d6efba637f213f
+SIZE (textbrowser-dooble-2023.11.30_GH0.tar.gz) = 90362129
 SHA256 (95c0d3277d714ea1dba658ff4433bde3eb29ef76.patch) = 44f46c147340cd0e883cda35b714e1ecb68535fd569c70052f1e57e5fba67705
 SIZE (95c0d3277d714ea1dba658ff4433bde3eb29ef76.patch) = 904
diff --git a/www/dooble/pkg-plist b/www/dooble/pkg-plist
new file mode 100644
index 000000000000..9fa13d7b46db
--- /dev/null
+++ b/www/dooble/pkg-plist
@@ -0,0 +1,59 @@
+bin/dooble
+share/applications/dooble.desktop
+share/pixmaps/dooble.png
+%%QTWEBENGINE_DICTIONARIES%%/af_ZA.bdic
+%%QTWEBENGINE_DICTIONARIES%%/an_ES.bdic
+%%QTWEBENGINE_DICTIONARIES%%/ar.bdic
+%%QTWEBENGINE_DICTIONARIES%%/be_BY.bdic
+%%QTWEBENGINE_DICTIONARIES%%/bn_BD.bdic
+%%QTWEBENGINE_DICTIONARIES%%/br_FR.bdic
+%%QTWEBENGINE_DICTIONARIES%%/bs_BA.bdic
+%%QTWEBENGINE_DICTIONARIES%%/ca-valencia.bdic
+%%QTWEBENGINE_DICTIONARIES%%/ca.bdic
+%%QTWEBENGINE_DICTIONARIES%%/cs_CZ.bdic
+%%QTWEBENGINE_DICTIONARIES%%/da_DK.bdic
+%%QTWEBENGINE_DICTIONARIES%%/de_AT_frami.bdic
+%%QTWEBENGINE_DICTIONARIES%%/de_CH_frami.bdic
+%%QTWEBENGINE_DICTIONARIES%%/de_DE_frami.bdic
+%%QTWEBENGINE_DICTIONARIES%%/el_GR.bdic
+%%QTWEBENGINE_DICTIONARIES%%/en_AU.bdic
+%%QTWEBENGINE_DICTIONARIES%%/en_CA.bdic
+%%QTWEBENGINE_DICTIONARIES%%/en_GB.bdic
+%%QTWEBENGINE_DICTIONARIES%%/en_US.bdic
+%%QTWEBENGINE_DICTIONARIES%%/en_ZA.bdic
+%%QTWEBENGINE_DICTIONARIES%%/es_ANY.bdic
+%%QTWEBENGINE_DICTIONARIES%%/et_EE.bdic
+%%QTWEBENGINE_DICTIONARIES%%/fr.bdic
+%%QTWEBENGINE_DICTIONARIES%%/gd_GB.bdic
+%%QTWEBENGINE_DICTIONARIES%%/gl_ES.bdic
+%%QTWEBENGINE_DICTIONARIES%%/gug.bdic
+%%QTWEBENGINE_DICTIONARIES%%/he_IL.bdic
+%%QTWEBENGINE_DICTIONARIES%%/hi_IN.bdic
+%%QTWEBENGINE_DICTIONARIES%%/hr_HR.bdic
+%%QTWEBENGINE_DICTIONARIES%%/hu_HU.bdic
+%%QTWEBENGINE_DICTIONARIES%%/is.bdic
+%%QTWEBENGINE_DICTIONARIES%%/it_IT.bdic
+%%QTWEBENGINE_DICTIONARIES%%/kmr_Latn.bdic
+%%QTWEBENGINE_DICTIONARIES%%/lo_LA.bdic
+%%QTWEBENGINE_DICTIONARIES%%/lt.bdic
+%%QTWEBENGINE_DICTIONARIES%%/lv_LV.bdic
+%%QTWEBENGINE_DICTIONARIES%%/nb_NO.bdic
+%%QTWEBENGINE_DICTIONARIES%%/ne_NP.bdic
+%%QTWEBENGINE_DICTIONARIES%%/nl_NL.bdic
+%%QTWEBENGINE_DICTIONARIES%%/nn_NO.bdic
+%%QTWEBENGINE_DICTIONARIES%%/oc_FR.bdic
+%%QTWEBENGINE_DICTIONARIES%%/pl_PL.bdic
+%%QTWEBENGINE_DICTIONARIES%%/pt_BR.bdic
+%%QTWEBENGINE_DICTIONARIES%%/pt_PT.bdic
+%%QTWEBENGINE_DICTIONARIES%%/ro_RO.bdic
+%%QTWEBENGINE_DICTIONARIES%%/ru_RU.bdic
+%%QTWEBENGINE_DICTIONARIES%%/si_LK.bdic
+%%QTWEBENGINE_DICTIONARIES%%/sk_SK.bdic
+%%QTWEBENGINE_DICTIONARIES%%/sl_SI.bdic
+%%QTWEBENGINE_DICTIONARIES%%/sr-Latn.bdic
+%%QTWEBENGINE_DICTIONARIES%%/sr.bdic
+%%QTWEBENGINE_DICTIONARIES%%/sw_TZ.bdic
+%%QTWEBENGINE_DICTIONARIES%%/te_IN.bdic
+%%QTWEBENGINE_DICTIONARIES%%/uk_UA.bdic
+%%QTWEBENGINE_DICTIONARIES%%/vi_VN.bdic
+@dir %%QTWEBENGINE_DICTIONARIES%%