kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/dooble: Fix build with upcoming Qt 6.6.0

Browse source 
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]
This commit is contained in:
Jason E. Hale 2023-11-03 00:23:16 -04:00
parent 4ed67700b8
commit 9c02656488
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
www/dooble/Makefile
View file

@ -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>

4
www/dooble/distinfo
View file

@ -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