From owner-svn-ports-head@freebsd.org Sat Mar 13 01:33:26 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 157A95B496E; Sat, 13 Mar 2021 01:33:26 +0000 (UTC) (envelope-from novel@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 4Dy4vV07x7z3h1r; Sat, 13 Mar 2021 01:33:26 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EB0EC22078; Sat, 13 Mar 2021 01:33:25 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12D1XPcL077579; Sat, 13 Mar 2021 01:33:25 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12D1XPWC077578; Sat, 13 Mar 2021 01:33:25 GMT (envelope-from novel@FreeBSD.org) Message-Id: <202103130133.12D1XPWC077578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Sat, 13 Mar 2021 01:33:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568225 - head/www/qutebrowser X-SVN-Group: ports-head X-SVN-Commit-Author: novel X-SVN-Commit-Paths: head/www/qutebrowser X-SVN-Commit-Revision: 568225 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Mar 2021 01:33:26 -0000 Author: novel Date: Sat Mar 13 01:33:25 2021 New Revision: 568225 URL: https://svnweb.freebsd.org/changeset/ports/568225 Log: www/qutebrowser: add adblock support - Introduce ADBLOCK option that adds adblock support via www/py-adblock. As py-adblock is currently available only for amd64, limit the option to amd64 too, - Reorder some Makefile variables based on portclippy suggestions. PR: 254131 Submitted by: Adam Jimerson Modified: head/www/qutebrowser/Makefile Modified: head/www/qutebrowser/Makefile ============================================================================== --- head/www/qutebrowser/Makefile Sat Mar 13 01:04:46 2021 (r568224) +++ head/www/qutebrowser/Makefile Sat Mar 13 01:33:25 2021 (r568225) @@ -2,7 +2,7 @@ PORTNAME= qutebrowser DISTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= CHEESESHOP @@ -22,25 +22,27 @@ RUN_DEPENDS= \ USES= desktop-file-utils python:3.6+ pyqt:5 qt:5 USE_PYQT= core opengl printsupport sql widgets qml -USE_QT= sql-sqlite3 USE_PYTHON= distutils autoplist noflavors +USE_QT= sql-sqlite3 +# Upstream archive contains files with UTF-8 names +EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar NO_ARCH= yes PLIST_FILES= share/applications/${PORTNAME}-${PYTHON_VER}.desktop -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - -OPTIONS_MULTI= BACKEND -OPTIONS_MULTI_BACKEND= WEBKIT WEBENGINE +OPTIONS_DEFINE_amd64= ADBLOCK OPTIONS_DEFAULT= WEBKIT -OPTIONS_DEFAULT_amd64= WEBENGINE +OPTIONS_DEFAULT_amd64= WEBENGINE ADBLOCK OPTIONS_DEFAULT_i386= WEBENGINE +OPTIONS_MULTI= BACKEND +OPTIONS_MULTI_BACKEND= WEBKIT WEBENGINE +ADBLOCK_DESC= Enable the newer adblocking support WEBENGINE_DESC= WebEngine webpage renderer support -WEBKIT_USE= PYQT=webkit,webkitwidgets +ADBLOCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}adblock>=0.4.2:www/py-adblock@${PY_FLAVOR} WEBENGINE_USE= PYQT=webengine,webchannel +WEBKIT_USE= PYQT=webkit,webkitwidgets .include