Fix FTBFS issues in the icu59, no-sse2 and skia-neon patches
Also bump changelog date.
This commit is contained in:
Kevin Kofler
parent
3119084d60
commit
b32710261f
@ -575,7 +575,7 @@ done
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Dec 25 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.10.0-1
|
||||
* Tue Dec 26 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.10.0-1
|
||||
- Update to 5.10.0
|
||||
- Update version numbers of bundled stuff
|
||||
- Drop support for Fedora < 26 (in particular, WEBENGINE_CONFIG F25 workarounds)
|
||||
|
||||
@ -165,6 +165,27 @@ diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/base/i18n/stri
|
||||
|
||||
// Default to basic substring search if usearch fails. According to
|
||||
// http://icu-project.org/apiref/icu4c/usearch_8h.html, usearch_open will fail
|
||||
diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/base/i18n/unicodestring.h qtwebengine-everywhere-src-5.10.0-icu59/src/3rdparty/chromium/base/i18n/unicodestring.h
|
||||
--- qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/base/i18n/unicodestring.h 2017-11-28 14:06:53.000000000 +0100
|
||||
+++ qtwebengine-everywhere-src-5.10.0-icu59/src/3rdparty/chromium/base/i18n/unicodestring.h 2017-12-26 01:22:00.605067404 +0100
|
||||
@@ -9,16 +9,12 @@
|
||||
#include "third_party/icu/source/common/unicode/unistr.h"
|
||||
#include "third_party/icu/source/common/unicode/uvernum.h"
|
||||
|
||||
-#if U_ICU_VERSION_MAJOR_NUM >= 59
|
||||
-#include "third_party/icu/source/common/unicode/char16ptr.h"
|
||||
-#endif
|
||||
-
|
||||
namespace base {
|
||||
namespace i18n {
|
||||
|
||||
inline string16 UnicodeStringToString16(const icu::UnicodeString& unistr) {
|
||||
#if U_ICU_VERSION_MAJOR_NUM >= 59
|
||||
- return base::string16(icu::toUCharPtr(unistr.getBuffer()),
|
||||
+ return base::string16(reinterpret_cast<const char16*>(unistr.getBuffer()),
|
||||
static_cast<size_t>(unistr.length()));
|
||||
#else
|
||||
return base::string16(unistr.getBuffer(),
|
||||
diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/components/url_formatter/idn_spoof_checker.cc qtwebengine-everywhere-src-5.10.0-icu59/src/3rdparty/chromium/components/url_formatter/idn_spoof_checker.cc
|
||||
--- qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/components/url_formatter/idn_spoof_checker.cc 2017-11-28 14:06:53.000000000 +0100
|
||||
+++ qtwebengine-everywhere-src-5.10.0-icu59/src/3rdparty/chromium/components/url_formatter/idn_spoof_checker.cc 2017-12-26 00:16:45.791461970 +0100
|
||||
|
||||
@ -2098,7 +2098,7 @@ diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/We
|
||||
+#include "VectorMath.cpp"
|
||||
diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/BUILD.gn qtwebengine-everywhere-src-5.10.0-no-sse2/src/3rdparty/chromium/third_party/WebKit/Source/platform/BUILD.gn
|
||||
--- qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/BUILD.gn 2017-11-28 14:06:53.000000000 +0100
|
||||
+++ qtwebengine-everywhere-src-5.10.0-no-sse2/src/3rdparty/chromium/third_party/WebKit/Source/platform/BUILD.gn 2017-12-25 13:05:24.025939484 +0100
|
||||
+++ qtwebengine-everywhere-src-5.10.0-no-sse2/src/3rdparty/chromium/third_party/WebKit/Source/platform/BUILD.gn 2017-12-26 01:28:56.946048732 +0100
|
||||
@@ -1693,6 +1693,10 @@
|
||||
deps += [ ":blink_x86_sse" ]
|
||||
}
|
||||
@ -2110,7 +2110,7 @@ diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/We
|
||||
if (use_webaudio_ffmpeg) {
|
||||
include_dirs += [ "//third_party/ffmpeg" ]
|
||||
deps += [ "//third_party/ffmpeg" ]
|
||||
@@ -2139,6 +2143,26 @@
|
||||
@@ -2139,6 +2143,23 @@
|
||||
}
|
||||
}
|
||||
|
||||
@ -2122,9 +2122,6 @@ diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/We
|
||||
+ "audio/VectorMathSSE2.cpp",
|
||||
+ ]
|
||||
+ cflags = [ "-msse2", "-mfpmath=sse" ]
|
||||
+ deps = [
|
||||
+ ":blink_common",
|
||||
+ ]
|
||||
+ configs += [
|
||||
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
||||
+ "//build/config/compiler:no_size_t_to_int_warning",
|
||||
@ -2235,7 +2232,7 @@ diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/we
|
||||
#endif
|
||||
diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/v8/BUILD.gn qtwebengine-everywhere-src-5.10.0-no-sse2/src/3rdparty/chromium/v8/BUILD.gn
|
||||
--- qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/v8/BUILD.gn 2017-11-28 14:06:53.000000000 +0100
|
||||
+++ qtwebengine-everywhere-src-5.10.0-no-sse2/src/3rdparty/chromium/v8/BUILD.gn 2017-12-25 17:42:57.199465881 +0100
|
||||
+++ qtwebengine-everywhere-src-5.10.0-no-sse2/src/3rdparty/chromium/v8/BUILD.gn 2017-12-26 01:32:06.842303361 +0100
|
||||
@@ -116,9 +116,9 @@
|
||||
v8_experimental_extra_library_files =
|
||||
[ "//test/cctest/test-experimental-extra.js" ]
|
||||
@ -2372,7 +2369,7 @@ diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/v8/BUILD.gn qt
|
||||
defines = [ "BUILDING_V8_PLATFORM_SHARED" ]
|
||||
}
|
||||
|
||||
@@ -2676,7 +2718,22 @@
|
||||
@@ -2676,7 +2718,37 @@
|
||||
]
|
||||
}
|
||||
|
||||
@ -2392,6 +2389,21 @@ diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/v8/BUILD.gn qt
|
||||
+
|
||||
+ public_configs = [ ":external_config" ]
|
||||
+ }
|
||||
+
|
||||
+ group("v8_for_testing") {
|
||||
+ testonly = true
|
||||
+
|
||||
+ public_deps = [
|
||||
+ ":v8_base",
|
||||
+ ":v8_maybe_snapshot",
|
||||
+ ]
|
||||
+
|
||||
+ if (v8_use_snapshot) {
|
||||
+ public_deps += [ ":v8_builtins_generators" ]
|
||||
+ }
|
||||
+
|
||||
+ public_configs = [ ":external_config" ]
|
||||
+ }
|
||||
+} else if (is_component_build) {
|
||||
v8_component("v8") {
|
||||
sources = [
|
||||
|
||||
@ -339,8 +339,8 @@ diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/sk
|
||||
#endif // SkUtilsArm_DEFINED
|
||||
diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/skia/src/opts/SkOpts_neon.cpp qtwebengine-everywhere-src-5.10.0-skia-neon/src/3rdparty/chromium/third_party/skia/src/opts/SkOpts_neon.cpp
|
||||
--- qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/skia/src/opts/SkOpts_neon.cpp 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ qtwebengine-everywhere-src-5.10.0-skia-neon/src/3rdparty/chromium/third_party/skia/src/opts/SkOpts_neon.cpp 2017-12-25 18:34:52.850631826 +0100
|
||||
@@ -0,0 +1,54 @@
|
||||
+++ qtwebengine-everywhere-src-5.10.0-skia-neon/src/3rdparty/chromium/third_party/skia/src/opts/SkOpts_neon.cpp 2017-12-26 01:45:00.514114716 +0100
|
||||
@@ -0,0 +1,47 @@
|
||||
+/*
|
||||
+ * Copyright 2015 Google Inc.
|
||||
+ *
|
||||
@ -354,10 +354,8 @@ diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/sk
|
||||
+#include "SkBlitMask_opts.h"
|
||||
+#include "SkBlitRow_opts.h"
|
||||
+#include "SkBlurImageFilter_opts.h"
|
||||
+#include "SkColorCubeFilter_opts.h"
|
||||
+#include "SkMorphologyImageFilter_opts.h"
|
||||
+#include "SkSwizzler_opts.h"
|
||||
+#include "SkTextureCompressor_opts.h"
|
||||
+#include "SkXfermode_opts.h"
|
||||
+
|
||||
+namespace SkOpts {
|
||||
@ -373,16 +371,11 @@ diff -Nur qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/sk
|
||||
+ erode_x = sk_neon::erode_x;
|
||||
+ erode_y = sk_neon::erode_y;
|
||||
+
|
||||
+ texture_compressor = sk_neon::texture_compressor;
|
||||
+ fill_block_dimensions = sk_neon::fill_block_dimensions;
|
||||
+
|
||||
+ blit_mask_d32_a8 = sk_neon::blit_mask_d32_a8;
|
||||
+
|
||||
+ blit_row_color32 = sk_neon::blit_row_color32;
|
||||
+ blit_row_s32a_opaque = sk_neon::blit_row_s32a_opaque;
|
||||
+
|
||||
+ color_cube_filter_span = sk_neon::color_cube_filter_span;
|
||||
+
|
||||
+ RGBA_to_BGRA = sk_neon::RGBA_to_BGRA;
|
||||
+ RGBA_to_rgbA = sk_neon::RGBA_to_rgbA;
|
||||
+ RGBA_to_bgrA = sk_neon::RGBA_to_bgrA;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user