qupzilla-2.0.1-2.parabola1: updating version

2 files changed, 26 insertions, 61 deletions

diff --git a/libre/qupzilla/PKGBUILD b/libre/qupzilla/PKGBUILD
index 8a4401448..492cce3a6 100644
--- a/libre/qupzilla/PKGBUILD
+++ b/libre/qupzilla/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 150188 2015-12-08 07:49:06Z fyan $
+# $Id: PKGBUILD 181473 2016-06-28 07:46:38Z arojas $
 # Maintainer (Arch): speps <speps at aur dot archlinux dot org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-pkgbase=qupzilla
-pkgname=(qupzilla qupzilla-qt4)
-pkgver=1.8.9
-pkgrel=4.parabola1
+pkgname=qupzilla
+pkgver=2.0.1
+pkgrel=2.parabola1
+pkgdesc="Cross-platform QtWebEngine browser, without non-privacy search engines"
 arch=(i686 x86_64 armv7h)
 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"
-         'searchenginesmanager.cpp.sed'
-         'speeddial.cpp.sed'
-         'start.html.sed')
-noextract=("$pkgbase-$pkgver.tar.gz")
-md5sums=('a39767aa92b482863ea4851935e26dd2'
-         '1d926e97a5b287d40fb695f6516f2a06'
+depends=('qt5-webengine' 'qt5-x11extras' '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"
+        'searchenginesmanager.cpp.sed'
+        'speeddial.cpp.sed'
+        'start.html.sed')
+md5sums=('6d23fc5c51ccf05f6fe55c5e6c69ac17'
+         '7c6692810cc521633e0a6d9a076334e1'
          '0f166fa102af975b3b8ac030d477e9b8'
          '77120a0c39ba8254e5b2c273910f029a')
 
 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/ \
@@ -34,54 +33,20 @@ prepare() {
          GNOME_INTEGRATION=true
 
   # 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
+  cd $pkgname-$pkgver
   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 qt4
-  qmake-qt4
-  make
-
-  cd ../qt5
+  cd $pkgname-$pkgver
   qmake
   make
 }
 
-package_qupzilla() {
-  pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search engines"
-  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' 'qupzilla-libre')
-  replaces=('qupzilla-qt5' 'qupzilla-libre')
-
-  cd qt5
-  make INSTALL_ROOT="$pkgdir/" install
-
-  # zsh completion
-  install -Dm644 linux/completion/_$pkgbase \
-    "$pkgdir/usr/share/zsh/site-functions/_$pkgbase"
-}
-
-package_qupzilla-qt4() {
-  pkgdesc="Cross-platform QtWebKit browser (Qt4), without non-privacy search engines"
-  depends=('qtwebkit' 'hunspell')
-  optdepends=('kdelibs: kwallet integration'
-              'libgnome-keyring: gnome keyring integration')
-  provides=('qupzilla')
-  conflicts=('qupzilla' 'qupzilla-libre-qt4')
-  replaces=('qupzilla-libre-qt4')
-
-  cd qt4
+package() {
+  cd $pkgname-$pkgver
   make INSTALL_ROOT="$pkgdir/" install
 
   # zsh completion
diff --git a/libre/qupzilla/searchenginesmanager.cpp.sed b/libre/qupzilla/searchenginesmanager.cpp.sed
index 76011d058..e52540797 100644
--- a/libre/qupzilla/searchenginesmanager.cpp.sed
+++ b/libre/qupzilla/searchenginesmanager.cpp.sed
@@ -4,15 +4,15 @@ s|DuckDuckGo|DuckDuckGo HTML|
 \|Engine google;|d
 \|google[.]name = "Google";|d
 \|google[.]icon = QIcon(":icons/sites/google[.]png");|d
-\|google[.]url = "http://www[.]google[.]com/search?client=qupzilla[&]q=%s";|d
+\|google[.]url = "https://www[.]google[.]com/search?client=qupzilla[&]q=%s";|d
 \|google[.]shortcut = "g";|d
-\|google[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?output=firefox[&]q=%s";|d
+\|google[.]suggestionsUrl = "https://suggestqueries[.]google[.]com/complete/search?output=firefox[&]q=%s";|d
 \|Engine yt;|d
 \|yt[.]name = "YouTube";|d
 \|yt[.]icon = QIcon(":/icons/sites/youtube.png");|d
-\|yt[.]url = "http://www[.]youtube[.]com/results?search_query=%s[&]search=Search";|d
+\|yt[.]url = "https://www[.]youtube[.]com/results?search_query=%s[&]search=Search";|d
 \|yt[.]shortcut = "yt";|d
-\|yt[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?ds=yt[&]output=firefox[&]q=%s";|d
+\|yt[.]suggestionsUrl = "https://suggestqueries[.]google[.]com/complete/search?ds=yt[&]output=firefox[&]q=%s";|d
 \|https://duckduckgo[.]com/?q=%s[&]t=qupzilla| s|duckduckgo[.]com|duckduckgo.com/html|
 \|addEngine(google);|d
 \|addEngine(yt);|d