From e09216dc8ff61edf981118eef8f149ce48d60751 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 29 2018 14:49:27 +0000 Subject: default to kwebkitpart until kwebenginepart works properly (#1523082,kde#401976) --- diff --git a/konqueror-18.12.0-webenginepart_priority.patch b/konqueror-18.12.0-webenginepart_priority.patch new file mode 100644 index 0000000..6c96b16 --- /dev/null +++ b/konqueror-18.12.0-webenginepart_priority.patch @@ -0,0 +1,9 @@ +diff -up konqueror-18.12.0/webenginepart/src/webenginepart.desktop.priority konqueror-18.12.0/webenginepart/src/webenginepart.desktop +--- konqueror-18.12.0/webenginepart/src/webenginepart.desktop.priority 2018-11-20 04:15:47.000000000 -0600 ++++ konqueror-18.12.0/webenginepart/src/webenginepart.desktop 2018-12-29 08:40:48.825838738 -0600 +@@ -82,4 +82,4 @@ Name[zh_TW]=WebEngine + X-KDE-Default-UserAgent=Mozilla/5.0 (%PLATFORM%; %SECURITY%; %OSNAME% %OSVERSION% %SYSTYPE%; %LANGUAGE%) AppleWebKit/534.34 (KHTML, like Gecko) %APPVERSION% Safari/534.34 + X-KDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View + X-KDE-Library=kf5/parts/webenginepart +-InitialPreference=12 ++InitialPreference=10 diff --git a/konqueror.spec b/konqueror.spec index 3307412..27ae065 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -2,9 +2,13 @@ ## uncomment to enable bootstrap mode #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 Version: 18.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE File Manager and Browser License: GPLv2+ and LGPLv2+ and GFDL @@ -24,6 +28,11 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-% Patch100: konqueror-17.12.3-webengine_optional.patch ## Fedora specific patches +# lower kwebenginepart to be lower than kwebkitpart (10<11) +# since kwebenginepart has crippling bug, +# https://bugzilla.redhat.com/show_bug.cgi?id=1523082 +# https://bugs.kde.org/show_bug.cgi?id=401976 +Patch200: konqueror-18.12.0-webenginepart_priority.patch BuildRequires: desktop-file-utils @@ -54,9 +63,8 @@ BuildRequires: libtidy-devel BuildRequires: cmake(Qt5TextToSpeech) %endif -%ifarch %{qt5_qtwebengine_arches} +%if 0%{?webengine} && 0%{?webengine_default} Requires: kwebenginepart%{_isa} = %{version}-%{release} -%global webengine 1 %else Requires: kwebkitpart%{?_isa} >= 1.4.0 %endif @@ -179,6 +187,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/konqbrowser.deskt %changelog +* Sat Dec 29 2018 Rex Dieter - 18.12.0-2 +- default to kwebkitpart until kwebenginepart works properly (#1523082,kde#401976) + * Sat Dec 08 2018 Rex Dieter - 18.12.0-1 - 18.12.0