Date: Saturday, June 5, 2021 @ 10:45:17 Author: jlichtblau Revision: 955995
upgpkg: kchmviewer 8.0-1 - new upstream release Modified: kchmviewer/trunk/PKGBUILD kchmviewer/trunk/kchmviewer.changelog Deleted: kchmviewer/trunk/fix-qt5-build.patch kchmviewer/trunk/kchmviewer-7.7-underlinking.patch -----------------------------------+ PKGBUILD | 26 ++++++++++++-------------- fix-qt5-build.patch | 24 ------------------------ kchmviewer-7.7-underlinking.patch | 11 ----------- kchmviewer.changelog | 3 +++ 4 files changed, 15 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-05 10:05:59 UTC (rev 955994) +++ PKGBUILD 2021-06-05 10:45:17 UTC (rev 955995) @@ -2,30 +2,28 @@ # Contributor: Alexander Bogdanov <[email protected]> pkgname=kchmviewer -pkgver=7.7 -pkgrel=5 +pkgver=8.0 +pkgrel=1 pkgdesc="A .chm files (MS HTML help file format) viewer" arch=('x86_64') url="http://kchmviewer.sourceforge.net/"; license=('GPL') -depends=('chmlib' 'libzip' 'qt5-webkit') +depends=('chmlib' 'libzip' 'qt5-webkit' 'qt5-webengine') changelog=$pkgname.changelog -source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-$pkgver-underlinking.patch - fix-qt5-build.patch) -sha256sums=('27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd' - 'bb9345a0ecaf70e06cfad06c6c2dbbfca79c3462e1f4bb459e80ecaa31ea58cc' - '7d070f4eaa79fa2fd8c4a06807b4792807056e9c248d55e98169d01066248f3d') +source=($pkgname-$pkgver.tar.gz::https://github.com/gyunaev/$pkgname/archive/refs/tags/RELEASE_8_0.tar.gz + fix-8.0-build.patch::https://github.com/gyunaev/$pkgname/commit/e3b09edbbae17ad19661a7514afe5a9d84ca0ffa.patch) +sha256sums=('0eec144b2c09c8b6be98b795f84767098c893bdad7b5a3d11fc5faafead5f9b2' + '9a3022ce78ab97b6816f80b04557dc25c5dde868e6d89a2a2435ce51417b4f2c') prepare() { - cd $pkgname-$pkgver + cd $pkgname-RELEASE_8_0 - patch -Np1 -i "${srcdir}"/$pkgname-$pkgver-underlinking.patch - patch -Np1 -i "${srcdir}"/fix-qt5-build.patch +#https://github.com/gyunaev/kchmviewer/issues/9 + patch -Np1 -i "${srcdir}"/fix-8.0-build.patch } build() { - cd $pkgname-$pkgver + cd $pkgname-RELEASE_8_0 qmake-qt5 PREFIX=/usr make @@ -32,7 +30,7 @@ } package() { - cd $pkgname-$pkgver + cd $pkgname-RELEASE_8_0 make DESTDIR="${pkgdir}" install Deleted: fix-qt5-build.patch =================================================================== --- fix-qt5-build.patch 2021-06-05 10:05:59 UTC (rev 955994) +++ fix-qt5-build.patch 2021-06-05 10:45:17 UTC (rev 955995) @@ -1,24 +0,0 @@ -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 Deleted: kchmviewer-7.7-underlinking.patch =================================================================== --- kchmviewer-7.7-underlinking.patch 2021-06-05 10:05:59 UTC (rev 955994) +++ kchmviewer-7.7-underlinking.patch 2021-06-05 10:45:17 UTC (rev 955995) @@ -1,11 +0,0 @@ ---- 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 - } - Modified: kchmviewer.changelog =================================================================== --- kchmviewer.changelog 2021-06-05 10:05:59 UTC (rev 955994) +++ kchmviewer.changelog 2021-06-05 10:45:17 UTC (rev 955995) @@ -1,3 +1,6 @@ +2021-06-05 Jaroslav Lichtblau <[email protected]> + * kchmviewer 8.0-1 + 2016-12-08 Jaroslav Lichtblau <[email protected]> * kchmviewer 7.7-1
