libv8-node 22.5.1.0 → 24.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4d182c4050cbe87afb303fa22af0c30e8210e9ff4d5baa70b4b031fc94bc24
-  data.tar.gz: bedfffdb624aef289109e1329c3a6c6d1acdd3429372ca34c902dd221d685fcd
+  metadata.gz: a2b8e967d1a38a0d8436f0f0d6019d04a37a1ff32089e4f7240dccaa4757124c
+  data.tar.gz: f9a4f5dac6062d022367f5a66c251d09484e8d6924e3d6b7b50dd60c5ac5e109
 SHA512:
-  metadata.gz: adf67d9e1f2aae6605e5badc547a42dda99321a2946f948ea66b3514cd976aaa3a85687beac06fd7a844243d36016d61fa9bf041469c064c79b29d8877b88cad
-  data.tar.gz: f625fd8f763be4fed375bd4d3d23638b2d1f1e45477cf46fee6ca7234b3090ea4f91ce2939109dbb6e760c46f379dea332288e60fd8621097d36cc1f6f15f619
+  metadata.gz: 9d62e6a23daf53112c214e2440ff189baeee278b903d1031067bcb2791fa207b7d529075f0fa07a922965d365aeb0b5f64467f94cadc91ea99e0728eccc93eed
+  data.tar.gz: 840e1fbf57f570b491efab1696d7ecf3ffbf70d28f9364b3f69d559ad6bf59db4be7703d93fe56abb61ed20e2699d97086e0a7b8cca45ff5e2d5d958842ad181

data/lib/libv8/node/version.rb

@@ -1,7 +1,10 @@
-module Libv8; end
+# frozen_string_literal: true
+
+module Libv8
+end
 
 module Libv8::Node
-  VERSION = '22.5.1.0'.freeze
-  NODE_VERSION = '22.5.1'.freeze
-  LIBV8_VERSION = '21.4.254.21'.freeze # from v8/include/v8-version.h
+  VERSION = '24.1.0.0'
+  NODE_VERSION = '24.1.0'
+  LIBV8_VERSION = '13.6.233.10' # from src/node-.../deps/v8/include/v8-version.h
 end

data/libexec/build-libv8

@@ -14,9 +14,12 @@ NJOBS="${NJOBS:-1}"
 echo "parallel job count: ${NJOBS}"
 
 BUILDTYPE="${BUILDTYPE:-Release}"
+GITHUB_ACTIONS="${GITHUB_ACTIONS:-}"
 
 cd "${src}/node-v${version}"
 
+# Maglev is disabled because of a suspected x64 snapshot regression in
+# DoComputeOutputFrames
 configure_flags='--openssl-no-asm --without-npm --shared --with-intl=full-icu'
 eval "$("${libexec}/platform")"
 
@@ -40,5 +43,15 @@ if [ "$host_platform" != "$target_platform" ] && [ "${target_platform%%-*}" = "a
 	find . -iname "*.host.mk" -exec sed -i '/-msign-return-address/d' {} ';'
 fi
 
+if [ "${BUILDTYPE}" = "Release" ] && [ "${GITHUB_ACTIONS}" != "" ]; then
+	case "${target_platform}" in
+		arm64*-darwin*)
+			# dwarf debug info for v8 is so massive the macos
+			# builder runs out of disk space when it's enabled
+			find out -name '*.mk' -exec sed -i '' -e 's/gdwarf-2/g0/g' {} ';'
+			;;
+	esac
+fi
+
 export PATH="${PWD}/out/tools/bin:${PATH}"
-make -j"${NJOBS}" -C out BUILDTYPE="${BUILDTYPE}" V=0
+make -j"${NJOBS}" -C out BUILDTYPE="${BUILDTYPE}" V=

data/libexec/build-monolith

@@ -21,13 +21,13 @@ platform=$(uname)
 rm -f "${LIBV8_MONOLITH}"
 case "${platform}" in
     "SunOS")
-        /usr/xpg4/bin/find . '(' '!' -path './icutools/deps/icu-small/source/stubdata/stubdata.o' ')' -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" | sort | uniq | xargs ar cq "${LIBV8_MONOLITH}"
+        /usr/xpg4/bin/find . '(' '!' -path './icutools/deps/icu-small/source/stubdata/stubdata.o' ')' -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" -or -path './abseil/deps/v8/third_party/abseil-cpp/absl/**/*.o' -or -path './highway/deps/v8/third_party/highway/**/*.o' -or -path './simdutf/deps/v8/third_party/simdutf/*.o' | sort | uniq | xargs ar cq "${LIBV8_MONOLITH}"
         ;;
     "Darwin")
-        /usr/bin/find . '(' '!' -path './icutools/deps/icu-small/source/stubdata/stubdata.o' ')' -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" | sort | uniq | xargs /usr/bin/ar -cq "${LIBV8_MONOLITH}"
+        /usr/bin/find . '(' '!' -path './icutools/deps/icu-small/source/stubdata/stubdata.o' ')' -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" -or -path './abseil/deps/v8/third_party/abseil-cpp/absl/**/*.o' -or -path './highway/deps/v8/third_party/highway/**/*.o' -or -path './simdutf/deps/v8/third_party/simdutf/*.o' | sort | uniq | xargs /usr/bin/ar -cq "${LIBV8_MONOLITH}"
         ;;
     "Linux")
-        find . '(' '!' -path './icutools/deps/icu-small/source/stubdata/stubdata.o' ')' -and '(' -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" ')' | sort | uniq | xargs ar -cqSP "${LIBV8_MONOLITH}"
+        find . '(' '!' -path './icutools/deps/icu-small/source/stubdata/stubdata.o' ')' -and '(' -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" -or -path './abseil/deps/v8/third_party/abseil-cpp/absl/**/*.o' -or -path './highway/deps/v8/third_party/highway/**/*.o' -or -path './simdutf/deps/v8/third_party/simdutf/*.o' ')' | sort | uniq | xargs ar -cqSP "${LIBV8_MONOLITH}"
         ar -sP "${LIBV8_MONOLITH}"
         ;;
     *)

data/libexec/extract-node

@@ -29,17 +29,7 @@ extract "${src}" "${src}/node-v${version}.tar.gz"
 
 cd "${src}/node-v${version}"
 
-#patch -p1 < "${top}"/patch/gyp-libv8_monolith.patch
-#patch -p1 < "${top}"/patch/py2-icutrim.patch
-#patch -p1 < "${top}"/patch/py2-genv8constants.patch
-
-# TODO: the following still fails on py3 so the above one forcing py2 is needed
-# patch -p1 < ../../py3-genv8constants.patch
-#
-# This is the error:
-#
-#     Traceback (most recent call last):
-#       File "tools/genv8constants.py", line 99, in <module>
-#         curr_val += int('0x%s' % octetstr, 16) << (curr_octet * 8)
-#     ValueError: invalid literal for int() with base 16: "0xb'04 '"
-#     node_dtrace_ustack.target.mk:13: recipe for target '/usbkey/user_home/vagrant/ruby-libv8-node/src/node-14.14.0/out/Release/obj/gen/v8constants.h' failed
+patch -p1 < "${top}"/patch/v8-add-missing-typename.patch
+patch -p1 < "${top}"/patch/v8-std-is-trivially-destructible.patch
+patch -p1 < "${top}"/patch/v8-disable-madv-dontfork.patch
+patch -p1 < "${top}"/patch/v8-disable-pkey.patch

data/libexec/inject-libv8

@@ -56,7 +56,9 @@ for lib in libv8_monolith.a; do
             "$AR" "$AREXTRACTFLAGS" "$BASEDIR/out/${BUILDTYPE}/$lib"
 
             # strip all objects
-            "$FIND" -type f -exec "$STRIP" -Sx {} +
+            if [ "$BUILDTYPE" = "Release" ]; then
+                "$FIND" -type f -exec "$STRIP" -Sx {} +
+            fi
 
             # rebuild the archive
             "$FIND" -type f -exec "$AR" "$ARCOLLECTFLAGS" "../$lib" {} +

data/libexec/platform

@@ -3,12 +3,12 @@
 set -e
 set -u
 
-if command -v clang >/dev/null 2>&1; then
-    CC="${CC:-clang}"
-    CXX="${CXX:-clang++}"
-elif command -v gcc >/dev/null 2>&1; then
+if command -v gcc >/dev/null 2>&1; then
     CC="${CC:-gcc}"
     CXX="${CXX:-g++}"
+elif command -v clang >/dev/null 2>&1; then
+    CC="${CC:-clang}"
+    CXX="${CXX:-clang++}"
 elif command -v cc >/dev/null 2>&1; then
     CC="${CC:-cc}"
     CXX="${CXX:-c++}"
@@ -98,10 +98,10 @@ if [ "${host_platform}" != "${target_platform}" ]; then
             configure_flags='--dest-cpu=arm --cross-compiling --dest-os=linux --with-arm-float-abi=hard --with-arm-fpu=neon'
             ;;
         x86_64-*linux*)
-            CC='x86_64-linux-gnu-gcc'
-            CXX='x86_64-linux-gnu-g++'
-            CC_host='gcc'
-            CXX_host='g++'
+            CC='clang -arch x86_64'
+            CXX='clang++ -arch x86_64'
+            CC_host='clang'
+            CXX_host='clang++'
             STRIP='x86_64-linux-gnu-strip'
             configure_flags='--dest-cpu=x86_64 --cross-compiling --dest-os=linux'
             ;;
@@ -142,17 +142,17 @@ fi
 #         ;;
 # esac
 
-if command -v ccache >/dev/null 2>&1; then
-    if [ -n "${CC:-}" ] && [ "${CC}" = "${CC#ccache}" ]; then
-        CC="ccache ${CC}"
-        CXX="ccache ${CXX}"
-    fi
-
-    if [ -n "${CC_host:-}" ] && [ "${CC_host}" = "${CC_host#ccache}" ]; then
-        CC_host="ccache ${CC_host}"
-        CXX_host="ccache ${CXX_host}"
-    fi
-fi
+#if command -v ccache >/dev/null 2>&1; then
+#    if [ -n "${CC:-}" ] && [ "${CC}" = "${CC#ccache}" ]; then
+#        CC="ccache ${CC}"
+#        CXX="ccache ${CXX}"
+#    fi
+#
+#    if [ -n "${CC_host:-}" ] && [ "${CC_host}" = "${CC_host#ccache}" ]; then
+#        CC_host="ccache ${CC_host}"
+#        CXX_host="ccache ${CXX_host}"
+#    fi
+#fi
 
 cat <<EOF
 export CC='${CC}'

data/patch/v8-add-missing-typename.patch

@@ -0,0 +1,66 @@
+diff --git a/deps/v8/src/objects/ordered-hash-table.h b/deps/v8/src/objects/ordered-hash-table.h
+index 0e1605d566..8145bb1b8a 100644
+--- a/deps/v8/src/objects/ordered-hash-table.h
++++ b/deps/v8/src/objects/ordered-hash-table.h
+@@ -70,7 +70,7 @@ class OrderedHashTable : public FixedArray {
+   // to add at least one new element.
+   template <template <typename> typename HandleType>
+     requires(std::is_convertible_v<HandleType<Derived>, DirectHandle<Derived>>)
+-  static HandleType<Derived>::MaybeType EnsureCapacityForAdding(
++  static typename HandleType<Derived>::MaybeType EnsureCapacityForAdding(
+       Isolate* isolate, HandleType<Derived> table);
+ 
+   // Returns an OrderedHashTable (possibly |table|) that's shrunken
+@@ -218,11 +218,11 @@ class OrderedHashTable : public FixedArray {
+ 
+   template <template <typename> typename HandleType>
+     requires(std::is_convertible_v<HandleType<Derived>, DirectHandle<Derived>>)
+-  static HandleType<Derived>::MaybeType Rehash(Isolate* isolate,
++  static typename HandleType<Derived>::MaybeType Rehash(Isolate* isolate,
+                                                HandleType<Derived> table);
+   template <template <typename> typename HandleType>
+     requires(std::is_convertible_v<HandleType<Derived>, DirectHandle<Derived>>)
+-  static HandleType<Derived>::MaybeType Rehash(Isolate* isolate,
++  static typename HandleType<Derived>::MaybeType Rehash(Isolate* isolate,
+                                                HandleType<Derived> table,
+                                                int new_capacity);
+ 
+@@ -287,7 +287,7 @@ class V8_EXPORT_PRIVATE OrderedHashSet
+   template <template <typename> typename HandleType>
+     requires(std::is_convertible_v<HandleType<OrderedHashSet>,
+                                    DirectHandle<OrderedHashSet>>)
+-  static HandleType<OrderedHashSet>::MaybeType Add(
++  static typename HandleType<OrderedHashSet>::MaybeType Add(
+       Isolate* isolate, HandleType<OrderedHashSet> table,
+       DirectHandle<Object> value);
+   static Handle<FixedArray> ConvertToKeysArray(Isolate* isolate,
+@@ -296,12 +296,12 @@ class V8_EXPORT_PRIVATE OrderedHashSet
+   template <template <typename> typename HandleType>
+     requires(std::is_convertible_v<HandleType<OrderedHashSet>,
+                                    DirectHandle<OrderedHashSet>>)
+-  static HandleType<OrderedHashSet>::MaybeType Rehash(
++  static typename HandleType<OrderedHashSet>::MaybeType Rehash(
+       Isolate* isolate, HandleType<OrderedHashSet> table);
+   template <template <typename> typename HandleType>
+     requires(std::is_convertible_v<HandleType<OrderedHashSet>,
+                                    DirectHandle<OrderedHashSet>>)
+-  static HandleType<OrderedHashSet>::MaybeType Rehash(
++  static typename HandleType<OrderedHashSet>::MaybeType Rehash(
+       Isolate* isolate, HandleType<OrderedHashSet> table, int new_capacity);
+ 
+   template <typename IsolateT>
+@@ -343,12 +343,12 @@ class V8_EXPORT_PRIVATE OrderedHashMap
+   template <template <typename> typename HandleType>
+     requires(std::is_convertible_v<HandleType<OrderedHashMap>,
+                                    DirectHandle<OrderedHashMap>>)
+-  static HandleType<OrderedHashMap>::MaybeType Rehash(
++  static typename HandleType<OrderedHashMap>::MaybeType Rehash(
+       Isolate* isolate, HandleType<OrderedHashMap> table);
+   template <template <typename> typename HandleType>
+     requires(std::is_convertible_v<HandleType<OrderedHashMap>,
+                                    DirectHandle<OrderedHashMap>>)
+-  static HandleType<OrderedHashMap>::MaybeType Rehash(
++  static typename HandleType<OrderedHashMap>::MaybeType Rehash(
+       Isolate* isolate, HandleType<OrderedHashMap> table, int new_capacity);
+ 
+   void SetEntry(InternalIndex entry, Tagged<Object> key, Tagged<Object> value);

data/patch/v8-disable-madv-dontfork.patch

@@ -0,0 +1,16 @@
+diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi
+index 6e21dac6d7..bcf022fb28 100644
+--- a/tools/v8_gypfiles/features.gypi
++++ b/tools/v8_gypfiles/features.gypi
+@@ -73,7 +73,10 @@
+       }, {
+         'v8_enable_etw_stack_walking': 0,
+       }],
+-      ['OS=="linux"', {
++      # Disable madvise(MADV_DONTFORK), it's a great optimization for programs
++      # that fork & exec but not for programs that fork and keep running.
++      # It makes mini_racer's test/test_forking.rb test segfault.
++      ['False and OS=="linux"', {
+         # Sets -dV8_ENABLE_PRIVATE_MAPPING_FORK_OPTIMIZATION.
+         #
+         # This flag speeds up the performance of fork/execve on Linux systems for

data/patch/v8-disable-pkey.patch

@@ -0,0 +1,17 @@
+diff --git a/deps/v8/src/base/build_config.h b/deps/v8/src/base/build_config.h
+index 9ed4c8f102..dfca698506 100644
+--- a/deps/v8/src/base/build_config.h
++++ b/deps/v8/src/base/build_config.h
+@@ -35,11 +35,8 @@
+ #define V8_HAS_PTHREAD_JIT_WRITE_PROTECT 0
+ #endif
+ 
+-#if defined(V8_OS_LINUX) && defined(V8_HOST_ARCH_X64)
+-#define V8_HAS_PKU_JIT_WRITE_PROTECT 1
+-#else
++// disabled, see https://issues.chromium.org/issues/360909072
+ #define V8_HAS_PKU_JIT_WRITE_PROTECT 0
+-#endif
+ 
+ #if defined(V8_TARGET_ARCH_IA32) || defined(V8_TARGET_ARCH_X64)
+ #define V8_TARGET_ARCH_STORES_RETURN_ADDRESS_ON_STACK true

data/patch/v8-std-is-trivially-destructible.patch

@@ -0,0 +1,22 @@
+diff --git a/deps/v8/src/base/macros.h b/deps/v8/src/base/macros.h
+index d404b6120a..053ac0e5ba 100644
+--- a/deps/v8/src/base/macros.h
++++ b/deps/v8/src/base/macros.h
+@@ -173,7 +173,7 @@ namespace base {
+ // base::is_trivially_copyable will differ for these cases.
+ template <typename T>
+ struct is_trivially_copyable {
+-#if V8_CC_MSVC || (__GNUC__ == 12 && __GNUC_MINOR__ <= 2)
++#if V8_CC_MSVC || (__GNUC__ == 12 && __GNUC_MINOR__ <= 2) || defined(__clang__)
+   // Unfortunately, MSVC 2015 is broken in that std::is_trivially_copyable can
+   // be false even though it should be true according to the standard.
+   // (status at 2018-02-26, observed on the msvc waterfall bot).
+@@ -186,6 +186,8 @@ struct is_trivially_copyable {
+   // distributions, so the same polyfill is also used.
+   // See
+   // https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=aeba3e009b0abfccaf01797556445dbf891cc8dc
++  //
++  // The same is observed with at least clang 14 and 15.
+   static constexpr bool value =
+       // Copy constructor is trivial or deleted.
+       (std::is_trivially_copy_constructible<T>::value ||

data/sums/v22.13.1.sum

@@ -0,0 +1 @@
+e7d5b1e84e7f3c3cebda81e2b138469eef41ba4ecf16a87fd15fc3f7afa3f701

data/sums/v22.6.0.sum

@@ -0,0 +1 @@
+af4a8747651385515163db5da0d2e217da15cf7c832672b234128ed5118f086d

data/sums/v22.7.0.sum

@@ -0,0 +1 @@
+7a7c99282d59866d971b2da12c99596cb15782b9c3efe2e2146390c14f4d490e

data/sums/v22.9.0.sum

@@ -0,0 +1 @@
+296854aa1dca140b0462c2415637d0419e42af91114538a7e6fdf623971a6833

data/sums/v23.6.1.sum

@@ -0,0 +1 @@
+35c0f7957085083071fcf01c7eaea953fba98f17afc4d7c189e3ef56925b453c

data/sums/v23.8.0.sum

@@ -0,0 +1 @@
+23b5e0b0b6752a21c7af4e2361655a54ad499d3ae06b6f9af1dd311365b8496a

data/sums/v24.1.0.sum

@@ -0,0 +1 @@
+b565cba1dd8f2eb3db7c95e0c3a87ecc5e77f079611ea6a3688531511383ec72

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libv8-node
 version: !ruby/object:Gem::Version
-  version: 22.5.1.0
+  version: 24.1.0.0
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2025-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -63,10 +63,10 @@ files:
 - libexec/inject-libv8
 - libexec/metadata
 - libexec/platform
-- patch/gyp-libv8_monolith.patch
-- patch/py2-genv8constants.patch
-- patch/py2-icutrim.patch
-- patch/py3-genv8constants.patch
+- patch/v8-add-missing-typename.patch
+- patch/v8-disable-madv-dontfork.patch
+- patch/v8-disable-pkey.patch
+- patch/v8-std-is-trivially-destructible.patch
 - sums/v16.10.0.sum
 - sums/v16.11.1.sum
 - sums/v16.3.0.sum
@@ -84,7 +84,14 @@ files:
 - sums/v20.12.1.sum
 - sums/v20.2.0.sum
 - sums/v21.7.2.sum
+- sums/v22.13.1.sum
 - sums/v22.5.1.sum
+- sums/v22.6.0.sum
+- sums/v22.7.0.sum
+- sums/v22.9.0.sum
+- sums/v23.6.1.sum
+- sums/v23.8.0.sum
+- sums/v24.1.0.sum
 homepage: https://github.com/rubyjs/libv8-node
 licenses:
 - MIT
@@ -105,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Node.JS's V8 JavaScript engine

data/patch/gyp-libv8_monolith.patch

@@ -1,44 +0,0 @@
---- a/node.gyp	2020-11-04 15:55:48.000000000 +0100
-+++ b/node.gyp	2020-11-04 15:55:51.000000000 +0100
-@@ -1467,6 +1467,16 @@
-         }],
-       ],
-     }, # node_mksnapshot
-+    {
-+      'target_name': 'libv8_monolith',
-+      'type': 'none',
-+      'includes': [
-+        'node.gypi'
-+      ],
-+      #'dependencies': [
-+      #  'tools/v8_gypfiles/v8.gyp:v8_monolith',
-+      #],
-+    },
-   ], # end targets
- 
-   'conditions': [
---- a/tools/v8_gypfiles/v8.gyp	2020-11-04 16:34:06.000000000 +0100
-+++ b/tools/v8_gypfiles/v8.gyp	2020-11-04 16:34:10.000000000 +0100
-@@ -1726,5 +1726,21 @@
-         '<(V8_ROOT)/third_party/zlib/google/compression_utils_portable.h',
-       ],
-     },  # v8_zlib
-+    {
-+      'target_name': 'v8_monolith',
-+      'type': 'static_library',
-+      'sources': [
-+        '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8.*?sources = ")',
-+        '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_libbase.*?sources = ")',
-+        '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_libplatform.*?sources = ")',
-+        '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_libsampler.*?sources = ")',
-+      ],
-+      'dependencies': [
-+        'v8',
-+        'v8_libbase',
-+        'v8_libplatform',
-+        'v8_libsampler',
-+      ],
-+    }
-   ],
- }
-

data/patch/py2-genv8constants.patch

@@ -1,10 +0,0 @@
---- a/tools/genv8constants.py	2020-11-04 09:49:14.000000000 +0100
-+++ b/tools/genv8constants.py	2020-11-04 12:40:46.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- #
- # genv8constants.py output_file libv8_base.a
-
-

data/patch/py2-icutrim.patch

@@ -1,14 +0,0 @@
---- a/tools/icu/icutrim.py	2020-11-03 16:54:23.000000000 +0100
-+++ b/tools/icu/icutrim.py	2020-11-03 16:54:27.000000000 +0100
-@@ -316,7 +316,10 @@
-             erritems = fi.readlines()
-             fi.close()
-             #Item zone/zh_Hant_TW.res depends on missing item zone/zh_Hant.res
--            pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*", 'utf-8'))
-+            if str == bytes:
-+              pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*"))
-+            else:
-+              pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*", 'utf-8'))
-             for i in range(len(erritems)):
-                 line = erritems[i].strip()
-                 m = pat.match(line)

data/patch/py3-genv8constants.patch

@@ -1,20 +0,0 @@
---- a/tools/genv8constants.py	2020-11-04 09:49:14.000000000 +0100
-+++ b/tools/genv8constants.py	2020-11-04 09:49:25.000000000 +0100
-@@ -33,9 +33,14 @@
- 
-   sys.exit()
- 
--pattern = re.compile(bytes('([0-9a-fA-F]{8}|[0-9a-fA-F]{16}) <(.*)>:'))
--v8dbg = re.compile(bytes('^v8dbg.*$'))
--numpattern = re.compile(bytes('^[0-9a-fA-F]{2} $'))
-+if str == bytes:
-+  pattern = re.compile(bytes('([0-9a-fA-F]{8}|[0-9a-fA-F]{16}) <(.*)>:'))
-+  v8dbg = re.compile(bytes('^v8dbg.*$'))
-+  numpattern = re.compile(bytes('^[0-9a-fA-F]{2} $'))
-+else:
-+  pattern = re.compile(bytes('([0-9a-fA-F]{8}|[0-9a-fA-F]{16}) <(.*)>:', 'utf-8'))
-+  v8dbg = re.compile(bytes('^v8dbg.*$', 'utf-8'))
-+  numpattern = re.compile(bytes('^[0-9a-fA-F]{2} $', 'utf-8'))
- octets = 4
- 
- outfile.write("""