[neon/qt/qtwebengine/Neon/testing] debian/patches: throw away all the mispel patches
Harald Sitter
null at kde.org
Thu May 6 12:43:52 BST 2021
Git commit 9da691104610f3a19c3e4025c198301505a6a21b by Harald Sitter.
Committed on 06/05/2021 at 11:43.
Pushed by sitter into branch 'Neon/testing'.
throw away all the mispel patches
one doesn't apply, perhaps others don't we don't need them one way or the other
D +0 -28 debian/patches/mipsel-link-atomic.patch
D +0 -43 debian/patches/mipsel-linux-5.patch
D +0 -20 debian/patches/mipsel-no-v8-embedded-builtins.patch
D +0 -20 debian/patches/mipsel-ptrace-include.patch
M +0 -3 debian/patches/series
https://invent.kde.org/neon/qt/qtwebengine/commit/9da691104610f3a19c3e4025c198301505a6a21b
diff --git a/debian/patches/mipsel-link-atomic.patch b/debian/patches/mipsel-link-atomic.patch
deleted file mode 100644
index 0c359ef..0000000
--- a/debian/patches/mipsel-link-atomic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: add -latomic to dependencies of base component on mipsel
- This is needed to fix build of qwebengine_convert_dict, which uses the
- generated convert_dict.pri to get the list of libraries.
- .
- qmake adds its own -latomic, but it comes before the list of static
- libraries, so it does not help. We need -latomic after that list.
- .
- The error was:
- .
- /usr/bin/ld.bfd: <<BUILDDIR>>/src/core/release/obj/base/base/base_jumbo_17.o: undefined reference to symbol '__atomic_load_8@@LIBATOMIC_1.0'
- /usr/bin/ld.bfd: /usr/lib/gcc/mipsel-linux-gnu/9/libatomic.so: error adding symbols: DSO missing from command line
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: no
-Last-Update: 2020-03-20
-
-Index: qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/BUILD.gn
-===================================================================
---- qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/base/BUILD.gn
-+++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/BUILD.gn
-@@ -1325,7 +1325,7 @@ jumbo_component("base") {
- # Needed for <atomic> if using newer C++ library than sysroot, except if
- # building inside the cros_sdk environment - use host_toolchain as a
- # more robust check for this.
-- if (!use_sysroot && (is_android || (is_linux && !is_chromecast && !use_qt)) &&
-+ if (!use_sysroot && (is_android || (is_linux && !is_chromecast && !use_qt) || current_cpu == "mipsel") &&
- host_toolchain != "//build/toolchain/cros:host") {
- libs += [ "atomic" ]
- }
diff --git a/debian/patches/mipsel-linux-5.patch b/debian/patches/mipsel-linux-5.patch
deleted file mode 100644
index f362453..0000000
--- a/debian/patches/mipsel-linux-5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: fix mipsel build with Linux ≥ 5.0
- Linux 5.0 switched to generated system call table files, which needs some
- changes in Chromium code. See this commit:
- https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=99bf73ebf9c4193d
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-yet
-Last-Update: 2020-03-02
-
---- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-+++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-@@ -37,14 +37,14 @@
-
- #elif defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)
-
--#include <asm/unistd.h> // for __NR_O32_Linux and __NR_Linux_syscalls
-+#include <asm/unistd_nr_o32.h> // for __NR_O32_Linux and __NR_O32_Linux_syscalls
- #define MIN_SYSCALL __NR_O32_Linux
--#define MAX_PUBLIC_SYSCALL (MIN_SYSCALL + __NR_Linux_syscalls)
-+#define MAX_PUBLIC_SYSCALL (MIN_SYSCALL + __NR_O32_Linux_syscalls)
- #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
-
- #elif defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)
-
--#include <asm/unistd.h> // for __NR_64_Linux and __NR_64_Linux_syscalls
-+#include <asm/unistd_nr_n64.h> // for __NR_64_Linux and __NR_64_Linux_syscalls
- #define MIN_SYSCALL __NR_64_Linux
- #define MAX_PUBLIC_SYSCALL (MIN_SYSCALL + __NR_64_Linux_syscalls)
- #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
---- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/syscall_set.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/syscall_set.cc
-@@ -17,10 +17,10 @@ namespace {
-
- #if defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)
- // This is true for Mips O32 ABI.
--static_assert(MIN_SYSCALL == __NR_Linux, "min syscall number should be 4000");
-+static_assert(MIN_SYSCALL == __NR_O32_Linux, "min syscall number should be 4000");
- #elif defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)
- // This is true for MIPS N64 ABI.
--static_assert(MIN_SYSCALL == __NR_Linux, "min syscall number should be 5000");
-+static_assert(MIN_SYSCALL == __NR_64_Linux, "min syscall number should be 5000");
- #else
- // This true for supported architectures (Intel and ARM EABI).
- static_assert(MIN_SYSCALL == 0u,
diff --git a/debian/patches/mipsel-no-v8-embedded-builtins.patch b/debian/patches/mipsel-no-v8-embedded-builtins.patch
deleted file mode 100644
index f14b31a..0000000
--- a/debian/patches/mipsel-no-v8-embedded-builtins.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: disable v8 embedded builtins on mipsel
- They were not enabled in Qt 5.12 and until this v8 commit:
- https://chromium.googlesource.com/v8/v8.git/+/f5a8352b0fbba0d8
- .
- This fixes OOM error when running mksnapshot.
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: no
-Last-Update: 2020-03-19
-
---- a/src/3rdparty/chromium/v8/BUILD.gn
-+++ b/src/3rdparty/chromium/v8/BUILD.gn
-@@ -89,7 +89,7 @@ declare_args() {
- v8_enable_fast_torque = ""
-
- # Enable embedded builtins.
-- v8_enable_embedded_builtins = true
-+ v8_enable_embedded_builtins = v8_current_cpu != "mipsel"
-
- # Enable the registration of unwinding info for Windows/x64.
- v8_win64_unwinding_info = true
diff --git a/debian/patches/mipsel-ptrace-include.patch b/debian/patches/mipsel-ptrace-include.patch
deleted file mode 100644
index 7aab167..0000000
--- a/debian/patches/mipsel-ptrace-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: on mipsel PTRACE_GET_THREAD_AREA is defined in asm/ptrace.h
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: no
-Last-Update: 2020-03-17
-
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -41,8 +41,12 @@
- // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
- // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
- // defined on aarch64, so don't try to include this on those platforms.
-+#if defined(__mips__)
-+#include <asm/ptrace.h>
-+#else
- #include <asm/ptrace-abi.h>
- #endif
-+#endif
- #endif // !OS_NACL_NONSFI
-
- #if defined(OS_ANDROID)
diff --git a/debian/patches/series b/debian/patches/series
index 9bfe735..e0d0020 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,4 @@
#system-lcms2.patch
system-nspr-prtime.patch
verbose-gn-bootstrap.patch
-mipsel-linux-5.patch
-mipsel-ptrace-include.patch
-mipsel-link-atomic.patch
sandbox-time64-syscalls.patch
More information about the Neon-commits
mailing list