summaryrefslogtreecommitdiff
path: root/dev-qt/qtwebkit/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt/qtwebkit/files')
-rw-r--r--dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch22
-rw-r--r--dev-qt/qtwebkit/files/qtwebkit-fixes.patch31
2 files changed, 22 insertions, 31 deletions
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
new file mode 100644
index 00000000..d8b5ba6c
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
@@ -0,0 +1,22 @@
+From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+Date: Fri, 26 Jan 2018 20:50:07 +0300
+Subject: [PATCH] Add missing #include <functional>
+
+Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f
+---
+ Source/WebCore/dom/SlotAssignment.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h
+index 0fcd4dfa6de8..9b9ebe429816 100644
+--- a/Source/WebCore/dom/SlotAssignment.h
++++ b/Source/WebCore/dom/SlotAssignment.h
+@@ -28,6 +28,7 @@
+
+ #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+
++#include <functional>
+ #include <wtf/HashMap.h>
+ #include <wtf/HashSet.h>
+ #include <wtf/Vector.h>
diff --git a/dev-qt/qtwebkit/files/qtwebkit-fixes.patch b/dev-qt/qtwebkit/files/qtwebkit-fixes.patch
deleted file mode 100644
index a34c4810..00000000
--- a/dev-qt/qtwebkit/files/qtwebkit-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nur a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
---- a/Source/WebKit/PlatformQt.cmake 2017-06-09 15:11:36.000000000 +0100
-+++ b/Source/WebKit/PlatformQt.cmake 2018-04-26 20:40:30.062720394 +0100
-@@ -786,6 +786,7 @@
- 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
-@@ -795,7 +796,6 @@
-
- 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 -Nur a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
---- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-06-04 21:16:07.000000000 +0100
-+++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2018-04-26 20:41:32.399699229 +0100
-@@ -961,6 +961,8 @@
- FrameView* view = frame->view();
- ASSERT(view);
- view->resize(size);
-+ if (view->needsLayout())
-+ view->layout();
- view->adjustViewSize();
- }
-