* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/
@ 2016-04-23 23:17 Davide Pesavento
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento @ 2016-04-23 23:17 UTC (permalink / raw
To: gentoo-commits
commit: 219be92692f4a9388e1c185eb5d5b90233fe543e
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 23:16:54 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 23:16:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219be926
dev-qt/qtwebkit: edit gstreamer patches so that they work with eapply
Package-Manager: portage-2.2.28
dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch | 4 ++--
dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
index 05e41a1..69550f2 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
@@ -1,5 +1,5 @@
---- Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000
-+++ Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000
+--- a/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000
++++ b/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000
@@ -99,12 +99,6 @@
# HTML5 Media Support for builds with GStreamer
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
index 1c02e45..e44dc29 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
@@ -1,5 +1,5 @@
---- Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100
-+++ Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100
+--- a/Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100
++++ b/Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100
@@ -96,14 +96,8 @@
use?(3d_graphics): WEBKIT_CONFIG += webgl
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/
@ 2018-05-13 6:56 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-05-13 6:56 UTC (permalink / raw
To: gentoo-commits
commit: 8a911806ddfa48634342416055e02489ed1f3b72
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat May 12 15:27:12 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 13 06:56:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a911806
dev-qt/qtwebkit: remove unused patches
.../files/qtwebkit-5.2.1-disable-gstreamer.patch | 15 ----
.../files/qtwebkit-5.3.2-use-gstreamer010.patch | 18 -----
dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch | 92 ----------------------
3 files changed, 125 deletions(-)
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
deleted file mode 100644
index 69550f290fa..00000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000
-+++ b/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000
-@@ -99,12 +99,6 @@
-
- # HTML5 Media Support for builds with GStreamer
- unix:!mac:!contains(QT_CONFIG, no-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) {
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
deleted file mode 100644
index e44dc295a41..00000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100
-+++ b/Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100
-@@ -96,14 +96,8 @@
- use?(3d_graphics): WEBKIT_CONFIG += webgl
-
- # HTML5 Media Support for builds with GStreamer
-- unix:!mac:!contains(QT_CONFIG, no-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
-- }
-+ WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
-- }
-
- !enable?(video):qtHaveModule(multimediawidgets) {
- WEBKIT_CONFIG += video use_qt_multimedia
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch
deleted file mode 100644
index 2a2709b34ce..00000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-Date: Thu, 4 May 2017 15:12:37 +0300
-Subject: [PATCH] Fix compilation with ICU 59
-
-Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612
-
-Task-number: QTBUG-60532
-Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++---
- Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++-
- Source/WTF/wtf/TypeTraits.h | 3 +++
- Source/WebKit2/Shared/API/c/WKString.cpp | 2 +-
- 4 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
-index 812f3d413..77a3fd0f4 100644
---- a/Source/JavaScriptCore/API/JSStringRef.cpp
-+++ b/Source/JavaScriptCore/API/JSStringRef.cpp
-@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
- JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
- {
- initializeThreading();
-- return OpaqueJSString::create(chars, numChars).leakRef();
-+ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
- }
-
- JSStringRef JSStringCreateWithUTF8CString(const char* string)
-@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
- JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
- {
- initializeThreading();
-- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
-+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
- }
-
- JSStringRef JSStringRetain(JSStringRef string)
-@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
-
- const JSChar* JSStringGetCharactersPtr(JSStringRef string)
- {
-- return string->characters();
-+ return reinterpret_cast<const JSChar*>(string->characters());
- }
-
- size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
-diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp
-index 0b57f012d..05e27338b 100644
---- a/Source/JavaScriptCore/runtime/DateConversion.cpp
-+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
-@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as
- #if OS(WINDOWS)
- TIME_ZONE_INFORMATION timeZoneInformation;
- GetTimeZoneInformation(&timeZoneInformation);
-- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
-+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
-+ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
- #else
- struct tm gtm = t;
- char timeZoneName[70];
-diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
-index 9df2c95cf..f5d6121fd 100644
---- a/Source/WTF/wtf/TypeTraits.h
-+++ b/Source/WTF/wtf/TypeTraits.h
-@@ -72,6 +72,9 @@ namespace WTF {
- template<> struct IsInteger<unsigned long> { static const bool value = true; };
- template<> struct IsInteger<long long> { static const bool value = true; };
- template<> struct IsInteger<unsigned long long> { static const bool value = true; };
-+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT)
-+ template<> struct IsInteger<char16_t> { static const bool value = true; };
-+#endif
- #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
- template<> struct IsInteger<wchar_t> { static const bool value = true; };
- #endif
-diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp
-index cbac67dd8..23400a64e 100644
---- a/Source/WebKit2/Shared/API/c/WKString.cpp
-+++ b/Source/WebKit2/Shared/API/c/WKString.cpp
-@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
- size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
- {
- COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
-- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
-+ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
- }
-
- size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
---
-2.13.1
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/
@ 2019-12-01 18:42 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-12-01 18:42 UTC (permalink / raw
To: gentoo-commits
commit: 0c26ac28753383ed6b714d00651f56a97ae0ebf6
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Dec 1 08:20:33 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 18:42:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c26ac28
dev-qt/qtwebkit: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13818
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
...0180120-cmake-fix-pkgconfig_deps-spelling.patch | 97 ----------------------
...twebkit-5.212.0_pre20180120-fix-pkgconfig.patch | 29 -------
.../qtwebkit-5.212.0_pre20180120-functional.patch | 22 -----
...webkit-5.212.0_pre20180120-js-build-error.patch | 34 --------
4 files changed, 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 a460cec609b..00000000000
--- 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 e5d7796ee14..00000000000
--- 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 d8b5ba6cf31..00000000000
--- 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 904957c7186..00000000000
--- 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-01 18:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-01 18:42 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2018-05-13 6:56 Andreas Sturmlechner
2016-04-23 23:17 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox