From bfddaeb7d0e1aa388e630df5abbd6e8a653eae7c Mon Sep 17 00:00:00 2001
From: Chaoting Liu <brli@chakraos.org>
Date: Thu, 31 Mar 2016 19:57:43 +0100
Subject: [PATCH] qupzilla: update to 2.0.0

---
 qupzilla/0001-branded-speeddial.patch | 27 ++++++---------------------
 qupzilla/PKGBUILD                     | 21 +++++++++------------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/qupzilla/0001-branded-speeddial.patch b/qupzilla/0001-branded-speeddial.patch
index 1ec751bb7..159e6cb1c 100644
--- a/qupzilla/0001-branded-speeddial.patch
+++ b/qupzilla/0001-branded-speeddial.patch
@@ -1,25 +1,13 @@
-From 58bba903cfc5fb05dd09b227b597c9487234bcaa Mon Sep 17 00:00:00 2001
-From: Chaoting Liu <brli@chakraos.org>
-Date: Fri, 30 Oct 2015 01:41:10 +0800
-Subject: [PATCH] branded speeddial
-
----
- src/lib/plugins/speeddial.cpp | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
 diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp
-index 07b791a..f003ff4 100644
+index 6072e8b..7e59e93 100644
 --- a/src/lib/plugins/speeddial.cpp
 +++ b/src/lib/plugins/speeddial.cpp
-@@ -64,10 +64,11 @@ void SpeedDial::loadSettings()
-     settings.endGroup();
- 
-     if (allPages.isEmpty()) {
--        allPages = "url:\"http://www.qupzilla.com\"|title:\"QupZilla\";"
--                   "url:\"http://blog.qupzilla.com\"|title:\"QupZilla Blog\";"
--                   "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";"
+@@ -66,7 +66,11 @@ void SpeedDial::loadSettings()
+         allPages = "url:\"https://www.qupzilla.com\"|title:\"QupZilla\";"
+                    "url:\"http://blog.qupzilla.com\"|title:\"QupZilla Blog\";"
+                    "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";"
 -                   "url:\"https://duckduckgo.com\"|title:\"DuckDuckGo\";";
-+        allPages = "url:\"https://chakraos.org\"|title:\"The Chakra Project\";"
++                   "url:\"https://chakraos.org\"|title:\"The Chakra Project\";"
 +                   "url:\"https://chakraos.org/forum\"|title:\"Forums\";"
 +                   "url:\"https://webchat.freenode.net/?channels=chakra\"|title:\"IRC\";"
 +                   "url:\"http://www.youtube.com/html5\"|title:\"YouTube-html5\";"
@@ -27,6 +15,3 @@ index 07b791a..f003ff4 100644
      }
      changed(allPages);
  
--- 
-2.4.1
-
diff --git a/qupzilla/PKGBUILD b/qupzilla/PKGBUILD
index dc2b37718..fb849c647 100644
--- a/qupzilla/PKGBUILD
+++ b/qupzilla/PKGBUILD
@@ -1,28 +1,23 @@
-# Maintainer: Bruce Liu <brli@users.sourceforge.net>
-
 _pkgname=QupZilla
 pkgname='qupzilla'
-pkgver=1.8.9
-pkgrel=5
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="A very fast open source browser based on WebKit core"
 url="http://www.qupzilla.com"
 arch=('x86_64')
 license=('GPL3')
 makedepends=('qt5-tools' 'kwallet')
-depends=('qt5-webkit' 'qt5-script')
+depends=('qt5-webengine' 'qt5-script')
 optdepends=('bash-completion: bash completion support'
             'kwallet: kf5 kwallet integration')
-provides=('qupzilla-qt5')
-conflicts=('qupzilla-qt5')
-replaces=('qupzilla-qt5')
 install=${pkgname}.install
 categories=('network') 
 screenshot='http://www.qupzilla.com/screens/kde.png'
 source=("https://github.com/QupZilla/qupzilla/releases/download/v${pkgver}/${_pkgname}-${pkgver}.tar.xz"
         '0001-branded-speeddial.patch'
         'start-white.png')
-sha1sums=('6a4613d6df5cfabe949e3a14ec8a5294005c1a78'
-          '7ae942d114016e5971caffd8a5cef8e20495f127'
+sha1sums=('5eea8ec0e2254978f6d0f5a25b7fe0649113776f'
+          '7fbbd3b732e27154ab375f736c167d84a83619d7'
           '6ec67993bda3054d4210cc08177b124f873774e3')
 
 prepare() {
@@ -34,7 +29,8 @@ prepare() {
   cd ${srcdir}/${_pkgname}-${pkgver}/src/lib/plugins/
   sed -e 's|"background", QString()|"file:///usr/share/pixmaps/start-white.png", QString()|' \
       -e 's|"backsize", "auto"|"backsize", "contain"|' -i speeddial.cpp
-  patch -p4 -i ${srcdir}/0001-branded-speeddial.patch
+  cd ${srcdir}/${_pkgname}-${pkgver}/
+  patch -Np1 -i ${srcdir}/0001-branded-speeddial.patch
   msg 'Applying preference patch'
   cd ${srcdir}/${_pkgname}-${pkgver}/src/lib/preferences/
   sed -e 's|"homepage", QUrl(QSL("qupzilla:start"))|"homepage", QUrl(QSL("https://chakraos.org/?welcome"))|' \
@@ -48,6 +44,7 @@ build() {
   export USE_WEBGL="true"
   export KDE_INTEGRATION="true"
   export ENABLE_OPACITY_EFFECT="true"
+  export NO_X11="true"
 
   cd "${srcdir}/${_pkgname}-${pkgver}/"
   /usr/lib/qt5/bin/qmake
@@ -55,7 +52,7 @@ build() {
 
 }
 
-package_qupzilla() {
+package() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
   make INSTALL_ROOT="${pkgdir}" install
   install -Dm 644 "${srcdir}/start-white.png" "${pkgdir}/usr/share/pixmaps/start-white.png"