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

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

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

4 files changed, 87 insertions, 43 deletions

diff --git a/network/qutebrowser-bin/README b/network/qutebrowser-bin/README
index f386ebb9b6..49fca7d063 100644
--- a/network/qutebrowser-bin/README
+++ b/network/qutebrowser-bin/README
@@ -10,3 +10,10 @@ pre-compiled QtWebEngine binary, but has a couple of caveats:
 * It only works on 64-bit x86 systems.
 * It comes with a QtWebEngine compiled without proprietary codec support
   (such as h.264).
+
+qt6 needed for this script can be built without webengine to speed up
+compilation. If such an option is not available, just replace the line
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+with
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz --exclude=qtwebengine
+in qt6.SlackBuild.
diff --git a/network/qutebrowser-bin/qutebrowser-bin.SlackBuild b/network/qutebrowser-bin/qutebrowser-bin.SlackBuild
index 2dca8d8507..10d8f064ad 100644
--- a/network/qutebrowser-bin/qutebrowser-bin.SlackBuild
+++ b/network/qutebrowser-bin/qutebrowser-bin.SlackBuild
@@ -25,8 +25,10 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=qutebrowser-bin
-VERSION=${VERSION:-2.5.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.5.4_5fa878c}
+SSLVERSION=${SSLVERSION:-3.1.1}
+COMMIT=5fa878c7d190ba227aa05ab01385e640fc7ff42b
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -57,8 +59,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG/opt $OUTPUT
 cd $PKG/opt
-tar xvf $CWD/qutebrowser-$VERSION.tar.gz
-mv qutebrowser-$VERSION qutebrowser
+tar xvf $CWD/qutebrowser-$COMMIT.tar.gz
+mv qutebrowser-$COMMIT qutebrowser
 cd qutebrowser
 sed -i.bak "s|\(run_venv(venv_dir, 'python', '-m', 'pip', 'install',\)|\1 \
 '--no-index', '--find-links=$CWD/',|" scripts/mkvenv.py
@@ -66,6 +68,8 @@ 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 \
@@ -73,7 +77,8 @@ 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 --skip-smoke-test
+python3 scripts/mkvenv.py --venv-dir .venv-qt6 --pyqt-version 6.5 \
+    --skip-smoke-test
 
 mv scripts/mkvenv.py.bak scripts/mkvenv.py
 
@@ -81,12 +86,12 @@ 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/bin/python3|' {} \;
-.venv/bin/python3 -m compileall scripts/__init__.py \
+  '1,2 s|^#!/usr/bin/env python.*$|#!/opt/qutebrowser/.venv-qt6/bin/python3|' {} \;
+.venv-qt6/bin/python3 -m compileall scripts/__init__.py \
   scripts/setupcommon.py scripts/utils.py -fq
-.venv/bin/python3 -m compileall .venv/lib -fq
+.venv-qt6/bin/python3 -m compileall .venv-qt6/lib -fq
 
-.venv/bin/python3 scripts/asciidoc2html.py
+.venv-qt6/bin/python3 scripts/asciidoc2html.py
 a2x -f manpage doc/qutebrowser.1.asciidoc
 gzip -9 doc/qutebrowser.1
 mkdir -p $PKG/usr/man/man1
@@ -99,12 +104,12 @@ install -m 0644 misc/org.qutebrowser.qutebrowser.desktop \
   $PKG/usr/share/applications
 for res in 16 24 32 48 64 96 128 256 512; do
   mkdir -p $PKG/usr/share/icons/hicolor/${res}x${res}/apps/;
-  install -m 0644 "icons/qutebrowser-${res}x${res}.png" \
+  install -m 0644 "qutebrowser/icons/qutebrowser-${res}x${res}.png" \
 "$PKG/usr/share/icons/hicolor/${res}x${res}/apps/qutebrowser.png"
 done
-install -m 0644 "icons/qutebrowser.svg" \
+install -m 0644 "qutebrowser/icons/qutebrowser.svg" \
   $PKG/usr/share/icons/hicolor/scalable/apps/
-install -m 0644 "icons/qutebrowser.xpm" $PKG/usr/share/pixmaps/
+install -m 0644 "qutebrowser/icons/qutebrowser.xpm" $PKG/usr/share/pixmaps/
 
 cp -a misc/userscripts $PKG/usr/share/qutebrowser
 cp -a scripts $PKG/usr/share/qutebrowser
@@ -121,6 +126,35 @@ unzip $CWD/pdfjs-*-dist.zip
 chown -R root:root $PKG/usr/share/qutebrowser/pdf.js
 find ./ -type f -exec chmod 644 {} \;
 
+cd $TMP
+rm -rf openssl-$SSLVERSION
+tar xvf $CWD/openssl-$SSLVERSION.tar.gz
+cd openssl-$SSLVERSION
+./config \
+ zlib \
+ enable-camellia \
+ enable-seed \
+ enable-rfc3779 \
+ enable-cms \
+ enable-md2 \
+ enable-rc5 \
+ enable-ssl3 \
+ enable-ssl3-method \
+ no-weak-ssl-ciphers \
+ no-mdc2 \
+ no-ec2m \
+ no-sm2 \
+ no-sm4 \
+ no-sse2 \
+ shared
+
+make
+
+mv libcrypto.so.3 libssl.so.3 $PKG/opt/qutebrowser
+cd $PKG/opt/qutebrowser
+ln -s libssl.so.3 libssl.so
+ln -s libcrypto.so.3 libcrypto.so
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/network/qutebrowser-bin/qutebrowser-bin.info b/network/qutebrowser-bin/qutebrowser-bin.info
index 2463e8812e..4bc6907003 100644
--- a/network/qutebrowser-bin/qutebrowser-bin.info
+++ b/network/qutebrowser-bin/qutebrowser-bin.info
@@ -1,42 +1,44 @@
 PRGNAM="qutebrowser-bin"
-VERSION="2.5.4"
+VERSION="2.5.4_5fa878c"
 HOMEPAGE="https://qutebrowser.org"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.5.4/qutebrowser-2.5.4.tar.gz \
+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 \
-                 https://files.pythonhosted.org/packages/2f/8c/f336a966d4097c7cef6fc699b2ecb83b5fb63fd698198c1b5c7905a74f0f/setuptools-67.7.2-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/36/66/19983d471c702e551a19a7225a92a7c1efadd961f6c650110ed906dd0ed7/PyQt5-5.15.6-cp36-abi3-manylinux1_x86_64.whl \
-                 https://files.pythonhosted.org/packages/83/d4/241a6a518d0bcf0a9fcdcbad5edfed18d43e884317eab8d5230a2b27e206/PyQt5_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl \
-                 https://files.pythonhosted.org/packages/71/f7/52c15afe87e769a5892cbe3da8e38db6dee8fc58ce1fb6091dba975c6202/PyQt5_sip-12.9.1-cp39-cp39-manylinux1_x86_64.whl \
-                 https://files.pythonhosted.org/packages/a1/45/667e82a0f584be10d785213b04c8ce01ae4d2f63cd23ab6307312c69be89/PyQtWebEngine-5.15.5-cp36-abi3-manylinux1_x86_64.whl \
-                 https://files.pythonhosted.org/packages/48/62/117c9c96837287b181fce6da481065ddda68b3a8c0fa5f00ea62cc08b877/PyQtWebEngine_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl \
-                 https://files.pythonhosted.org/packages/27/2e/2d98eba665d3d70f4d0bc8e807bac660be0db66330e990978168c05a51a1/adblock-0.5.2-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl \
-                 https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/76/02/af4045156cde8feeefa30cb1c051e10321d4960c418bd52346a497feb302/Jinja2-3.1.1-py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/df/06/c515c5bc43b90462e753bc768e6798193c6520c9c7eb2054c7466779a9db/MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
-                 https://files.pythonhosted.org/packages/1d/17/ed4d2df187995561b28f1073df24137cb750e12f9879d291cc8ab67c65d2/Pygments-2.11.2-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/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/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/52/c5/df7953fe6065185af5956265e3b16f13c2826c2b1ba23d43154f3af453bc/zipp-3.7.0-py3-none-any.whl \
-                 https://github.com/mozilla/pdf.js/releases/download/v3.6.172/pdfjs-3.6.172-legacy-dist.zip"
-MD5SUM_x86_64="6029496c6270924f937ae887005ff142 \
+                 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 \
-               a0f9300999be3afcd2c4abba2a9aa114 \
+               5316861f5f2f39d13b06effbff7215b5 \
                517d39f133bd7b1ff17caf09784b7543 \
-               0e637e2d6f117699f41ba163e6a0e73e \
-               038f56bd7af99133f591c7497b64ea17 \
-               022756b2a8744a111f622092ed36dee4 \
-               094f8349af070ad35255184061b6d62a \
-               d9fe06e7758913f32dc09324ff9abfdf \
-               d45a0ceee0df8ec1a6f62c4697355074 \
-               1dcd07acf2b1875ed09428e1ddf7e028 \
-               cae2986094602b6c2d6f4405e8d0eb3b \
-               68a29c49e695e11d59af9e33d7e4cfd4 \
-               9b19b40b048b2897d0af1b6af62f3799 \
+               ada238e089d228b8784969349f505c65 \
+               9e04aa49786f24281d4f8d8574b45831 \
+               254efdf247f0830a3eda8f10c1fecb34 \
+               04eafb3f8d5f63ac1735d0a42284bc8e \
+               5cdf7f4f376b5737130922e5ff4cad33 \
+               c8653c10db5900c22054b27a03924988 \
+               3fc7a89530d68d7ea231ebe779c0db9c \
+               00ccdb509d3592cc2163b286177d75c8 \
+               c2388278e7f7c4bb11ae830da5a071cc \
+               c66cdf8d756af0113ee0fe30552bc4a9 \
                aba0c6954cd00aaf39f3619a0bfce3ae \
-               fe228758662bbf708699fe52d0232b3b \
-               3280337e9a7d1f123b427b81063f7632"
-REQUIRES=""
+               d47ea986a8945257f0f54e92455d198f \
+               1864b75e31fb4a6e0a07fd832529add3 \
+               d63d49353d8b2c30dd129fad6b5b01fc"
+REQUIRES="qt6"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/network/qutebrowser-bin/wrapper.qutebrowser b/network/qutebrowser-bin/wrapper.qutebrowser
index 754786748c..95790a9dc4 100644
--- a/network/qutebrowser-bin/wrapper.qutebrowser
+++ b/network/qutebrowser-bin/wrapper.qutebrowser
@@ -1,2 +1,3 @@
 #!/bin/bash
-setsid /opt/qutebrowser/.venv/bin/python3 -m qutebrowser "$@"
+LD_LIBRARY_PATH="/opt/qutebrowser" \
+setsid /opt/qutebrowser/.venv-qt6/bin/python3 -m qutebrowser "$@"