[arch-commits] Commit in qupzilla/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Friday, June 24, 2016 @ 19:48:56
  Author: arojas
Revision: 181036

Update to 2.0.1

Modified:
  qupzilla/trunk/PKGBUILD

----------+
 PKGBUILD |   62 +++++++++++++++----------------------------------------------
 1 file changed, 16 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-24 17:48:38 UTC (rev 181035)
+++ PKGBUILD	2016-06-24 19:48:56 UTC (rev 181036)
@@ -1,26 +1,24 @@
 # $Id$
 # Maintainer: speps <speps at aur dot archlinux dot org>
 
-pkgbase=qupzilla
-pkgname=(qupzilla qupzilla-qt4)
-pkgver=1.8.9
-pkgrel=4
-pkgdesc="Cross-platform QtWebKit browser"
+pkgname=qupzilla
+pkgver=2.0.1
+pkgrel=1
+pkgdesc="Cross-platform QtWebEngine browser"
 arch=(i686 x86_64)
 url="http://www.qupzilla.com/"
 license=('GPL3')
-makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'qt5-tools' 'hunspell' 'kdelibs' 'kwallet' 'libgnome-keyring')
-optdepends=('bash-completion: bash completion support')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz")
-noextract=("$pkgbase-$pkgver.tar.gz")
-md5sums=('a39767aa92b482863ea4851935e26dd2')
+depends=('qt5-webengine' 'hunspell')
+makedepends=('qt5-tools' 'kwallet' 'libgnome-keyring')
+optdepends=('bash-completion: bash completion support' 'kwallet: kf5 kwallet integration'
+              'libgnome-keyring: gnome keyring integration')
+provides=('qupzilla-qt5')
+conflicts=('qupzilla-qt5')
+replaces=('qupzilla-qt5')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz")
+md5sums=('6d23fc5c51ccf05f6fe55c5e6c69ac17')
 
 prepare() {
-  # extract
-  mkdir -p qt{4,5}
-  bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt4
-  bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt5
-
   # configure
   export USE_WEBGL=true \
          QUPZILLA_PREFIX=/usr/ \
@@ -29,25 +27,13 @@
 }
 
 build() {
-  cd qt4
-  qmake-qt4
-  make
-
-  cd ../qt5
+  cd $pkgname-$pkgver
   qmake
   make
 }
 
-package_qupzilla() {
-  pkgdesc+=" (Qt5)"
-  depends=('qt5-webkit' 'qt5-script' 'qt5-x11extras' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('kwallet: kf5 kwallet integration'
-              'libgnome-keyring: gnome keyring integration')
-  provides=('qupzilla-qt5')
-  conflicts=('qupzilla-qt5')
-  replaces=('qupzilla-qt5')
-
-  cd qt5
+package() {
+  cd $pkgname-$pkgver
   make INSTALL_ROOT="$pkgdir/" install
 
   # zsh completion
@@ -55,20 +41,4 @@
     "$pkgdir/usr/share/zsh/site-functions/_$pkgbase"
 }
 
-package_qupzilla-qt4() {
-  pkgdesc+=" (Qt4)"
-  depends=('qtwebkit' 'hunspell')
-  optdepends=('kdelibs: kwallet integration'
-              'libgnome-keyring: gnome keyring integration')
-  provides=('qupzilla')
-  conflicts=('qupzilla')
-
-  cd qt4
-  make INSTALL_ROOT="$pkgdir/" install
-
-  # zsh completion
-  install -Dm644 linux/completion/_$pkgbase \
-    "$pkgdir/usr/share/zsh/site-functions/_$pkgbase"
-}
-
 # vim:set ts=2 sw=2 et: