Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=f5402b14fadf3e3125e0fc44dea776d3ae770e72
commit f5402b14fadf3e3125e0fc44dea776d3ae770e72 Author: crazy <[email protected]> Date: Mon Mar 13 23:38:44 2017 +0100 kchmviewer-7.7-1-x86_64 * Version bump * added an patch to force WebKit usage and fix compile errors.. * build() fixes.. * added desktop file ( was missing ) diff --git a/source/kde5-extra/kchmviewer/FrugalBuild b/source/kde5-extra/kchmviewer/FrugalBuild index 6a4d414..3cdc726 100644 --- a/source/kde5-extra/kchmviewer/FrugalBuild +++ b/source/kde5-extra/kchmviewer/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Christian Hamar alias krix <[email protected]> pkgname=kchmviewer -pkgver=7.5 -pkgrel=3 +pkgver=7.7 +pkgrel=1 pkgdesc="A viewer of CHM (MS-Help) files" groups=('kde5-extra') archs=('i686' 'x86_64') @@ -12,19 +12,27 @@ options=('scriptlet') _F_kde_defaults=0 _F_archive_grepv="beta" Finclude sourceforge kf5 +source+=(force-webkit-and-fix-compile-errors.patch) license=("GPL2") depends=('chmlib' 'libzip' 'qt5-webkit') +sha1sums=('7ab48cef2ab74753de305e902f555e1a552e9260' \ + '037bab3fe43420bda15f5fad8396caa31ede930e') build() { - Fcd - qmake-qt5 || Fdie - Fmake - Fexerel bin/$pkgname usr/bin/$pkgname + Fcd + Fpatchall - #icon file - Ficonrel packages/$pkgname.png + ## fix desktop file + Fsed 'zip' 'zip;' packages/kchmviewer.desktop + + qmake-qt5 || Fdie + Fmake + Fexerel bin/$pkgname usr/bin/$pkgname + + #icon file + Ficonrel packages/$pkgname.png + Fdesktoprel packages/kchmviewer.desktop } -sha1sums=('53ee176f44337faba0da1fbca20ee2cc74bdd773') # optimization OK diff --git a/source/kde5-extra/kchmviewer/force-webkit-and-fix-compile-errors.patch b/source/kde5-extra/kchmviewer/force-webkit-and-fix-compile-errors.patch new file mode 100644 index 0000000..d1ef9a9 --- /dev/null +++ b/source/kde5-extra/kchmviewer/force-webkit-and-fix-compile-errors.patch @@ -0,0 +1,40 @@ +diff -Naur kchmviewer-7.7/src/src.pro kchmviewer-7.7-p/src/src.pro +--- kchmviewer-7.7/src/src.pro 2016-10-05 09:35:34.149265000 +0200 ++++ kchmviewer-7.7-p/src/src.pro 2017-03-13 23:13:23.028257398 +0100 +@@ -108,26 +108,19 @@ + HEADERS += dbus_interface.h + SOURCES += dbus_interface.cpp + CONFIG += dbus +- LIBS += ../lib/libebook/libebook.a +- POST_TARGETDEPS += ../lib/libebook/libebook.a ++ ## compile error without ! ++ LIBS += ../lib/libebook/libebook.a -lchm -lzip ++ POST_TARGETDEPS += ../lib/libebook/libebook.a + } + + 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 +- } ++ # Qt5 ++ ## well why f**** fail on broken ++ ## WebEngine code while WebKit backend works! ++ 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 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
