$ git show --format=fuller --patch-with-stat --summary 2090f8c959d8b08a19f573ffc7489823c37a17d4
commit 2090f8c959d8b08a19f573ffc7489823c37a17d4
Author: Crispin Boylan <crispin.boylan@beintrepid.co.uk>
AuthorDate: Sat Feb 24 08:38:55 2024 +0000
Commit: Crispin Boylan <crispin.boylan@beintrepid.co.uk>
CommitDate: Sat Feb 24 08:38:55 2024 +0000
Fix build without webkit installed
---
fix-no-webkit.patch | 15 +++++++++++++++
fix-qt5-build.patch | 24 ------------------------
kchmviewer.spec | 1 +
3 files changed, 16 insertions(+), 24 deletions(-)
create mode 100644 fix-no-webkit.patch
delete mode 100644 fix-qt5-build.patch
diff --git a/fix-no-webkit.patch b/fix-no-webkit.patch
new file mode 100644
index 0000000..3fb0c83
--- /dev/null
+++ b/fix-no-webkit.patch
@@ -0,0 +1,15 @@
+--- kchmviewer-RELEASE_8_0/src/src.pro.orig 2024-02-24 08:36:50.854131816 +0000
++++ kchmviewer-RELEASE_8_0/src/src.pro 2024-02-24 08:37:01.339842690 +0000
+@@ -60,11 +60,9 @@
+ toolbareditor.ui
+ RESOURCES += resources/images.qrc
+
+-QT += webkit \
+- xml \
++QT += xml \
+ network \
+ widgets \
+- webkitwidgets \
+ printsupport
+
+ linux-g++*:{
diff --git a/fix-qt5-build.patch b/fix-qt5-build.patch
deleted file mode 100644
index 831ac16..0000000
--- a/fix-qt5-build.patch
+++ /dev/null
@@ -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
diff --git a/kchmviewer.spec b/kchmviewer.spec
index 193920b..c8acabd 100644
--- a/kchmviewer.spec
+++ b/kchmviewer.spec
@@ -8,6 +8,7 @@ License: GPLv2+
URL: http://www.ulduzsoft.com/linux/kchmviewer/
Group: Graphical desktop/KDE
Source: https://github.com/gyunaev/kchmviewer/archive/refs/tags/RELEASE_%{bin_ver}.tar.gz
+Patch1: fix-no-webkit.patch
BuildRequires: cmake(ECM)
BuildRequires: pkgconfig(Qt5WebEngine)
BuildRequires: pkgconfig(Qt5WebEngineWidgets)