diff --git a/.gitignore b/.gitignore index a47a913..45a47dc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ kchmviewer-5.2.tar.gz /kchmviewer-7.1.tar.gz /kchmviewer-7.3.tar.gz /kchmviewer-7.5.tar.gz +/kchmviewer-7.7.tar.gz diff --git a/kchmviewer-7.7-qtwebengine-disable.patch b/kchmviewer-7.7-qtwebengine-disable.patch new file mode 100644 index 0000000..831ac16 --- /dev/null +++ b/kchmviewer-7.7-qtwebengine-disable.patch @@ -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 diff --git a/kchmviewer-7.7-underlinking.patch b/kchmviewer-7.7-underlinking.patch new file mode 100644 index 0000000..75bfed8 --- /dev/null +++ b/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 + SOURCES += dbus_interface.cpp + CONFIG += dbus +- LIBS += ../lib/libebook/libebook.a ++ LIBS += ../lib/libebook/libebook.a -lchm -lzip + POST_TARGETDEPS += ../lib/libebook/libebook.a + } + diff --git a/kchmviewer.spec b/kchmviewer.spec index 833fd54..bf84a87 100644 --- a/kchmviewer.spec +++ b/kchmviewer.spec @@ -1,11 +1,13 @@ Name: kchmviewer -Version: 7.5 -Release: 13%{?dist} +Version: 7.7 +Release: 1%{?dist} Summary: CHM viewer License: GPLv3+ URL: http://www.kchmviewer.net/ Source0: http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz +Patch0: https://raw.githubusercontent.com/scx/flathub/820954b40029ab1ebe9a2c20d08e009bf8dc59d0/kchmviewer-7.7-qtwebengine-disable.patch +Patch1: https://raw.githubusercontent.com/scx/flathub/820954b40029ab1ebe9a2c20d08e009bf8dc59d0/kchmviewer-7.7-underlinking.patch Provides: %{name}-qt = %{version}-%{release} Obsoletes: %{name}-qt < 7.3 @@ -33,6 +35,8 @@ Common data files for KchmViewer. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build @@ -63,6 +67,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %changelog +* Sat Mar 21 2020 Robin Lee - 7.7-1 +- Update to 7.7 (RHBZ#1382189) + * Wed Jan 29 2020 Fedora Release Engineering - 7.5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index ef98c86..8429437 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8de084103375a33833ba5331a89ff7b9 kchmviewer-7.5.tar.gz +SHA512 (kchmviewer-7.7.tar.gz) = e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070