network/qutebrowser-bin: Updated for version 2.5.4_6d84462.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 31 insertions, 30 deletions

diff --git a/network/qutebrowser-bin/qutebrowser-bin.SlackBuild b/network/qutebrowser-bin/qutebrowser-bin.SlackBuild
index 10d8f064ad..6e0d05fdb7 100644
--- a/network/qutebrowser-bin/qutebrowser-bin.SlackBuild
+++ b/network/qutebrowser-bin/qutebrowser-bin.SlackBuild
@@ -25,9 +25,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=qutebrowser-bin
-VERSION=${VERSION:-2.5.4_5fa878c}
+VERSION=${VERSION:-2.5.4_6d84462}
 SSLVERSION=${SSLVERSION:-3.1.1}
-COMMIT=5fa878c7d190ba227aa05ab01385e640fc7ff42b
+COMMIT=6d84462d68ec1ce4cde459297e0c52ad3c2bf29f
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -68,8 +68,6 @@ sed -i.bak "s|\(run_venv(venv_dir, 'python', '-m', 'pip', 'install',\)|\1 \
 sed -i "/env\['PATH'\] = str(bin_path) + os.pathsep + env\['PATH'\]/d" \
   scripts/asciidoc2html.py
 
-sed -i 's/_DEFAULT_WRAPPER = "PyQt5"/_DEFAULT_WRAPPER = "PyQt6"/' qutebrowser/qt/machinery.py
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -77,8 +75,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python3 scripts/mkvenv.py --venv-dir .venv-qt6 --pyqt-version 6.5 \
-    --skip-smoke-test
+python3 scripts/mkvenv.py --skip-smoke-test
 
 mv scripts/mkvenv.py.bak scripts/mkvenv.py
 
@@ -86,12 +83,14 @@ find ./ -type f -name '*.pyc' -delete
 find ./ -type d -name '__pycache__' -delete
 find ./ -type f -exec sed -i -e "s|$PKG||" {} \;
 find ./ -type f -exec sed -i -e \
-  '1,2 s|^#!/usr/bin/env python.*$|#!/opt/qutebrowser/.venv-qt6/bin/python3|' {} \;
-.venv-qt6/bin/python3 -m compileall scripts/__init__.py \
+  '1,2 s|^#!/usr/bin/env python.*$|#!/opt/qutebrowser/.venv/bin/python3|' {} \;
+.venv/bin/python3 -m compileall scripts/__init__.py \
   scripts/setupcommon.py scripts/utils.py -fq
-.venv-qt6/bin/python3 -m compileall .venv-qt6/lib -fq
+.venv/bin/python3 -m compileall .venv/lib -fq
+
+find -L .venv/lib -type f -name "*.so" -exec chmod 755 {} \;
 
-.venv-qt6/bin/python3 scripts/asciidoc2html.py
+.venv/bin/python3 scripts/asciidoc2html.py
 a2x -f manpage doc/qutebrowser.1.asciidoc
 gzip -9 doc/qutebrowser.1
 mkdir -p $PKG/usr/man/man1
diff --git a/network/qutebrowser-bin/qutebrowser-bin.info b/network/qutebrowser-bin/qutebrowser-bin.info
index 4bc6907003..0aac38cc1f 100644
--- a/network/qutebrowser-bin/qutebrowser-bin.info
+++ b/network/qutebrowser-bin/qutebrowser-bin.info
@@ -1,41 +1,43 @@
 PRGNAM="qutebrowser-bin"
-VERSION="2.5.4_5fa878c"
+VERSION="2.5.4_6d84462"
 HOMEPAGE="https://qutebrowser.org"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/5fa878c/qutebrowser-5fa878c7d190ba227aa05ab01385e640fc7ff42b.tar.gz \
-                 https://files.pythonhosted.org/packages/08/e3/57d4c24a050aa0bcca46b2920bff40847db79535dc78141eb83581a52eb8/pip-23.1.2-py3-none-any.whl \
+DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/6d84462/qutebrowser-6d84462d68ec1ce4cde459297e0c52ad3c2bf29f.tar.gz \
+                 https://files.pythonhosted.org/packages/50/c2/e06851e8cc28dcad7c155f4753da8833ac06a5c704c109313b8d5a62968a/pip-23.2.1-py3-none-any.whl \
                  https://files.pythonhosted.org/packages/c7/42/be1c7bbdd83e1bfb160c94b9cafd8e25efc7400346cf7ccdbdb452c467fa/setuptools-68.0.0-py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/61/86/cc8d1ff2ca31a312a25a708c891cf9facbad4eae493b3872638db6785eb5/wheel-0.40.0-py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/9c/3c/44083f0075c41532209e76c9d3ac1bd5799dabafbd4465cbb2bcb715a2e7/PyQt6-6.5.1-1-cp37-abi3-manylinux_2_28_x86_64.whl \
-                 https://files.pythonhosted.org/packages/c4/35/5a75e038f96afbf2310dc0574d52370ec7b4b269dedd48b99320dc890ce6/PyQt6_Qt6-6.5.1-py3-none-manylinux_2_28_x86_64.whl \
-                 https://files.pythonhosted.org/packages/d9/27/896cd83d72d59916f7b4864da611912a1e94f2604c3ab2f183589c87f652/PyQt6_sip-13.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl \
+                 https://files.pythonhosted.org/packages/17/11/f139e25018ea2218aeedbedcf85cd0dd8abeed29a38ac1fda7f5a8889382/wheel-0.41.0-py3-none-any.whl \
                  https://files.pythonhosted.org/packages/2f/0d/37432ce6e8434ecedc272621f09d08087bb8c00d26dace52e8c90efc2c72/PyQt6_WebEngine-6.5.0-cp37-abi3-manylinux_2_28_x86_64.whl \
-                 https://files.pythonhosted.org/packages/7e/75/a1406b35448d90a1cb8d187f01c23c45ad91bcc094942caf56cf54fb3b8f/PyQt6_WebEngine_Qt6-6.5.1-py3-none-manylinux_2_28_x86_64.whl \
+                 https://files.pythonhosted.org/packages/08/ae/24fac3a18cc809572dc83f9e609aae045b0c8d9158db06b4d84c4ff8fac7/PyQt6-6.5.2-cp37-abi3-manylinux_2_28_x86_64.whl \
+                 https://files.pythonhosted.org/packages/01/05/05a2bdeee76effa65360d9c28b0c82c5467ea68bde765a1a38b52195df4d/PyQt6_Qt6-6.5.2-py3-none-manylinux_2_28_x86_64.whl \
+                 https://files.pythonhosted.org/packages/10/92/92b0524a918bd79ae9378b956825768022dd01ed1752faa425d279cd4e93/PyQt6_sip-13.5.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl \
+                 https://files.pythonhosted.org/packages/89/5e/27eb0ed2a32478a9c9b9eb2afb0d8f29ac012096d2fc9f760ab4f249fb66/PyQt6_WebEngine_Qt6-6.5.2-py3-none-manylinux_2_28_x86_64.whl \
                  https://files.pythonhosted.org/packages/06/26/39fad77ba6fe8bd5b1c5ebe411ea84a768075f40caa5400e889678de39b3/adblock-0.6.0-cp37-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl \
                  https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl \
                  https://files.pythonhosted.org/packages/bc/c3/f068337a370801f372f2f8f6bad74a5c140f6fda3d9de154052708dd3c65/Jinja2-3.1.2-py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/de/63/cb7e71984e9159ec5f45b5e81e896c8bdd0e45fe3fc6ce02ab497f0d790e/MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
                  https://files.pythonhosted.org/packages/34/a7/37c8d68532ba71549db4212cb036dbd6161b40e463aba336770e80c72f84/Pygments-2.15.1-py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/12/fc/a4d5a7554e0067677823f7265cb3ae22aed8a238560b5133b58cda252dad/PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl \
+                 https://files.pythonhosted.org/packages/de/63/cb7e71984e9159ec5f45b5e81e896c8bdd0e45fe3fc6ce02ab497f0d790e/MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
+                 https://files.pythonhosted.org/packages/7d/39/472f2554a0f1e825bd7c5afc11c817cd7a2f3657460f7159f691fbb37c51/PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
+                 https://files.pythonhosted.org/packages/8c/08/d3006317aefe25ea79d3b76c9650afabaf6d63d1c8443b236e7405447503/zipp-3.16.2-py3-none-any.whl \
                  https://files.pythonhosted.org/packages/ff/1d/8f96eb0ce05f20e5d0722a3e910627a26a382c81f40c7292faa91545e43f/asciidoc-10.2.0-py2.py3-none-any.whl \
                  https://www.openssl.org/source/openssl-3.1.1.tar.gz \
                  https://github.com/mozilla/pdf.js/releases/download/v3.8.162/pdfjs-3.8.162-dist.zip"
-MD5SUM_x86_64="08d039c0ceac2c39629700bf32dad8ad \
-               58deb0635a7d5f57ec2d516ad7c69dd5 \
+MD5SUM_x86_64="24a5bb40744a48c3f7d6dc3dc7e0e481 \
+               371ebd0103cfa878280c2c615b0f80b8 \
                5316861f5f2f39d13b06effbff7215b5 \
-               517d39f133bd7b1ff17caf09784b7543 \
-               ada238e089d228b8784969349f505c65 \
-               9e04aa49786f24281d4f8d8574b45831 \
-               254efdf247f0830a3eda8f10c1fecb34 \
+               4fad8d1da6d986c2fed16a859b7ab4f9 \
                04eafb3f8d5f63ac1735d0a42284bc8e \
-               5cdf7f4f376b5737130922e5ff4cad33 \
+               c94ba8517e8166b2e30f086342e4177a \
+               e53b364b1bb258b6740f416c1df07532 \
+               eb4145d9e5b37be24352e0b1c6f27ddb \
+               2184bdc8b4865f7145b9775a532d31c5 \
                c8653c10db5900c22054b27a03924988 \
                3fc7a89530d68d7ea231ebe779c0db9c \
                00ccdb509d3592cc2163b286177d75c8 \
-               c2388278e7f7c4bb11ae830da5a071cc \
                c66cdf8d756af0113ee0fe30552bc4a9 \
-               aba0c6954cd00aaf39f3619a0bfce3ae \
+               c2388278e7f7c4bb11ae830da5a071cc \
+               4d6e421811f9057f61344a07257dbc26 \
+               4145fd62be41c39ea8d127e63b171f72 \
                d47ea986a8945257f0f54e92455d198f \
                1864b75e31fb4a6e0a07fd832529add3 \
                d63d49353d8b2c30dd129fad6b5b01fc"
diff --git a/network/qutebrowser-bin/wrapper.qutebrowser b/network/qutebrowser-bin/wrapper.qutebrowser
index 95790a9dc4..179325561c 100644
--- a/network/qutebrowser-bin/wrapper.qutebrowser
+++ b/network/qutebrowser-bin/wrapper.qutebrowser
@@ -1,3 +1,3 @@
 #!/bin/bash
 LD_LIBRARY_PATH="/opt/qutebrowser" \
-setsid /opt/qutebrowser/.venv-qt6/bin/python3 -m qutebrowser "$@"
+setsid /opt/qutebrowser/.venv/bin/python3 -m qutebrowser "$@"