Hello community, here is the log from the commit of package kchmviewer for openSUSE:Factory checked in at 2018-05-29 10:47:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kchmviewer (Old) and /work/SRC/openSUSE:Factory/.kchmviewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kchmviewer" Tue May 29 10:47:27 2018 rev:35 rq:612407 version:7.7 Changes: -------- --- /work/SRC/openSUSE:Factory/kchmviewer/kchmviewer.changes 2018-01-13 21:45:20.744512817 +0100 +++ /work/SRC/openSUSE:Factory/.kchmviewer.new/kchmviewer.changes 2018-05-29 10:47:35.142590428 +0200 @@ -1,0 +2,8 @@ +Fri May 25 21:00:47 UTC 2018 - christo...@krop.fr + +- Update to 7.7: + * Added a Ctrl-I shortcut which copies the URL of currently opened page. + * Minor bugfixes +- Add fix-build.patch + +------------------------------------------------------------------- Old: ---- kchmviewer-7.5.tar.gz New: ---- fix-build.patch kchmviewer-7.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kchmviewer.spec ++++++ --- /var/tmp/diff_new_pack.zrcH3w/_old 2018-05-29 10:47:35.782566814 +0200 +++ /var/tmp/diff_new_pack.zrcH3w/_new 2018-05-29 10:47:35.786566667 +0200 @@ -1,7 +1,7 @@ # # spec file for package kchmviewer # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,25 @@ Name: kchmviewer -BuildRequires: chmlib-devel -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebKitWidgets) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: pkgconfig(libzip) +Version: 7.7 +Release: 0 Summary: KDE CHM Viewer -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Office/Other -Version: 7.5 -Release: 0 -Url: http://www.kchmviewer.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: http://downloads.sourceforge.net/%name/%version/%name-%version.tar.gz +URL: http://www.kchmviewer.net/ +Source: http://downloads.sourceforge.net/%{name}/%{version}/%{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE fix-build.patch +Patch0: fix-build.patch +BuildRequires: chmlib-devel +BuildRequires: pkgconfig +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5PrintSupport) +BuildRequires: cmake(Qt5WebKit) +BuildRequires: cmake(Qt5WebKitWidgets) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Xml) +BuildRequires: pkgconfig(libzip) %description This is a viewer for the CHM files which are used for end user @@ -41,22 +43,23 @@ complex searching for large books and has various viewing features. %prep -%setup -q +%autosetup -p1 %build %qmake5 %make_jobs %install -%{__mkdir_p} %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_bindir} install bin/kchmviewer %{buildroot}%{_bindir} -%{__mkdir_p} %{buildroot}%{_datadir}/applications +mkdir -p %{buildroot}%{_datadir}/applications install packages/kchmviewer.desktop %{buildroot}%{_datadir}/applications -%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps +mkdir -p %{buildroot}%{_datadir}/pixmaps install packages/kchmviewer.png %{buildroot}%{_datadir}/pixmaps %files -%defattr(-,root,root) +%license COPYING +%doc ChangeLog FAQ README %{_bindir}/kchmviewer %{_datadir}/applications/kchmviewer.desktop %{_datadir}/pixmaps/kchmviewer.* ++++++ fix-build.patch ++++++ >From 79f02581982773c7d0ab54570a944e35f9e4ecd3 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Sat, 26 May 2018 14:34:29 +0200 Subject: [PATCH] Fix build. --- src/src.pro | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/src.pro b/src/src.pro index ae4222a..fb56346 100644 --- a/src/src.pro +++ b/src/src.pro @@ -108,30 +108,11 @@ unix:!macx: { 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 } -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 DEFINES += USE_WEBKIT SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h -} -- 2.17.0 ++++++ kchmviewer-7.5.tar.gz -> kchmviewer-7.7.tar.gz ++++++ ++++ 21289 lines of diff (skipped)
