Hello community, here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2018-03-04 11:54:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit" Sun Mar 4 11:54:38 2018 rev:47 rq:581851 version:5.212~alpha2 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2018-02-28 19:59:47.086361911 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2018-03-04 11:54:42.781588039 +0100 @@ -1,0 +2,8 @@ +Thu Mar 1 13:54:27 UTC 2018 - [email protected] + +- Add upstream patches to fix broken layout of plain-text mails in + Trojita (boo#1083451): + * Trigger-layout-after-resizing-the-FrameView.patch + * run-adjustViewSize-after-relayout.patch + +------------------------------------------------------------------- New: ---- Trigger-layout-after-resizing-the-FrameView.patch run-adjustViewSize-after-relayout.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.Zyz7jp/_old 2018-03-04 11:54:44.685519502 +0100 +++ /var/tmp/diff_new_pack.Zyz7jp/_new 2018-03-04 11:54:44.689519358 +0100 @@ -56,6 +56,9 @@ Patch102: fix-build-with-cmake-3.10.diff Patch103: fix-nullTerminatedWCharToString-loses-last-character.patch Patch104: fix-nullptr-crash-in-QWebPage-selectedHtml-when-selectedRange.patch +# PATCH-FIX-UPSTREAM https://github.com/annulen/webkit/issues/511 +Patch105: Trigger-layout-after-resizing-the-FrameView.patch +Patch106: run-adjustViewSize-after-relayout.patch # openSUSE Leap 42.x defaults to GCC 4 %if 0%{?suse_version} == 1315 @@ -149,6 +152,8 @@ %patch102 -p1 %patch103 -p1 %patch104 -p1 +%patch105 -p1 +%patch106 -p1 %package -n %libname Summary: Qt 5 WebKit Widget library ++++++ Trigger-layout-after-resizing-the-FrameView.patch ++++++ >From 6faf11215e1af27d35e921ae669aa0251a01a1ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= <[email protected]> Date: Wed, 13 Nov 2013 18:13:36 +0100 Subject: [PATCH] Trigger layout after resizing the FrameView. There are problems with QGLWidget based web plugins due to the fact that WebKit forces us to relayout during paint events, which in turn might resize widgets, causing the shared backing store's QImages to be corrupted and hence causing crashed. This patch triggers a layout upon resizing the FrameView, which reduces the likely hood of resizing plugins during a subsequent paintEvent. Task-number: QTBUG-34277 Change-Id: Id35c72a3cc68ac6633a74fba0669c2d8fbfabc88 Reviewed-by: Allan Sandfeld Jensen <[email protected]> --- Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp index e6145b6ffb82..941d8df603d9 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp @@ -962,6 +962,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& size) ASSERT(view); view->resize(size); view->adjustViewSize(); + + if (view->needsLayout()) + view->layout(); } ++++++ run-adjustViewSize-after-relayout.patch ++++++ >From 76420459a13d9440b41864c93cb4ebb404bdab55 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev <[email protected]> Date: Thu, 12 Oct 2017 20:15:15 +0300 Subject: [PATCH] Fix for 451c5a10: run adjustViewSize() after relayout Additional note for 451c5a10 + this: Since r162515 resize of FrameView that does not have scrollbars (or use overlay scrollbars) does not lead to automatic re-layout. In Trojita contentsSize() is called immediately after QWebPage::setViewportSize(), returning wrong result. Change-Id: I543b22d7bbe1514333007e5f99b97a7c12c19c1a --- Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp index 941d8df603d9..df28e9f21f2c 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp @@ -961,10 +961,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& size) FrameView* view = frame->view(); ASSERT(view); view->resize(size); - view->adjustViewSize(); - if (view->needsLayout()) view->layout(); + view->adjustViewSize(); }
