From nobody Mon Apr 24 16:30:50 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q4rGf3jJfz473t8; Mon, 24 Apr 2023 16:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q4rGf3GW9z4Ch9; Mon, 24 Apr 2023 16:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682353850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gczMvaicEou381+Xi9YxaGA6PudrwW5BR8flJOlGFjQ=; b=EzI3jW//PtI5TLfR8Np/9fay8dUY14X/ptIXUXpxucOXtrLjV6VNeW3XvCyoFLh+o9WCv5 EfL8yUpHFGvYPgSjXlEMtOymxfsf64LpYX9svJ16k3mvBTg6Zs3wRf9AyylkcoEpdh7sG6 ulRUfoNhqsLwqc16wqwboFIrjZJOBQVapCgagSfhEJX2OnuxCrmL77aaRgrzox0Dwu1Zmk ZcJ9kQaIsIV1f69oDBLjsEYYFF9KIyxhlg5pUPh/vU1vnBQQpG1+vZrkcgt1zEghwbFM40 37Jv2cuclttjAOXiSwuuuJzJaLOmgwXlPs/bbi/zdkn8k/QnoVBvAvhsIDX5ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682353850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gczMvaicEou381+Xi9YxaGA6PudrwW5BR8flJOlGFjQ=; b=E2ko/qYgnwfWA7sY9Qo45zSSd4wHRBFvzdeEwoxvZv0CpatNJ14/hylDnLYbEUt6+PsubK SqhPNl2Y7vF52vwKJDaWX95g5nwZ679phTdab3yxBAV9zdcdo2VE0NO5rXjR+jPrwhDPhz /yu/dwcldGgBxp5RduzYq6nPZkHQ31JT2aOpsrSiUxHpg81GxiYQ3N2W6VHti4Rclh3pB8 dtfmP9OUYu5uevusLgjyObeLC30fcpJKpaGfWbiZz7At97DdmCFGyqnynA5pPHlOTKJx0r dF9xOBc8514eOcp43Q05IhIJAxHWmBmYhRvRVpZwqWXPOm85s2eMxsLxG/jODA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682353850; a=rsa-sha256; cv=none; b=vTbcLqbIGzNzclecXbZg9VTZO8pJusBLUD7olDPR12R2gusRWvdpTuVPJ11CbSM1FV6M18 ruG08Mtbqd4+1v6QnQy38UV3CU0EBJkfeTPLy+HVAXk9/vq6HzSOgsr7ulSX+toMd6mrvp 9ed+yLSEiyXcHdG4hTgNMYG2wD0JZzndwKZjoEBh78pWYXqHtjgw6cvunjjWla6jcYUCfZ yl4f0+UPbWrYvKfhAVOHEvHFpZsvSdMr1LXvU19Bg+Wl73fCRMjOmcyM84DVdu3BRwfJUT MWihsCkOLqY5Z3NNtVvyLR6+oQWaSr6E1Awcp4QmBDlHs1nSh9qz0osG1tja3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q4rGf2MPvzXqT; Mon, 24 Apr 2023 16:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33OGUoQE061056; Mon, 24 Apr 2023 16:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OGUoUg061055; Mon, 24 Apr 2023 16:30:50 GMT (envelope-from git) Date: Mon, 24 Apr 2023 16:30:50 GMT Message-Id: <202304241630.33OGUoUg061055@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: eef49b8e794c - main - www/dooble: update to 2023.04.20 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eef49b8e794c35ed8e13b7d91986db537945a98e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=eef49b8e794c35ed8e13b7d91986db537945a98e commit eef49b8e794c35ed8e13b7d91986db537945a98e Author: Eric Camachat AuthorDate: 2023-04-22 10:50:14 +0000 Commit: Fernando Apesteguía CommitDate: 2023-04-24 16:25:39 +0000 www/dooble: update to 2023.04.20 ChangeLog: https://github.com/textbrowser/dooble/releases/tag/2023.04.20 Flavorize port (qt5, qt6) 2023.04.10 Release Notes * AdGuard DNS file processing. Dooble will now allow importing of https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt. Basic interpretation is included. For example, ||url^ is blocked. All other entries are ignored. Please see Data/dooble_filter.txt. * Include default HTTP agent string in About. * Listen on fullScreenRequested() signal and accept the request. Address, menu bar, and status bar widgets will be hidden. Other widgets (find, page notifications, etc.) will remain visible. The Escape key may be used to exit a full-screen mode. * Native dialogs. * Non-modal import dialog on MacOS. The dialog offers a simple explanation of the import process. * Qt 6.5 LTS. * Replaced Q_OS_MAC with Q_OS_MACOS. * Updated Data/dooble_accepted_or_blocked_domains.txt. 2023.04.10 Release Notes * Avoid native file dialogs. * FreeBSD and Qt 6.4. Dooble does not provide support for non-LTS. This is a brief exception. * Set a page's address text as soon as possible. PR: 270850 Reported by: eric@camachat.org (maintainer) --- www/dooble/Makefile | 18 +++++++++++++++--- www/dooble/distinfo | 6 +++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/www/dooble/Makefile b/www/dooble/Makefile index f46b2274ca23..d2590983ab21 100644 --- a/www/dooble/Makefile +++ b/www/dooble/Makefile @@ -1,6 +1,7 @@ PORTNAME= dooble -DISTVERSION= 2023.04.01 +DISTVERSION= 2023.04.20 CATEGORIES= www +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= eric@camachat.org COMMENT= Dooble Web Browser @@ -9,14 +10,23 @@ WWW= https://textbrowser.github.io/dooble/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= compiler:c++17-lang desktop-file-utils gl gmake qmake qt:5 ssl \ +FLAVORS= qt5 qt6 +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 USE_QT= 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 webchannel webengine +.endif USE_XORG= xcb QMAKE_SOURCE_PATH= ${PORTNAME}.pro @@ -27,17 +37,19 @@ PLIST_FILES= ${PREFIX}/share/applications/${PORTNAME}.desktop \ .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=${PREFIX}/bin/${PORTNAME} ${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 diff --git a/www/dooble/distinfo b/www/dooble/distinfo index 56f85a48e9fa..d8accc5d5559 100644 --- a/www/dooble/distinfo +++ b/www/dooble/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680379072 -SHA256 (textbrowser-dooble-2023.04.01_GH0.tar.gz) = e5db6cec9e281a7a054c64f5211ed72606117407ea4bb939762ad297fa8a8f3b -SIZE (textbrowser-dooble-2023.04.01_GH0.tar.gz) = 92588583 +TIMESTAMP = 1682008357 +SHA256 (textbrowser-dooble-2023.04.20_GH0.tar.gz) = 5425a5ad6753c08df061a8b78fa4aba035a915327d7b967eab3f0a6479eb869c +SIZE (textbrowser-dooble-2023.04.20_GH0.tar.gz) = 93786166