kchmviewer: update to 7.7

This commit is contained in:
Jeff Huang 2017-03-13 23:03:54 +00:00
parent fd60ee05a1
commit 4bfb397fd4
3 changed files with 51 additions and 5 deletions

View File

@ -1,6 +1,6 @@
pkgname=kchmviewer
pkgver=7.5
pkgrel=2
pkgver=7.7
pkgrel=1
pkgdesc="A .chm files (MS HTML help file format) viewer"
arch=('x86_64')
url="http://kchmviewer.sourceforge.net/"
@ -10,8 +10,19 @@ makedepends=('qt5-tools')
categories=('office')
options=('libtool')
install=${pkgname}.install
source=("$pkgname-$pkgver::http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
sha256sums=('c81f8fb7ac1fe8a5284e03b0d91def61cbd5638f2276c5de8046251755352e53')
source=("$pkgname-$pkgver::http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
$pkgname-$pkgver-underlinking.patch
fix-qt5-build.patch)
sha256sums=('27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd'
'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
@ -23,7 +34,7 @@ build() {
package() {
cd $pkgname-$pkgver
# make DISTDIR="${pkgdir}" install
make DISTDIR="${pkgdir}" install
install -Dm755 bin/$pkgname "${pkgdir}"/usr/bin/$pkgname
#icon/desktop file

View File

@ -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

View File

@ -0,0 +1,11 @@
--- a/src/src.pro
+++ b/src/src.pro
@@ -108,7 +108,7 @@
HEADERS += dbus_interface.h
SOURCES += dbus_interface.cpp
CONFIG += dbus
- LIBS += ../lib/libebook/libebook.a
+ LIBS += ../lib/libebook/libebook.a -lchm -lzip
POST_TARGETDEPS += ../lib/libebook/libebook.a
}