qtwebkit: 5.212.0 -> 5.212.0.a3 closes FS#1772

8 files changed, 30 insertions, 180 deletions

diff --git a/qtwebkit/.footprint b/qtwebkit/.footprint
index b82507d12..bbd063f19 100644
--- a/qtwebkit/.footprint
+++ b/qtwebkit/.footprint
@@ -6,10 +6,30 @@ drwxr-xr-x	root/root	usr/include/qt5/QtWebKit/5.212.0/
 drwxr-xr-x	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/
 drwxr-xr-x	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/
 -rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkreply_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkrequest_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickurlschemedelegate_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qtwebsecurityorigin_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebchannelwebkittransport_p.h
 -rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdatabase_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p_p.h
 -rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebelement_p.h
 -rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebhistory_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebiconimageprovider_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebkittest_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebloadrequest_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationrequest_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpermissionrequest_p.h
 -rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebplugindatabase_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p.h
+-rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p_p.h
 -rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebscriptworld_p.h
 -rw-r--r--	root/root	usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebsecurityorigin_p.h
 -rw-r--r--	root/root	usr/include/qt5/QtWebKit/QWebDatabase
@@ -91,14 +111,16 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/Qt5WebKitWidgets.pc
 drwxr-xr-x	root/root	usr/lib/qt5/
 drwxr-xr-x	root/root	usr/lib/qt5/libexec/
--rwxr-xr-x	root/root	usr/lib/qt5/libexec/QtWebDatabaseProcess
 -rwxr-xr-x	root/root	usr/lib/qt5/libexec/QtWebNetworkProcess
 -rwxr-xr-x	root/root	usr/lib/qt5/libexec/QtWebPluginProcess
 -rwxr-xr-x	root/root	usr/lib/qt5/libexec/QtWebProcess
+-rwxr-xr-x	root/root	usr/lib/qt5/libexec/QtWebStorageProcess
 drwxr-xr-x	root/root	usr/lib/qt5/mkspecs/
 drwxr-xr-x	root/root	usr/lib/qt5/mkspecs/modules/
 -rw-r--r--	root/root	usr/lib/qt5/mkspecs/modules/qt_lib_webkit.pri
+-rw-r--r--	root/root	usr/lib/qt5/mkspecs/modules/qt_lib_webkit_private.pri
 -rw-r--r--	root/root	usr/lib/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri
+-rw-r--r--	root/root	usr/lib/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri
 drwxr-xr-x	root/root	usr/lib/qt5/qml/
 drwxr-xr-x	root/root	usr/lib/qt5/qml/QtWebKit/
 drwxr-xr-x	root/root	usr/lib/qt5/qml/QtWebKit/experimental/
diff --git a/qtwebkit/.signature b/qtwebkit/.signature
index cc41f887b..bf79eda31 100644
--- a/qtwebkit/.signature
+++ b/qtwebkit/.signature
@@ -1,10 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/QdnLhnu9ynAqdarcdUeq5oYYfX+augnoIJ9T5+nxN0peqiAYCv2+mJny0ApXMVO/8wHP3E5WqGxhIHa3fv7cAQ=
-SHA256 (Pkgfile) = 592374714bd7b3f5fca2d4ea3e7a2794d3eca8d6a69a1a8b80923d1905e67d62
-SHA256 (.footprint) = ed0c315f99b71f4f3ef3e2a9379ab90dbb8f86a507a7e9b24fee8ea85842c2a7
-SHA256 (qtwebkit-5.212.0-alpha2.tar.xz) = f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a
-SHA256 (qt5-webkit-gcc7.patch) = f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720
-SHA256 (qt5-webkit-null-pointer-dereference.patch) = 510e1f78c2bcd76909703a097dbc1d5c9c6ce4cd94883c26138f09cc10121f43
-SHA256 (qt5-webkit-trojita-1.patch) = bd22bd7842d5ad1cb1f5a4b6acb2674509732274d5f9dc51943144dff76996ae
-SHA256 (qt5-webkit-trojita-2.patch) = b42b70fd2a4a36b0ff48fc4e0dc386b3dda373e6fec18f3be9f5e2d3b04e0aa3
-SHA256 (qt5-webkit-cmake3.10.patch) = b4e6c85fcb062e7cc141b0e34977bcc4f9c8677c773fc4b310151b85f51e7189
+RWSE3ohX2g5d/UbkZA3AcNevHDxs5QgtzGpXNWhnAXEbT1AMjjKCIydwoLin8WKM+L8ClRR+oNqeo7IrvuSMJVjiqB2wtLchJA0=
+SHA256 (Pkgfile) = 679ed9baeffea2ae490701fc17473a29747af7a20d6907179434338a6b981889
+SHA256 (.footprint) = 839d04c7250b0262d6f81ad2c5ec4182e696bdb0a7c70c298afe2b0614269bc1
+SHA256 (qtwebkit-5.212.0-alpha3.tar.xz) = 357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17
diff --git a/qtwebkit/Pkgfile b/qtwebkit/Pkgfile
index f215a9286..4568fe68d 100644
--- a/qtwebkit/Pkgfile
+++ b/qtwebkit/Pkgfile
@@ -4,32 +4,14 @@
 # Depends on: qt5 ruby icu hyphen
 
 name=qtwebkit
-version=5.212.0
-_version=$version-alpha2
+version=5.212.0.a3
+_version=${version/.a/-alpha}
 release=1
-source=(https://github.com/annulen/webkit/releases/download/$name-$_version/$name-$_version.tar.xz
-	qt5-webkit-gcc7.patch
-	qt5-webkit-null-pointer-dereference.patch
-	qt5-webkit-trojita-1.patch
-	qt5-webkit-trojita-2.patch
-	qt5-webkit-cmake3.10.patch)
+source=(https://github.com/annulen/webkit/releases/download/$name-$_version/$name-$_version.tar.xz)
 
 build() {
 	cd $name-$_version
 
-	# Fix crashes with GCC7 https://bugs.webkit.org/show_bug.cgi?id=173407
-	patch -p1 -i ../qt5-webkit-gcc7.patch
-
-	# Fix layout issues in trojita https://github.com/annulen/webkit/issues/511
-	patch -p1 -i ../qt5-webkit-trojita-1.patch
-	patch -p1 -i ../qt5-webkit-trojita-2.patch
-
-	# Fix null point dereference (Fedora) https://github.com/annulen/webkit/issues/573
-	patch -p1 -i ../qt5-webkit-null-pointer-dereference.patch
-
-	# Fix build with cmake 3.10
-	patch -p1 -i ../qt5-webkit-cmake3.10.patch
-
 	install -d build
 	cd build
 
diff --git a/qtwebkit/qt5-webkit-cmake3.10.patch b/qtwebkit/qt5-webkit-cmake3.10.patch
deleted file mode 100644
index 5e21f57e9..000000000
--- a/qtwebkit/qt5-webkit-cmake3.10.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f51554bf104ab0491370f66631fe46143a23d5c2 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-Date: Sat, 7 Oct 2017 17:38:32 +0300
-Subject: [PATCH] [cmake] Fix build with CMake 3.10: -frtti was enabled for
- wrong file path
-
-Change-Id: I65d4f491f21c17f6d99a14259988d2ddb0d67105
----
- Source/WebKit/PlatformQt.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
-index 61433257a767..edfa57e97ac1 100644
---- a/Source/WebKit/PlatformQt.cmake
-+++ b/Source/WebKit/PlatformQt.cmake
-@@ -795,6 +795,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
-     set_source_files_properties(
-         qt/Api/qwebdatabase.cpp
-         qt/Api/qwebelement.cpp
-+        qt/Api/qwebfullscreenrequest.cpp
-         qt/Api/qwebhistory.cpp
-         qt/Api/qwebhistoryinterface.cpp
-         qt/Api/qwebpluginfactory.cpp
-@@ -804,7 +805,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
- 
-         qt/WidgetApi/qgraphicswebview.cpp
-         qt/WidgetApi/qwebframe.cpp
--        qt/WidgetApi/qwebfullscreenrequest.cpp
-         qt/WidgetApi/qwebinspector.cpp
-         qt/WidgetApi/qwebpage.cpp
-         qt/WidgetApi/qwebview.cpp
diff --git a/qtwebkit/qt5-webkit-gcc7.patch b/qtwebkit/qt5-webkit-gcc7.patch
deleted file mode 100644
index bddb6fcee..000000000
--- a/qtwebkit/qt5-webkit-gcc7.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -u -r webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h
---- webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h	2017-02-20 17:20:15.000000000 +0100
-+++ webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h	2017-06-27 13:13:57.801527350 +0200
-@@ -581,29 +581,7 @@
-     // FIXME: Does this really belong in StringImpl?
-     template <typename T> static void copyChars(T* destination, const T* source, unsigned numCharacters)
-     {
--        if (numCharacters == 1) {
--            *destination = *source;
--            return;
--        }
--
--        if (numCharacters <= s_copyCharsInlineCutOff) {
--            unsigned i = 0;
--#if (CPU(X86) || CPU(X86_64))
--            const unsigned charsPerInt = sizeof(uint32_t) / sizeof(T);
--
--            if (numCharacters > charsPerInt) {
--                unsigned stopCount = numCharacters & ~(charsPerInt - 1);
--
--                const uint32_t* srcCharacters = reinterpret_cast<const uint32_t*>(source);
--                uint32_t* destCharacters = reinterpret_cast<uint32_t*>(destination);
--                for (unsigned j = 0; i < stopCount; i += charsPerInt, ++j)
--                    destCharacters[j] = srcCharacters[j];
--            }
--#endif
--            for (; i < numCharacters; ++i)
--                destination[i] = source[i];
--        } else
--            memcpy(destination, source, numCharacters * sizeof(T));
-+        memcpy(destination, source, numCharacters * sizeof(T));
-     }
- 
-     ALWAYS_INLINE static void copyChars(UChar* destination, const LChar* source, unsigned numCharacters)
diff --git a/qtwebkit/qt5-webkit-null-pointer-dereference.patch b/qtwebkit/qt5-webkit-null-pointer-dereference.patch
deleted file mode 100644
index 97b9f9ea1..000000000
--- a/qtwebkit/qt5-webkit-null-pointer-dereference.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 
-qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
---- qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp	2017-06-09 16:11:36.000000000 +0200
-+++ qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp	2017-10-24 21:44:40.504943501 
-+0200
-@@ -390,7 +390,10 @@
- 
- QString QWebPageAdapter::selectedHtml() const
- {
--    return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML();
-+    RefPtr<Range> range = page->focusController().focusedOrMainFrame().editor().selectedRange();
-+    if (!range)
-+        return QString();
-+    return range->toHTML();
- }
- 
- bool QWebPageAdapter::isContentEditable() const
diff --git a/qtwebkit/qt5-webkit-trojita-1.patch b/qtwebkit/qt5-webkit-trojita-1.patch
deleted file mode 100644
index b963d5ec4..000000000
--- a/qtwebkit/qt5-webkit-trojita-1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6faf11215e1af27d35e921ae669aa0251a01a1ab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@digia.com>
-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 <allan.jensen@digia.com>
----
- 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();
- }
- 
- 
diff --git a/qtwebkit/qt5-webkit-trojita-2.patch b/qtwebkit/qt5-webkit-trojita-2.patch
deleted file mode 100644
index 51fb78b78..000000000
--- a/qtwebkit/qt5-webkit-trojita-2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 76420459a13d9440b41864c93cb4ebb404bdab55 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-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();
- }
- 
-