Rebase on latest Arch PKGBUILD

2 files changed, 41 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f96c84d186a6..21091f3ff33b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Oct  3 14:35:29 UTC 2018
 pkgbase = qutebrowser-git
 	pkgdesc = A keyboard-driven, vim-like browser based on PyQt5
-	pkgver = 1.5.0.r1.g7d08714a9
+	pkgver = 1.5.2.r605.g17eff15ab
 	pkgrel = 1
 	url = https://www.qutebrowser.org/
 	arch = any
@@ -10,24 +8,22 @@ pkgbase = qutebrowser-git
 	makedepends = asciidoc
 	makedepends = pygmentize
 	makedepends = git
-	depends = python
-	depends = python-setuptools
-	depends = python-pyqt5
-	depends = qt5-base
-	depends = qt5-webengine
-	depends = qt5-declarative
-	depends = python-pypeg2
+	depends = python-attrs
 	depends = python-jinja
 	depends = python-pygments
+	depends = python-pypeg2
+	depends = python-pyqt5
 	depends = python-yaml
-	depends = python-attrs
-	optdepends = qt5-webkit: To use the QtWebKit backend
-	optdepends = gst-libav: media playback with QtWebKit
-	optdepends = gst-plugins-base: media playback with QtWebKit
-	optdepends = gst-plugins-good: media playback with QtWebKit
-	optdepends = gst-plugins-bad: media playback with QtWebKit
-	optdepends = gst-plugins-ugly: media playback with QtWebKit
-	optdepends = pdfjs: Displaying PDF in-browser with QtWebKit
+	depends = qt5-base
+	depends = python-pyqtwebengine
+	depends = python-setuptools
+	optdepends = gst-libav: media playback with qt5-webkit backend
+	optdepends = gst-plugins-base: media playback with qt5-webkit backend
+	optdepends = gst-plugins-good: media playback with qt5-webkit backend
+	optdepends = gst-plugins-bad: media playback with qt5-webkit backend
+	optdepends = gst-plugins-ugly: media playback with qt5-webkit backend
+	optdepends = pdfjs: displaying PDF in-browser
+	optdepends = qt5-webkit: alternative backend
 	provides = qutebrowser
 	conflicts = qutebrowser
 	options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index 4e51ca85dd78..0ef814764e19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,26 @@
 # Maintainer: Florian Bruhin (The Compiler) <archlinux.org@the-compiler.org>
-# vim: set ts=2 sw=2 et ft=sh:
+# Contributor: Morten Linderud <foxboron@archlinux.org>
+# Contributor: Pierre Neidhardt <ambrevar@gmail.com>
+# vim: set ts=4 sw=4 et ft=sh:
 
 pkgname=qutebrowser-git
-pkgver=1.5.0.r1.g7d08714a9
+pkgver=1.5.2.r605.g17eff15ab
 pkgrel=1
 pkgdesc="A keyboard-driven, vim-like browser based on PyQt5"
-arch=(any)
+arch=("any")
 url="https://www.qutebrowser.org/"
-license=('GPL')
-depends=('python' 'python-setuptools' 'python-pyqt5' 'qt5-base'
-         'qt5-webengine' 'qt5-declarative' 'python-pypeg2' 'python-jinja'
-         'python-pygments' 'python-yaml' 'python-attrs')
-makedepends=('asciidoc' 'pygmentize' 'git')
-optdepends=(
-  'qt5-webkit: To use the QtWebKit backend'
-  'gst-libav: media playback with QtWebKit'
-  'gst-plugins-base: media playback with QtWebKit'
-  'gst-plugins-good: media playback with QtWebKit'
-  'gst-plugins-bad: media playback with QtWebKit'
-  'gst-plugins-ugly: media playback with QtWebKit'
-  'pdfjs: Displaying PDF in-browser with QtWebKit'
-)
-
+license=("GPL")
+depends=("python-attrs" "python-jinja" "python-pygments" "python-pypeg2"
+         "python-pyqt5" "python-yaml" "qt5-base" "python-pyqtwebengine"
+         "python-setuptools")
+makedepends=("asciidoc" "pygmentize" "git")
+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"
+            "qt5-webkit: alternative backend")
 options=(!emptydirs)
 conflicts=('qutebrowser')
 provides=('qutebrowser')
@@ -29,33 +28,20 @@ source=('git+https://github.com/qutebrowser/qutebrowser.git')
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/qutebrowser"
-  # Minor releases are not part of the master branch
-  _tag=$(git tag --sort=v:refname | tail -n1)
-  printf '%s.r%s.g%s' "${_tag#v}" "$(git rev-list "$_tag"..HEAD --count)" "$(git rev-parse --short HEAD)"
+    cd "$srcdir/qutebrowser"
+    # Minor releases are not part of the master branch
+    _tag=$(git tag --sort=v:refname | tail -n1)
+    printf '%s.r%s.g%s' "${_tag#v}" "$(git rev-list "$_tag"..HEAD --count)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd "$srcdir/qutebrowser"
-  python scripts/asciidoc2html.py
-  a2x -f manpage doc/qutebrowser.1.asciidoc
-  python setup.py build
+    cd "$srcdir/qutebrowser"
+    python scripts/asciidoc2html.py
+    a2x -f manpage doc/qutebrowser.1.asciidoc
+    python setup.py build
 }
 
 package() {
-  cd "$srcdir/qutebrowser"
-  python setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 doc/qutebrowser.1 "$pkgdir/usr/share/man/man1/qutebrowser.1"
-  install -Dm644 misc/qutebrowser.desktop \
-    "$pkgdir/usr/share/applications/qutebrowser.desktop"
-
-	for i in 16 24 32 48 64 128 256 512; do
-		install -Dm644 "icons/qutebrowser-${i}x$i.png" \
-			"$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/qutebrowser.png"
-	done
-  install -Dm644 icons/qutebrowser.svg \
-    "$pkgdir/usr/share/icons/hicolor/scalable/apps/qutebrowser.svg"
-
-  install -dm755 "$pkgdir/usr/share/qutebrowser/userscripts"
-  find misc/userscripts -type f -exec install -m755 {} "$pkgdir/usr/share/qutebrowser/userscripts" \;
+    cd "$srcdir/qutebrowser"
+    make -f misc/Makefile DESTDIR="$pkgdir" PREFIX=/usr install
 }