diff options
author | Bart Ribbers <bribbers@disroot.org> | 2020-02-20 16:12:31 +0100 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2020-02-24 19:18:43 -0300 |
commit | 65f58742e6e669c7d0f5b23c0764f4f73661980b (patch) | |
tree | 76a9004e9c481ced23debc121c304bdc24273ae4 /community/qt5-qtwebengine | |
parent | 76ca77d9ba8ee59f1a761b7d44252958584347bc (diff) | |
download | aports-65f58742e6e669c7d0f5b23c0764f4f73661980b.tar.bz2 aports-65f58742e6e669c7d0f5b23c0764f4f73661980b.tar.xz |
{community,testing}/qt: upgrade to 5.14.1
Diffstat (limited to 'community/qt5-qtwebengine')
-rw-r--r-- | community/qt5-qtwebengine/APKBUILD | 29 | ||||
-rw-r--r-- | community/qt5-qtwebengine/arm-void-is-not-android.patch | 17 | ||||
-rw-r--r-- | community/qt5-qtwebengine/musl-hacks.patch | 13 | ||||
-rw-r--r-- | community/qt5-qtwebengine/musl-sandbox.patch | 61 | ||||
-rw-r--r-- | community/qt5-qtwebengine/nasm.patch | 13 | ||||
-rw-r--r-- | community/qt5-qtwebengine/qt-musl-execinfo.patch | 96 | ||||
-rw-r--r-- | community/qt5-qtwebengine/qt-musl-serialio.patch | 12 | ||||
-rw-r--r-- | community/qt5-qtwebengine/sandbox-sched_getparam.patch | 24 |
8 files changed, 150 insertions, 115 deletions
diff --git a/community/qt5-qtwebengine/APKBUILD b/community/qt5-qtwebengine/APKBUILD index c3ae9610ce..a5be60ce1a 100644 --- a/community/qt5-qtwebengine/APKBUILD +++ b/community/qt5-qtwebengine/APKBUILD @@ -1,15 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtwebengine -pkgver=5.12.5 -pkgrel=5 +pkgver=5.14.1 +pkgrel=0 pkgdesc="Qt5 - QtWebEngine components" url="https://www.qt.io/developers/" # ppc64le, s390x: not supported arch="all !ppc64le !s390x !armhf" # armhf blocked by qt5-qtdeclarative license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" -depends_dev="qt5-qtdeclarative-dev qt5-qtwebchannel-dev gstreamer-dev gst-plugins-base-dev - libxslt-dev mesa-dev icu-dev libxext-dev glib-dev libxcomposite-dev - libxrender-dev ninja ffmpeg-dev +depends_dev="gstreamer-dev gst-plugins-base-dev libxslt-dev mesa-dev icu-dev + libxext-dev glib-dev libxcomposite-dev libxrender-dev ninja ffmpeg-dev " makedepends="$depends_dev alsa-lib-dev @@ -41,6 +40,8 @@ makedepends="$depends_dev pcre-dev protobuf-dev qt5-qtbase-dev + qt5-qtdeclarative-dev + qt5-qtwebchannel-dev re2-dev ruby snappy-dev @@ -61,14 +62,12 @@ case $pkgver in esac source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtwebengine-everywhere-src-$_v.tar.xz - arm-void-is-not-android.patch qt-musl-dispatch_to_musl.patch qt-musl-execinfo.patch qt-musl-mallinfo.patch qt-musl-off_t.patch qt-musl-pvalloc.patch qt-musl-resolve.patch - qt-musl-serialio.patch qt-musl-siginfo_t.patch qt-musl-fpstate.patch qt-musl-pread-pwrite.patch @@ -77,6 +76,9 @@ source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtwebengin qt-musl-thread-stacksize.patch musl-sandbox.patch yasm-nls.patch + nasm.patch + musl-hacks.patch + sandbox-sched_getparam.patch " builddir="$srcdir"/qtwebengine-everywhere-src-$_v @@ -93,20 +95,21 @@ package() { sed -i -e 's:-L/home[^ ]\+::g' "$pkgdir"/usr/lib/pkgconfig/*.pc } -sha512sums="b485d37dca14f1cf4adf01bd8b1ae52c1d4916d7acf6ed210bc9feaece8efc2aa6cee8a3ef9174b50b767e373379c6a18d14db4426ac53a8c27d2d7b222826df qtwebengine-everywhere-src-5.12.5.tar.xz -5e017e6500af56d0e608839c466782193ab3f6e5d01938b84b7f9c86fbb826e140f9fca789a23e7a7431ba42377be328a8bfcacbf7c302746de79f7857f2832d arm-void-is-not-android.patch +sha512sums="fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9 qtwebengine-everywhere-src-5.14.1.tar.xz 5ecbf435062b8565322dd1cbd0cbdb44f3daef264ab677fe22fe8cb400d4bb22281cc607ea419c7362c483312482632ed41bd67130413188425ef6e0ae184f07 qt-musl-dispatch_to_musl.patch -982550095ccebc49b15f71bddc7c7373e8bc1aa88cbc6db0e8984c31d02760e6ed8ec635f5e16faa022cc312f354fc6811d3cd2438e20561be565f3c00bebc67 qt-musl-execinfo.patch +7084a07386fb9f66fbfeadac53869c0f386cea98dbb29787f030635bc8cd116b7459acafbe06540f1aef79d8a69817520ad18bcb9ac24954dd70773ef083537e qt-musl-execinfo.patch 229f148c2b9bbb517409d3627e3bacf144cd39bfd3b7915f35de2f3b8c3e19f80c93799ef42784014cdd79af7b56557b6852632c4f1646a747d9eed24f61decb 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 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 -76b1966bdd76fd22f0073b23be50f69fb95451e06bdce567a439b0fbb69ff2956264704f5b53c50842e9c4aafaab7d2f330465a04092b66c5965e5d0ae2c7761 musl-sandbox.patch -f6b1941e40f44b675ab554166e3cd8d3272b23f48571b4949b3af7b8e1c642ee84fe0ee26dd2457fc3bf20e9924cddb411e293b7a8a103029ee196587371a1e2 yasm-nls.patch" +89005585780ee4459ae3f065f056e166c7686d4dfe3e9e3f2a77b0ed7b8ba819eeb1c9659a971c9cda79cf7fb49b29189765f010a7a55167b6e3282c62c4cbe1 musl-sandbox.patch +f6b1941e40f44b675ab554166e3cd8d3272b23f48571b4949b3af7b8e1c642ee84fe0ee26dd2457fc3bf20e9924cddb411e293b7a8a103029ee196587371a1e2 yasm-nls.patch +9add958caa0d6acb2866d3927aadfa6b378c92d62463f1b3d65ae1e5400915d89388ac54beb30c4d4d42d2901ee28f404d8574b771854556f6a75698301870eb nasm.patch +b99eaa4a0b06ab1cb461fc4bfc7416c779ba1e847614b96f08de97a137a09577ea642813e5e3235167ccc5180c6ffcc06ebf2a61e3b4c210de9dee765e0e7404 musl-hacks.patch +dbe606be93377f094c6a1ab0358ae042f3e7aff95c635b07ebc04aa3173f7221a478fd544e8347152a4ca125a837d6da774929423868d5c9d5bd6165bdd1ba6d sandbox-sched_getparam.patch" diff --git a/community/qt5-qtwebengine/arm-void-is-not-android.patch b/community/qt5-qtwebengine/arm-void-is-not-android.patch deleted file mode 100644 index 6ae86dde37..0000000000 --- a/community/qt5-qtwebengine/arm-void-is-not-android.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn 2018-01-30 16:42:15.332826020 +0100 -@@ -194,14 +194,6 @@ - "sp/src/arm/armv7/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S", - "sp/src/arm/armv7/omxSP_FFTInv_CCSToR_F32_Sfs_s.S", - ] -- if (arm_optionally_use_neon) { -- # Run-time NEON detection. -- deps = [ "//third_party/android_tools:cpu_features" ] -- # To get the __android_log_print routine -- libs = [ "log" ] -- # Detection routine -- sources += [ "sp/src/arm/detect.c" ] -- } - } - - # GYP: third_party/openmax_dl/dl/dl.gyp:openmax_dl_neon diff --git a/community/qt5-qtwebengine/musl-hacks.patch b/community/qt5-qtwebengine/musl-hacks.patch new file mode 100644 index 0000000000..ee82b48d3d --- /dev/null +++ b/community/qt5-qtwebengine/musl-hacks.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc +index dbc8c5aaf..077bbde33 100644 +--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc ++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc +@@ -1191,7 +1191,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( + msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); + msgvec->reserve(buffers.size()); + for (size_t j = 0; j < buffers.size(); j++) +- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0}); ++ msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0}); + int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0)); + SendResult send_result(0, 0, std::move(buffers)); + if (result < 0) { diff --git a/community/qt5-qtwebengine/musl-sandbox.patch b/community/qt5-qtwebengine/musl-sandbox.patch index 45e3d9336e..ad64fae921 100644 --- a/community/qt5-qtwebengine/musl-sandbox.patch +++ b/community/qt5-qtwebengine/musl-sandbox.patch @@ -1,17 +1,12 @@ diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -index 2577f02..b27300c 100644 +index 348ab6e8c..2eac6ef82 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -@@ -129,23 +129,13 @@ namespace sandbox { - // CLONE_VM, nor CLONE_THREAD, which includes all fork() implementations. +@@ -139,21 +139,11 @@ namespace sandbox { + // present (as in newer versions of posix_spawn). ResultExpr RestrictCloneToThreadsAndEPERMFork() { const Arg<unsigned long> flags(0); -+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | -+ CLONE_THREAD | CLONE_SYSVSEM; -+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | -+ CLONE_DETACHED; -+ const BoolExpr thread_clone_ok = (flags&~safe)==required; - +- - // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2. - const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES | - CLONE_SIGHAND | CLONE_THREAD | @@ -26,17 +21,28 @@ index 2577f02..b27300c 100644 - const BoolExpr android_test = - AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask, - flags == kGlibcPthreadFlags); -- ++ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_THREAD | CLONE_SYSVSEM; ++ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | ++ CLONE_DETACHED; ++ const BoolExpr thread_clone_ok = (flags&~safe)==required; + + // The following two flags are the two important flags in any vfork-emulating + // clone call. EPERM any clone call that contains both of them. +@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() { + AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0, + (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags); + - return If(IsAndroid() ? android_test : glibc_test, Allow()) + return If(thread_clone_ok, Allow()) - .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM)) + .ElseIf(is_fork_or_clone_vfork, Error(EPERM)) .Else(CrashSIGSYSClone()); } diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -index 9f1cdef..a2d703b 100644 +index 6e2bd4fee..9f9e4ad8a 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -@@ -375,6 +375,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { +@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { #if defined(__i386__) case __NR_waitpid: #endif @@ -44,7 +50,7 @@ index 9f1cdef..a2d703b 100644 return true; case __NR_clone: // Should be parameter-restricted. case __NR_setns: // Privileged. -@@ -387,7 +388,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { +@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) case __NR_set_thread_area: #endif @@ -52,7 +58,7 @@ index 9f1cdef..a2d703b 100644 case __NR_unshare: #if !defined(__mips__) && !defined(__aarch64__) case __NR_vfork: -@@ -496,6 +496,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { +@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { case __NR_mlock: case __NR_munlock: case __NR_munmap: @@ -61,7 +67,7 @@ index 9f1cdef..a2d703b 100644 return true; case __NR_madvise: case __NR_mincore: -@@ -511,7 +513,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { +@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { case __NR_modify_ldt: #endif case __NR_mprotect: @@ -70,7 +76,7 @@ index 9f1cdef..a2d703b 100644 case __NR_munlockall: case __NR_readahead: diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h -index 59d0eab..7ae7002 100644 +index 59d0eab8e..7ae700213 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h @@ -1063,4 +1063,8 @@ @@ -83,22 +89,23 @@ index 59d0eab..7ae7002 100644 + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -index 1addd53..7843b5e 100644 +index 1addd5384..d8811ce87 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -@@ -1385,6 +1385,10 @@ +@@ -1385,6 +1385,11 @@ #define __NR_memfd_create (__NR_SYSCALL_BASE+385) #endif +#if !defined(__NR_membarrier) -+#define __NR_membarrier (__NR_SYSCALL_BASE+389) ++#define __NR_membarrier (__NR_SYSCALL_BASE+389)) +#endif + ++ // ARM private syscalls. #if !defined(__ARM_NR_BASE) #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000) diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h -index ec75815..612fcfa 100644 +index ec75815a8..612fcfaa9 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h @@ -1271,4 +1271,8 @@ @@ -111,7 +118,7 @@ index ec75815..612fcfa 100644 + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h -index ddbf97f..1742acd 100644 +index ddbf97f3d..1742acd4c 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h @@ -1433,4 +1433,8 @@ @@ -124,10 +131,10 @@ index ddbf97f..1742acd 100644 + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -index a6afc62..7ed0a3b 100644 +index a6afc62d9..6ab7740de 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -@@ -1422,5 +1422,9 @@ +@@ -1422,5 +1422,10 @@ #define __NR_memfd_create 356 #endif @@ -135,13 +142,14 @@ index a6afc62..7ed0a3b 100644 +#define __NR_membarrier 375 +#endif + ++ #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -index 349504a..ea3c7c9 100644 +index 349504aee..6a6d4756f 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -@@ -1290,5 +1290,9 @@ +@@ -1290,5 +1290,10 @@ #define __NR_memfd_create 319 #endif @@ -149,5 +157,6 @@ index 349504a..ea3c7c9 100644 +#define __NR_membarrier 324 +#endif + ++ #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_ diff --git a/community/qt5-qtwebengine/nasm.patch b/community/qt5-qtwebengine/nasm.patch new file mode 100644 index 0000000000..05e7307540 --- /dev/null +++ b/community/qt5-qtwebengine/nasm.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h +index 7eb7c20ff..3bdc2eb39 100644 +--- a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h ++++ b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h +@@ -117,7 +117,7 @@ + #define HAVE_ACCESS 1 + + /* Define to 1 if you have the `canonicalize_file_name' function. */ +-#define HAVE_CANONICALIZE_FILE_NAME 1 ++// #define HAVE_CANONICALIZE_FILE_NAME 1 + + /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */ + /* #undef HAVE_CPU_TO_LE16 */ diff --git a/community/qt5-qtwebengine/qt-musl-execinfo.patch b/community/qt5-qtwebengine/qt-musl-execinfo.patch index c5e085005c..7082f51aee 100644 --- a/community/qt5-qtwebengine/qt-musl-execinfo.patch +++ b/community/qt5-qtwebengine/qt-musl-execinfo.patch @@ -1,6 +1,29 @@ ---- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2018-01-27 21:50:04.693231905 +0100 -@@ -26,7 +26,7 @@ +diff --git a/src/3rdparty/chromium/base/debug/stack_trace.cc b/src/3rdparty/chromium/base/debug/stack_trace.cc +index d8ca822d9..f6f3d9c69 100644 +--- a/src/3rdparty/chromium/base/debug/stack_trace.cc ++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc +@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const { + } + std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + OutputToStreamWithPrefix(&stream, prefix_string); + #endif + return stream.str(); + } + + std::ostream& operator<<(std::ostream& os, const StackTrace& s) { +-#if !defined(__UCLIBC__) & !defined(_AIX) ++#if defined(__GLIBC__) & !defined(_AIX) + s.OutputToStream(&os); + #else + os << "StackTrace::OutputToStream not implemented."; +diff --git a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc +index f4ddf9c1e..aef993613 100644 +--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc ++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc +@@ -27,7 +27,7 @@ #if !defined(USE_SYMBOLIZE) #include <cxxabi.h> #endif @@ -9,7 +32,7 @@ #include <execinfo.h> #endif -@@ -82,7 +82,7 @@ +@@ -88,7 +88,7 @@ void DemangleSymbols(std::string* text) { // Note: code in this function is NOT async-signal safe (std::string uses // malloc internally). @@ -18,17 +41,17 @@ std::string::size_type search_from = 0; while (search_from < text->size()) { // Look for the start of a mangled symbol, from search_from. -@@ -117,7 +117,7 @@ +@@ -123,7 +123,7 @@ void DemangleSymbols(std::string* text) { search_from = mangled_start + 2; } } -#endif // !defined(__UCLIBC__) && !defined(_AIX) -+#endif // !defined(__GLIBC__) && !defined(_AIX) ++#endif // defined(__GLIBC__) && !defined(_AIX) } #endif // !defined(USE_SYMBOLIZE) -@@ -129,7 +129,7 @@ - virtual ~BacktraceOutputHandler() {} +@@ -135,7 +135,7 @@ class BacktraceOutputHandler { + virtual ~BacktraceOutputHandler() = default; }; -#if !defined(__UCLIBC__) && !defined(_AIX) @@ -36,54 +59,45 @@ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) { // This should be more than enough to store a 64-bit number in hex: // 16 hex digits + 1 for null-terminator. -@@ -206,7 +206,7 @@ +@@ -218,7 +218,7 @@ void ProcessBacktrace(void* const* trace, } #endif // defined(USE_SYMBOLIZE) } -#endif // !defined(__UCLIBC__) && !defined(_AIX) -+#endif // !defined(__GLIBC__) && !defined(_AIX) ++#endif // defined(__GLIBC__) && !defined(_AIX) void PrintToStderr(const char* output) { // NOTE: This code MUST be async-signal safe (it's used by in-process -@@ -749,7 +749,7 @@ - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. +@@ -834,7 +834,7 @@ size_t CollectStackTrace(void** trace, size_t count) { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - count = std::min(arraysize(trace_), count); - // Though the backtrace API man page does not list any possible negative -@@ -764,13 +764,13 @@ - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. + // return values, we take no chance. + return base::saturated_cast<size_t>(backtrace(trace, count)); +@@ -847,13 +847,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) PrintBacktraceOutputHandler handler; - ProcessBacktrace(trace_, count_, &handler); + ProcessBacktrace(trace_, count_, prefix_string, &handler); #endif } -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - void StackTrace::OutputToStream(std::ostream* os) const { + void StackTrace::OutputToStreamWithPrefix(std::ostream* os, + const char* prefix_string) const { StreamBacktraceOutputHandler handler(os); - ProcessBacktrace(trace_, count_, &handler); ---- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.cc 2018-01-27 22:31:08.296359000 +0100 -@@ -214,7 +214,7 @@ - - std::string StackTrace::ToString() const { - std::stringstream stream; --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - OutputToStream(&stream); - #endif - return stream.str(); ---- qtwebengine/src/3rdparty/chromium/base/logging.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/logging.cc 2018-01-27 22:46:34.970406807 +0100 -@@ -546,7 +546,7 @@ +diff --git a/src/3rdparty/chromium/base/logging.cc b/src/3rdparty/chromium/base/logging.cc +index 4c4bfa6af..0ca5c2159 100644 +--- a/src/3rdparty/chromium/base/logging.cc ++++ b/src/3rdparty/chromium/base/logging.cc +@@ -618,7 +618,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity, LogMessage::~LogMessage() { size_t stack_start = stream_.tellp(); @@ -92,15 +106,3 @@ !defined(OS_AIX) if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) { // Include a stack trace on a fatal, unless a debugger is attached. -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 <cxxabi.h> - #include <dlfcn.h> --#include <execinfo.h> - #endif - - #if defined(OS_ANDROID) diff --git a/community/qt5-qtwebengine/qt-musl-serialio.patch b/community/qt5-qtwebengine/qt-musl-serialio.patch deleted file mode 100644 index cf0e0fa768..0000000000 --- a/community/qt5-qtwebengine/qt-musl-serialio.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/device/serial/serial_io_handler_posix.cc 2017-01-03 10:28:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/device/serial/serial_io_handler_posix.cc 2017-02-23 21:20:42.650669563 +0100 -@@ -12,6 +12,9 @@ - - #if defined(OS_LINUX) - #include <linux/serial.h> -+#if !defined(__GLIBC__) -+#include <asm-generic/ioctls.h> -+#endif - - // The definition of struct termios2 is copied from asm-generic/termbits.h - // because including that header directly conflicts with termios.h. diff --git a/community/qt5-qtwebengine/sandbox-sched_getparam.patch b/community/qt5-qtwebengine/sandbox-sched_getparam.patch new file mode 100644 index 0000000000..15c33a57f0 --- /dev/null +++ b/community/qt5-qtwebengine/sandbox-sched_getparam.patch @@ -0,0 +1,24 @@ +Allow SYS_sched_getparam and SYS_sched_getscheduler +musl uses them for pthread_getschedparam() + +source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e + +--- qtwebengine/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc 2019-11-12 20:48:20.013724661 +0100 ++++ qtwebengine/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc.patched 2019-11-12 20:58:57.330695676 +0100 +@@ -93,10 +93,16 @@ + case __NR_sysinfo: + case __NR_times: + case __NR_uname: ++#if !defined(__GLIBC__) ++ case __NR_sched_getparam: ++ case __NR_sched_getscheduler: ++#endif + return Allow(); + case __NR_sched_getaffinity: ++#if defined(__GLIBC__) + case __NR_sched_getparam: + case __NR_sched_getscheduler: ++#endif + case __NR_sched_setscheduler: + return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno); + case __NR_prlimit64: |