Revert "5.6.2"

This reverts commit 5132c134a0.

.gitignore

@@ -1 +1,3 @@
-/qtwebkit-opensource-src-5.6.2.tar.xz
+/qtwebkit-opensource-src-5.5.1.tar.xz
+/qtwebkit-opensource-src-5.6.0.tar.xz
+/qtwebkit-opensource-src-5.6.1-b889f46.tar.xz

0005-Added-missing-break-statement.patch

@@ -0,0 +1,26 @@
+From 9d69c357ca97785eee385b14942a27ec2a680ede Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+Date: Fri, 20 May 2016 13:59:05 +0300
+Subject: [PATCH 5/9] Added missing break statement.
+
+Change-Id: I90bc4a7c65dd70206fd250dcfa81dfac02f8ba74
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+index d1a7f6c..554ab89 100644
+--- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
++++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+@@ -1179,6 +1179,7 @@ void QWebPageAdapter::triggerAction(QWebPageAdapter::MenuAction action, QWebHitT
+     case ToggleMediaPlayPause:
+         if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode))
+             mediaElt->togglePlayState();
++        break;
+     case ToggleMediaMute:
+         if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode))
+             mediaElt->setMuted(!mediaElt->muted());
+-- 
+2.7.4
+

0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch

@@ -0,0 +1,49 @@
+From da5f9d788f96340a44083ed4e28cdf6ea0a393f0 Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+Date: Tue, 24 May 2016 15:25:43 +0300
+Subject: [PATCH 9/9] Fixed drawing of zoomed border-image with repeat mode.
+
+Image::drawPattern has special optimized path for scaled transform which
+creates pre-scaled brush and removes scale from original transform.
+However this change makes following translation to (tr.x(), tr.y())
+incorrect because it is expected to be done in scaled coordinate system.
+
+Change-Id: I570cf82a4e7f61f6abe3fa4cb9b39aea0e51f2e5
+Task-number: QTBUG-53532
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ Source/WebCore/platform/graphics/qt/ImageQt.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Source/WebCore/platform/graphics/qt/ImageQt.cpp b/Source/WebCore/platform/graphics/qt/ImageQt.cpp
+index 9e4408b..f30284b 100644
+--- a/Source/WebCore/platform/graphics/qt/ImageQt.cpp
++++ b/Source/WebCore/platform/graphics/qt/ImageQt.cpp
+@@ -156,6 +156,8 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const
+     if (tr.x() || tr.y() || tr.width() != pixmap.width() || tr.height() != pixmap.height())
+         pixmap = pixmap.copy(tr);
+ 
++    QPoint trTopLeft = tr.topLeft();
++
+     CompositeOperator previousOperator = ctxt->compositeOperation();
+ 
+     ctxt->setCompositeOperation(!pixmap.hasAlpha() && op == CompositeSourceOver ? CompositeCopy : op);
+@@ -180,13 +182,14 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const
+                 painter.drawPixmap(QRect(0, 0, scaledPixmap.width(), scaledPixmap.height()), pixmap);
+             }
+             pixmap = scaledPixmap;
++            trTopLeft = transform.map(trTopLeft);
+             transform = QTransform::fromTranslate(transform.dx(), transform.dy());
+         }
+     }
+ 
+     /* Translate the coordinates as phase is not in world matrix coordinate space but the tile rect origin is. */
+     transform *= QTransform().translate(phase.x(), phase.y());
+-    transform.translate(tr.x(), tr.y());
++    transform.translate(trTopLeft.x(), trTopLeft.y());
+ 
+     QBrush b(pixmap);
+     b.setTransform(transform);
+-- 
+2.7.4
+

qt5-qtwebkit.spec

@@ -14,13 +14,13 @@
 %endif
 %endif
 
-#global commit0 b889f460280ad98c89ede179bd3b9ce9cb02002b
+%global commit0 b889f460280ad98c89ede179bd3b9ce9cb02002b
-#global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Summary: Qt5 - QtWebKit components
 Name:    qt5-qtwebkit
-Version: 5.6.2
+Version: 5.6.1
-Release: 1%{?dist}
+Release: 3.%{shortcommit0}git%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -55,7 +55,10 @@ Patch7: 0001-Add-ARM-64-support.patch
 Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch
 
 ## upstream patches
+Patch105: 0005-Added-missing-break-statement.patch
+Patch109: 0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch
 
+BuildRequires: cmake
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtdeclarative-devel >= %{version}
 %if ! 0%{?bootstrap}
@@ -127,6 +130,9 @@ BuildArch: noarch
 %prep
 %setup -q -n %{qt_module}-opensource-src-%{version}
 
+%patch105 -p1 -b .0005
+%patch109 -p1 -b .0009
+
 %patch1 -p1 -b .pluginpath
 %patch3 -p1 -b .debuginfo
 %patch4 -p1 -b .save_memory
@@ -210,9 +216,6 @@ popd
 
 
 %changelog
-* Wed Nov 16 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.2-1
-- 5.6.2
-
 * Wed Jun 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-3.b889f46git
 - drop pkgconfig-style deps
 

sources

@@ -1 +1 @@
-5196f47b75e2d6cc9663c89cf9902ef0  qtwebkit-opensource-src-5.6.2.tar.xz
+1a7f3953c457c57a942bdd6a92d198fb  qtwebkit-opensource-src-5.6.1-b889f46.tar.xz