git: a3c5311b86f1 - main - www/dooble: Update to 2026.08.21
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Sep 2026 21:53:19 UTC
The branch main has been updated by mce:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a3c5311b86f16ff058fb6ef4c94dba5e145571bd
commit a3c5311b86f16ff058fb6ef4c94dba5e145571bd
Author: Eric Camachat <eric@camachat.org>
AuthorDate: 2026-08-31 04:34:29 +0000
Commit: Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-09-01 21:51:41 +0000
www/dooble: Update to 2026.08.21
Link with gpgme for use with the application lock function.
Replace /usr/local with ${LOCALBASE}.
Install dictionaries into ${DATADIR} to avoid pageedit conflict.
Remove the unnecessary desktop-file-edit.
Changelog:
https://github.com/textbrowser/dooble/releases#release-2026.08.21
PR: 297900
Approved by: Eric Camachat <eric@camachat.org> (maintainer)
Approved by: osa (mentor)
Co-authored-by: mce
---
textproc/pageedit/Makefile | 2 --
www/dooble/Makefile | 32 ++++++++------------
www/dooble/distinfo | 6 ++--
www/dooble/files/patch-Source_dooble__settings.cc | 37 +++++++++++++++++++++++
www/dooble/files/patch-dooble.pro | 29 ++++++++++++++++++
5 files changed, 81 insertions(+), 25 deletions(-)
diff --git a/textproc/pageedit/Makefile b/textproc/pageedit/Makefile
index 6c43041c049a..70fcc3c94f03 100644
--- a/textproc/pageedit/Makefile
+++ b/textproc/pageedit/Makefile
@@ -17,6 +17,4 @@ USE_GL= opengl
USE_QT= base declarative positioning svg translations webchannel \
webengine
-CONFLICTS_INSTALL= dooble
-
.include <bsd.port.mk>
diff --git a/www/dooble/Makefile b/www/dooble/Makefile
index 9ea3431f57b2..2dd0e8fa47da 100644
--- a/www/dooble/Makefile
+++ b/www/dooble/Makefile
@@ -1,5 +1,5 @@
PORTNAME= dooble
-DISTVERSION= 2026.05.15
+DISTVERSION= 2026.08.21
CATEGORIES= www
MAINTAINER= eric@camachat.org
@@ -9,41 +9,33 @@ WWW= https://textbrowser.github.io/dooble/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= compiler:c++17-lang desktop-file-utils gl gmake qmake qt:6 ssl \
- tar xorg
+LIB_DEPENDS= libgpgme.so:security/gpgme
+
+USES= compiler:c++17-lang gl gmake qmake qt:6 tar xorg
USE_GITHUB= yes
GH_ACCOUNT= textbrowser
GH_TUPLE= textbrowser:dooble-dictionaries:0f1e715:dictionaries
-#textbrowser:dooble:${DISTVERSION}:DEFAULT
+
USE_GL= opengl
USE_QT= base charts declarative positioning sqldriver-sqlite:run \
webchannel webengine
USE_XORG= xcb
-QMAKE_ENV+= DOOBLE_DICTIONARIES_DIRECTORY=${WRKSRC_dictionaries}/Dictionaries
+QTWEBENGINE_DICTIONARIES= ${DATADIR}/qtwebengine_dictionaries
+QMAKE_ENV+= DOOBLE_DICTIONARIES_DIRECTORY=${WRKSRC_dictionaries}/Dictionaries \
+ QTWEBENGINE_DICTIONARIES_PATH=${QTWEBENGINE_DICTIONARIES}
QMAKE_SOURCE_PATH= dooble.pro
-CXXFLAGS+= -Wno-c++26-extensions
-
-CONFLICTS_INSTALL= pageedit
+PLIST_SUB= QTWEBENGINE_DICTIONARIES=${QTWEBENGINE_DICTIONARIES}
-QTWEBENGINE_DICTIONARIES= ${QT_DATADIR}/qtwebengine_dictionaries
-PLIST_SUB= QTWEBENGINE_DICTIONARIES=${QTWEBENGINE_DICTIONARIES}
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/dooble.pro
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/Dooble ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
- ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps \
- ${STAGEDIR}${QTWEBENGINE_DICTIONARIES}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${STAGEDIR}${QTWEBENGINE_DICTIONARIES}
${INSTALL_DATA} ${WRKSRC}/Icons/Logo/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/qtwebengine_dictionaries/*.bdic ${STAGEDIR}${QTWEBENGINE_DICTIONARIES}
- ${LOCALBASE}/bin/desktop-file-edit \
- --remove-category=Web \
- --add-category=Network \
- --add-category=WebBrowser \
- --set-key=Exec \
- --set-value="/usr/bin/env QTWEBENGINE_DICTIONARIES_PATH=${QTWEBENGINE_DICTIONARIES} ${PREFIX}/bin/${PORTNAME}" \
- --set-icon=${PREFIX}/share/pixmaps/${PORTNAME}.png \
- ${WRKSRC}/Distributions/${PORTNAME}.desktop
${INSTALL_DATA} ${WRKSRC}/Distributions/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
.include <bsd.port.mk>
diff --git a/www/dooble/distinfo b/www/dooble/distinfo
index ac38d6dbe056..31257d1b73b9 100644
--- a/www/dooble/distinfo
+++ b/www/dooble/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1778875192
-SHA256 (textbrowser-dooble-2026.05.15_GH0.tar.gz) = 3d2e23c440f54852582dc8555368548615aacd6e95531616e37919c5524cc751
-SIZE (textbrowser-dooble-2026.05.15_GH0.tar.gz) = 35612446
+TIMESTAMP = 1787605455
+SHA256 (textbrowser-dooble-2026.08.21_GH0.tar.gz) = 0c35db368b252775ecd885597234b8a632523db23b0b474ac18d3e51a4623f68
+SIZE (textbrowser-dooble-2026.08.21_GH0.tar.gz) = 36485031
SHA256 (textbrowser-dooble-dictionaries-0f1e715_GH0.tar.gz) = 474b2fd45429ed4cf68347dedd2c47650310d7e53a23cbeb8452655f596dc80c
SIZE (textbrowser-dooble-dictionaries-0f1e715_GH0.tar.gz) = 34764866
diff --git a/www/dooble/files/patch-Source_dooble__settings.cc b/www/dooble/files/patch-Source_dooble__settings.cc
new file mode 100644
index 000000000000..9fbe581df66e
--- /dev/null
+++ b/www/dooble/files/patch-Source_dooble__settings.cc
@@ -0,0 +1,37 @@
+--- Source/dooble_settings.cc.orig 2026-08-21 03:55:17 UTC
++++ Source/dooble_settings.cc
+@@ -2862,34 +2862,6 @@ void dooble_settings::show_qtwebengine_dictionaries_wa
+
+ auto const bytes(qEnvironmentVariable("QTWEBENGINE_DICTIONARIES_PATH"));
+
+- if(bytes.trimmed().isEmpty())
+- {
+- auto const directory
+- (QDir::currentPath() + QDir::separator() + "qtwebengine_dictionaries");
+-
+- m_ui.qtwebengine_dictionaries_warning_label->setText
+- (tr("<b>Warning!</b> "
+- "The directory qtwebengine_dictionaries cannot be accessed. "
+- "Dooble searched %1. Please read %2, line %3.").
+- arg(directory).arg(__FILE__).arg(__LINE__));
+-
+- if(!QFileInfo(directory).isReadable())
+- {
+- m_ui.qtwebengine_dictionaries_warning_label->setVisible(true);
+- return;
+- }
+- }
+- else if(!QFileInfo(bytes).isReadable())
+- {
+- m_ui.qtwebengine_dictionaries_warning_label->setText
+- (tr("<b>Warning!</b> "
+- "The directory qtwebengine_dictionaries cannot be accessed. "
+- "Dooble searched %1. Please read %2, line %3.").
+- arg(bytes.constData()).arg(__FILE__).arg(__LINE__));
+- m_ui.qtwebengine_dictionaries_warning_label->setVisible(true);
+- return;
+- }
+-
+ for(int i = 0; i < m_ui.dictionaries->count(); i++)
+ {
+ auto item = m_ui.dictionaries->item(i);
diff --git a/www/dooble/files/patch-dooble.pro b/www/dooble/files/patch-dooble.pro
new file mode 100644
index 000000000000..1ac3320b1b63
--- /dev/null
+++ b/www/dooble/files/patch-dooble.pro
@@ -0,0 +1,29 @@
+--- dooble.pro.orig 2026-08-21 03:55:17 UTC
++++ dooble.pro
+@@ -10,7 +10,7 @@ freebsd-* {
+ } else {
+ versionAtLeast(QT_VERSION, 6.0.0) {
+ freebsd-* {
+-CONVERT_DICT = "/usr/local/libexec/qt6/qwebengine_convert_dict"
++CONVERT_DICT = "%%LOCALBASE%%/libexec/qt6/qwebengine_convert_dict"
+ } else:win32 {
+ qtPrepareTool(CONVERT_DICT, qwebengine_convert_dict)
+ } else {
+@@ -208,7 +208,7 @@ freebsd-* {
+ build_deb.bash =
+
+ freebsd-* {
+-exists(/usr/local/include/gpgme.h) {
++exists(%%LOCALBASE%%/include/gpgme.h) {
+ DEFINES += DOOBLE_PEEKABOO
+ LIBS += -lgpgme
+ message("Discovered gpgme.h. Peekaboo activated!")
+@@ -281,7 +281,7 @@ QMAKE_CXXFLAGS_RELEASE += -O3 \
+ -Werror \
+ -Wextra \
+ -Wformat=2 \
+- -Wold-style-cast \
++ -Wno-old-style-cast \
+ -Woverloaded-virtual \
+ -Wpointer-arith \
+ -Wstack-protector \