app-text/kchmviewer: version bump

Package-Manager: portage-2.3.1

diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index 821d5afd772fb0607da23d9f2542544d75b1ddd8..89dab6aba4e5368e1c5d1cff0a111b46facb35a5 100644 (file)
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1 +1,2 @@
 DIST kchmviewer-7.5.tar.gz 342487 SHA256 c81f8fb7ac1fe8a5284e03b0d91def61cbd5638f2276c5de8046251755352e53 SHA512 4e867766d60788f11cddc7373b82f7930fb9e5efbef4231fbb386ed2651297d9ab2f893770142c6445c18bf0df3ad2b47b8a0428bb3baa37465d9091e2e15f9a WHIRLPOOL a12e2c63b0cb3aa03d60f463da7d98500fa7021335d721fc26aeec53bee0d2d4af2ce5e6495e2d4b6a0bb5b25734b9a46f255482f0e065d3e26afbeb09bf3c67
+DIST kchmviewer-7.7.tar.gz 345952 SHA256 27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd SHA512 e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070 WHIRLPOOL 94230893add520861605edc09979f98774cc553f95b30364860afb130e5a77cbafa487fa5623d7d063bbec350a3b5d845ecd54072556128fc9c7a7d1d24dfa46

diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch b/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch
new file mode 100644 (file)
index 0000000..897c62a
--- /dev/null
+++ b/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch
@@ -0,0 +1,26 @@
+Gentoo still ships QtWebKit in 5.6 and later, so don't try and fail to use QtWebEngine.
+
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -113,21 +113,11 @@
+ }\r
+ \r
+ greaterThan(QT_MAJOR_VERSION, 4) {\r
+-    # Qt 5\r
+-    greaterThan(QT_MINOR_VERSION, 5) {\r
+-        # Qt 5.6+\r
+-        error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")\r
+-        QT += webengine webenginewidgets\r
+-        DEFINES += USE_WEBENGINE\r
+-        SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp\r
+-        HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h\r
+-    } else {\r
+         # Qt 5.0-5.5\r
+         QT += webkit webkitwidgets\r
+         DEFINES += USE_WEBKIT\r
+         SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp\r
+         HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h\r
+-    }\r
+ } else {\r
+     message("Qt4 is not supported anymore, please do not report any errors")\r
+     QT += webkit webkitwidgets\r

diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch b/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch
new file mode 100644 (file)
index 0000000..75bfed8
--- /dev/null
+++ b/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -108,7 +108,7 @@
+     HEADERS += dbus_interface.h\r
+     SOURCES += dbus_interface.cpp\r
+     CONFIG += dbus\r
+-    LIBS += ../lib/libebook/libebook.a\r
++    LIBS += ../lib/libebook/libebook.a -lchm -lzip\r
+     POST_TARGETDEPS += ../lib/libebook/libebook.a\r
+ }\r
+ \r

diff --git a/app-text/kchmviewer/kchmviewer-7.7.ebuild b/app-text/kchmviewer/kchmviewer-7.7.ebuild
new file mode 100644 (file)
index 0000000..cdcd179
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-7.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit fdo-mime qmake-utils
+
+DESCRIPTION="Feature rich chm file viewer, based on Qt"
+HOMEPAGE="http://www.kchmviewer.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+       dev-libs/chmlib
+       dev-libs/libzip:=
+       dev-qt/qtcore:5
+       dev-qt/qtdbus:5
+       dev-qt/qtgui:5
+       dev-qt/qtnetwork:5
+       dev-qt/qtprintsupport:5
+       dev-qt/qtwebkit:5
+       dev-qt/qtwidgets:5
+       dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+       "${FILESDIR}/${P}-force-qtwebkit.patch"
+       "${FILESDIR}/${P}-underlinking.patch"
+)
+
+src_prepare() {
+       # bug #579430
+       sed -i \
+               -e "s:zip:zip;:g" \
+               packages/kchmviewer.desktop || die "Failed to fix desktop file"
+
+       default
+}
+
+src_configure() {
+       eqmake5
+}
+
+src_install() {
+       dodoc ChangeLog DBUS-bindings FAQ README
+       doicon packages/kchmviewer.png
+
+       dobin bin/kchmviewer
+       domenu packages/kchmviewer.desktop
+
+}
+
+pkg_postinst() {
+       fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+       fdo-mime_desktop_database_update
+}