qt5-webengine: fix issue #2368 for 5.13
This commit is contained in:
parent
8eb43c0508
commit
97fbd523b0
@ -20,7 +20,7 @@
|
|||||||
MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
|
MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
|
||||||
--- qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc 2017-11-28 14:06:53.000000000 +0100
|
--- qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc 2017-11-28 14:06:53.000000000 +0100
|
||||||
+++ qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc 2018-01-27 20:48:11.571040348 +0100
|
+++ qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc 2018-01-27 20:48:11.571040348 +0100
|
||||||
@@ -94,7 +94,7 @@
|
@@ -100,14 +100,14 @@
|
||||||
malloc_statistics_t stats = {0};
|
malloc_statistics_t stats = {0};
|
||||||
malloc_zone_statistics(nullptr, &stats);
|
malloc_zone_statistics(nullptr, &stats);
|
||||||
return stats.size_in_use;
|
return stats.size_in_use;
|
||||||
@ -29,3 +29,12 @@
|
|||||||
struct mallinfo minfo = mallinfo();
|
struct mallinfo minfo = mallinfo();
|
||||||
#if defined(USE_TCMALLOC)
|
#if defined(USE_TCMALLOC)
|
||||||
return minfo.uordblks;
|
return minfo.uordblks;
|
||||||
|
#else
|
||||||
|
return minfo.hblkhd + minfo.arena;
|
||||||
|
#endif
|
||||||
|
-#elif defined(OS_FUCHSIA)
|
||||||
|
+#else //if defined(OS_FUCHSIA) // also musl doesn't do this.
|
||||||
|
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
|
||||||
|
return 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
24
srcpkgs/qt5/patches/0100-sandbox-sched_getparam.patch
Normal file
24
srcpkgs/qt5/patches/0100-sandbox-sched_getparam.patch
Normal file
@ -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:
|
@ -1,7 +1,7 @@
|
|||||||
# Template file for 'qt5'
|
# Template file for 'qt5'
|
||||||
pkgname=qt5
|
pkgname=qt5
|
||||||
version=5.13.2
|
version=5.13.2
|
||||||
revision=1
|
revision=2
|
||||||
wrksrc="qt-everywhere-src-${version}"
|
wrksrc="qt-everywhere-src-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config
|
hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config
|
||||||
|
Loading…
x
Reference in New Issue
Block a user