Attachment 274284 Details for Bug 297900 – update patch

[patch] update patch

dooble-2026.08.21.patch (text/plain), 6.15 KB, created by Eric Camachat on 2026-08-30 21:38:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Camachat

Created: 2026-08-30 21:38:55 UTC

Size: 6.15 KB

patch

obsolete

>diff --color=auto -purN a/www/dooble/Makefile b/www/dooble/Makefile
>--- a/www/dooble/Makefile	2026-07-29 09:54:00.678363000 -0500
>+++ b/www/dooble/Makefile	2026-08-30 16:06:27.061326000 -0500
>@@ -1,5 +1,5 @@ PORTNAME=	dooble
> PORTNAME=	dooble
>-DISTVERSION=	2026.05.15
>+DISTVERSION=	2026.08.21
> CATEGORIES=	www
> 
> MAINTAINER=	eric@camachat.org
>@@ -9,40 +9,38 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		compiler:c++17-lang desktop-file-utils gl gmake qmake qt:6 ssl \
>+USES=		compiler:c++17-lang desktop-file-utils gl gmake qmake qt:6 \
> 		tar xorg
>+
>+LIB_DEPENDS=	libgpgme.so:security/gpgme
>+
> 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
>+PLIST_SUB=		QTWEBENGINE_DICTIONARIES=${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
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/dooble.pro
> 
>-CONFLICTS_INSTALL=	pageedit
>-
>-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 \
>-		 ${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}
> 
>diff --color=auto -purN a/www/dooble/distinfo b/www/dooble/distinfo
>--- a/www/dooble/distinfo	2026-05-16 11:04:46.791725000 -0500
>+++ b/www/dooble/distinfo	2026-08-24 16:04:15.900912000 -0500
>@@ -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 --color=auto -purN a/www/dooble/files/patch-Source_dooble__settings.cc b/www/dooble/files/patch-Source_dooble__settings.cc
>--- a/www/dooble/files/patch-Source_dooble__settings.cc	1969-12-31 18:00:00.000000000 -0600
>+++ b/www/dooble/files/patch-Source_dooble__settings.cc	2026-08-30 16:25:03.678595000 -0500
>@@ -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 --color=auto -purN a/www/dooble/files/patch-dooble.pro b/www/dooble/files/patch-dooble.pro
>--- a/www/dooble/files/patch-dooble.pro	1969-12-31 18:00:00.000000000 -0600
>+++ b/www/dooble/files/patch-dooble.pro	2026-08-30 16:25:05.914528000 -0500
>@@ -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 \

Actions: View | Diff

Attachments on bug 297900: 274117 | 274158 | 274214 | 274284 | 274295