From ed4ea7d5406926d529ca86be83700c356c555fea Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 20 2019 16:03:38 +0000 Subject: fix patch --- diff --git a/konqueror-17.12.3-webengine_optional.patch b/konqueror-17.12.3-webengine_optional.patch deleted file mode 100644 index 688991f..0000000 --- a/konqueror-17.12.3-webengine_optional.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up konqueror-17.12.3/CMakeLists.txt.webengine konqueror-17.12.3/CMakeLists.txt ---- konqueror-17.12.3/CMakeLists.txt.webengine 2018-03-05 18:07:27.000000000 -0600 -+++ konqueror-17.12.3/CMakeLists.txt 2018-03-21 13:21:51.847664877 -0500 -@@ -23,7 +23,8 @@ include(ECMQtDeclareLoggingCategory) - set(KONQUEROR_LIB_VERSION "5.0.97") - set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}") - --find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets) -+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets) -+find_package(Qt5WebEngineWidgets) - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils KHtml KDELibs4Support Archive Crash) - - find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities DocTools) # Optional -@@ -53,7 +54,9 @@ add_subdirectory( libkonq ) - add_subdirectory( src ) - add_subdirectory( client ) - add_subdirectory( autotests ) -+if (Qt5WebEngineWidgets_FOUND) - add_subdirectory( webenginepart ) -+endif() - - add_subdirectory( about ) - add_subdirectory( pics ) diff --git a/konqueror-18.12.2-webengine_optional.patch b/konqueror-18.12.2-webengine_optional.patch new file mode 100644 index 0000000..9060205 --- /dev/null +++ b/konqueror-18.12.2-webengine_optional.patch @@ -0,0 +1,13 @@ +diff -up konqueror-18.12.2/CMakeLists.txt.webengine_optinal konqueror-18.12.2/CMakeLists.txt +--- konqueror-18.12.2/CMakeLists.txt.webengine_optinal 2019-02-20 10:00:56.759740582 -0600 ++++ konqueror-18.12.2/CMakeLists.txt 2019-02-20 10:02:25.744522748 -0600 +@@ -56,7 +56,9 @@ add_subdirectory( client ) + if(BUILD_TESTING) + add_subdirectory( autotests ) + endif() ++if (Qt5WebEngineWidgets_FOUND) + add_subdirectory( webenginepart ) ++endif() + + add_subdirectory( about ) + add_subdirectory( pics ) diff --git a/konqueror.spec b/konqueror.spec index 6c6699b..0cb4f3e 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -3,7 +3,6 @@ #global bootstrap 1 ## use webengine by default or not -## do not define for now, see webengine_priority.patch below %global webengine_default 1 Name: konqueror @@ -25,7 +24,7 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-% ## upstream patches ## upstreamable patches -Patch100: konqueror-17.12.3-webengine_optional.patch +Patch100: konqueror-18.12.2-webengine_optional.patch ## Fedora specific patches # lower kwebenginepart to be lower than kwebkitpart (10<11)