forked from pool/libqt5-qtwebengine
Accepting request 885924 from KDE:Qt:5.15
- Add patch to fix build with GCC 11: * 0001-Fix-build-with-GCC-11.patch - Update _constraints to avoid OOM - Add back missing part in fix1163766.patch (boo#1184610) OBS-URL: https://build.opensuse.org/request/show/885924 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
8f078f2fa6
36
0001-Fix-build-with-GCC-11.patch
Normal file
36
0001-Fix-build-with-GCC-11.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 7d0456664fb76572a560364172c31140ec20fc8a Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Wed, 14 Apr 2021 20:23:07 +0200
|
||||
Subject: [PATCH] Fix build with GCC 11.
|
||||
|
||||
Origin:
|
||||
https://github.com/abseil/abseil-cpp/commit/5bf048b8
|
||||
https://github.com/google/perfetto/commit/372366b4
|
||||
|
||||
---
|
||||
|
||||
diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc b/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
|
||||
index 19f9aab5b1a..27fec21681d 100644
|
||||
--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
|
||||
@@ -37,6 +37,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
+#include <limits>
|
||||
#include "absl/base/internal/hide_ptr.h"
|
||||
#include "absl/base/internal/raw_logging.h"
|
||||
#include "absl/base/internal/spinlock.h"
|
||||
|
||||
diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
|
||||
index 11ae91cfeca..58c6db27bd6 100644
|
||||
--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
|
||||
+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
+#include <limits>
|
||||
|
||||
#include "perfetto/ext/base/optional.h"
|
||||
#include "perfetto/ext/base/paged_memory.h"
|
||||
@ -4,10 +4,10 @@
|
||||
<size unit="G">12</size>
|
||||
</disk>
|
||||
<memory>
|
||||
<size unit="G">12</size>
|
||||
<size unit="G">14</size>
|
||||
</memory>
|
||||
<physicalmemory>
|
||||
<size unit="G">10</size>
|
||||
<size unit="G">12</size>
|
||||
</physicalmemory>
|
||||
<processors>4</processors>
|
||||
</hardware>
|
||||
|
||||
@ -6,14 +6,15 @@ Subject: [PATCH] https://bugzilla.opensuse.org/show_bug.cgi?id=1163766
|
||||
seccomp filters disallow a new kernel syscall to get time
|
||||
used on i586
|
||||
---
|
||||
.../sandbox/linux/system_headers/x86_32_linux_syscalls.h | 8 ++++++++
|
||||
.../chromium/sandbox/policy/linux/bpf_ime_policy_linux.cc | 3 +++
|
||||
3 files changed, 16 insertions(+)
|
||||
src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc | 6 ++++++
|
||||
src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h | 8 ++++++++
|
||||
src/3rdparty/chromium/sandbox/policy/linux/bpf_ime_policy_linux.cc | 3 +++
|
||||
3 files changed, 17 insertions(+)
|
||||
|
||||
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 7613c9bbc..7093ac054 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
|
||||
Index: qtwebengine-everywhere-src-5.15.3/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
|
||||
===================================================================
|
||||
--- qtwebengine-everywhere-src-5.15.3.orig/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
|
||||
+++ qtwebengine-everywhere-src-5.15.3/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
|
||||
@@ -1710,5 +1710,13 @@
|
||||
#define __NR_clone3 435
|
||||
#endif
|
||||
@ -28,20 +29,34 @@ index 7613c9bbc..7093ac054 100644
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
|
||||
|
||||
diff --git a/src/3rdparty/chromium/sandbox/policy/linux/bpf_ime_policy_linux.cc b/src/3rdparty/chromium/sandbox/policy/linux/bpf_ime_policy_linux.cc
|
||||
index 3fcdbcc18..c7a00c2c2 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_ime_policy_linux.cc
|
||||
+++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_ime_policy_linux.cc
|
||||
@@ -31,6 +31,9 @@ ResultExpr ImeProcessPolicy::EvaluateSyscall(int sysno) const {
|
||||
#endif
|
||||
Index: qtwebengine-everywhere-src-5.15.3/src/3rdparty/chromium/sandbox/policy/linux/bpf_ime_policy_linux.cc
|
||||
===================================================================
|
||||
--- qtwebengine-everywhere-src-5.15.3.orig/src/3rdparty/chromium/sandbox/policy/linux/bpf_ime_policy_linux.cc
|
||||
+++ qtwebengine-everywhere-src-5.15.3/src/3rdparty/chromium/sandbox/policy/linux/bpf_ime_policy_linux.cc
|
||||
@@ -32,6 +32,9 @@ ResultExpr ImeProcessPolicy::EvaluateSys
|
||||
#if defined(__NR_clock_gettime)
|
||||
case __NR_clock_gettime:
|
||||
+#endif
|
||||
#endif
|
||||
+#if defined(__NR_clock_gettime64)
|
||||
+ case __NR_clock_gettime64:
|
||||
#endif
|
||||
+#endif
|
||||
return Allow();
|
||||
// https://crbug.com/991435
|
||||
--
|
||||
2.30.2
|
||||
|
||||
#if defined(__NR_getrusage)
|
||||
Index: qtwebengine-everywhere-src-5.15.3/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||
===================================================================
|
||||
--- qtwebengine-everywhere-src-5.15.3.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||
+++ qtwebengine-everywhere-src-5.15.3/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||
@@ -161,6 +161,12 @@ ResultExpr EvaluateSyscallImpl(int fs_de
|
||||
return RestrictClockID();
|
||||
}
|
||||
|
||||
+#if defined(__NR_clock_gettime64)
|
||||
+ if (sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep_time64) {
|
||||
+ return RestrictClockID();
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if (sysno == __NR_clone) {
|
||||
return RestrictCloneToThreadsAndEPERMFork();
|
||||
}
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 14 18:26:57 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Add patch to fix build with GCC 11:
|
||||
* 0001-Fix-build-with-GCC-11.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 14 16:35:17 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Update _constraints to avoid OOM
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 13 20:12:47 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Add back missing part in fix1163766.patch (boo#1184610)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 24 12:45:13 UTC 2021 - christophe@krop.fr
|
||||
|
||||
|
||||
@ -54,6 +54,8 @@ Patch4: rtc-dont-use-h264.patch
|
||||
Patch5: 0001-Fix-normalization-of-app-locales.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch6: chromium-glibc-2.33.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch7: 0001-Fix-build-with-GCC-11.patch
|
||||
# http://www.chromium.org/blink not ported to PowerPC
|
||||
ExcludeArch: ppc ppc64 ppc64le s390 s390x
|
||||
# Try to fix i586 MemoryErrors with rpmlint
|
||||
|
||||
Loading…
Reference in New Issue
Block a user