diff options
4 files changed, 0 insertions, 182 deletions
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch deleted file mode 100644 index a460cec609bc..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 326604b27878566d581ea8c1991abd280453a75b Mon Sep 17 00:00:00 2001 -From: Andrew Webster <awebster@arcx.com> -Date: Tue, 20 Mar 2018 09:08:00 -0400 -Subject: [PATCH] [cmake] Make spelling for PKGCONFIG_DEPS consistent - -It was referenced as PKGCONGIG_DEPS and PKGCONFIG_DEPS which left -Qt5WebKitWidgets with empty dependencies. Correcting to -PKGCONFIG_DEPS gives it the proper dependencies. - -Qt5WebKit was already working, but the spelling has also been -corrected to avoid confusion. ---- - Source/WebKit/PlatformQt.cmake | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake -index 28976b611cd8..de3eabab1157 100644 ---- a/Source/WebKit/PlatformQt.cmake -+++ b/Source/WebKit/PlatformQt.cmake -@@ -427,7 +427,7 @@ install( - COMPONENT Data - ) - --set(WEBKIT_PKGCONGIG_DEPS "Qt5Core Qt5Gui Qt5Network") -+set(WEBKIT_PKGCONFIG_DEPS "Qt5Core Qt5Gui Qt5Network") - set(WEBKIT_PRI_DEPS "core gui network") - set(WEBKIT_PRI_EXTRA_LIBS "") - set(WEBKIT_PRI_RUNTIME_DEPS "core_private gui_private") -@@ -448,11 +448,11 @@ if (USE_MEDIA_FOUNDATION) - set(WEBKIT_PRI_EXTRA_LIBS "-lmfuuid -lstrmiids ${WEBKIT_PRI_EXTRA_LIBS}") - endif () - if (USE_QT_MULTIMEDIA) -- set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Multimedia") -+ set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Multimedia") - set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}") - endif () - --set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit") -+set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit") - set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit") - set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} widgets_private") - -@@ -465,12 +465,12 @@ if (ENABLE_PRINT_SUPPORT) - endif () - - if (USE_QT_MULTIMEDIA) -- set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5MultimediaWidgets") -+ set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5MultimediaWidgets") - set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKITWIDGETS_PRI_RUNTIME_DEPS} multimediawidgets") - endif () - - if (QT_STATIC_BUILD) -- set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5PrintSupport") -+ set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5PrintSupport") - set(WEBKITWIDGETS_PRI_DEPS "${WEBKITWIDGETS_PRI_DEPS} printsupport") - set(EXTRA_LIBS_NAMES WebCore JavaScriptCore WTF) - append_lib_names_to_list(EXTRA_LIBS_NAMES ${LIBXML2_LIBRARIES} ${SQLITE_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES}) -@@ -494,7 +494,7 @@ if (QT_STATIC_BUILD) - endif () - list(REMOVE_DUPLICATES EXTRA_LIBS_NAMES) - foreach (LIB_NAME ${EXTRA_LIBS_NAMES}) -- set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} ${LIB_PREFIX}${LIB_NAME}") -+ set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} ${LIB_PREFIX}${LIB_NAME}") - set(WEBKIT_PRI_EXTRA_LIBS "${WEBKIT_PRI_EXTRA_LIBS} -l${LIB_PREFIX}${LIB_NAME}") - endforeach () - endif () -@@ -504,7 +504,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) - BASE_NAME Qt5WebKit - DESCRIPTION "Qt WebKit module" - INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit" -- DEPS "${WEBKIT_PKGCONGIG_DEPS}" -+ DEPS "${WEBKIT_PKGCONFIG_DEPS}" - FILENAME_VAR WebKit_PKGCONFIG_FILENAME - ) - set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") -From 8c76aabf062232c3fb26839b76716006eca44eec Mon Sep 17 00:00:00 2001 -From: Andrew Webster <awebster@arcx.com> -Date: Tue, 20 Mar 2018 10:33:59 -0400 -Subject: [PATCH] [cmake] Another PKGCONFIG_DEPS correction - ---- - 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 de3eabab1157..6ab441b98d29 100644 ---- a/Source/WebKit/PlatformQt.cmake -+++ b/Source/WebKit/PlatformQt.cmake -@@ -452,7 +452,7 @@ if (USE_QT_MULTIMEDIA) - set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}") - endif () - --set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit") -+set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Widgets Qt5WebKit") - set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit") - set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} widgets_private") - diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch deleted file mode 100644 index e5d7796ee142..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fbd1de045999d1e5b5dcae7ac6c1e674ac0044fe Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev <mitya57@gmail.com> -Date: Sat, 24 Feb 2018 15:09:53 +0300 -Subject: [PATCH] [cmake] Fix include dir in the generated pkg-config files - ---- - Source/WebKit/PlatformQt.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake -index 6fe440be800c..28976b611cd8 100644 ---- a/Source/WebKit/PlatformQt.cmake -+++ b/Source/WebKit/PlatformQt.cmake -@@ -503,6 +503,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) - ecm_generate_pkgconfig_file( - BASE_NAME Qt5WebKit - DESCRIPTION "Qt WebKit module" -+ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit" - DEPS "${WEBKIT_PKGCONGIG_DEPS}" - FILENAME_VAR WebKit_PKGCONFIG_FILENAME - ) -@@ -728,6 +729,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) - ecm_generate_pkgconfig_file( - BASE_NAME Qt5WebKitWidgets - DESCRIPTION "Qt WebKitWidgets module" -+ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets" - DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}" - FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME - ) 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 deleted file mode 100644 index d8b5ba6cf31e..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch +++ /dev/null @@ -1,22 +0,0 @@ -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.212.0_pre20180120-js-build-error.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch deleted file mode 100644 index 904957c71861..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e9a78eafc172a69d48ee48d971b3e430613ab513 Mon Sep 17 00:00:00 2001 -From: bernhardu <bernhardu@mailbox.org> -Date: Mon, 25 Mar 2019 01:57:26 +0100 -Subject: [PATCH] Add attribute fastcall to derived class member - JSImageConstructor::construct (#803) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise the Debian build on i386 fails with this error: -In file included from ../Source/WebCore/bindings/js/JSImageConstructor.cpp:24, - from ../Source/WebCore/bindings/js/JSBindingsAllInOne.cpp:101: -../Source/WebCore/bindings/js/JSDOMConstructor.h: In instantiation of ‘static JSC::ConstructType WebCore::JSDOMNamedConstructor<JSClass>::getConstructData(JSC::JSCell*, JSC::ConstructData&) [with JSClass = WebCore::JSHTMLImageElement]’: -../Source/WebCore/bindings/js/JSImageConstructor.cpp:75:97: required from here -../Source/WebCore/bindings/js/JSDOMConstructor.h:195:35: error: invalid conversion from ‘JSC::EncodedJSValue (*)(JSC::ExecState*)’ {aka ‘long long int (*)(JSC::ExecState*)’} to ‘JSC::NativeFunction’ {aka ‘long long int (__attribute__((fastcall)) *)(JSC::ExecState*)’} [-fpermissive] - constructData.native.function = construct; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~ ---- - Source/WebCore/bindings/js/JSImageConstructor.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebCore/bindings/js/JSImageConstructor.cpp b/Source/WebCore/bindings/js/JSImageConstructor.cpp -index 923690600ab1..de553f5fa899 100644 ---- a/Source/WebCore/bindings/js/JSImageConstructor.cpp -+++ b/Source/WebCore/bindings/js/JSImageConstructor.cpp -@@ -44,7 +44,7 @@ template<> JSValue JSImageConstructor::prototypeForStructure(VM& vm, const JSDOM - return JSHTMLElement::getConstructor(vm, &globalObject); - } - --template<> EncodedJSValue JSImageConstructor::construct(ExecState* state) -+template<> EncodedJSValue JSC_HOST_CALL JSImageConstructor::construct(ExecState* state) - { - JSImageConstructor* jsConstructor = jsCast<JSImageConstructor*>(state->callee()); - Document* document = jsConstructor->document();
\ No newline at end of file |