1 |
commit: 006cf189250749e6a40080ebbf67ab9e9481881d |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 1 14:04:25 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 1 14:04:34 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006cf189 |
7 |
|
8 |
dev-qt/qtwebengine: remove patches accidentally introduced in 9f88b15ff6b650018934340b24e50d10eb15aa58 |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
dev-qt/qtwebengine/files/a.patch | 381 --------------------------------------- |
13 |
dev-qt/qtwebengine/files/b.patch | 49 ----- |
14 |
2 files changed, 430 deletions(-) |
15 |
|
16 |
diff --git a/dev-qt/qtwebengine/files/a.patch b/dev-qt/qtwebengine/files/a.patch |
17 |
deleted file mode 100644 |
18 |
index a522e8e..00000000 |
19 |
--- a/dev-qt/qtwebengine/files/a.patch |
20 |
+++ /dev/null |
21 |
@@ -1,381 +0,0 @@ |
22 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/base.gypi |
23 |
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi 2016-01-12 03:01:20.875004550 +0100 |
24 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/base.gypi 2016-01-12 03:04:12.789946122 +0100 |
25 |
-@@ -621,8 +621,6 @@ |
26 |
- 'third_party/dmg_fp/dmg_fp.h', |
27 |
- 'third_party/dmg_fp/dtoa_wrapper.cc', |
28 |
- 'third_party/dmg_fp/g_fmt.cc', |
29 |
-- 'third_party/icu/icu_utf.cc', |
30 |
-- 'third_party/icu/icu_utf.h', |
31 |
- 'third_party/superfasthash/superfasthash.c', |
32 |
- 'third_party/xdg_mime/xdgmime.h', |
33 |
- 'thread_task_runner_handle.cc', |
34 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/BUILD.gn |
35 |
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn 2016-01-12 03:03:08.040591492 +0100 |
36 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/BUILD.gn 2016-01-12 03:04:27.209025094 +0100 |
37 |
-@@ -504,8 +504,6 @@ |
38 |
- "third_party/dmg_fp/dmg_fp.h", |
39 |
- "third_party/dmg_fp/dtoa_wrapper.cc", |
40 |
- "third_party/dmg_fp/g_fmt.cc", |
41 |
-- "third_party/icu/icu_utf.cc", |
42 |
-- "third_party/icu/icu_utf.h", |
43 |
- "third_party/superfasthash/superfasthash.c", |
44 |
- "thread_task_runner_handle.cc", |
45 |
- "thread_task_runner_handle.h", |
46 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/files/file_path.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/files/file_path.cc |
47 |
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/files/file_path.cc 2015-12-10 18:17:21.000000000 +0100 |
48 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/files/file_path.cc 2016-01-12 03:09:08.430565334 +0100 |
49 |
-@@ -20,7 +20,7 @@ |
50 |
- |
51 |
- #if defined(OS_MACOSX) |
52 |
- #include "base/mac/scoped_cftyperef.h" |
53 |
--#include "base/third_party/icu/icu_utf.h" |
54 |
-+#include <unicode/utf.h> |
55 |
- #endif |
56 |
- |
57 |
- #if defined(OS_WIN) |
58 |
-@@ -1140,9 +1140,9 @@ |
59 |
- int* index) { |
60 |
- int codepoint = 0; |
61 |
- while (*index < length && codepoint == 0) { |
62 |
-- // CBU8_NEXT returns a value < 0 in error cases. For purposes of string |
63 |
-+ // U8_NEXT returns a value < 0 in error cases. For purposes of string |
64 |
- // comparison, we just use that value and flag it with DCHECK. |
65 |
-- CBU8_NEXT(string, *index, length, codepoint); |
66 |
-+ U8_NEXT(string, *index, length, codepoint); |
67 |
- DCHECK_GT(codepoint, 0); |
68 |
- if (codepoint > 0) { |
69 |
- // Check if there is a subtable for this upper byte. |
70 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/json_parser.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/json_parser.cc |
71 |
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/json_parser.cc 2015-12-10 18:17:21.000000000 +0100 |
72 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/json_parser.cc 2016-01-12 03:12:23.701634827 +0100 |
73 |
-@@ -14,7 +14,7 @@ |
74 |
- #include "base/strings/stringprintf.h" |
75 |
- #include "base/strings/utf_string_conversion_utils.h" |
76 |
- #include "base/strings/utf_string_conversions.h" |
77 |
--#include "base/third_party/icu/icu_utf.h" |
78 |
-+#include <unicode/utf.h> |
79 |
- #include "base/values.h" |
80 |
- |
81 |
- namespace base { |
82 |
-@@ -616,8 +616,8 @@ |
83 |
- int32 next_char = 0; |
84 |
- |
85 |
- while (CanConsume(1)) { |
86 |
-- pos_ = start_pos_ + index_; // CBU8_NEXT is postcrement. |
87 |
-- CBU8_NEXT(start_pos_, index_, length, next_char); |
88 |
-+ pos_ = start_pos_ + index_; // U8_NEXT is postcrement. |
89 |
-+ U8_NEXT(start_pos_, index_, length, next_char); |
90 |
- if (next_char < 0 || !IsValidCharacter(next_char)) { |
91 |
- ReportError(JSONReader::JSON_UNSUPPORTED_ENCODING, 1); |
92 |
- return false; |
93 |
-@@ -710,7 +710,7 @@ |
94 |
- return false; |
95 |
- } |
96 |
- } else if (next_char == '"') { |
97 |
-- --index_; // Rewind by one because of CBU8_NEXT. |
98 |
-+ --index_; // Rewind by one because of U8_NEXT. |
99 |
- out->Swap(&string); |
100 |
- return true; |
101 |
- } else { |
102 |
-@@ -750,10 +750,10 @@ |
103 |
- |
104 |
- // If this is a high surrogate, consume the next code unit to get the |
105 |
- // low surrogate. |
106 |
-- if (CBU16_IS_SURROGATE(code_unit16_high)) { |
107 |
-+ if (U16_IS_SURROGATE(code_unit16_high)) { |
108 |
- // Make sure this is the high surrogate. If not, it's an encoding |
109 |
- // error. |
110 |
-- if (!CBU16_IS_SURROGATE_LEAD(code_unit16_high)) |
111 |
-+ if (!U16_IS_SURROGATE_LEAD(code_unit16_high)) |
112 |
- return false; |
113 |
- |
114 |
- // Make sure that the token has more characters to consume the |
115 |
-@@ -770,24 +770,24 @@ |
116 |
- |
117 |
- NextNChars(3); |
118 |
- |
119 |
-- if (!CBU16_IS_TRAIL(code_unit16_low)) { |
120 |
-+ if (!U16_IS_TRAIL(code_unit16_low)) { |
121 |
- return false; |
122 |
- } |
123 |
- |
124 |
-- uint32 code_point = CBU16_GET_SUPPLEMENTARY(code_unit16_high, |
125 |
-- code_unit16_low); |
126 |
-+ uint32 code_point = U16_GET_SUPPLEMENTARY(code_unit16_high, |
127 |
-+ code_unit16_low); |
128 |
- if (!IsValidCharacter(code_point)) |
129 |
- return false; |
130 |
- |
131 |
- offset = 0; |
132 |
-- CBU8_APPEND_UNSAFE(code_unit8, offset, code_point); |
133 |
-+ U8_APPEND_UNSAFE(code_unit8, offset, code_point); |
134 |
- } else { |
135 |
- // Not a surrogate. |
136 |
-- DCHECK(CBU16_IS_SINGLE(code_unit16_high)); |
137 |
-+ DCHECK(U16_IS_SINGLE(code_unit16_high)); |
138 |
- if (!IsValidCharacter(code_unit16_high)) |
139 |
- return false; |
140 |
- |
141 |
-- CBU8_APPEND_UNSAFE(code_unit8, offset, code_unit16_high); |
142 |
-+ U8_APPEND_UNSAFE(code_unit8, offset, code_unit16_high); |
143 |
- } |
144 |
- |
145 |
- dest_string->append(code_unit8); |
146 |
-@@ -804,9 +804,9 @@ |
147 |
- } else { |
148 |
- char utf8_units[4] = { 0 }; |
149 |
- int offset = 0; |
150 |
-- CBU8_APPEND_UNSAFE(utf8_units, offset, point); |
151 |
-+ U8_APPEND_UNSAFE(utf8_units, offset, point); |
152 |
- dest->Convert(); |
153 |
-- // CBU8_APPEND_UNSAFE can overwrite up to 4 bytes, so utf8_units may not be |
154 |
-+ // U8_APPEND_UNSAFE can overwrite up to 4 bytes, so utf8_units may not be |
155 |
- // zero terminated at this point. |offset| contains the correct length. |
156 |
- dest->AppendString(std::string(utf8_units, offset)); |
157 |
- } |
158 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/string_escape.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/string_escape.cc |
159 |
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/string_escape.cc 2015-12-10 18:17:21.000000000 +0100 |
160 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/string_escape.cc 2016-01-12 03:12:46.093757468 +0100 |
161 |
-@@ -10,7 +10,7 @@ |
162 |
- #include "base/strings/stringprintf.h" |
163 |
- #include "base/strings/utf_string_conversion_utils.h" |
164 |
- #include "base/strings/utf_string_conversions.h" |
165 |
--#include "base/third_party/icu/icu_utf.h" |
166 |
-+#include <unicode/utf.h> |
167 |
- |
168 |
- namespace base { |
169 |
- |
170 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/pattern.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/pattern.cc |
171 |
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/pattern.cc 2015-12-10 18:17:21.000000000 +0100 |
172 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/pattern.cc 2016-01-12 03:14:17.884254687 +0100 |
173 |
-@@ -4,13 +4,13 @@ |
174 |
- |
175 |
- #include "base/strings/pattern.h" |
176 |
- |
177 |
--#include "base/third_party/icu/icu_utf.h" |
178 |
-+#include <unicode/utf.h> |
179 |
- |
180 |
- namespace base { |
181 |
- |
182 |
- namespace { |
183 |
- |
184 |
--static bool IsWildcard(base_icu::UChar32 character) { |
185 |
-+static bool IsWildcard(UChar32 character) { |
186 |
- return character == '*' || character == '?'; |
187 |
- } |
188 |
- |
189 |
-@@ -37,9 +37,9 @@ |
190 |
- // Check if the chars match, if so, increment the ptrs. |
191 |
- const CHAR* pattern_next = *pattern; |
192 |
- const CHAR* string_next = *string; |
193 |
-- base_icu::UChar32 pattern_char = next(&pattern_next, pattern_end); |
194 |
-+ UChar32 pattern_char = next(&pattern_next, pattern_end); |
195 |
- if (pattern_char == next(&string_next, string_end) && |
196 |
-- pattern_char != CBU_SENTINEL) { |
197 |
-+ pattern_char != U_SENTINEL) { |
198 |
- *pattern = pattern_next; |
199 |
- *string = string_next; |
200 |
- } else { |
201 |
-@@ -133,20 +133,20 @@ |
202 |
- } |
203 |
- |
204 |
- struct NextCharUTF8 { |
205 |
-- base_icu::UChar32 operator()(const char** p, const char* end) { |
206 |
-- base_icu::UChar32 c; |
207 |
-+ UChar32 operator()(const char** p, const char* end) { |
208 |
-+ UChar32 c; |
209 |
- int offset = 0; |
210 |
-- CBU8_NEXT(*p, offset, end - *p, c); |
211 |
-+ U8_NEXT(*p, offset, end - *p, c); |
212 |
- *p += offset; |
213 |
- return c; |
214 |
- } |
215 |
- }; |
216 |
- |
217 |
- struct NextCharUTF16 { |
218 |
-- base_icu::UChar32 operator()(const char16** p, const char16* end) { |
219 |
-- base_icu::UChar32 c; |
220 |
-+ UChar32 operator()(const char16** p, const char16* end) { |
221 |
-+ UChar32 c; |
222 |
- int offset = 0; |
223 |
-- CBU16_NEXT(*p, offset, end - *p, c); |
224 |
-+ U16_NEXT(*p, offset, end - *p, c); |
225 |
- *p += offset; |
226 |
- return c; |
227 |
- } |
228 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_split.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_split.cc |
229 |
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_split.cc 2015-12-10 18:17:21.000000000 +0100 |
230 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_split.cc 2016-01-12 03:14:39.106365912 +0100 |
231 |
-@@ -6,7 +6,7 @@ |
232 |
- |
233 |
- #include "base/logging.h" |
234 |
- #include "base/strings/string_util.h" |
235 |
--#include "base/third_party/icu/icu_utf.h" |
236 |
-+#include <unicode/utf.h> |
237 |
- |
238 |
- namespace base { |
239 |
- |
240 |
-@@ -201,7 +201,7 @@ |
241 |
- void SplitString(const string16& str, |
242 |
- char16 c, |
243 |
- std::vector<string16>* result) { |
244 |
-- DCHECK(CBU16_IS_SINGLE(c)); |
245 |
-+ DCHECK(U16_IS_SINGLE(c)); |
246 |
- *result = SplitStringT<string16, string16, char16>( |
247 |
- str, c, TRIM_WHITESPACE, SPLIT_WANT_ALL); |
248 |
- |
249 |
-@@ -274,7 +274,7 @@ |
250 |
- void SplitStringDontTrim(StringPiece16 str, |
251 |
- char16 c, |
252 |
- std::vector<string16>* result) { |
253 |
-- DCHECK(CBU16_IS_SINGLE(c)); |
254 |
-+ DCHECK(U16_IS_SINGLE(c)); |
255 |
- *result = SplitStringT<string16, string16, char16>( |
256 |
- str, c, KEEP_WHITESPACE, SPLIT_WANT_ALL); |
257 |
- } |
258 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_util.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_util.cc |
259 |
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_util.cc 2015-12-10 18:17:21.000000000 +0100 |
260 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_util.cc 2016-01-12 03:15:00.981480560 +0100 |
261 |
-@@ -24,7 +24,7 @@ |
262 |
- #include "base/strings/string_split.h" |
263 |
- #include "base/strings/utf_string_conversion_utils.h" |
264 |
- #include "base/strings/utf_string_conversions.h" |
265 |
--#include "base/third_party/icu/icu_utf.h" |
266 |
-+#include <unicode/utf.h> |
267 |
- #include "build/build_config.h" |
268 |
- |
269 |
- // Remove when this entire file is in the base namespace. |
270 |
-@@ -274,19 +274,19 @@ |
271 |
- return; |
272 |
- } |
273 |
- DCHECK_LE(byte_size, static_cast<uint32>(kint32max)); |
274 |
-- // Note: This cast is necessary because CBU8_NEXT uses int32s. |
275 |
-+ // Note: This cast is necessary because U8_NEXT uses int32s. |
276 |
- int32 truncation_length = static_cast<int32>(byte_size); |
277 |
- int32 char_index = truncation_length - 1; |
278 |
- const char* data = input.data(); |
279 |
- |
280 |
-- // Using CBU8, we will move backwards from the truncation point |
281 |
-+ // Using U8, we will move backwards from the truncation point |
282 |
- // to the beginning of the string looking for a valid UTF8 |
283 |
- // character. Once a full UTF8 character is found, we will |
284 |
- // truncate the string to the end of that character. |
285 |
- while (char_index >= 0) { |
286 |
- int32 prev = char_index; |
287 |
-- base_icu::UChar32 code_point = 0; |
288 |
-- CBU8_NEXT(data, char_index, truncation_length, code_point); |
289 |
-+ UChar32 code_point = 0; |
290 |
-+ U8_NEXT(data, char_index, truncation_length, code_point); |
291 |
- if (!IsValidCharacter(code_point) || |
292 |
- !IsValidCodepoint(code_point)) { |
293 |
- char_index = prev - 1; |
294 |
-@@ -447,7 +447,7 @@ |
295 |
- |
296 |
- while (char_index < src_len) { |
297 |
- int32 code_point; |
298 |
-- CBU8_NEXT(src, char_index, src_len, code_point); |
299 |
-+ U8_NEXT(src, char_index, src_len, code_point); |
300 |
- if (!IsValidCharacter(code_point)) |
301 |
- return false; |
302 |
- } |
303 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc |
304 |
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc 2015-12-10 18:17:21.000000000 +0100 |
305 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc 2016-01-12 03:15:27.384618939 +0100 |
306 |
-@@ -4,7 +4,7 @@ |
307 |
- |
308 |
- #include "base/strings/utf_string_conversion_utils.h" |
309 |
- |
310 |
--#include "base/third_party/icu/icu_utf.h" |
311 |
-+#include <unicode/utf.h> |
312 |
- |
313 |
- namespace base { |
314 |
- |
315 |
-@@ -18,7 +18,7 @@ |
316 |
- // use a signed type for code_point. But this function returns false |
317 |
- // on error anyway, so code_point_out is unsigned. |
318 |
- int32 code_point; |
319 |
-- CBU8_NEXT(src, *char_index, src_len, code_point); |
320 |
-+ U8_NEXT(src, *char_index, src_len, code_point); |
321 |
- *code_point_out = static_cast<uint32>(code_point); |
322 |
- |
323 |
- // The ICU macro above moves to the next char, we want to point to the last |
324 |
-@@ -33,16 +33,16 @@ |
325 |
- int32 src_len, |
326 |
- int32* char_index, |
327 |
- uint32* code_point) { |
328 |
-- if (CBU16_IS_SURROGATE(src[*char_index])) { |
329 |
-- if (!CBU16_IS_SURROGATE_LEAD(src[*char_index]) || |
330 |
-+ if (U16_IS_SURROGATE(src[*char_index])) { |
331 |
-+ if (!U16_IS_SURROGATE_LEAD(src[*char_index]) || |
332 |
- *char_index + 1 >= src_len || |
333 |
-- !CBU16_IS_TRAIL(src[*char_index + 1])) { |
334 |
-+ !U16_IS_TRAIL(src[*char_index + 1])) { |
335 |
- // Invalid surrogate pair. |
336 |
- return false; |
337 |
- } |
338 |
- |
339 |
- // Valid surrogate pair. |
340 |
-- *code_point = CBU16_GET_SUPPLEMENTARY(src[*char_index], |
341 |
-+ *code_point = U16_GET_SUPPLEMENTARY(src[*char_index], |
342 |
- src[*char_index + 1]); |
343 |
- (*char_index)++; |
344 |
- } else { |
345 |
-@@ -76,30 +76,30 @@ |
346 |
- } |
347 |
- |
348 |
- |
349 |
-- // CBU8_APPEND_UNSAFE can append up to 4 bytes. |
350 |
-+ // U8_APPEND_UNSAFE can append up to 4 bytes. |
351 |
- size_t char_offset = output->length(); |
352 |
- size_t original_char_offset = char_offset; |
353 |
-- output->resize(char_offset + CBU8_MAX_LENGTH); |
354 |
-+ output->resize(char_offset + U8_MAX_LENGTH); |
355 |
- |
356 |
-- CBU8_APPEND_UNSAFE(&(*output)[0], char_offset, code_point); |
357 |
-+ U8_APPEND_UNSAFE(&(*output)[0], char_offset, code_point); |
358 |
- |
359 |
-- // CBU8_APPEND_UNSAFE will advance our pointer past the inserted character, so |
360 |
-+ // U8_APPEND_UNSAFE will advance our pointer past the inserted character, so |
361 |
- // it will represent the new length of the string. |
362 |
- output->resize(char_offset); |
363 |
- return char_offset - original_char_offset; |
364 |
- } |
365 |
- |
366 |
- size_t WriteUnicodeCharacter(uint32 code_point, string16* output) { |
367 |
-- if (CBU16_LENGTH(code_point) == 1) { |
368 |
-+ if (U16_LENGTH(code_point) == 1) { |
369 |
- // Thie code point is in the Basic Multilingual Plane (BMP). |
370 |
- output->push_back(static_cast<char16>(code_point)); |
371 |
- return 1; |
372 |
- } |
373 |
- // Non-BMP characters use a double-character encoding. |
374 |
- size_t char_offset = output->length(); |
375 |
-- output->resize(char_offset + CBU16_MAX_LENGTH); |
376 |
-- CBU16_APPEND_UNSAFE(&(*output)[0], char_offset, code_point); |
377 |
-- return CBU16_MAX_LENGTH; |
378 |
-+ output->resize(char_offset + U16_MAX_LENGTH); |
379 |
-+ U16_APPEND_UNSAFE(&(*output)[0], char_offset, code_point); |
380 |
-+ return U16_MAX_LENGTH; |
381 |
- } |
382 |
- |
383 |
- // Generalized Unicode converter ----------------------------------------------- |
384 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc |
385 |
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc 2015-12-10 18:17:21.000000000 +0100 |
386 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc 2016-01-12 03:15:51.205743785 +0100 |
387 |
-@@ -5,13 +5,13 @@ |
388 |
- #include "ui/gfx/utf16_indexing.h" |
389 |
- |
390 |
- #include "base/logging.h" |
391 |
--#include "base/third_party/icu/icu_utf.h" |
392 |
-+#include <unicode/utf.h> |
393 |
- |
394 |
- namespace gfx { |
395 |
- |
396 |
- bool IsValidCodePointIndex(const base::string16& s, size_t index) { |
397 |
- return index == 0 || index == s.length() || |
398 |
-- !(CBU16_IS_TRAIL(s[index]) && CBU16_IS_LEAD(s[index - 1])); |
399 |
-+ !(U16_IS_TRAIL(s[index]) && U16_IS_LEAD(s[index - 1])); |
400 |
- } |
401 |
- |
402 |
- ptrdiff_t UTF16IndexToOffset(const base::string16& s, size_t base, size_t pos) { |
403 |
|
404 |
diff --git a/dev-qt/qtwebengine/files/b.patch b/dev-qt/qtwebengine/files/b.patch |
405 |
deleted file mode 100644 |
406 |
index dffa81e..00000000 |
407 |
--- a/dev-qt/qtwebengine/files/b.patch |
408 |
+++ /dev/null |
409 |
@@ -1,49 +0,0 @@ |
410 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/base.gypi qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi |
411 |
---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/base.gypi 2015-12-10 18:17:21.000000000 +0100 |
412 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi 2016-01-12 03:01:20.875004550 +0100 |
413 |
-@@ -623,8 +623,6 @@ |
414 |
- 'third_party/dmg_fp/g_fmt.cc', |
415 |
- 'third_party/icu/icu_utf.cc', |
416 |
- 'third_party/icu/icu_utf.h', |
417 |
-- 'third_party/nspr/prtime.cc', |
418 |
-- 'third_party/nspr/prtime.h', |
419 |
- 'third_party/superfasthash/superfasthash.c', |
420 |
- 'third_party/xdg_mime/xdgmime.h', |
421 |
- 'thread_task_runner_handle.cc', |
422 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn |
423 |
---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/BUILD.gn 2015-12-10 18:17:21.000000000 +0100 |
424 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn 2016-01-12 03:03:08.040591492 +0100 |
425 |
-@@ -506,8 +506,6 @@ |
426 |
- "third_party/dmg_fp/g_fmt.cc", |
427 |
- "third_party/icu/icu_utf.cc", |
428 |
- "third_party/icu/icu_utf.h", |
429 |
-- "third_party/nspr/prtime.cc", |
430 |
-- "third_party/nspr/prtime.h", |
431 |
- "third_party/superfasthash/superfasthash.c", |
432 |
- "thread_task_runner_handle.cc", |
433 |
- "thread_task_runner_handle.h", |
434 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/pr_time_unittest.cc qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc |
435 |
---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2015-12-10 18:17:21.000000000 +0100 |
436 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2016-01-12 03:01:20.876004555 +0100 |
437 |
-@@ -6,7 +6,7 @@ |
438 |
- #include <time.h> |
439 |
- |
440 |
- #include "base/compiler_specific.h" |
441 |
--#include "base/third_party/nspr/prtime.h" |
442 |
-+#include <nspr4/prtime.h> |
443 |
- #include "base/time/time.h" |
444 |
- #include "testing/gtest/include/gtest/gtest.h" |
445 |
- |
446 |
-diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/time.cc qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc |
447 |
---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/time.cc 2015-12-10 18:17:21.000000000 +0100 |
448 |
-+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc 2016-01-12 03:01:20.877004561 +0100 |
449 |
-@@ -13,7 +13,8 @@ |
450 |
- #include "base/lazy_instance.h" |
451 |
- #include "base/logging.h" |
452 |
- #include "base/strings/stringprintf.h" |
453 |
--#include "base/third_party/nspr/prtime.h" |
454 |
-+ |
455 |
-+#include <nspr4/prtime.h> |
456 |
- |
457 |
- namespace base { |
458 |
- |