diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-qt/qtwebkit/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-qt/qtwebkit/files')
4 files changed, 77 insertions, 0 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 000000000000..d8b5ba6cf31e --- /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-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch new file mode 100644 index 000000000000..265d5075f2fa --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch @@ -0,0 +1,25 @@ +Correct header location so system dev-libs/leveldb can be detected. + +--- a/Tools/qmake/config.tests/leveldb/leveldb.cpp ++++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp +@@ -19,7 +19,7 @@ + + #include <leveldb/db.h> + #include <leveldb/env.h> +-#include <helpers/memenv/memenv.h> ++#include <leveldb/helpers/memenv.h> + + int main(int, char**) + { + +--- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp ++++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp +@@ -38,7 +38,7 @@ + #include <leveldb/comparator.h> + #include <leveldb/db.h> + #include <leveldb/env.h> +-#include <helpers/memenv/memenv.h> ++#include <leveldb/helpers/memenv.h> + #include <leveldb/slice.h> + #include <string> + #include <wtf/PassOwnPtr.h> diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch new file mode 100644 index 000000000000..40e58f0d0dec --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch @@ -0,0 +1,15 @@ +Allow disabling JIT for hardened. + +Author: Magnus Granberg <zorry@gentoo.org> +Gentoo-bug: 562396 + +--- a/Tools/qmake/mkspecs/features/features.pri ++++ b/Tools/qmake/mkspecs/features/features.pri +@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \ + ENABLE_INPUT_TYPE_WEEK=0 \ + ENABLE_INSPECTOR=1 \ + ENABLE_INSPECTOR_SERVER=1 \ ++ ENABLE_JIT=0 \ + ENABLE_JAVASCRIPT_DEBUGGER=1 \ + ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \ + ENABLE_LEGACY_NOTIFICATIONS=1 \ diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch new file mode 100644 index 000000000000..867e8dcb8ef9 --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch @@ -0,0 +1,15 @@ +--- a/Tools/qmake/mkspecs/features/features.prf ++++ b/Tools/qmake/mkspecs/features/features.prf +@@ -101,12 +101,6 @@ defineTest(detectFeatures) { + + # HTML5 Media Support for builds with GStreamer + unix:!mac:qtConfig(pkg-config) { +- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { +- WEBKIT_CONFIG += video use_gstreamer +- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { +- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 +- } +- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video + } + + !enable?(video):qtHaveModule(multimediawidgets) { |