From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: UPDATE: dooble-2025.07.04
To: ports@openbsd.org
Cc: Brian Callahan <bcallah@openbsd.org>
Date: Sun, 13 Jul 2025 09:21:39 +0200

Simple update dooble-2025.07.04. Tested on amd64. OK?

Cheers Rafael

diff --git a/www/dooble/Makefile b/www/dooble/Makefile
index 946f5ede587..d8f026ab11e 100755
--- a/www/dooble/Makefile
+++ b/www/dooble/Makefile
@@ -5,7 +5,7 @@ CATEGORIES =	www x11
 
 GH_ACCOUNT =	textbrowser
 GH_PROJECT =	dooble
-GH_TAGNAME =	2023.07.15
+GH_TAGNAME =	2025.07.04
 
 HOMEPAGE =	https://textbrowser.github.io/dooble/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -13,17 +13,20 @@ MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
 # BSD
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Charts Qt5Concurrent Qt5Core
-WANTLIB += Qt5Gui Qt5Network Qt5Positioning Qt5PrintSupport Qt5Qml
-WANTLIB += Qt5QmlModels Qt5Quick Qt5Sql Qt5WebChannel Qt5WebEngine
-WANTLIB += Qt5WebEngineCore Qt5WebEngineWidgets Qt5Widgets Qt5Xml
-WANTLIB += c m
+WANTLIB += ${COMPILER_LIBCXX} GL Qt6Charts Qt6Concurrent Qt6Core
+WANTLIB += Qt6Gui Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6Positioning
+WANTLIB += Qt6PrintSupport Qt6Qml Qt6QmlMeta Qt6QmlModels Qt6QmlWorkerScript
+WANTLIB += Qt6Quick Qt6Sql Qt6WebChannel Qt6WebEngineCore Qt6WebEngineWidgets
+WANTLIB += Qt6Widgets Qt6Xml c m
 
 MODULES =	devel/qmake \
-		x11/qt5
+		x11/qt6
 
-LIB_DEPENDS =	x11/qt5/qtcharts \
-		x11/qt5/qtwebengine
+LIB_DEPENDS =	x11/qt6/qtcharts \
+		x11/qt6/qtdeclarative \
+		x11/qt6/qtpositioning \
+		x11/qt6/qtwebchannel \
+		x11/qt6/qtwebengine
 
 RUN_DEPENDS =	devel/desktop-file-utils
 
@@ -35,12 +38,15 @@ USE_GMAKE =	Yes
 
 NO_TEST =	Yes
 
+post-patch:
+	${SUBST_CMD} ${WRKSRC}/dooble.pro
+
 # No install routine.
 # Taken from FreeBSD.
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Dooble ${PREFIX}/bin/dooble
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-	${SUBST_CMD} -c ${WRKSRC}/dooble.desktop \
+	${SUBST_CMD} -c ${WRKSRC}/Distributions/dooble.desktop \
 		${PREFIX}/share/applications/dooble.desktop
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/Icons/Logo/dooble.png \
diff --git a/www/dooble/distinfo b/www/dooble/distinfo
index 5d8d0348fac..f3236375596 100644
--- a/www/dooble/distinfo
+++ b/www/dooble/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dooble-2023.07.15.tar.gz) = yO7TYNlA1yS/I9vHotukpTMSvZey1WO3evAnoiB5qU4=
-SIZE (dooble-2023.07.15.tar.gz) = 90240040
+SHA256 (dooble-2025.07.04.tar.gz) = pHBWmoFgsNOKtyhrcEFFK1TLW0vRMfa9xYlMYesCQ6U=
+SIZE (dooble-2025.07.04.tar.gz) = 6507557
diff --git a/www/dooble/patches/patch-Distributions_dooble_desktop b/www/dooble/patches/patch-Distributions_dooble_desktop
new file mode 100644
index 00000000000..29178ad1cca
--- /dev/null
+++ b/www/dooble/patches/patch-Distributions_dooble_desktop
@@ -0,0 +1,13 @@
+Make sure Exec points to the correct place.
+Index: Distributions/dooble.desktop
+--- Distributions/dooble.desktop.orig
++++ Distributions/dooble.desktop
+@@ -3,7 +3,7 @@
+ [Desktop Entry]
+ Categories=Network;WebBrowser;
+ Comment=Dooble Web Browser
+-Exec=/usr/bin/dooble
++Exec=${TRUEPREFIX}/bin/dooble
+ GenericName=Dooble Web Browser
+ Icon=dooble
+ Name=Dooble Web Browser
diff --git a/www/dooble/patches/patch-dooble_desktop b/www/dooble/patches/patch-dooble_desktop
deleted file mode 100644
index 7a38b8e6908..00000000000
--- a/www/dooble/patches/patch-dooble_desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-Make sure Exec points to the correct place.
-
-Index: dooble.desktop
---- dooble.desktop.orig
-+++ dooble.desktop
-@@ -3,7 +3,7 @@
- [Desktop Entry]
- Categories=Network;WebBrowser;
- Comment=Dooble Web Browser
--Exec=/usr/bin/dooble
-+Exec=${TRUEPREFIX}/bin/dooble
- GenericName=Dooble Web Browser
- Icon=dooble
- Name=Dooble Web Browser
diff --git a/www/dooble/patches/patch-dooble_pro b/www/dooble/patches/patch-dooble_pro
index 8c9dd06826a..b2176499325 100644
--- a/www/dooble/patches/patch-dooble_pro
+++ b/www/dooble/patches/patch-dooble_pro
@@ -3,26 +3,39 @@ Remove -O3 and -Werror.
 Index: dooble.pro
 --- dooble.pro.orig
 +++ dooble.pro
-@@ -305,13 +305,12 @@ versionAtLeast(QT_VERSION, 6.0.0) {
- QMAKE_LFLAGS += /entry:mainCRTStartup
- }
+@@ -9,8 +9,9 @@ macx {
+ CONVERT_DICT = ""
  } else {
+ versionAtLeast(QT_VERSION, 6.0.0) {
+-freebsd-* {
++openbsd-* {
+ CONVERT_DICT = "/usr/local/libexec/qt6/qwebengine_convert_dict"
++CONVERT_DICT = "${LOCALBASE}/lib/qt6/libexec/qwebengine_convert_dict"
+ } else:win32 {
+ qtPrepareTool(CONVERT_DICT, qwebengine_convert_dict)
+ } else {
+@@ -262,14 +263,12 @@ TEMPLATE	= app
+ 
+ QMAKE_CLEAN     += Dooble
+ 
+-freebsd-* {
++freebsd-*|openbsd-* {
+ # Enable only if FreeBSD's Qt and WebEngine versions differ.
+ DEFINES -= DOOBLE_FREEBSD_WEBENGINE_MISMATCH
 -QMAKE_CXXFLAGS_RELEASE += -O3 \
-+QMAKE_CXXFLAGS_RELEASE += \
-                           -Wall \
- 			  -Warray-bounds=2 \
+-                          -Wall \
++QMAKE_CXXFLAGS_RELEASE += -Wall \
                            -Wcast-align \
                            -Wcast-qual \
-                           -Wdouble-promotion \
 -                          -Werror \
                            -Wextra \
-                           -Wformat-overflow=2 \
-                           -Wformat-security \
-@@ -342,7 +341,6 @@ QMAKE_CXXFLAGS_RELEASE += -Wl,-z,relro \
- versionAtLeast(QT_VERSION, 6.0.0) {
- QMAKE_CXXFLAGS_RELEASE += -Wno-int-in-bool-context
- }
+                           -Wformat=2 \
+                           -Wold-style-cast \
+@@ -285,7 +284,6 @@ QMAKE_CXXFLAGS_RELEASE += -O3 \
+                           -fwrapv \
+                           -pedantic \
+                           -std=c++17
 -QMAKE_CXXFLAGS_RELEASE -= -O2
- }
- 
- QMAKE_DISTCLEAN += -r qtwebengine_dictionaries \
+ } else:macx {
+ QMAKE_APPLE_DEVICE_ARCHS = arm64 x86_64
+ QMAKE_CXXFLAGS_RELEASE += -O3 \