extra/chromium: added reenable 32-bit and remove sanbox patch

2 files changed, 33 insertions, 3 deletions

diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD
index 12564c02..69e59c86 100644
--- a/extra/chromium/PKGBUILD
+++ b/extra/chromium/PKGBUILD
@@ -49,13 +49,24 @@ if [ "$CARCH" = 'i686' ]; then
   )"
 fi
 
+# disabled: not complete and completely broken, use --no-sandbox for now when running
 # for for 64-bit time functions in seccomp sanbox (thanks to schnitzeltony)
 # https://github.com/schnitzeltony/meta-browser/blob/master/recipes-browser/chromium/files/0003-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch
-source+=('chromium-81.0.4044.122-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch')
-sha256sums+=('4837f797a910795bf3161805a3302d5f3701573ca90da8af32b2f4aa62510d20')
+#source+=('chromium-81.0.4044.122-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch')
+#sha256sums+=('4837f797a910795bf3161805a3302d5f3701573ca90da8af32b2f4aa62510d20')
+#eval "$(
+#  declare -f prepare | \
+#    sed '
+#      /patch.*chromium-106.*/a patch -Np1 -i "$srcdir/chromium-81.0.4044.122-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch"
+#    '
+#)"
+
+# reenable 32-bit
+source+=('reenable-linux-i686-builds.patch')
+sha256sums+=('f3d3702106e2307c00f1db97fa2614bbedd208ecb217052e3cc789945e17a139')
 eval "$(
   declare -f prepare | \
     sed '
-      /patch.*skia.*/a patch -Np1 -i "$srcdir/chromium-81.0.4044.122-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch"
+      /patch.*chromium-106.*/a patch -Np1 -i "$srcdir/reenable-linux-i686-builds.patch"
     '
 )"
diff --git a/extra/chromium/reenable-linux-i686-builds.patch b/extra/chromium/reenable-linux-i686-builds.patch
new file mode 100644
index 00000000..b18718e4
--- /dev/null
+++ b/extra/chromium/reenable-linux-i686-builds.patch
@@ -0,0 +1,19 @@
+--- a/BUILD.gn.orig
++++ b/BUILD.gn
+@@ -1616,16 +1616,6 @@
+   }
+ }
+ 
+-# TODO(cassew): Add more OS's that don't support x86.
+-is_valid_x86_target =
+-    target_os != "ios" && target_os != "mac" &&
+-    (target_os != "linux" || use_libfuzzer || !build_with_chromium)
+-
+-# Note: v8_target_cpu == arm allows using the V8 arm simulator on x86 for fuzzing.
+-assert(
+-    is_valid_x86_target || target_cpu != "x86" || v8_target_cpu == "arm",
+-    "'target_cpu=x86' is not supported for 'target_os=$target_os'. Consider omitting 'target_cpu' (default) or using 'target_cpu=x64' instead.")
+-
+ group("chromium_builder_perf") {
+   testonly = true
+