[qutebrowser]: upgrade to v1.7.0

2 files changed, 26 insertions, 30 deletions

diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD
index 7e695be71..4c43f32e9 100644
--- a/libre/qutebrowser/PKGBUILD
+++ b/libre/qutebrowser/PKGBUILD
@@ -9,7 +9,7 @@
 #  - set webkit backend as default
 
 pkgname=qutebrowser
-pkgver=1.6.3
+pkgver=1.7.0
 pkgrel=1
 pkgrel+=.par1
 pkgdesc="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
@@ -31,12 +31,13 @@ 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")
-sha256sums=('1ed27f8bc7ce3e0d3d1d8687de5280d0be62c899154c773a22196cba49b02a7d'
+sha256sums=('f1f01b33669a9b08071997bb2642d46a1e5be9e293bdeb817d83db8dc5aad273'
 	    'SKIP'
-	    '9e65fa1a9726818de71c8aeb8c4bcbf08d4a317a8b36a1084277d49430cc1c6b')
+	    '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0')
 
 prepare() {
 	cd "$pkgname-$pkgver"
+
 	patch -Np1 < $srcdir/webkit-warning.patch
 }
 
@@ -52,5 +53,6 @@ build() {
 
 package() {
 	cd "$pkgname-$pkgver"
+
 	make -f misc/Makefile DESTDIR="$pkgdir" PREFIX=/usr install
 }
diff --git a/libre/qutebrowser/webkit-warning.patch b/libre/qutebrowser/webkit-warning.patch
index 3adf13cb3..97994870c 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 2797ea2..022a458 100644
+index e87597b..ada806f 100644
 --- a/qutebrowser/html/warning-webkit.html
 +++ b/qutebrowser/html/warning-webkit.html
-@@ -2,81 +2,12 @@
+@@ -2,8 +2,6 @@
  
  {% block content %}
  <h1>{{ title }}</h1>
@@ -11,23 +11,20 @@ index 2797ea2..022a458 100644
  
  <p>You're using qutebrowser with the QtWebKit backend.</p>
  
--<p>Unfortunately, QtWebKit hasn't seen a release (including security updates)
--since June 2017, and it also lacks various security features (process
--isolation/sandboxing) present in QtWebEngine.</p>
-+<p>QtWebKit lacks various security features (process isolation/sandboxing).</p>
+@@ -17,66 +15,6 @@ 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>
  
- <p>Because of those security issues and the maintaince burden coming with
- supporting QtWebKit, support for it will be dropped in a future qutebrowser
--release. It's recommended that you use QtWebEngine instead.</p>
+-<p>It's recommended that you use QtWebEngine instead.</p>
 -
 -<h2>(Outdated) reasons to use QtWebKit</h2>
 -<p>Most reasons why people preferred the QtWebKit backend aren't relevant anymore:</p>
 -
--<p><b>PDF.js support</b>: This qutebrowser release comes with PDF.js support
--for QtWebEngine.</p>
+-<p><b>PDF.js support</b>: Supported with QtWebEngine since qutebrowser v1.5.0.</p>
 -
--<p><b>Missing control over Referer header</b>: This qutebrowser release
--supports <span class="mono">content.headers.referer</span> for QtWebEngine.</p>
+-<p><b>Missing control over Referer header</b>: <span
+-class="mono">content.headers.referer</span> is supported with QtWebEngine since
+-qutebrowser v1.5.0.</p>
 -
 -<p><b>Missing control over cookies</b>: With Qt 5.11 or newer, the <span
 -class="mono">content.cookies.accept</span> setting works on QtWebEngine.</p>
@@ -36,11 +33,10 @@ index 2797ea2..022a458 100644
 -class="mono">qt.force_software_rendering</span> setting added in v1.4.0 should
 -hopefully help.</p>
 -
--<p><b>Missing support for notifications</b>: Those <a
--href="https://bugreports.qt.io/browse/QTBUG-29611">aren't supported yet</a> in
--Qt, but support is planned to be added in Qt 5.13, released around May 2019.</p>
+-<p><b>Missing support for notifications</b>: With qutebrowser v1.7.0, initial
+-notification support was added for Qt 5.13.0.</p>
 -
--<p><b>Resource usage</b>: This release adds the <span
+-<p><b>Resource usage</b>: qutebrowser v1.5.0 added the <span
 -class="mono">qt.process_model</span> and <span
 -class="mono">qt.low_end_device_mode</span> settings which can be used to
 -decrease the resource usage of QtWebEngine (but come with other drawbacks).</p>
@@ -55,10 +51,8 @@ index 2797ea2..022a458 100644
 -rendering. With Qt 5.13 (~May 2019) it might be possible to run with Nouveau
 -without software rendering.</p>
 -
--<p><b>Wayland</b>: It's possible to use QtWebEngine with XWayland. Some users
--also seem to be able to run it natively with Qt 5.11, but currently, <span
--class="mono">QUTE_SKIP_WAYLAND_CHECK=1</span> needs to be set in the
--environment to do so.</p>
+-<p><b>Wayland</b>: It's possible to use QtWebEngine with XWayland. With Qt
+-5.11.2 or newer, qutebrowser also runs natively with Wayland.</p>
 -
 -<p><b>Instability on FreeBSD</b>: Those seem to be FreeBSD-specific crashes,
 -and unfortunately nobody has looked into them yet so far...</p>
@@ -74,15 +68,15 @@ index 2797ea2..022a458 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 is orphaned and 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">alternative install
--method</a>.</p>
+-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>
 -
 -<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>
-+release.</p>
++<p>If that bothers you, it is recommended that you use another web browser instead,
++such as IceCat or IceWeasel.</p>
  {% endblock %}