diff --git a/cares_public_headers.patch b/cares_public_headers.patch deleted file mode 100644 index 6c9dbdc..0000000 --- a/cares_public_headers.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: node-v14.17.5/src/cares_wrap.h -=================================================================== ---- node-v14.17.5.orig/src/cares_wrap.h -+++ node-v14.17.5/src/cares_wrap.h -@@ -22,7 +22,7 @@ - # include - #endif // __POSIX__ - --# include -+#include - - namespace node { - namespace cares_wrap { diff --git a/gcc13.patch b/gcc13.patch new file mode 100644 index 0000000..c1483b4 --- /dev/null +++ b/gcc13.patch @@ -0,0 +1,36 @@ +Index: node-v20.0.0/deps/v8/src/builtins/builtins-array-gen.cc +=================================================================== +--- node-v20.0.0.orig/deps/v8/src/builtins/builtins-array-gen.cc ++++ node-v20.0.0/deps/v8/src/builtins/builtins-array-gen.cc +@@ -18,6 +18,7 @@ + #include "src/objects/arguments-inl.h" + #include "src/objects/elements-kind.h" + #include "src/objects/property-cell.h" ++#include "src/wasm/wasm-objects.h" + + namespace v8 { + namespace internal { +Index: node-v20.0.0/deps/v8/src/builtins/builtins-array.cc +=================================================================== +--- node-v20.0.0.orig/deps/v8/src/builtins/builtins-array.cc ++++ node-v20.0.0/deps/v8/src/builtins/builtins-array.cc +@@ -22,6 +22,7 @@ + #include "src/objects/objects-inl.h" + #include "src/objects/prototype.h" + #include "src/objects/smi.h" ++#include "src/wasm/wasm-objects.h" + + namespace v8 { + namespace internal { +Index: node-v20.0.0/deps/v8/src/codegen/tnode.h +=================================================================== +--- node-v20.0.0.orig/deps/v8/src/codegen/tnode.h ++++ node-v20.0.0/deps/v8/src/codegen/tnode.h +@@ -6,6 +6,7 @@ + #define V8_CODEGEN_TNODE_H_ + + #include "src/codegen/machine-type.h" ++#include "src/wasm/wasm-objects.h" + + namespace v8 { + namespace internal { diff --git a/nodejs20.spec b/nodejs20.spec index 9c9adb6..23af65a 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -139,11 +139,16 @@ Source11: node_modules.tar.xz Source20: bash_output_helper.bash ## Patches not distribution specific +Patch1: cares_public_headers.patch Patch3: fix_ci_tests.patch +Patch5: sle12_python3_compat.patch +Patch7: manual_configure.patch +Patch13: openssl_binary_detection.patch ## Patches specific to SUSE and openSUSE +Patch100: linker_lto_jobs.patch # PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built Patch101: nodejs-libpath.patch # PATCH-FIX-UPSTREAM -- use custom addon.gypi by default instead of @@ -154,13 +159,19 @@ Patch102: node-gyp-addon-gypi.patch # PATCH-FIX-OPENSUSE -- install user global npm packages to /usr/local # instead of /usr Patch104: npm_search_paths.patch +Patch106: skip_no_console.patch +Patch110: legacy_python.patch Patch120: flaky_test_rerun.patch +Patch132: test-skip-y2038-on-32bit-time_t.patch # Use versioned binaries and paths Patch200: versioned.patch +Patch305: qemu_timeouts_arches.patch +Patch308: node-gyp-config.patch +Patch309: gcc13.patch BuildRequires: pkg-config BuildRequires: fdupes @@ -669,25 +680,36 @@ tar Jxf %{SOURCE5} popd %if %{node_version_number} >= 19 +%patch308 -p1 %endif %endif +%patch1 -p1 %patch3 -p1 %if %{node_version_number} <= 12 && 0%{?suse_version} < 1500 +%patch5 -p1 %endif +%patch7 -p1 %if 0%{with valgrind_tests} %endif +%patch13 -p1 +%patch100 -p1 %patch101 -p1 %patch102 -p1 # Add check_output to configure script (not part of Python 2.6 in SLE11). %if 0%{?suse_version} == 1110 %endif %patch104 -p1 +%patch106 -p1 +%patch110 -p1 %patch120 -p1 +%patch132 -p1 %if ! 0%{with openssl_RSA_get0_pss_params} %endif %patch200 -p1 +%patch305 -p1 +%patch309 -p1 %if %{node_version_number} == 12 # minimist security update - patch50