network/qutebrowser-tox: Updated for version 2.2.0.

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

3 files changed, 53 insertions, 9 deletions

diff --git a/network/qutebrowser-tox/8232d38.patch b/network/qutebrowser-tox/8232d38.patch
new file mode 100644
index 0000000000..952170b1bd
--- /dev/null
+++ b/network/qutebrowser-tox/8232d38.patch
@@ -0,0 +1,42 @@
+From 8232d384929641be7409e026d20843a2edd73e48 Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <me@the-compiler.org>
+Date: Tue, 13 Apr 2021 16:33:13 +0200
+Subject: [PATCH] notifications: Handle MaxNotificationsExceeded error from
+ GNOME Flashback
+
+(cherry picked from commit 2cfc64579a22e7dd933c9591e6bb141b877b58e0)
+---
+ qutebrowser/browser/webengine/notification.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py
+index 36493f4f72..5e32b63276 100644
+--- a/qutebrowser/browser/webengine/notification.py
++++ b/qutebrowser/browser/webengine/notification.py
+@@ -693,6 +693,15 @@ class DBusNotificationAdapter(AbstractNotificationAdapter):
+     SPEC_VERSION = "1.2"  # Released in January 2011, still current in March 2021.
+     NAME = "libnotify"
+ 
++    _NON_FATAL_ERRORS = {
++        # notification daemon is gone
++        "org.freedesktop.DBus.Error.NoReply",
++
++        # https://gitlab.gnome.org/GNOME/gnome-flashback/-/blob/3.40.0/gnome-flashback/libnotifications/nd-daemon.c#L178-187
++        # Exceeded maximum number of notifications
++        "org.freedesktop.Notifications.MaxNotificationsExceeded",
++    }
++
+     def __init__(self, parent: QObject = None) -> None:
+         super().__init__(bridge)
+         if not qtutils.version_check('5.14'):
+@@ -878,8 +887,8 @@ def _verify_message(
+ 
+         if msg.type() == QDBusMessage.ErrorMessage:
+             err = msg.errorName()
+-            if err == "org.freedesktop.DBus.Error.NoReply":
+-                self.error.emit(msg.errorMessage())  # notification daemon is gone
++            if err in self._NON_FATAL_ERRORS:
++                self.error.emit(msg.errorMessage())
+                 return
+ 
+             raise Error(f"Got DBus error: {err} - {msg.errorMessage()}")
diff --git a/network/qutebrowser-tox/qutebrowser-tox.SlackBuild b/network/qutebrowser-tox/qutebrowser-tox.SlackBuild
index 32d02e5e07..40794c7ea8 100644
--- a/network/qutebrowser-tox/qutebrowser-tox.SlackBuild
+++ b/network/qutebrowser-tox/qutebrowser-tox.SlackBuild
@@ -23,9 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qutebrowser-tox
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.2.0}
 SSLVERSION=${SSLVERSION:-1.1.1k}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -67,6 +67,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 {} \;
 
+patch -p1 < $CWD/8232d38.patch
+
 python3 scripts/mkvenv.py --skip-smoke-test
 
 mv scripts/mkvenv.py.bak scripts/mkvenv.py
diff --git a/network/qutebrowser-tox/qutebrowser-tox.info b/network/qutebrowser-tox/qutebrowser-tox.info
index 0c33f73d93..7e33863895 100644
--- a/network/qutebrowser-tox/qutebrowser-tox.info
+++ b/network/qutebrowser-tox/qutebrowser-tox.info
@@ -1,11 +1,11 @@
 PRGNAM="qutebrowser-tox"
-VERSION="2.1.1"
+VERSION="2.2.0"
 HOMEPAGE="https://qutebrowser.org"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.1.1/qutebrowser-2.1.1.tar.gz \
+DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.2.0/qutebrowser-2.2.0.tar.gz \
                  https://files.pythonhosted.org/packages/fe/ef/60d7ba03b5c442309ef42e7d69959f73aacccd0d86008362a681c4698e83/pip-21.0.1-py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/9e/d4/b99a960314121a003e9f39c61dfde01a1010bb47661e193a7722f7f32d52/setuptools-54.2.0-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/ae/42/2876a3a136f8bfa9bd703518441c8db78ff1eeaddf174baa85c083c1fd15/setuptools-56.0.0-py3-none-any.whl \
                  https://files.pythonhosted.org/packages/65/63/39d04c74222770ed1589c0eaba06c05891801219272420b40311cd60c880/wheel-0.36.2-py2.py3-none-any.whl \
                  https://files.pythonhosted.org/packages/ed/62/cd9f10702c75b242f82da858668fba0cda04cda92133244d3d1555e530b4/PyQt5-5.15.4-cp36.cp37.cp38.cp39-abi3-manylinux2014_x86_64.whl \
                  https://files.pythonhosted.org/packages/83/d4/241a6a518d0bcf0a9fcdcbad5edfed18d43e884317eab8d5230a2b27e206/PyQt5_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl \
@@ -14,7 +14,7 @@ DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.1.1/quteb
                  https://files.pythonhosted.org/packages/48/62/117c9c96837287b181fce6da481065ddda68b3a8c0fa5f00ea62cc08b877/PyQtWebEngine_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl \
                  https://files.pythonhosted.org/packages/39/5d/68618c48e0c2f051143d0dfb981dc9098fe3362f77bfe53bb6f970800ac2/adblock-0.4.3-cp37-cp37m-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/d9/10/191b97506cd4cceb4b860fb5c75b26feeefbca5a8f7f4687bca71e215cc6/importlib_metadata-3.9.0-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/99/8f/b0ac918b2234848ec5bd2a887d2be7d6686355fcb22d7a0efe878d5c1555/importlib_metadata-3.10.0-py3-none-any.whl \
                  https://files.pythonhosted.org/packages/f0/5e/69e6a0602c1f18d390952177de648468c4a380252858b0022affc3ce7811/importlib_resources-5.1.2-py3-none-any.whl \
                  https://files.pythonhosted.org/packages/7e/c2/1eece8c95ddbc9b1aeb64f5783a9e07a286de42191b7204d67b7496ddf35/Jinja2-2.11.3-py2.py3-none-any.whl \
                  https://files.pythonhosted.org/packages/c2/37/2e4def8ce3739a258998215df907f5815ecd1af71e62147f5eea2d12d4e8/MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_x86_64.whl \
@@ -24,9 +24,9 @@ DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.1.1/quteb
                  https://files.pythonhosted.org/packages/0f/8c/715c54e9e34c0c4820f616a913a7de3337d0cd79074dd1bed4dd840f16ae/zipp-3.4.1-py3-none-any.whl \
                  https://github.com/mozilla/pdf.js/releases/download/v2.7.570/pdfjs-2.7.570-dist.zip \
                  https://www.openssl.org/source/openssl-1.1.1k.tar.gz"
-MD5SUM_x86_64="5e268ad53f82944e33a8dbcf257b6aa4 \
+MD5SUM_x86_64="c3d6baacef40ee84e0c5b01fd0f3e3a7 \
                e6e25dc3ecf3bab199b5ba1f14e81474 \
-               c701dde33ba15c744c527d7df20220dd \
+               23559a79917a14480246c46e797e73c5 \
                6c222a4df97a3311b4e189a59c47dea0 \
                2020d0624acda6a6ab1abdb868f146ae \
                038f56bd7af99133f591c7497b64ea17 \
@@ -35,7 +35,7 @@ MD5SUM_x86_64="5e268ad53f82944e33a8dbcf257b6aa4 \
                d9fe06e7758913f32dc09324ff9abfdf \
                504321e0e009e2fbb194ffde9d9a594a \
                1dcd07acf2b1875ed09428e1ddf7e028 \
-               3272b1c03591bf32cea19bf20e5d0cab \
+               f99fe16a8f0c96a7149bd99a84dbb6f9 \
                4414bda5a4cd09f2b87cffa1aa10fd33 \
                8e733c6f4cdef7f6a336299e8e548dfa \
                c9c9888fa812cc8bc44cf6951b5d84e1 \