From a347a358bcff5bd7943e76d001c8f3d4b1a4524b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 28 Dec 2018 09:50:44 +0000 Subject: community/qt5-qtwebengine: build fix --- community/qt5-qtwebengine/APKBUILD | 18 ++- community/qt5-qtwebengine/qt-musl-execinfo.patch | 28 +--- community/qt5-qtwebengine/qt-musl-fpstate.patch | 48 +++++++ community/qt5-qtwebengine/qt-musl-mallinfo.patch | 11 -- .../qt5-qtwebengine/qt-musl-pread-pwrite.patch | 20 +++ community/qt5-qtwebengine/qt-musl-stackstart.patch | 10 +- .../qt-musl-sysreg-for__WORDSIZE.patch | 14 ++ .../qt5-qtwebengine/qt-musl-thread-stacksize.patch | 26 ++++ .../qt5-qtwebengine/qtwebengine-ffmpeg4.patch | 89 ------------ community/qt5-qtwebengine/qtwebkit-chartype.patch | 157 --------------------- 10 files changed, 130 insertions(+), 291 deletions(-) create mode 100644 community/qt5-qtwebengine/qt-musl-fpstate.patch create mode 100644 community/qt5-qtwebengine/qt-musl-pread-pwrite.patch create mode 100644 community/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch create mode 100644 community/qt5-qtwebengine/qt-musl-thread-stacksize.patch delete mode 100644 community/qt5-qtwebengine/qtwebengine-ffmpeg4.patch delete mode 100644 community/qt5-qtwebengine/qtwebkit-chartype.patch (limited to 'community/qt5-qtwebengine') diff --git a/community/qt5-qtwebengine/APKBUILD b/community/qt5-qtwebengine/APKBUILD index e2f0b78f87..ed43c1b393 100644 --- a/community/qt5-qtwebengine/APKBUILD +++ b/community/qt5-qtwebengine/APKBUILD @@ -72,9 +72,11 @@ source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qt qt-musl-resolve.patch qt-musl-serialio.patch qt-musl-siginfo_t.patch + qt-musl-fpstate.patch + qt-musl-pread-pwrite.patch + qt-musl-sysreg-for__WORDSIZE.patch qt-musl-stackstart.patch - qtwebkit-chartype.patch - qtwebengine-ffmpeg4.patch + qt-musl-thread-stacksize.patch musl-sandbox.patch yasm-nls.patch " @@ -98,15 +100,17 @@ package() { sha512sums="bdc37cddb121b371f0219227136d2383d4df4ef93327fa13601438222975bfdd18958cb27750fa8c422dde32b46a0c68e160e6e0adc41406d7bd6001d3fd21e7 qtwebengine-everywhere-src-5.12.0.tar.xz 5e017e6500af56d0e608839c466782193ab3f6e5d01938b84b7f9c86fbb826e140f9fca789a23e7a7431ba42377be328a8bfcacbf7c302746de79f7857f2832d arm-void-is-not-android.patch 5ecbf435062b8565322dd1cbd0cbdb44f3daef264ab677fe22fe8cb400d4bb22281cc607ea419c7362c483312482632ed41bd67130413188425ef6e0ae184f07 qt-musl-dispatch_to_musl.patch -3af77688071c5d42bb8e902e059f2c1c956ed531c5072f16dfc02cff091df4828fda2cce887deba49b2e8c4c4195754c2ccb2a2238b9b827eb4d58398e1f0e07 qt-musl-execinfo.patch -819786f225c2312cf1afeceed24968204095db0ff4e5739f6b46bfec639e26a9d1702e0d7ce8493562f9d4c08d5a31ba48bdc47553ac78ef5763cb4ec1e57e5c qt-musl-mallinfo.patch +982550095ccebc49b15f71bddc7c7373e8bc1aa88cbc6db0e8984c31d02760e6ed8ec635f5e16faa022cc312f354fc6811d3cd2438e20561be565f3c00bebc67 qt-musl-execinfo.patch +f580239dc09ba0592ddcba8225411baef9c2116fb4d401bdf0327f3567d9c2428f33bb1fd1ec21f4d8208fb0c9aff70263b77ff5041eb289ea1375790901eebc qt-musl-mallinfo.patch 7eba28eb015f1a7e5cf70e9354fcd647b69f4e7c061b889a8c0d55f4a94a033f95d0252f9baebf13c3d501438074a05d547eef2c8cf898dc2c87cec3b60e76e0 qt-musl-off_t.patch ac563e0c444a6d3214ff7465cad2c701692cfa90408c57243d3ae9459937c36e88acd57335bb90da85157e03865faaf17d61a767483b00ed8f3580ebf8a2fbb5 qt-musl-pvalloc.patch 8d95e4fcb463b5d2053c9538e66150ec9a3acddd7815cc34c8cd6fa115e49f1d602c4f1fc73f5e507a932c918e36c9c3d1386476dca91c5fc422906d0d88f610 qt-musl-resolve.patch c39b4c39ad3e297dc4f2508af9fb6b1618e8f6fac4399e41b5bde00a1e79cc0cd24af8b8c01bfe61e4748b2b74778a06afff166095e59baf491d6fc56f3537f7 qt-musl-serialio.patch 2fead16e7d7379b622da0e3172905444d9d72d1a53ff080327a3d59f60541c5c076d9b58f110b039da8c9ebc3b5efec53af118e1172efd01886ff9ac2b730d5f qt-musl-siginfo_t.patch -1acac5b3c94096f3ff05105008a971d44512074b09a2c1313b48e10cb1bcefb94d8a6d29c305c00d461c532afbeed2f2953ffc8c722d9000e178d977c8566f33 qt-musl-stackstart.patch -20e8262292aa55c2a30f66570e702cbf3539e03ca563be987de734c50b6e0ccceccab64d1b11e55dde01868abd965470eb1c1fbf0d56917fa370e500c90a9660 qtwebkit-chartype.patch -e06fd01cab57e50e137faea5a73839e584afb3678f9e690c8869c215ce3809ee5a713f9213da4b10612edbe9f936e87d542a8d9f5229f47271d1dc019ca44310 qtwebengine-ffmpeg4.patch +059f22a594a046d552a33b17d811c50b645c4be11a49ed3b29a32ce38d501fd07c1e15a4e1075c46f984c850bf88aecb357e4310a62b30494ea25297055f05c8 qt-musl-fpstate.patch +b1f7823d0bdd14dbcb4dbd72ab2d16460d343722d2601921a50f8912ce580a632e0d7b01d7fea6f27ff5014a1f21595c6d8d4500b995bcc6db38cbd10ac4aa96 qt-musl-pread-pwrite.patch +987b9b35d04317e22ae2cce382e776f3309fc7fd4588e408cd6bed846f47620d01e2b9958cb60c84b8f6f496de6544a21ba399ba8b8f107b73df179794740092 qt-musl-sysreg-for__WORDSIZE.patch +7dc3e9995596adef65cd96f650eb7ee13d52cabfe6353f04eeb5b8a5776e7e0585ffc2a0a31deea6924352ee9a5a8e03ac37432b558c6a46f3dc457b4283392a qt-musl-stackstart.patch +b37fbc4df03c82123f94982039defa12d9bb8c885c9dcf8fff556b5f9cc58182fa471f970cc3a5e2d5dbe964855f591b474366b6a8926d94ae6a78e883811c1a qt-musl-thread-stacksize.patch 635d77109b5ce9bc9697d621f1bf98193903e2ac69fc4079fb92f175daa80147fed8ae15544d239ef680e120474d8f811002935ef1a078836ba01695f9ddfcb9 musl-sandbox.patch f6b1941e40f44b675ab554166e3cd8d3272b23f48571b4949b3af7b8e1c642ee84fe0ee26dd2457fc3bf20e9924cddb411e293b7a8a103029ee196587371a1e2 yasm-nls.patch" diff --git a/community/qt5-qtwebengine/qt-musl-execinfo.patch b/community/qt5-qtwebengine/qt-musl-execinfo.patch index 615177ba16..c5e085005c 100644 --- a/community/qt5-qtwebengine/qt-musl-execinfo.patch +++ b/community/qt5-qtwebengine/qt-musl-execinfo.patch @@ -92,9 +92,11 @@ !defined(OS_AIX) if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) { // Include a stack trace on a fatal, unless a debugger is attached. ---- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/Assertions.cpp 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/Assertions.cpp 2018-01-29 20:23:26.498185623 +0100 -@@ -59,7 +59,6 @@ +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc +index c7ecc7f..96ba0e4 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc +@@ -51,7 +51,6 @@ #if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__)) #include #include @@ -102,23 +104,3 @@ #endif #if defined(OS_ANDROID) ---- qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.cc 2018-01-29 20:32:41.070163511 +0100 -@@ -16,7 +16,7 @@ - #include - #include - --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(__GLIBCXX__) && defined(__GLIBC__) - #include - #include - #endif -@@ -60,7 +60,7 @@ - // to get usable symbols on Linux. This is copied from V8. Chromium has a more - // advanced stace trace system; also more difficult to copy. - void DumpBacktrace() { --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(__GLIBCXX__) && defined(__GLIBC__) - void* trace[100]; - int size = backtrace(trace, sizeof(trace) / sizeof(*trace)); - char** symbols = backtrace_symbols(trace, size); diff --git a/community/qt5-qtwebengine/qt-musl-fpstate.patch b/community/qt5-qtwebengine/qt-musl-fpstate.patch new file mode 100644 index 0000000000..42fe157935 --- /dev/null +++ b/community/qt5-qtwebengine/qt-musl-fpstate.patch @@ -0,0 +1,48 @@ +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +index 052ce37..95b0fb4 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + } + + void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, +- const struct _libc_fpstate* fp) { ++ const struct _fpstate* fp) { + const greg_t* regs = uc->uc_mcontext.gregs; + + out->context_flags = MD_CONTEXT_X86_FULL | +@@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + } + + void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, +- const struct _libc_fpstate* fpregs) { ++ const struct _fpstate* fpregs) { + const greg_t* regs = uc->uc_mcontext.gregs; + + out->context_flags = MD_CONTEXT_AMD64_FULL; +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +index f830618..f3dde1f 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +@@ -50,7 +50,7 @@ struct UContextReader { + // info: the collection of register structures. + #if defined(__i386__) || defined(__x86_64) + static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, +- const struct _libc_fpstate* fp); ++ const struct _fpstate* fp); + #elif defined(__aarch64__) + static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct fpsimd_context* fpregs); +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +index d1dc331..d1cc562 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +@@ -48,7 +48,7 @@ class ExceptionHandler; + #if defined(__aarch64__) + typedef struct fpsimd_context fpstate_t; + #elif !defined(__ARM_EABI__) && !defined(__mips__) +-typedef struct _libc_fpstate fpstate_t; ++typedef struct _fpstate fpstate_t; + #endif + + // These entries store a list of memory regions that the client wants included diff --git a/community/qt5-qtwebengine/qt-musl-mallinfo.patch b/community/qt5-qtwebengine/qt-musl-mallinfo.patch index 67ce2cb3f7..7b30717136 100644 --- a/community/qt5-qtwebengine/qt-musl-mallinfo.patch +++ b/community/qt5-qtwebengine/qt-musl-mallinfo.patch @@ -29,14 +29,3 @@ struct mallinfo minfo = mallinfo(); #if defined(USE_TCMALLOC) return minfo.uordblks; ---- qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2018-01-28 06:23:14.891238507 +0100 -@@ -25,7 +25,7 @@ - // though, this provides only a partial and misleading value. - // Unfortunately some telemetry benchmark rely on it and these need to - // be refactored before getting rid of this. See crbug.com/581365 . --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(__GLIBC__) || defined(OS_ANDROID) - size_t GetMemoryUsageKB() { - struct mallinfo minfo = mallinfo(); - uint64_t mem_usage = diff --git a/community/qt5-qtwebengine/qt-musl-pread-pwrite.patch b/community/qt5-qtwebengine/qt-musl-pread-pwrite.patch new file mode 100644 index 0000000000..c5dcfd812a --- /dev/null +++ b/community/qt5-qtwebengine/qt-musl-pread-pwrite.patch @@ -0,0 +1,20 @@ +diff --git a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h +index 5d9c2e8..e81e7b4 100644 +--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h ++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h +@@ -1794,6 +1794,15 @@ struct kernel_statfs { + /* End of s390/s390x definitions */ + #endif + ++#ifndef __GLIBC__ ++ /* For Musl libc pread/pread is the same as pread64/pwrite64 */ ++#ifndef __NR_pread ++#define __NR_pread __NR_pread64 ++#endif ++#ifndef __NR_pwrite ++#define __NR_pwrite __NR_pwrite64 ++#endif ++#endif /* ifndef __GLIBC__ */ + + /* After forking, we must make sure to only call system calls. */ + #if defined(__BOUNDED_POINTERS__) diff --git a/community/qt5-qtwebengine/qt-musl-stackstart.patch b/community/qt5-qtwebengine/qt-musl-stackstart.patch index d8dd1aa90f..1286c741c9 100644 --- a/community/qt5-qtwebengine/qt-musl-stackstart.patch +++ b/community/qt5-qtwebengine/qt-musl-stackstart.patch @@ -1,6 +1,8 @@ ---- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp 2018-01-27 23:08:43.586475349 +0100 -+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp 2018-01-27 23:18:22.274505203 +0100 -@@ -28,7 +28,7 @@ +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc +index 10f1c0d..8e86a2e 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc +@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { // FIXME: On Mac OSX and Linux, this method cannot estimate stack size // correctly for the main thread. @@ -9,7 +11,7 @@ defined(OS_FUCHSIA) // pthread_getattr_np() can fail if the thread is not invoked by // pthread_create() (e.g., the main thread of webkit_unit_tests). -@@ -96,7 +96,7 @@ +@@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() { } void* GetStackStart() { diff --git a/community/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch b/community/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch new file mode 100644 index 0000000000..a8b74e40d7 --- /dev/null +++ b/community/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch @@ -0,0 +1,14 @@ +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h +index d03c7a8..d43fda0 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h +@@ -36,6 +36,9 @@ + #include + #include + #include ++#ifndef __GLIBC__ ++#include ++#endif + + #include "common/memory_range.h" + diff --git a/community/qt5-qtwebengine/qt-musl-thread-stacksize.patch b/community/qt5-qtwebengine/qt-musl-thread-stacksize.patch new file mode 100644 index 0000000000..a5c59fe7d3 --- /dev/null +++ b/community/qt5-qtwebengine/qt-musl-thread-stacksize.patch @@ -0,0 +1,26 @@ +diff --git a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc +index 02bf49b..05ee182 100644 +--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc ++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc +@@ -13,7 +13,7 @@ namespace pp { + namespace { + + // Use 2MB default stack size for Native Client, otherwise use system default. +-#if defined(__native_client__) ++#if defined(__native_client__) || !defined(__GLIBC__) + const size_t kDefaultStackSize = 2 * 1024 * 1024; + #else + const size_t kDefaultStackSize = 0; +diff --git a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc +index cf7f3ec..e06a5ce 100644 +--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc ++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc +@@ -761,7 +761,7 @@ void Thread::Start() { + #if V8_OS_MACOSX + // Default on Mac OS X is 512kB -- bump up to 1MB + stack_size = 1 * 1024 * 1024; +-#elif V8_OS_AIX ++#elif V8_OS_AIX || !defined(__GLIBC__) + // Default on AIX is 96kB -- bump up to 2MB + stack_size = 2 * 1024 * 1024; + #endif diff --git a/community/qt5-qtwebengine/qtwebengine-ffmpeg4.patch b/community/qt5-qtwebengine/qtwebengine-ffmpeg4.patch deleted file mode 100644 index ffe1584d2b..0000000000 --- a/community/qt5-qtwebengine/qtwebengine-ffmpeg4.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h -index 0341e5784f..60ffba708b 100644 ---- a/src/3rdparty/chromium/media/base/decoder_buffer.h -+++ b/src/3rdparty/chromium/media/base/decoder_buffer.h -@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer - : public base::RefCountedThreadSafe { - public: - enum { -- kPaddingSize = 32, -+ kPaddingSize = 64, - #if defined(ARCH_CPU_ARM_FAMILY) - kAlignmentSize = 16 - #else -diff --git a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc -index 61d0bc341c..d79c694555 100644 ---- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc -+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc -@@ -30,10 +30,10 @@ EncryptionScheme GetEncryptionScheme(const AVStream* stream) { - - } // namespace - --// Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are -+// Why AV_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are - // padded. Check here to ensure FFmpeg only receives data padded to its - // specifications. --static_assert(DecoderBuffer::kPaddingSize >= FF_INPUT_BUFFER_PADDING_SIZE, -+static_assert(DecoderBuffer::kPaddingSize >= AV_INPUT_BUFFER_PADDING_SIZE, - "DecoderBuffer padding size does not fit ffmpeg requirement"); - - // Alignment requirement by FFmpeg for input and output buffers. This need to -@@ -444,11 +444,11 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config, - } else { - codec_context->extradata_size = config.extra_data().size(); - codec_context->extradata = reinterpret_cast( -- av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE)); -+ av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE)); - memcpy(codec_context->extradata, &config.extra_data()[0], - config.extra_data().size()); - memset(codec_context->extradata + config.extra_data().size(), '\0', -- FF_INPUT_BUFFER_PADDING_SIZE); -+ AV_INPUT_BUFFER_PADDING_SIZE); - } - } - -@@ -585,11 +585,11 @@ void VideoDecoderConfigToAVCodecContext( - } else { - codec_context->extradata_size = config.extra_data().size(); - codec_context->extradata = reinterpret_cast( -- av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE)); -+ av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE)); - memcpy(codec_context->extradata, &config.extra_data()[0], - config.extra_data().size()); - memset(codec_context->extradata + config.extra_data().size(), '\0', -- FF_INPUT_BUFFER_PADDING_SIZE); -+ AV_INPUT_BUFFER_PADDING_SIZE); - } - } - -diff --git a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc -index b4020b001d..41da2d3939 100644 ---- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc -+++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc -@@ -368,7 +368,7 @@ void FFmpegAudioDecoder::ResetTimestampState(const AudioDecoderConfig& config) { - int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, - AVFrame* frame, - int flags) { -- DCHECK(s->codec->capabilities & CODEC_CAP_DR1); -+ DCHECK(s->codec->capabilities & AV_CODEC_CAP_DR1); - DCHECK_EQ(s->codec_type, AVMEDIA_TYPE_AUDIO); - - // Since this routine is called by FFmpeg when a buffer is required for audio -diff --git a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc -index 42d044dd69..32f5c7b79d 100644 ---- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc -+++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc -@@ -427,12 +427,11 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config, - codec_context_->thread_type = - FF_THREAD_SLICE | (low_delay ? 0 : FF_THREAD_FRAME); - codec_context_->opaque = this; -- codec_context_->flags |= CODEC_FLAG_EMU_EDGE; - codec_context_->get_buffer2 = GetVideoBufferImpl; - codec_context_->refcounted_frames = 1; - - if (decode_nalus_) -- codec_context_->flags2 |= CODEC_FLAG2_CHUNKS; -+ codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS; - - AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id); - if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) { diff --git a/community/qt5-qtwebengine/qtwebkit-chartype.patch b/community/qt5-qtwebengine/qtwebkit-chartype.patch deleted file mode 100644 index 3b621db1aa..0000000000 --- a/community/qt5-qtwebengine/qtwebkit-chartype.patch +++ /dev/null @@ -1,157 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/base/i18n/unicodestring.h 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/i18n/unicodestring.h 2018-01-27 19:45:41.595846890 +0100 -@@ -18,7 +18,7 @@ - - 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(unistr.getBuffer()), - static_cast(unistr.length())); - #else - return base::string16(unistr.getBuffer(), ---- qtwebengine/src/3rdparty/chromium/base/i18n/string_search.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/i18n/string_search.cc 2018-01-27 18:35:29.907629612 +0100 -@@ -20,7 +20,9 @@ - const string16& dummy = find_this_; - - UErrorCode status = U_ZERO_ERROR; -- search_ = usearch_open(find_this_.data(), find_this_.size(), -- dummy.data(), dummy.size(), -+ search_ = usearch_open(reinterpret_cast(find_this_.data()), -+ find_this_.size(), -+ reinterpret_cast(dummy.data()), -+ dummy.size(), - uloc_getDefault(), - NULL, // breakiter -@@ -43,7 +43,7 @@ - bool FixedPatternStringSearchIgnoringCaseAndAccents::Search( - const string16& in_this, size_t* match_index, size_t* match_length) { - UErrorCode status = U_ZERO_ERROR; -- usearch_setText(search_, in_this.data(), in_this.size(), &status); -+ usearch_setText(search_, reinterpret_cast(in_this.data()), in_this.size(), &status); - - // Default to basic substring search if usearch fails. According to - // http://icu-project.org/apiref/icu4c/usearch_8h.html, usearch_open will fail ---- qtwebengine/src/3rdparty/chromium/base/i18n/bidi_line_iterator.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/i18n/bidi_line_iterator.cc 2018-01-27 18:57:39.643698212 +0100 -@@ -44,7 +44,7 @@ - bidi_ = ubidi_openSized(static_cast(text.length()), 0, &error); - if (U_FAILURE(error)) - return false; -- ubidi_setPara(bidi_, text.data(), static_cast(text.length()), -+ ubidi_setPara(bidi_, reinterpret_cast(text.data()), static_cast(text.length()), - GetParagraphLevelForDirection(direction), NULL, &error); - return (U_SUCCESS(error) == TRUE); - } ---- qtwebengine/src/3rdparty/chromium/base/i18n/break_iterator.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/i18n/break_iterator.cc 2018-01-27 19:08:24.185731464 +0100 -@@ -59,7 +59,7 @@ - return false; - } - if (break_type_ == RULE_BASED) { -- iter_ = ubrk_openRules(rules_.c_str(), -- static_cast(rules_.length()), -- string_.data(), -+ iter_ = ubrk_openRules(reinterpret_cast(rules_.c_str()), -+ static_cast(rules_.length()), -+ reinterpret_cast(string_.data()), - static_cast(string_.size()), -@@ -72,7 +72,7 @@ - } else { - iter_ = ubrk_open(break_type, - NULL, -- string_.data(), -+ reinterpret_cast(string_.data()), - static_cast(string_.size()), - &status); - if (U_FAILURE(status)) { -@@ -128,7 +128,7 @@ - bool BreakIterator::SetText(const base::char16* text, const size_t length) { - UErrorCode status = U_ZERO_ERROR; - ubrk_setText(static_cast(iter_), -- text, length, &status); -+ reinterpret_cast(text), length, &status); - pos_ = 0; // implicit when ubrk_setText is done - prev_ = npos; - if (U_FAILURE(status)) { ---- qtwebengine/src/3rdparty/chromium/base/i18n/rtl.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/i18n/rtl.cc 2018-01-27 19:25:16.283783677 +0100 -@@ -212,7 +212,7 @@ - } - - TextDirection GetFirstStrongCharacterDirection(const string16& text) { -- const UChar* string = text.c_str(); -+ const UChar* string = reinterpret_cast(text.c_str()); - size_t length = text.length(); - size_t position = 0; - while (position < length) { -@@ -228,7 +228,7 @@ - } - - TextDirection GetLastStrongCharacterDirection(const string16& text) { -- const UChar* string = text.c_str(); -+ const UChar* string = reinterpret_cast(text.c_str()); - size_t position = text.length(); - while (position > 0) { - UChar32 character; -@@ -243,7 +243,7 @@ - } - - TextDirection GetStringDirection(const string16& text) { -- const UChar* string = text.c_str(); -+ const UChar* string = reinterpret_cast(text.c_str()); - size_t length = text.length(); - size_t position = 0; - -@@ -374,7 +374,7 @@ - #endif // !OS_WIN - - bool StringContainsStrongRTLChars(const string16& text) { -- const UChar* string = text.c_str(); -+ const UChar* string = reinterpret_cast(text.c_str()); - size_t length = text.length(); - size_t position = 0; - while (position < length) { ---- qtwebengine/src/3rdparty/chromium/base/i18n/icu_string_conversions.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/i18n/icu_string_conversions.cc 2018-01-27 19:51:29.425864834 +0100 -@@ -151,7 +151,7 @@ - if (!U_SUCCESS(status)) - return false; - -- return ConvertFromUTF16(converter, utf16.c_str(), -+ return ConvertFromUTF16(converter, reinterpret_cast(utf16.c_str()), - static_cast(utf16.length()), on_error, encoded); - } - -@@ -178,7 +178,7 @@ - - SetUpErrorHandlerForToUChars(on_error, converter, &status); - std::unique_ptr buffer(new char16[uchar_max_length]); -- int actual_size = ucnv_toUChars(converter, buffer.get(), -+ int actual_size = ucnv_toUChars(converter, reinterpret_cast(buffer.get()), - static_cast(uchar_max_length), encoded.data(), - static_cast(encoded.length()), &status); - ucnv_close(converter); -@@ -205,8 +205,8 @@ - string16 normalized_utf16; - std::unique_ptr buffer(new char16[max_length]); - int actual_length = unorm_normalize( -- utf16.c_str(), utf16.length(), UNORM_NFC, 0, -- buffer.get(), static_cast(max_length), &status); -+ reinterpret_cast(utf16.c_str()), utf16.length(), UNORM_NFC, 0, -+ reinterpret_cast(buffer.get()), static_cast(max_length), &status); - if (!U_SUCCESS(status)) - return false; - normalized_utf16.assign(buffer.get(), actual_length); ---- qtwebengine/src/3rdparty/chromium/base/i18n/case_conversion.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/i18n/case_conversion.cc 2018-01-27 19:59:11.955888696 +0100 -@@ -65,7 +65,7 @@ - // Don't use WriteInto, which assumes null terminators. - int32_t new_length = case_mapper( -- &dest[0], saturated_cast(dest.size()), -- string.data(), saturated_cast(string.size()), -+ reinterpret_cast(&dest[0]), saturated_cast(dest.size()), -+ reinterpret_cast(string.data()), saturated_cast(string.size()), - &error); - dest.resize(new_length); - } while (error == U_BUFFER_OVERFLOW_ERROR); -- cgit v1.2.3