Skip to content

Commit 680aeac

Browse files
committed
qt5-webengine: update to 5.15.19.
1 parent 2cecf3b commit 680aeac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+910
-3406
lines changed

srcpkgs/qt5-webengine/patches/0001-mus-cstring.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

srcpkgs/qt5-webengine/patches/0002-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

srcpkgs/qt5-webengine/patches/0003-musl-dispatch-to-musl.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
--- qtwebengine/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
2-
--- qtwebengine/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
3-
@@ -6,6 +6,7 @@
4-
1+
--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
2+
+++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
3+
@@ -8,6 +8,7 @@
4+
#include <dlfcn.h>
55
#include <malloc.h>
66

77
+#if defined(__GLIBC__)
88
// This translation unit defines a default dispatch for the allocator shim which
99
// routes allocations to libc functions.
1010
// The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
11-
@@ -73,3 +74,92 @@ const AllocatorDispatch AllocatorDispatch::default_dispatch = {
12-
nullptr, /* free_definite_size_function */
11+
@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
12+
nullptr, /* aligned_free_function */
1313
nullptr, /* next */
1414
};
1515
+

srcpkgs/qt5-webengine/patches/0004-musl-no-mallinfo.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
--- qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2017-11-28 14:06:53.000000000 +0100
2-
+++ qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2018-01-27 20:13:26.960932805 +0100
3-
@@ -243,7 +243,7 @@
4-
allocated_objects_count = main_heap_info.block_count;
1+
--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
2+
+++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
3+
@@ -132,7 +132,7 @@ bool MallocDumpProvider::OnMemoryDump(co
4+
}
55
#elif defined(OS_FUCHSIA)
66
// TODO(fuchsia): Port, see https://crbug.com/706592.
77
-#else
88
+#elif defined(__GLIBC__)
99
struct mallinfo info = mallinfo();
10-
DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
11-
12-
@@ -255,6 +255,8 @@
10+
// In case of Android's jemalloc |arena| is 0 and the outer pages size is
11+
// reported by |hblkhd|. In case of dlmalloc the total is given by
12+
@@ -142,6 +142,8 @@ bool MallocDumpProvider::OnMemoryDump(co
1313

1414
// Total allocated space is given by |uordblks|.
1515
allocated_objects_size = info.uordblks;
@@ -18,9 +18,9 @@
1818
#endif
1919

2020
MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
21-
--- qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc 2021-02-23 16:36:59.000000000 +0100
22-
+++ - 2021-03-07 21:03:38.579424720 +0100
23-
@@ -119,14 +119,14 @@
21+
--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
22+
+++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
23+
@@ -119,14 +119,14 @@ size_t ProcessMetrics::GetMallocUsage()
2424
malloc_statistics_t stats = {0};
2525
malloc_zone_statistics(nullptr, &stats);
2626
return stats.size_in_use;

srcpkgs/qt5-webengine/patches/0005-musl-off_t.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

srcpkgs/qt5-webengine/patches/0006-musl-pread-pwrite.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- qtwebengine/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h 2018-09-07 21:25:26.639964100 +0200
2-
+++ qtwebengine/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h 2018-09-07 21:25:11.611964995 +0200
3-
@@ -1794,6 +1794,15 @@
1+
--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
2+
+++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
3+
@@ -1819,6 +1819,15 @@ struct kernel_statfs {
44
/* End of s390/s390x definitions */
55
#endif
66

srcpkgs/qt5-webengine/patches/0007-musl-replace-pvalloc.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- qtwebengine/src/core/api/qtbug-61521.cpp 2017-11-29 09:42:29.000000000 +0100
2-
+++ qtwebengine/src/core/api/qtbug-61521.cpp 2018-01-28 06:49:29.454175725 +0100
3-
@@ -111,7 +111,11 @@
1+
--- a/src/core/api/qtbug-61521.cpp
2+
+++ b/src/core/api/qtbug-61521.cpp
3+
@@ -111,7 +111,11 @@ SHIM_HIDDEN void* ShimValloc(size_t size
44
}
55

66
SHIM_HIDDEN void* ShimPvalloc(size_t size) {

srcpkgs/qt5-webengine/patches/0008-musl-resolve.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- qtwebengine/src/3rdparty/chromium/net/dns/dns_reloader.cc 2016-11-07 15:46:18.000000000 +0100
2-
+++ qtwebengine/src/3rdparty/chromium/net/dns/dns_reloader.cc 2016-12-20 03:33:11.749059656 +0100
1+
--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
2+
+++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
33
@@ -9,6 +9,10 @@
44

55
#include <resolv.h>
@@ -9,13 +9,13 @@
99
+#endif
1010
+
1111
#include "base/lazy_instance.h"
12-
#include "base/logging.h"
1312
#include "base/macros.h"
14-
--- qtwebengine/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-11-07 15:46:18.000000000 +0100
15-
+++ qtwebengine/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-12-20 03:40:07.671953098 +0100
16-
@@ -6,6 +6,10 @@
17-
13+
#include "base/notreached.h"
14+
--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
15+
+++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
16+
@@ -8,6 +8,10 @@
1817
#include <string>
18+
#include <type_traits>
1919

2020
+#if !defined(__GLIBC__)
2121
+#include "resolv_compat.h"

srcpkgs/qt5-webengine/patches/0009-musl-siginfo_t.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ There's a subtle difference in the internal name of siginfo_t fields
22
between glibc and musl. The structure itself is equivalent, so it
33
should suffice to add a macro to rename the field.
44

5-
--- qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-02-17 05:57:43.000000000 +0100
6-
+++ qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-06-03 08:20:25.032716427 +0200
7-
@@ -22,6 +22,11 @@
8-
#include "sandbox/linux/services/android_ucontext.h"
9-
#endif
10-
5+
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
6+
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
7+
@@ -25,6 +25,11 @@
8+
#include "sandbox/linux/system_headers/linux_seccomp.h"
9+
#include "sandbox/linux/system_headers/linux_signal.h"
10+
1111
+// musl libc defines siginfo_t __si_fields instead of _sifields
1212
+#if !defined(__GLIBC__)
1313
+#define _sifields __si_fields
1414
+#endif
1515
+
1616
namespace {
17-
18-
const int kCapacityIncrement = 20;
17+
18+
struct arch_sigsys {

srcpkgs/qt5-webengine/patches/0010-musl-stackstart.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 2018-01-27 23:08:43.586475349 +0100
2-
+++ qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 2018-01-27 23:18:22.274505203 +0100
3-
@@ -28,7 +28,7 @@
1+
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
2+
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
3+
@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
44
// FIXME: On Mac OSX and Linux, this method cannot estimate stack size
55
// correctly for the main thread.
66

@@ -9,7 +9,7 @@
99
defined(OS_FUCHSIA)
1010
// pthread_getattr_np() can fail if the thread is not invoked by
1111
// pthread_create() (e.g., the main thread of blink_unittests).
12-
@@ -96,7 +96,7 @@
12+
@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
1313
}
1414

1515
void* GetStackStart() {

0 commit comments

Comments
 (0)