Merge branch 'master' of https://projects.parabolagnulinux.org/abslibre

1 files changed, 51 insertions, 21 deletions

diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD
index ba0a64ed1..fbd577a90 100644
--- a/libre/qupzilla-libre/PKGBUILD
+++ b/libre/qupzilla-libre/PKGBUILD
@@ -1,57 +1,87 @@
-# $Id: PKGBUILD 96569 2013-09-01 16:36:10Z speps $
+# $Id: PKGBUILD 102853 2013-12-22 11:43:13Z speps $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
-_name=QupZilla
-_pkgname=qupzilla
-pkgname=qupzilla-libre
+_pkgbase=qupzilla
+pkgbase=qupzilla-libre
+pkgname=(qupzilla-libre qupzilla-libre-qt5)
 pkgver=1.4.4
-pkgrel=1.1
-pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers"
+pkgrel=2
 arch=(i686 x86_64 mips64el)
 url="http://www.qupzilla.com/"
 license=('GPL3')
-depends=('qtwebkit' 'hunspell')
+makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell')
 optdepends=('bash-completion: bash completion support')
-install="$_pkgname.install"
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("$_pkgname-$pkgver.tar.gz::https://github.com/$_name/$_pkgname/tarball/v$pkgver"
+source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/$_pkgbase/tarball/v$pkgver"
          'searchenginesmanager.cpp.sed'
          'speeddial.cpp.sed'
          'start.html.sed')
+install="$_pkgbase.install"
 md5sums=('cfbf5cd23d184275c389c79a39a28631'
          '1d926e97a5b287d40fb695f6516f2a06'
          '0f166fa102af975b3b8ac030d477e9b8'
          '77120a0c39ba8254e5b2c273910f029a')
 
 prepare() {
-  cd "$srcdir/$_name-$_pkgname-"*
+  # 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/
 
   # remove Google and Youtube support, replaces it to DDG HTML
+  cd qt4
+  sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp
+  sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp
+  sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html
+
+  cd ../qt5
   sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp
   sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp
   sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html
 }
 
 build() {
-  cd "$srcdir/$_name-$_pkgname-"*
-
-  # enable webgl support
-  export USE_WEBGL=true
+  cd qt4
+  qmake-qt4
+  make
 
-  qmake-qt4 QUPZILLA_PREFIX=/usr/
+  cd ../qt5
+  qmake
   make
 }
 
-package() {
-  cd "$srcdir/$_name-$_pkgname-"*
+package_qupzilla-libre() {
+  pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers"
+  depends=('qtwebkit' 'hunspell')
+  replaces=qupzilla
+  conflicts=qupzilla
+  provides=qupzilla=$pkgver
+
+  cd qt4
+  make INSTALL_ROOT="$pkgdir/" install
+
+  # zsh completion
+  install -Dm644 linux/completion/zsh_completion.sh \
+    "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase"
+}
+
+package_qupzilla-libre-qt5() {
+  pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers"
+  depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme')
+  provides=('qupzilla-qt5' 'qupzilla-libre')
+  conflicts=('qupzilla-qt5' 'qupzilla-libre')
+  provides=qupzilla-qt5=$pkgver
+
+  cd qt5
   make INSTALL_ROOT="$pkgdir/" install
 
   # zsh completion
   install -Dm644 linux/completion/zsh_completion.sh \
-    "$pkgdir/usr/share/zsh/site-functions/_$_pkgname"
+    "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase"
 }
 
 # vim:set ts=2 sw=2 et: