From 65434a912bace28b7c2684f3bafa356f4f20f3f33bf4f874c706518398129b8b Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 14 Apr 2021 08:08:35 +0000 Subject: [PATCH 1/3] Accepting request 885269 from home:Vogtinator:qt5.15 - Add back missing part in fix1163766.patch (boo#1184610) OBS-URL: https://build.opensuse.org/request/show/885269 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=25 --- fix1163766.patch | 51 ++++++++++++++++++++++++-------------- libqt5-qtwebengine.changes | 5 ++++ 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/fix1163766.patch b/fix1163766.patch index 557035d..31db231 100644 --- a/fix1163766.patch +++ b/fix1163766.patch @@ -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(); + } diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 17fc4b4..1390f49 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 13 20:12:47 UTC 2021 - Fabian Vogt + +- Add back missing part in fix1163766.patch (boo#1184610) + ------------------------------------------------------------------- Wed Mar 24 12:45:13 UTC 2021 - christophe@krop.fr From 2ac63f95f782cb23fa3adce97cfc94bc859f197dba0c85116d0af661f8137041 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 14 Apr 2021 17:41:46 +0000 Subject: [PATCH 2/3] Accepting request 885441 from home:Guillaume_G:branches:KDE:Qt:5.15 - Update _constraints to avoid OOM OBS-URL: https://build.opensuse.org/request/show/885441 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=26 --- _constraints | 4 ++-- libqt5-qtwebengine.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/_constraints b/_constraints index 1ade9eb..0274283 100644 --- a/_constraints +++ b/_constraints @@ -4,10 +4,10 @@ 12 - 12 + 14 - 10 + 12 4 diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 1390f49..78bf9e8 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 14 16:35:17 UTC 2021 - Guillaume GARDET + +- Update _constraints to avoid OOM + ------------------------------------------------------------------- Tue Apr 13 20:12:47 UTC 2021 - Fabian Vogt From d4ad3a15c7080d388431fe971fba8040b796e78ab9ceb143281dfd6d3797b286 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 16 Apr 2021 11:08:36 +0000 Subject: [PATCH 3/3] Accepting request 885473 from home:cgiboudeaux:branches:openSUSE:Factory:Staging:Gcc7 - Add patch to fix build with GCC 11: * 0001-Fix-build-with-GCC-11.patch OBS-URL: https://build.opensuse.org/request/show/885473 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=27 --- 0001-Fix-build-with-GCC-11.patch | 36 ++++++++++++++++++++++++++++++++ libqt5-qtwebengine.changes | 6 ++++++ libqt5-qtwebengine.spec | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 0001-Fix-build-with-GCC-11.patch diff --git a/0001-Fix-build-with-GCC-11.patch b/0001-Fix-build-with-GCC-11.patch new file mode 100644 index 0000000..652fe2a --- /dev/null +++ b/0001-Fix-build-with-GCC-11.patch @@ -0,0 +1,36 @@ +From 7d0456664fb76572a560364172c31140ec20fc8a Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +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 + #include ++#include + #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 + #include ++#include + + #include "perfetto/ext/base/optional.h" + #include "perfetto/ext/base/paged_memory.h" diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 78bf9e8..808168d 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 14 18:26:57 UTC 2021 - Christophe Giboudeaux + +- 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 diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 004483f..4ec1388 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -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