1 |
commit: 8a911806ddfa48634342416055e02489ed1f3b72 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat May 12 15:27:12 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 13 06:56:32 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a911806 |
7 |
|
8 |
dev-qt/qtwebkit: remove unused patches |
9 |
|
10 |
.../files/qtwebkit-5.2.1-disable-gstreamer.patch | 15 ---- |
11 |
.../files/qtwebkit-5.3.2-use-gstreamer010.patch | 18 ----- |
12 |
dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch | 92 ---------------------- |
13 |
3 files changed, 125 deletions(-) |
14 |
|
15 |
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 |
16 |
deleted file mode 100644 |
17 |
index 69550f290fa..00000000000 |
18 |
--- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch |
19 |
+++ /dev/null |
20 |
@@ -1,15 +0,0 @@ |
21 |
---- a/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000 |
22 |
-+++ b/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000 |
23 |
-@@ -99,12 +99,6 @@ |
24 |
- |
25 |
- # HTML5 Media Support for builds with GStreamer |
26 |
- unix:!mac:!contains(QT_CONFIG, no-pkg-config) { |
27 |
-- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { |
28 |
-- WEBKIT_CONFIG += video use_gstreamer |
29 |
-- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { |
30 |
-- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 |
31 |
-- } |
32 |
-- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video |
33 |
- } |
34 |
- |
35 |
- !enable?(video):qtHaveModule(multimediawidgets) { |
36 |
|
37 |
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 |
38 |
deleted file mode 100644 |
39 |
index e44dc295a41..00000000000 |
40 |
--- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch |
41 |
+++ /dev/null |
42 |
@@ -1,18 +0,0 @@ |
43 |
---- a/Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100 |
44 |
-+++ b/Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100 |
45 |
-@@ -96,14 +96,8 @@ |
46 |
- use?(3d_graphics): WEBKIT_CONFIG += webgl |
47 |
- |
48 |
- # HTML5 Media Support for builds with GStreamer |
49 |
-- unix:!mac:!contains(QT_CONFIG, no-pkg-config) { |
50 |
-- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { |
51 |
-- WEBKIT_CONFIG += video use_gstreamer |
52 |
-- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { |
53 |
-- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 |
54 |
-- } |
55 |
-+ WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 |
56 |
- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video |
57 |
-- } |
58 |
- |
59 |
- !enable?(video):qtHaveModule(multimediawidgets) { |
60 |
- WEBKIT_CONFIG += video use_qt_multimedia |
61 |
|
62 |
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 |
63 |
deleted file mode 100644 |
64 |
index 2a2709b34ce..00000000000 |
65 |
--- a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch |
66 |
+++ /dev/null |
67 |
@@ -1,92 +0,0 @@ |
68 |
-From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001 |
69 |
-From: Konstantin Tokarev <annulen@××××××.ru> |
70 |
-Date: Thu, 4 May 2017 15:12:37 +0300 |
71 |
-Subject: [PATCH] Fix compilation with ICU 59 |
72 |
- |
73 |
-Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 |
74 |
- |
75 |
-Task-number: QTBUG-60532 |
76 |
-Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 |
77 |
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@××.io> |
78 |
---- |
79 |
- Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- |
80 |
- Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- |
81 |
- Source/WTF/wtf/TypeTraits.h | 3 +++ |
82 |
- Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- |
83 |
- 4 files changed, 9 insertions(+), 5 deletions(-) |
84 |
- |
85 |
-diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp |
86 |
-index 812f3d413..77a3fd0f4 100644 |
87 |
---- a/Source/JavaScriptCore/API/JSStringRef.cpp |
88 |
-+++ b/Source/JavaScriptCore/API/JSStringRef.cpp |
89 |
-@@ -37,7 +37,7 @@ using namespace WTF::Unicode; |
90 |
- JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) |
91 |
- { |
92 |
- initializeThreading(); |
93 |
-- return OpaqueJSString::create(chars, numChars).leakRef(); |
94 |
-+ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef(); |
95 |
- } |
96 |
- |
97 |
- JSStringRef JSStringCreateWithUTF8CString(const char* string) |
98 |
-@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) |
99 |
- JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) |
100 |
- { |
101 |
- initializeThreading(); |
102 |
-- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); |
103 |
-+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); |
104 |
- } |
105 |
- |
106 |
- JSStringRef JSStringRetain(JSStringRef string) |
107 |
-@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) |
108 |
- |
109 |
- const JSChar* JSStringGetCharactersPtr(JSStringRef string) |
110 |
- { |
111 |
-- return string->characters(); |
112 |
-+ return reinterpret_cast<const JSChar*>(string->characters()); |
113 |
- } |
114 |
- |
115 |
- size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) |
116 |
-diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp |
117 |
-index 0b57f012d..05e27338b 100644 |
118 |
---- a/Source/JavaScriptCore/runtime/DateConversion.cpp |
119 |
-+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp |
120 |
-@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as |
121 |
- #if OS(WINDOWS) |
122 |
- TIME_ZONE_INFORMATION timeZoneInformation; |
123 |
- GetTimeZoneInformation(&timeZoneInformation); |
124 |
-- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; |
125 |
-+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; |
126 |
-+ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName)); |
127 |
- #else |
128 |
- struct tm gtm = t; |
129 |
- char timeZoneName[70]; |
130 |
-diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h |
131 |
-index 9df2c95cf..f5d6121fd 100644 |
132 |
---- a/Source/WTF/wtf/TypeTraits.h |
133 |
-+++ b/Source/WTF/wtf/TypeTraits.h |
134 |
-@@ -72,6 +72,9 @@ namespace WTF { |
135 |
- template<> struct IsInteger<unsigned long> { static const bool value = true; }; |
136 |
- template<> struct IsInteger<long long> { static const bool value = true; }; |
137 |
- template<> struct IsInteger<unsigned long long> { static const bool value = true; }; |
138 |
-+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) |
139 |
-+ template<> struct IsInteger<char16_t> { static const bool value = true; }; |
140 |
-+#endif |
141 |
- #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) |
142 |
- template<> struct IsInteger<wchar_t> { static const bool value = true; }; |
143 |
- #endif |
144 |
-diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp |
145 |
-index cbac67dd8..23400a64e 100644 |
146 |
---- a/Source/WebKit2/Shared/API/c/WKString.cpp |
147 |
-+++ b/Source/WebKit2/Shared/API/c/WKString.cpp |
148 |
-@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) |
149 |
- size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) |
150 |
- { |
151 |
- COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); |
152 |
-- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength)); |
153 |
-+ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength)); |
154 |
- } |
155 |
- |
156 |
- size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) |
157 |
--- |
158 |
-2.13.1 |
159 |
- |