diff --git a/www/dooble/Makefile b/www/dooble/Makefile index 1e266c545575..598c5eb6fdff 100644 --- a/www/dooble/Makefile +++ b/www/dooble/Makefile @@ -1,56 +1,53 @@ 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/ 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 \ tar xorg USE_GITHUB= yes 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 QMAKE_SOURCE_PATH= ${PORTNAME}.pro PLIST_FILES= ${PREFIX}/share/applications/${PORTNAME}.desktop \ ${PREFIX}/share/pixmaps/${PORTNAME}.png \ bin/${PORTNAME} -.include - -.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 ${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 -.include +.include diff --git a/www/dooble/distinfo b/www/dooble/distinfo index 991d0b0620d5..1d230049d02e 100644 --- a/www/dooble/distinfo +++ b/www/dooble/distinfo @@ -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