Attachment #244663 for bug #273252

Lines 7847-7849 devel/rubygem-cucumber-cucumber-expressions15\|devel/rubygem-cucumber-cucumber-ex Link Here

(-)b/MOVED (+1 lines)
7847	devel/rubygem-cucumber-messages18\|devel/rubygem-cucumber-messages\|2023-09-04\|Remove obsoleted port. Use devel/rubygem-cucumber-messages instead	7847	devel/rubygem-cucumber-messages18\|devel/rubygem-cucumber-messages\|2023-09-04\|Remove obsoleted port. Use devel/rubygem-cucumber-messages instead
7848	textproc/rubygem-cucumber-gherkin23\|textproc/rubygem-cucumber-gherkin\|2023-09-04\|Remove obsoleted port. Use textproc/rubygem-cucumber-gherkin instead	7848	textproc/rubygem-cucumber-gherkin23\|textproc/rubygem-cucumber-gherkin\|2023-09-04\|Remove obsoleted port. Use textproc/rubygem-cucumber-gherkin instead
7849	textproc/rubygem-cucumber-html-formatter19\|textproc/rubygem-cucumber-html-formatter\|2023-09-04\|Remove obsoleted port. Use textproc/rubygem-cucumber-html-formatter instead	7849	textproc/rubygem-cucumber-html-formatter19\|textproc/rubygem-cucumber-html-formatter\|2023-09-04\|Remove obsoleted port. Use textproc/rubygem-cucumber-html-formatter instead
		7850	www/qutebrowser\|\|2023-09-05\|Flavorize, use qutebrowser@qt5 (default), or www/qutebrowser@qt6




PORTNAME=	qutebrowser
DISTVERSION=	3.0.0
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	PYPI


WWW=		https://www.qutebrowser.org/

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/LICENSE

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}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} \
		nvim-qt:editors/neovim-qt@${FLAVOR}

FLAVORS=	qt5 qt6
FLAVOR?=	${FLAVORS:[1]}

USES=		cpe desktop-file-utils dos2unix python
USE_PYQT=	webengine
USE_PYTHON=	autoplist noflavors pep517

qt5_PKGNAMESUFFIX=	-qt5
qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt6

qt6_PKGNAMESUFFIX=	-qt6
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 ${TAR}
NO_ARCH=	yes
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_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}adblock>=0.4.2:www/py-adblock@${PY_FLAVOR}


	${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>

Lines 1-3 Link Here

(-)b/www/qutebrowser/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1678815951	1	TIMESTAMP = 1692525167
2	SHA256 (qutebrowser-2.5.4.tar.gz) = a460b2202527e42a670c26d225d9fa6417d092cc1f16f3a95e7bc95dd89c1ab1	2	SHA256 (qutebrowser-3.0.0.tar.gz) = 39eaf4a7f0f051f39e8d40a04824a432f2cb023372271e75aa037b6dc410d8fc
3	SIZE (qutebrowser-2.5.4.tar.gz) = 6117674	3	SIZE (qutebrowser-3.0.0.tar.gz) = 6030459




--- qutebrowser/config/configdata.yml.orig	2023-09-05 05:16:58 UTC
+++ qutebrowser/config/configdata.yml
@@ -1487,12 +1487,13 @@ editor.command:
   type:
     name: ShellCommand
     placeholder: true
-  default: ["gvim", "-f", "{file}", "-c", "normal {line}G{column0}l"]
+  default: ["nvim-qt", "{file}", "--", "+{line}"]
   desc: |
     Editor (and arguments) to use for the `edit-*` commands.
     The following placeholders are defined:
 
     * `{file}`: Filename of the file to be edited.
+    * `--`: Additional arguments passed to Neovim.
     * `{line}`: Line in which the caret is found in the text.
     * `{column}`: Column in which the caret is found in the text.
     * `{line0}`: Same as `{line}`, but starting from index 0.




--- qutebrowser/html/doc/settings.html.orig	2023-09-05 14:11:08 UTC
+++ qutebrowser/html/doc/settings.html
@@ -6283,6 +6283,7 @@ If set to -1, downloads are never removed.</p></div>
 <div class="sect2">
 <h3 id="editor.command">editor.command</h3>
 <div class="paragraph"><p>Editor (and arguments) to use for the <code>edit-*</code> commands.
+For nvim-qt, <code>--</code>, is used to pass additional argument to Neovim.
 The following placeholders are defined:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -6316,27 +6317,22 @@ The following placeholders are defined:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<code>gvim</code>
+<code>nvim-qt</code>
 </p>
 </li>
 <li>
 <p>
-<code>-f</code>
-</p>
-</li>
-<li>
-<p>
 <code>{file}</code>
 </p>
 </li>
 <li>
 <p>
-<code>-c</code>
+<code>--</code>
 </p>
 </li>
 <li>
 <p>
-<code>normal {line}G{column0}l</code>
+<code>+{line}</code>
 </p>
 </li>
 </ul></div>




--- qutebrowser/misc/editor.py.orig	2023-09-05 00:27:36 UTC
+++ qutebrowser/misc/editor.py
@@ -203,8 +203,8 @@ class ExternalEditor(QObject):
 
         Both line and column are 1-based indexes, because that's what most
         editors use as line and column starting index.  By "most" we mean at
-        least vim, nvim, gvim, emacs, atom, sublimetext, notepad++, brackets,
-        visual studio, QtCreator and so on.
+        least vim, nvim, nvim-qt (default), gvim, emacs, atom, sublimetext,
+        notepad++, brackets, visual studio, QtCreator and so on.
 
         To find the line we just count how many newlines there are before the
         caret and add 1.

Return to bug 273252

Lines 1-6 Link Here

(-)b/www/qutebrowser/Makefile (-11 / +37 lines)
1	PORTNAME= qutebrowser	1	PORTNAME= qutebrowser
2	DISTVERSION= 2.5.4	2	DISTVERSION= 3.0.0
3	PORTREVISION= 1
4	CATEGORIES= www	3	CATEGORIES= www
5	MASTER_SITES= PYPI	4	MASTER_SITES= PYPI
6		5
Lines 9-37 COMMENT= Keyboard-focused browser with a minimal GUI Link Here
9	WWW= https://www.qutebrowser.org/	8	WWW= https://www.qutebrowser.org/
10		9
11	LICENSE= GPLv3	10	LICENSE= GPLv3
		11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
13	RUN_DEPENDS= \	13	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
14	${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \	14	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
		15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
15	${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \	16	${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
16	${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
		19	${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR} \
		20	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \	21	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR}	22	nvim-qt:editors/neovim-qt@${FLAVOR}
20		23
21	USES= cpe desktop-file-utils python pyqt:5 qt:5	24	FLAVORS= qt5 qt6
22	USE_PYQT= pyqt5 webengine	25	FLAVOR?= ${FLAVORS:[1]}
23	USE_PYTHON= distutils autoplist noflavors	26
		27	USES= cpe desktop-file-utils dos2unix python
		28	USE_PYQT= webengine
		29	USE_PYTHON= autoplist noflavors pep517
		30
		31	qt5_PKGNAMESUFFIX= -qt5
		32	qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6
		33
		34	qt6_PKGNAMESUFFIX= -qt6
		35	qt6_CONFLICTS_INSTALL= ${PORTNAME}-qt5
		36
		37	.if ${FLAVOR:U} == "qt5"
		38	USES+= pyqt:5 qt:5
		39	USE_PYQT+= pyqt5
24	USE_QT= sql-sqlite3	40	USE_QT= sql-sqlite3
		41	.else
		42	USES+= pyqt:6 qt:6
		43	USE_PYQT+= pyqt6
		44	USE_QT= base declarative quick3d sqldriver-sqlite:run webengine \
		45	websockets tools:build
		46	.endif
25		47
26	# Upstream archive contains files with UTF-8 names	48	# Upstream archive contains files with UTF-8 names
27	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar	49	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
28	NO_ARCH= yes	50	NO_ARCH= yes
29	PLIST_FILES= share/applications/${PORTNAME}-${PYTHON_VER}.desktop	51	PLIST_FILES= share/applications/${PORTNAME}-${PYTHON_VER}.desktop \
		52	share/man/man1/${PORTNAME}.1.gz
30		53
31	OPTIONS_DEFINE_amd64= ADBLOCK	54	OPTIONS_DEFINE_amd64= ADBLOCK
32	OPTIONS_DEFAULT_amd64= ADBLOCK	55	OPTIONS_DEFAULT_amd64= ADBLOCK
33		56
34	ADBLOCK_DESC= Enable the newer adblocking support	57	ADBLOCK_DESC= Enable the newer adblocking support
35		58
36	ADBLOCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}adblock>=0.4.2:www/py-adblock@${PY_FLAVOR}	59	ADBLOCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}adblock>=0.4.2:www/py-adblock@${PY_FLAVOR}
37		60
Lines 45-48 post-install: Link Here
45	${INSTALL_DATA} ${WRKSRC}/misc/org.qutebrowser.qutebrowser.desktop \	68	${INSTALL_DATA} ${WRKSRC}/misc/org.qutebrowser.qutebrowser.desktop \
46	${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}-${PYTHON_VER}.desktop	69	${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}-${PYTHON_VER}.desktop
47		70
		71	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
		72	${STAGEDIR}${PREFIX}/share/man/man1
		73
48	.include <bsd.port.post.mk>	74	.include <bsd.port.post.mk>

Added Link Here

(-)b/www/qutebrowser/files/patch-qutebrowser_config_configdata.yml (+17 lines)
1	--- qutebrowser/config/configdata.yml.orig 2023-09-05 05:16:58 UTC
2	+++ qutebrowser/config/configdata.yml
3	@@ -1487,12 +1487,13 @@ editor.command:
4	type:
5	name: ShellCommand
6	placeholder: true
7	- default: ["gvim", "-f", "{file}", "-c", "normal {line}G{column0}l"]
8	+ default: ["nvim-qt", "{file}", "--", "+{line}"]
9	desc: \|
10	Editor (and arguments) to use for the `edit-*` commands.
11	The following placeholders are defined:
12
13	* `{file}`: Filename of the file to be edited.
14	+ * `--`: Additional arguments passed to Neovim.
15	* `{line}`: Line in which the caret is found in the text.
16	* `{column}`: Column in which the caret is found in the text.
17	* `{line0}`: Same as `{line}`, but starting from index 0.

Added Link Here

(-)b/www/qutebrowser/files/patch-qutebrowser_html_doc_settings.html (+41 lines)
1	--- qutebrowser/html/doc/settings.html.orig 2023-09-05 14:11:08 UTC
2	+++ qutebrowser/html/doc/settings.html
3	@@ -6283,6 +6283,7 @@ If set to -1, downloads are never removed.</p></div>
4	<div class="sect2">
5	<h3 id="editor.command">editor.command</h3>
6	<div class="paragraph"><p>Editor (and arguments) to use for the <code>edit-*</code> commands.
7	+For nvim-qt, <code>--</code>, is used to pass additional argument to Neovim.
8	The following placeholders are defined:</p></div>
9	<div class="ulist"><ul>
10	<li>
11	@@ -6316,27 +6317,22 @@ The following placeholders are defined:</p></div>
12	<div class="ulist"><ul>
13	<li>
14	<p>
15	-<code>gvim</code>
16	+<code>nvim-qt</code>
17	</p>
18	</li>
19	<li>
20	<p>
21	-<code>-f</code>
22	-</p>
23	-</li>
24	-<li>
25	-<p>
26	<code>{file}</code>
27	</p>
28	</li>
29	<li>
30	<p>
31	-<code>-c</code>
32	+<code>--</code>
33	</p>
34	</li>
35	<li>
36	<p>
37	-<code>normal {line}G{column0}l</code>
38	+<code>+{line}</code>
39	</p>
40	</li>
41	</ul></div>

Added Link Here

(-)b/www/qutebrowser/files/patch-qutebrowser_misc_editor.py (+13 lines)
1	--- qutebrowser/misc/editor.py.orig 2023-09-05 00:27:36 UTC
2	+++ qutebrowser/misc/editor.py
3	@@ -203,8 +203,8 @@ class ExternalEditor(QObject):
4
5	Both line and column are 1-based indexes, because that's what most
6	editors use as line and column starting index. By "most" we mean at
7	- least vim, nvim, gvim, emacs, atom, sublimetext, notepad++, brackets,
8	- visual studio, QtCreator and so on.
9	+ least vim, nvim, nvim-qt (default), gvim, emacs, atom, sublimetext,
10	+ notepad++, brackets, visual studio, QtCreator and so on.
11
12	To find the line we just count how many newlines there are before the
13	caret and add 1.