[qutebrowser]: upgrade to v1.8.2

adjusted whitespace to match the arch PKGBUILD

1 files changed, 43 insertions, 27 deletions

diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD
index c12b4ef66..3b854703e 100644
--- a/libre/qutebrowser/PKGBUILD
+++ b/libre/qutebrowser/PKGBUILD
@@ -9,50 +9,66 @@
 #  - set webkit backend as default
 
 pkgname=qutebrowser
-pkgver=1.8.1
+_pkgver_armv7h=1.8.2 # this could be an 'any' package
+_pkgver_i686=1.8.1   # but our different arches do not always roll at the same speed
+_pkgver_x86_64=1.8.2
+eval "pkgver=\$_pkgver_${CARCH}"
 pkgrel=1
-pkgrel+=.par2
-pkgdesc="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
-pkgdesc+=", without nonfree qt5-webengine recommendation"
-arch=("any")
-url="http://www.qutebrowser.org/"
+pkgrel+=.par1
+pkgdesc="A keyboard-driven, vim-like browser based on PyQt5"
+pkgdesc+=" and QtWebKit, without nonfree qt5-webengine recommendation"
+arch=('armv7h' 'i686' 'x86_64')
+url="https://www.qutebrowser.org/"
 license=("GPL")
 depends=("python-attrs" "python-jinja" "python-pygments" "python-pypeg2"
-	"python-pyqt5>=5.7" "python-yaml" "qt5-base>=5.7.1" "qt5-webkit")
+         "python-pyqt5" "python-yaml" "qt5-base" "qt5-webkit")
 makedepends=("asciidoc" "python-setuptools")
-optdepends=("gst-libav: media playback"
-	"gst-plugins-base: media playback"
-	"gst-plugins-good: media playback"
-	"gst-plugins-bad: media playback"
-	"gst-plugins-ugly: media playback"
-	"pdfjs: displaying PDF in-browser")
+optdepends=("gst-libav: media playback with qt5-webkit backend"
+            "gst-plugins-base: media playback with qt5-webkit backend"
+            "gst-plugins-good: media playback with qt5-webkit backend"
+            "gst-plugins-bad: media playback with qt5-webkit backend"
+            "gst-plugins-ugly: media playback with qt5-webkit backend"
+            "pdfjs: displaying PDF in-browser")
 options=(!emptydirs)
 source=("https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz"
-	"https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"
-	"webkit-warning.patch")
+        "https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"
+        "webkit-warning.patch")
 validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") # Florian Bruhin
-sha256sums=('dcf6eb63fc2430ac28ee40e2a236391adb7cdbe7debf4cbe53e0d12ff8726e32'
-	    'SKIP'
-	    '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0')
+sha256sums=('baf01c47095428ca95ddd796598efd5419aee6b34c08ecdb98c12c796f6b5471'
+            'SKIP'
+      	    '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0')
+
+_version_constraint() # (dep_pkgname)
+{
+  local dep_pkgname=$1
+  local version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1)
+  version=${version%-*}
+  local version_inc=${version%.*}.$(( ${version##*.} + 1 ))
+
+  echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}"
+}
 
 prepare() {
-	cd "$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-	patch -Np1 < $srcdir/webkit-warning.patch
+  patch -Np1 < $srcdir/webkit-warning.patch
 }
 
 build() {
-	cd "$pkgname-$pkgver"
+    cd "$pkgname-$pkgver"
 
-	# make sure webkit is the default backend
-	sed -i 's/webengine/webkit/' qutebrowser/config/configdata.yml
+    # make sure webkit is the default backend
+    sed -i 's/webengine/webkit/' qutebrowser/config/configdata.yml
 
-	a2x -f manpage doc/qutebrowser.1.asciidoc
-	python setup.py build
+    make -f misc/Makefile all
 }
 
 package() {
-	cd "$pkgname-$pkgver"
+    cd "$pkgname-$pkgver"
+
+    depends+=( $(_version_constraint 'python'      ) \
+               $(_version_constraint 'python-pyqt5') \
+               $(_version_constraint 'qt5-base'    ) )
 
-	make -f misc/Makefile DESTDIR="$pkgdir" PREFIX=/usr install
+    make -f misc/Makefile DESTDIR="$pkgdir" PREFIX=/usr install
 }