Attachment 244683 Details for Bug 273252 – updated patch without MOVED changes

[patch] updated patch without MOVED changes

0001-www-qutebrowser-Update-to-3.0.0-and-flavourise.patch (text/plain), 3.85 KB, created by Roman Bogorodskiy on 2023-09-06 18:34:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Bogorodskiy

Created: 2023-09-06 18:34:29 UTC

Size: 3.85 KB

patch

obsolete

>From a64eb4b5ee4e3c0c0bf53dcc1e08da2bc3e7c182 Mon Sep 17 00:00:00 2001
>From: Alastair Hogge <agh@riseup.net>
>Date: Wed, 6 Sep 2023 18:35:10 +0200
>Subject: [PATCH] www/qutebrowser: Update to 3.0.0 and flavourise
>
> - Update to 3.0.0
> - Flavourise WebEngine with Qt-5 or Qt-6, Qt-6 being default
>   version as per upstream
> - Add ${LICENSE_FILE}
> - Pet portlint
>
>PR:		273252
>Reviewed by:	eduardo
>Approved by:	novel (maintainer)
>---
> www/qutebrowser/Makefile | 48 ++++++++++++++++++++++++++++++----------
> www/qutebrowser/distinfo |  6 ++---
> 2 files changed, 39 insertions(+), 15 deletions(-)
>
>diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile
>index 3125c14a44ed..8e8f048276e5 100644
>--- a/www/qutebrowser/Makefile
>+++ b/www/qutebrowser/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	qutebrowser
>-DISTVERSION=	2.5.4
>-PORTREVISION=	1
>+DISTVERSION=	3.0.0
> CATEGORIES=	www
> MASTER_SITES=	PYPI
> 
>@@ -9,29 +8,51 @@ COMMENT=	Keyboard-focused browser with a minimal GUI
> WWW=		https://www.qutebrowser.org/
> 
> LICENSE=	GPLv3
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	\
>-		${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
> 
>-USES=		cpe desktop-file-utils python pyqt:5 qt:5
>-USE_PYQT=	pyqt5 webengine
>-USE_PYTHON=	distutils autoplist noflavors
>+FLAVORS=	qt5 qt6
>+FLAVOR?=	${FLAVORS:[2]}
>+
>+USES=		cpe desktop-file-utils python
>+USE_PYQT=	webengine
>+USE_PYTHON=	autoplist noflavors pep517
>+
>+qt5_PKGNAMESUFFIX=	-qt5
>+qt5_CONFLICTS_INSTALL=	${PORTNAME}
>+
>+qt6_CONFLICTS_INSTALL=	${PORTNAME}-qt5
>+
>+.if ${FLAVOR:U} == "qt5"
>+USES+=		pyqt:5 qt:5
>+USE_PYQT+=	pyqt5
> USE_QT=		sql-sqlite3
>+.else
>+USES+=		pyqt:6 qt:6
>+USE_PYQT+=	pyqt6
>+USE_QT=		base declarative quick3d sqldriver-sqlite:run webengine \
>+		websockets tools:build
>+.endif
> 
> # Upstream archive contains files with UTF-8 names
>-EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
>+EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
> NO_ARCH=	yes
>-PLIST_FILES=	share/applications/${PORTNAME}-${PYTHON_VER}.desktop
>+PLIST_FILES=	share/applications/${PORTNAME}-${PYTHON_VER}.desktop \
>+		share/man/man1/${PORTNAME}.1.gz
> 
> OPTIONS_DEFINE_amd64=	ADBLOCK
> OPTIONS_DEFAULT_amd64=	ADBLOCK
> 
>-ADBLOCK_DESC=		Enable the newer adblocking support
>+ADBLOCK_DESC=	Enable the newer adblocking support
> 
> ADBLOCK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}adblock>=0.4.2:www/py-adblock@${PY_FLAVOR}
> 
>@@ -45,4 +66,7 @@ post-install:
> 	${INSTALL_DATA} ${WRKSRC}/misc/org.qutebrowser.qutebrowser.desktop \
> 		${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}-${PYTHON_VER}.desktop
> 
>+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
>+		${STAGEDIR}${PREFIX}/share/man/man1
>+
> .include <bsd.port.post.mk>
>diff --git a/www/qutebrowser/distinfo b/www/qutebrowser/distinfo
>index f52b55b66d00..dfdcd5803129 100644
>--- a/www/qutebrowser/distinfo
>+++ b/www/qutebrowser/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1678815951
>-SHA256 (qutebrowser-2.5.4.tar.gz) = a460b2202527e42a670c26d225d9fa6417d092cc1f16f3a95e7bc95dd89c1ab1
>-SIZE (qutebrowser-2.5.4.tar.gz) = 6117674
>+TIMESTAMP = 1692525167
>+SHA256 (qutebrowser-3.0.0.tar.gz) = 39eaf4a7f0f051f39e8d40a04824a432f2cb023372271e75aa037b6dc410d8fc
>+SIZE (qutebrowser-3.0.0.tar.gz) = 6030459
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 273252: 244240 | 244276 | 244650 | 244654 | 244661 | 244663 | 244669 | 244683