From f93c77a2a23420da0dbe5c64a098b4bbfaf65094 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Wed, 6 May 2020 08:18:46 -0400
Subject: [qutebrowser]: upgrade to v1.11.0

---
 libre/qutebrowser/PKGBUILD             | 18 +++++++++---------
 libre/qutebrowser/webkit-warning.patch | 22 ++++++++++++++--------
 2 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'libre/qutebrowser')

diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD
index c473001bd..e246c460c 100644
--- a/libre/qutebrowser/PKGBUILD
+++ b/libre/qutebrowser/PKGBUILD
@@ -9,9 +9,9 @@
 #  - set webkit backend as default
 
 pkgname=qutebrowser
-_pkgver_armv7h=1.10.0 # this could be an 'any' package
-_pkgver_i686=1.10.0   # but our different arches do not always roll at the same speed
-_pkgver_x86_64=1.10.0
+_pkgver_armv7h=1.11.0 # this could be an 'any' package
+_pkgver_i686=1.11.0   # but our different arches do not always roll at the same speed
+_pkgver_x86_64=1.11.0
 eval "pkgver=\$_pkgver_${CARCH}"
 pkgrel=1
 pkgrel+=.par1
@@ -34,15 +34,15 @@ source=("https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/q
         "https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"
         "webkit-warning.patch")
 validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") # Florian Bruhin
-_sha256sums_x86_64=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf'
+_sha256sums_x86_64=('e2ed9d56aa5db8a0865f7a18d5d0d796d48db161d9c04c03a935dd95e2a4182c'
                     'SKIP'
-                    '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0')
-_sha256sums_i686=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf'
+                    '41da24c74fca7a716a672bab2924e7c1de8e83ad4bdcec3b0ba055baba6459f2')
+_sha256sums_i686=('e2ed9d56aa5db8a0865f7a18d5d0d796d48db161d9c04c03a935dd95e2a4182c'
                   'SKIP'
-                  '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0')
-_sha256sums_armv7h=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf'
+                  '41da24c74fca7a716a672bab2924e7c1de8e83ad4bdcec3b0ba055baba6459f2')
+_sha256sums_armv7h=('e2ed9d56aa5db8a0865f7a18d5d0d796d48db161d9c04c03a935dd95e2a4182c'
                     'SKIP'
-                    '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0')
+                    '41da24c74fca7a716a672bab2924e7c1de8e83ad4bdcec3b0ba055baba6459f2')
 eval "sha256sums=(\${_sha256sums_${CARCH}[@]})"
 
 
diff --git a/libre/qutebrowser/webkit-warning.patch b/libre/qutebrowser/webkit-warning.patch
index 97994870c..e659e68ee 100644
--- a/libre/qutebrowser/webkit-warning.patch
+++ b/libre/qutebrowser/webkit-warning.patch
@@ -1,8 +1,8 @@
 diff --git a/qutebrowser/html/warning-webkit.html b/qutebrowser/html/warning-webkit.html
-index e87597b..ada806f 100644
+index 7fc2290..938762c 100644
 --- a/qutebrowser/html/warning-webkit.html
 +++ b/qutebrowser/html/warning-webkit.html
-@@ -2,8 +2,6 @@
+@@ -2,81 +2,14 @@
  
  {% block content %}
  <h1>{{ title }}</h1>
@@ -11,7 +11,13 @@ index e87597b..ada806f 100644
  
  <p>You're using qutebrowser with the QtWebKit backend.</p>
  
-@@ -17,66 +15,6 @@ unpatched vulnerabilities. Please use it carefully and avoid visiting untrusted
+-<p>While QtWebKit has gained some traction again recently, its latest release
+-(5.212.0 Alpha 3) is still based on an old upstream WebKit. It also lacks
+-various security features (process isolation/sandboxing) present in
+-QtWebEngine. From the upstream release notes:</p>
+-
+ <blockquote>WARNING: This release is based on old WebKit revision with known
+ unpatched vulnerabilities. Please use it carefully and avoid visiting untrusted
  websites and using it for transmission of sensitive data. Wait for new release
  from qtwebkit-dev branch to use it with untrusted content.</blockquote>
  
@@ -68,15 +74,15 @@ index e87597b..ada806f 100644
 -<p><b>QtWebEngine being unavailable on Parabola</b>: Claims of Parabola
 -developers about QtWebEngine being "non-free" have repeatedly been disputed,
 -and so far nobody came up with solid evidence about that being the case. Also,
--note that their qutebrowser package was often outdated in the past (even
--qutebrowser security fixes took months to arrive there). You might be better
--off chosing an <a href="https://qutebrowser.org/doc/install.html#tox">
--alternative install method</a>.</p>
+-note that their qutebrowser package is usually very outdated (even qutebrowser
+-security fixes took months to arrive there). You might be better off chosing an
+-<a href="https://qutebrowser.org/doc/install.html#tox"> alternative install
+-method</a>.</p>
 -
 -<p><b>White flashing between loads with a custom stylesheet</b>: This doesn't
 -seem to happen with <span class="mono">qt.process_model = single-process</span>
 -set. However, note that that setting comes with decreased security and
 -stability, but QtWebKit doesn't have any process isolation at all.</p>
 +<p>If that bothers you, it is recommended that you use another web browser instead,
-+such as IceCat or IceWeasel.</p>
++such as IceCat, IceWeasel, or Epiphany.</p>
  {% endblock %}
-- 
cgit v1.2.3