[arch-commits] Commit in kchmviewer/trunk (PKGBUILD fix-qt5-build.patch)

[Balló György]

    Date: Tuesday, February 7, 2017 @ 14:25:50
  Author: bgyorgy
Revision: 210797

upgpkg: kchmviewer 7.7-2

Build again with Qt5

Added:
  kchmviewer/trunk/fix-qt5-build.patch
Modified:
  kchmviewer/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   14 ++++++++------
 fix-qt5-build.patch |   24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-07 14:25:49 UTC (rev 210796)
+++ PKGBUILD	2017-02-07 14:25:50 UTC (rev 210797)
@@ -4,29 +4,31 @@
 
 pkgname=kchmviewer
 pkgver=7.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A .chm files (MS HTML help file format) viewer"
 arch=('i686' 'x86_64')
 url="http://kchmviewer.sourceforge.net/"
 license=('GPL')
-depends=('desktop-file-utils' 'chmlib' 'xdg-utils' 'libzip' 'qtwebkit' 'zip')
-makedepends=('patch')
+depends=('chmlib' 'libzip' 'qt5-webkit')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-        $pkgname-$pkgver-underlinking.patch)
+        $pkgname-$pkgver-underlinking.patch
+        fix-qt5-build.patch)
 sha256sums=('27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd'
-            'bb9345a0ecaf70e06cfad06c6c2dbbfca79c3462e1f4bb459e80ecaa31ea58cc')
+            'bb9345a0ecaf70e06cfad06c6c2dbbfca79c3462e1f4bb459e80ecaa31ea58cc'
+            '7d070f4eaa79fa2fd8c4a06807b4792807056e9c248d55e98169d01066248f3d')
 
 prepare() {
   cd $pkgname-$pkgver
 
   patch -Np1 -i "${srcdir}"/$pkgname-$pkgver-underlinking.patch
+  patch -Np1 -i "${srcdir}"/fix-qt5-build.patch
 }
 
 build() {
   cd $pkgname-$pkgver
 
-  qmake-qt4 PREFIX=/usr
+  qmake-qt5 PREFIX=/usr
   make
 }
 

Added: fix-qt5-build.patch
===================================================================
--- fix-qt5-build.patch	                        (rev 0)
+++ fix-qt5-build.patch	2017-02-07 14:25:50 UTC (rev 210797)
@@ -0,0 +1,24 @@
+diff -Naur kchmviewer-7.7.orig/src/src.pro kchmviewer-7.7/src/src.pro
+--- kchmviewer-7.7.orig/src/src.pro	2016-10-05 09:35:34.149265000 +0200
++++ kchmviewer-7.7/src/src.pro	2017-02-07 15:16:27.749908883 +0100
+@@ -114,20 +114,10 @@
+ 
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     # Qt 5
+-    greaterThan(QT_MINOR_VERSION, 5) {
+-        # Qt 5.6+
+-        error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
+-        QT += webengine webenginewidgets
+-        DEFINES += USE_WEBENGINE
+-        SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
+-        HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
+-    } else {
+-        # Qt 5.0-5.5
+         QT += webkit webkitwidgets
+         DEFINES += USE_WEBKIT
+         SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
+         HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
+-    }
+ } else {
+     message("Qt4 is not supported anymore, please do not report any errors")
+     QT += webkit webkitwidgets