From 778313d6107e930a1a83011772aa65561cb247ef Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Tue, 24 Oct 2017 12:38:22 +0200 Subject: [PATCH] Added patch to fix issue with pagewidth (#1502332) --- qt5-qtwebkit-fix-pagewidth.patch | 12 ++++++++++++ qt5-qtwebkit.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 qt5-qtwebkit-fix-pagewidth.patch diff --git a/qt5-qtwebkit-fix-pagewidth.patch b/qt5-qtwebkit-fix-pagewidth.patch new file mode 100644 index 0000000..0837b91 --- /dev/null +++ b/qt5-qtwebkit-fix-pagewidth.patch @@ -0,0 +1,12 @@ +diff -Naur qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +--- qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-10-23 17:25:58.941518553 +0200 ++++ qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-10-23 17:27:44.223917497 +0200 +@@ -961,6 +961,8 @@ + FrameView* view = frame->view(); + ASSERT(view); + view->resize(size); ++ if (view->needsLayout()) ++ view->layout(); + view->adjustViewSize(); + } + diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 520983c..010570c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,13 +15,19 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.10.%{?prerel}%{?dist} +Release: 0.11.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD URL: https://github.com/annulen/webkit Source0: %{url}/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz +# Upstream patch to fix pagewidth issue with trojita +# https://github.com/annulen/webkit/issues/511 +# https://github.com/annulen/webkit/commit/6faf11215e1af27d35e921ae669aa0251a01a1ab +# https://github.com/annulen/webkit/commit/76420459a13d9440b41864c93cb4ebb404bdab55 +Patch0: qt5-qtwebkit-fix-pagewidth.patch + BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -215,6 +221,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Mon Oct 23 2017 Christian Dersch - 5.212.0-0.11.alpha2 +- Added patch to fix issue with pagewidth (#1502332) + * Mon Oct 09 2017 Rex Dieter - 5.212.0-0.10.alpha2 - rebuild (qt5)