[qutebrowser]: upgrade to v1.14.1

1 files changed, 30 insertions, 14 deletions

diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD
index cd9cfd932..a5c683194 100644
--- a/libre/qutebrowser/PKGBUILD
+++ b/libre/qutebrowser/PKGBUILD
@@ -14,11 +14,11 @@
 
 
 pkgname=qutebrowser
-pkgver=1.13.1
+pkgver=1.14.1
 pkgrel=1
 _pkgrel_armv7h=.parabola1 # this could be an 'any' package
-_pkgrel_i686=.parabola3   # but our different arches do not always roll at the same speed
-_pkgrel_x86_64=.parabola5
+_pkgrel_i686=.parabola1   # but our different arches do not always roll at the same speed
+_pkgrel_x86_64=.parabola1
 eval "pkgrel+=\$_pkgrel_${CARCH}"
 pkgdesc="A keyboard-driven, vim-like browser based on PyQt5"
 pkgdesc+=" and QtWebKit"
@@ -40,22 +40,38 @@ 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")
 source+=("warning-webkit.html")
 validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") # Florian Bruhin
-sha256sums=('2896851f07c6258cf8991975eed200ca8477ae393a6a7a40249035b2f36ee2d8'
+sha256sums=('554c145ff64b1a92d4f53e3c624aaad51baafb7cb5b469bc815ae2e0e1958796'
             'SKIP')
 sha256sums+=('e18216f24387b61a109611958bb59248beaf5afc90da8654e29ea8b0a7ef1610')
 
 
-_version_constraint() # (dep_pkgname)
+_version_constraint() # (dep_pkgname [precision])
 {
   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}"
+  local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1)
+  local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
+  local def_precision=$(( n_dots + 1 ))
+  local precision=$( [[ "$2" =~ ^[1-${def_precision}]$ ]] && echo $2 || echo ${def_precision} )
+  local pkgver_rx='[^-\.\ ]+'
+  local subver_rx='\.'${pkgver_rx}
+  local pkgrel_rx='[^-\ ]+'
+  local capture_rx=${pkgver_rx}
+  for (( n_dots=1 ; n_dots < precision ; n_dots++ )) ; do capture_rx+=${subver_rx} ; done ;
+
+  if   [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-${pkgrel_rx}$ ]]
+  then local version=${BASH_REMATCH[1]}
+       local subver_inc=$(( ${version##*.} + 1 ))
+       local version_inc=$( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} || \
+                                                        echo ${subver_inc}                  )
+       local constraint_string="${dep_pkgname}>=${version} ${dep_pkgname}<${version_inc}"
+
+       echo "applied version constraint: ${constraint_string}" >&2
+       echo -n "${constraint_string}"
+  else echo "ERROR: _version_constraint() error parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" >&2
+       exit 1
+  fi
 }
 
-
 prepare() {
   cd "$pkgname-$pkgver"
 
@@ -75,9 +91,9 @@ build() {
 package() {
     cd "$pkgname-$pkgver"
 
-    depends+=( $(_version_constraint 'python'      ) \
-               $(_version_constraint 'python-pyqt5') \
-               $(_version_constraint 'qt5-base'    ) )
+    depends+=( $(_version_constraint python       2) \
+               $(_version_constraint python-pyqt5  ) \
+               $(_version_constraint qt5-base      ) )
 
     make -f misc/Makefile DESTDIR="$pkgdir" PREFIX=/usr install
 }