ccdcad45ca
Important changes: qt5-enginio and qt5-enginio-devel are gone. qt5-plugin-gtk is gone. New submodules are qt5-charts, qt5-datavis3d, qt5-gamepad, qt5-scxml and qt5-virtualkeyboard. Packages which require updates: python-PyQt5, qtcreator-full
22 lines
1,016 B
Diff
22 lines
1,016 B
Diff
--- qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2016-11-07 15:46:18.000000000 +0100
|
|
+++ qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2016-12-20 03:02:28.260383021 +0100
|
|
@@ -61,7 +61,7 @@
|
|
// fixed quantum, so the excess region will not be resident.
|
|
// See crrev.com/1531463004 for detailed explanation.
|
|
resident_size = stats.max_size_in_use;
|
|
-#else
|
|
+#elif defined(__GLIBC__)
|
|
struct mallinfo info = mallinfo();
|
|
DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
|
|
|
|
--- qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2016-11-07 15:46:18.000000000 +0100
|
|
+++ qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2016-12-20 04:15:06.214331244 +0100
|
|
@@ -18,7 +18,7 @@
|
|
|
|
namespace content {
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_ANDROID)
|
|
+#if (defined(OS_LINUX) || defined(OS_ANDROID)) && defined(__GLIBC__)
|
|
size_t GetMemoryUsageKB() {
|
|
struct mallinfo minfo = mallinfo();
|
|
uint64_t mem_usage =
|