From 6d5397902a7881ac5a8fb08d9305d3f0b4c5ef29 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 21 Nov 2021 19:22:13 +0100
Subject: [PATCH] qutebrowser: bump version

---
 .../patches/qutebrowser-1.13.1.patchset       | 21 ----------
 .../patches/qutebrowser-2.4.0.patchset        | 22 ++++++++++
 ...1.13.1.recipe => qutebrowser-2.4.0.recipe} | 41 ++++++++-----------
 3 files changed, 38 insertions(+), 46 deletions(-)
 delete mode 100644 www-client/qutebrowser/patches/qutebrowser-1.13.1.patchset
 create mode 100644 www-client/qutebrowser/patches/qutebrowser-2.4.0.patchset
 rename www-client/qutebrowser/{qutebrowser-1.13.1.recipe => qutebrowser-2.4.0.recipe} (80%)

diff --git a/www-client/qutebrowser/patches/qutebrowser-1.13.1.patchset b/www-client/qutebrowser/patches/qutebrowser-1.13.1.patchset
deleted file mode 100644
index b4113be1d..000000000
--- a/www-client/qutebrowser/patches/qutebrowser-1.13.1.patchset
+++ /dev/null
@@ -1,21 +0,0 @@
-From 342880b65c3203052965da4534bbc9b645f0443c Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sun, 21 Apr 2019 22:13:29 +1000
-Subject: Disable OpenGL
-
-
-diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
-index c02b2f0..02fb0bf 100644
---- a/qutebrowser/misc/earlyinit.py
-+++ b/qutebrowser/misc/earlyinit.py
-@@ -237,7 +237,6 @@ def check_libraries():
-         'attr': _missing_str("attrs"),
-         'PyQt5.QtQml': _missing_str("PyQt5.QtQml"),
-         'PyQt5.QtSql': _missing_str("PyQt5.QtSql"),
--        'PyQt5.QtOpenGL': _missing_str("PyQt5.QtOpenGL"),
-     }
-     _check_modules(modules)
- 
--- 
-2.26.0
-
diff --git a/www-client/qutebrowser/patches/qutebrowser-2.4.0.patchset b/www-client/qutebrowser/patches/qutebrowser-2.4.0.patchset
new file mode 100644
index 000000000..e42d02d8b
--- /dev/null
+++ b/www-client/qutebrowser/patches/qutebrowser-2.4.0.patchset
@@ -0,0 +1,22 @@
+From 0372cd480a238754e83c9ae0ac38ec6b3e1da50c Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sun, 21 Nov 2021 19:07:13 +0100
+Subject: setuptools can't find importlib_resources correctly...
+
+
+diff --git a/setup.py b/setup.py
+index 4c4bd32..1b90b26 100755
+--- a/setup.py
++++ b/setup.py
+@@ -73,7 +73,7 @@ try:
+         zip_safe=True,
+         install_requires=['jinja2', 'PyYAML',
+                           'dataclasses; python_version < "3.7"',
+-                          'importlib_resources>=1.1.0; python_version < "3.9"'],
++                          'importlib_resources>=1.1.0; python_version < "3.8"'],
+         python_requires='>=3.6',
+         name='qutebrowser',
+         version=_get_constant('version'),
+-- 
+2.30.2
+
diff --git a/www-client/qutebrowser/qutebrowser-1.13.1.recipe b/www-client/qutebrowser/qutebrowser-2.4.0.recipe
similarity index 80%
rename from www-client/qutebrowser/qutebrowser-1.13.1.recipe
rename to www-client/qutebrowser/qutebrowser-2.4.0.recipe
index 2a46f7042..8d1f4f55d 100644
--- a/www-client/qutebrowser/qutebrowser-1.13.1.recipe
+++ b/www-client/qutebrowser/qutebrowser-2.4.0.recipe
@@ -5,9 +5,9 @@ It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl."
 HOMEPAGE="https://qutebrowser.org/"
 COPYRIGHT="2014-2020 Florian Bruhin (The Compiler)"
 LICENSE="GNU GPL v3"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/qutebrowser/qutebrowser/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="126afbc9325ff45bc2886545d61f74ba321569bd39090513e9fc6536fa5b900e"
+CHECKSUM_SHA256="71d7826042a5c63076c85a5a001a4a4f7bea6f6c0f25308e6e0d46b0b31e93ca"
 PATCHES="qutebrowser-$portVersion.patchset"
 PYTHON_VERSION="3.8"
 ADDITIONAL_FILES="qutebrowser.rdef.in"
@@ -21,10 +21,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	attrs_python38
+	importlib_resources_python38
 	jinja_python38
-	pygments_python38
-	pypeg2_python38
 	pyqt5_python38
 	pyyaml_python38
 	setuptools_python38
@@ -34,26 +32,34 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	attrs_python38
+	importlib_resources_python38
 	jinja_python38
-	pygments_python38
-	pypeg2_python38
 	pyyaml_python38
 	setuptools_python38
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
 	cmd:python$PYTHON_VERSION
+	cmd:a2x
+	cmd:make
 	"
 
 BUILD()
 {
 	python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python$PYTHON_VERSION
-	$python ./setup.py build $jobArgs
+	make -f misc/Makefile PYTHON=$python all
 }
 
 INSTALL()
 {
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python$PYTHON_VERSION
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation $appsDir
+
+	make -f misc/Makefile PREFIX=$prefix PYTHON=$python DATAROOTDIR=$dataDir install
+
 	# Add Haiku resources
 	local APP_SIGNATURE="application/x-vnd.qutebrowser"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -69,24 +75,9 @@ INSTALL()
 		$portDir/additional-files/qutebrowser.rdef.in \
 			> qutebrowser.rdef
 
-	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python$PYTHON_VERSION
-	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
-	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
-	export PYTHONPATH=$installLocation:$PYTHONPATH
-	mkdir -p $installLocation $appsDir
-
-	$python setup.py install --prefix $prefix
-
 	mv $prefix/bin/qutebrowser $appsDir/QuteBrowser
 	rm -rf $prefix/bin
 
-	sed -i '/import sys/a import os\nimport signal' $appsDir/QuteBrowser
-	sed -i '/sys.exit(/d' $appsDir/QuteBrowser
-	sed -i '$d' $appsDir/QuteBrowser
-	sed -i 's/    load/load/g' $appsDir/QuteBrowser
-	sed -i '$a\    os.kill(os.getpid(), signal.SIGTERM)' $appsDir/QuteBrowser
-
 	settype -t application/x-vnd.Be-elfexecutable \
 		$appsDir/QuteBrowser