From bbe6bfee5211b950d02674b069f4a8328e938984 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Mar 21 2018 19:56:42 +0000
Subject: make buildable on all archs (#1474171)

-kwebenginepart subpkg

---

diff --git a/konqueror-17.12.3-webengine_optional.patch b/konqueror-17.12.3-webengine_optional.patch
new file mode 100644
index 0000000..688991f
--- /dev/null
+++ b/konqueror-17.12.3-webengine_optional.patch
@@ -0,0 +1,23 @@
+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.spec b/konqueror.spec
index 847e2d7..57f771d 100644
--- a/konqueror.spec
+++ b/konqueror.spec
@@ -4,7 +4,7 @@
 
 Name:    konqueror
 Version: 17.12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE File Manager and Browser
 
 License: GPLv2+ and LGPLv2+ and GFDL
@@ -21,12 +21,10 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%
 ## upstream patches
 
 ## upstreamable patches
+Patch100: konqueror-17.12.3-webengine_optional.patch
 
 ## Fedora specific patches
 
-# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
-%{?qt5_qtwebengine_arches:ExclusiveArch: %{qt5_qtwebengine_arches}}
-
 BuildRequires: desktop-file-utils
 
 BuildRequires: extra-cmake-modules
@@ -43,7 +41,9 @@ BuildRequires: cmake(KF5Su)
 
 BuildRequires: cmake(Qt5Core)
 BuildRequires: cmake(Qt5Script)
-BuildRequires: cmake(Qt5WebEngine)
+%ifarch %{qt5_qtwebengine_arches}
+%global webengine 1
+%endif
 BuildRequires: cmake(Qt5Widgets)
 BuildRequires: cmake(Qt5X11Extras)
 
@@ -54,6 +54,13 @@ BuildRequires: libtidy-devel
 BuildRequires:  cmake(Qt5TextToSpeech)
 %endif
 
+%ifarch %{qt5_qtwebengine_arches}
+Requires: kwebenginepart%{_isa} = %{version}-%{release}
+%global webengine 1
+%else
+Requires: kwebkitpart%{?_isa} >= 1.4.0
+%endif
+
 # translations moved here
 Conflicts: kde-l10n < 17.03
 
@@ -79,6 +86,15 @@ Requires:      %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
+%package -n kwebenginepart
+Summary:  A KPart based on QtWebEngine
+BuildRequires: cmake(Qt5WebEngine)
+
+%description -n kwebenginepart
+KWebEnginePart is a web browser component for KDE (KPart)
+based on (Qt)WebEngine. You can use it for example for
+browsing the web in Konqueror.
+
 %prep
 %autosetup -p1
 
@@ -89,7 +105,7 @@ pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}
 
 
 %install
@@ -128,23 +144,17 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/konqbrowser.deskt
 %{_kf5_datadir}/khtml/
 %{_kf5_datadir}/konqueror/
 %{_kf5_datadir}/kwebkitpart/
-#{_kf5_datadir}/kxmlgui5/konqueror/
-%{_kf5_datadir}/kxmlgui5/webenginepart/
 %{_kf5_sysconfdir}/xdg/autostart/konqy_preload.desktop
 %{_kf5_sysconfdir}/xdg/translaterc
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
 
 %files libs
 %{_kf5_datadir}/kservices5/*
 %{_kf5_datadir}/kservicetypes5/konqaboutpage.desktop
 %{_kf5_libdir}/lib*.so.*
 %{_kf5_libdir}/libkdeinit5*.so
-%{_kf5_libdir}/libkwebenginepartlib.so
 %{_kf5_qtplugindir}/*.so
-%dir %{_kf5_plugindir}/parts/
-%{_kf5_plugindir}/parts/webenginepart.so
 
 %files devel
 %{_kf5_includedir}/konq_*.h
@@ -152,8 +162,20 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/konqbrowser.deskt
 %{_kf5_libdir}/cmake/KF5Konq/
 %{_kf5_libdir}/libKF5Konq.so
 
+%if 0%{?webengine}
+%files -n kwebenginepart
+%{_kf5_datadir}/kxmlgui5/webenginepart/
+%{_kf5_libdir}/libkwebenginepartlib.so
+%dir %{_kf5_plugindir}/parts/
+%{_kf5_plugindir}/parts/webenginepart.so
+%endif
+
 
 %changelog
+* Wed Mar 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 17.12.3-2
+- make buildable on all archs (#1474171)
+- -kwebenginepart subpkg
+
 * Tue Mar 06 2018 Rex Dieter <rdieter@fedoraproject.org> - 17.12.3-1
 - 17.12.3