From 6ad92ba65eb20ad26401787cc61cdc375c0d1cbc3f2d545c889f0ea5fdcb7d77 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 23 Nov 2023 10:50:30 +0000 Subject: [PATCH] - node-gyp-addon-gypi.patch: fix misapplied patch (bsc#1217424) OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs21?expand=0&rev=8 --- node-gyp-addon-gypi.patch | 52 +++++++++++++------------------ nodejs21.changes | 5 +++ nodejs21.spec | 64 ++++++++++++++++++++++++--------------- 3 files changed, 66 insertions(+), 55 deletions(-) diff --git a/node-gyp-addon-gypi.patch b/node-gyp-addon-gypi.patch index 145d10b..b50a35e 100644 --- a/node-gyp-addon-gypi.patch +++ b/node-gyp-addon-gypi.patch @@ -1,7 +1,7 @@ -Index: node-v21.2.0/addon-rpm.gypi +Index: node-v20.10.0/addon-rpm.gypi =================================================================== --- /dev/null -+++ node-v21.2.0/addon-rpm.gypi ++++ node-v20.10.0/addon-rpm.gypi @@ -0,0 +1,35 @@ +{ + 'target_defaults': { @@ -38,51 +38,41 @@ Index: node-v21.2.0/addon-rpm.gypi + ] + } +} -Index: node-v21.2.0/deps/npm/node_modules/node-gyp/lib/configure.js +Index: node-v20.10.0/deps/npm/node_modules/node-gyp/lib/configure.js =================================================================== ---- node-v21.2.0.orig/deps/npm/node_modules/node-gyp/lib/configure.js -+++ node-v21.2.0/deps/npm/node_modules/node-gyp/lib/configure.js -@@ -32,28 +32,11 @@ async function configure (gyp, argv) { - nodeDir = gyp.opts.nodedir.replace(/^~/, os.homedir()) - log.verbose('get node dir', 'compiling against specified --nodedir dev files: %s', nodeDir) - } else { -- // if no --nodedir specified, ensure node dependencies are installed -- if ('v' + release.version !== process.version) { -- // if --target was given, then determine a target version to compile for -- log.verbose('get node dir', 'compiling against --target node version: %s', release.version) +--- node-v20.10.0.orig/deps/npm/node_modules/node-gyp/lib/configure.js ++++ node-v20.10.0/deps/npm/node_modules/node-gyp/lib/configure.js +@@ -36,10 +36,6 @@ async function configure (gyp, argv) { + if ('v' + release.version !== process.version) { + // if --target was given, then determine a target version to compile for + log.verbose('get node dir', 'compiling against --target node version: %s', release.version) - } else { - // if no --target was specified then use the current host node version - log.verbose('get node dir', 'no --target version specified, falling back to host node version: %s', release.version) - } -- -- if (!release.semver) { -- // could not parse the version string with semver -- throw new Error('Invalid version number: ' + release.version) -- } -- -- // If the tarball option is set, always remove and reinstall the headers -- // into devdir. Otherwise only install if they're not already there. -- gyp.opts.ensure = !gyp.opts.tarball -- -- await gyp.commands.install([release.version]) -- -- log.verbose('get node dir', 'target node version installed:', release.versionDir) -- nodeDir = path.resolve(gyp.devDir, release.versionDir) + + if (!release.semver) { + // could not parse the version string with semver +@@ -54,6 +50,12 @@ async function configure (gyp, argv) { + + log.verbose('get node dir', 'target node version installed:', release.versionDir) + nodeDir = path.resolve(gyp.devDir, release.versionDir) ++ } else { + // if no --target was specified then use RPM-installed headers + log.verbose('get node dir', 'no --target version specified, falling back to RPM installed headers') + nodeDir = '/usr/include/node21' + createBuildDir() -+ ++ } } return createBuildDir() -@@ -201,7 +184,8 @@ async function configure (gyp, argv) { +@@ -201,7 +203,8 @@ async function configure (gyp, argv) { // this logic ported from the old `gyp_addon` python file const gypScript = path.resolve(__dirname, '..', 'gyp', 'gyp_main.py') - const addonGypi = path.resolve(__dirname, '..', 'addon.gypi') -+ const addon_gypi_file = gyp.opts.target || gyp.opts.nodedir ? 'addon.gypi' : 'addon-rpm.gypi' -+ let addonGypi = path.resolve(__dirname, '..', addon_gypi_file) ++ let addon_gypi_file = gyp.opts.target || gyp.opts.nodedir ? 'addon.gypi' : 'addon-rpm.gypi' ++ var addonGypi = path.resolve(__dirname, '..', addon_gypi_file) let commonGypi = path.resolve(nodeDir, 'include/node/common.gypi') try { await fs.stat(commonGypi) diff --git a/nodejs21.changes b/nodejs21.changes index d886df1..836c6a9 100644 --- a/nodejs21.changes +++ b/nodejs21.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 23 10:44:16 UTC 2023 - Adam Majer + +- node-gyp-addon-gypi.patch: fix misapplied patch (bsc#1217424) + ------------------------------------------------------------------- Wed Nov 15 15:18:00 UTC 2023 - Adam Majer diff --git a/nodejs21.spec b/nodejs21.spec index 558c05f..59b0513 100644 --- a/nodejs21.spec +++ b/nodejs21.spec @@ -1,7 +1,7 @@ # # spec file for package nodejs21 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,17 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +########################################################### +# +# WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! +# +# This spec file is generated from a template hosted at +# https://github.com/AdamMajer/nodejs-packaging +# +########################################################### +# Fedora doesn't have rpm-config-SUSE which provides +# ext_man in /usr/lib/rpm/macros.d/macros.obs %if 0%{?fedora_version} %define ext_man .gz %endif @@ -119,12 +129,12 @@ Source1: https://nodejs.org/dist/v%{version}/SHASUMS256.txt Source2: https://nodejs.org/dist/v%{version}/SHASUMS256.txt.sig Source3: nodejs.keyring -# Python 3.4 compatible node-gyp -### https://github.com/nodejs/node-gyp.git -### git archive v7.1.2 | xz > node-gyp_7.1.2.tar.xz -Source5: node-gyp_7.1.2.tar.xz -# Only required to run unit tests in NodeJS 10+ -Source10: update_npm_tarball.sh +# Python 3.4 compatible node-gyp +### https://github.com/nodejs/node-gyp.git +### git archive v7.1.2 | xz > node-gyp_7.1.2.tar.xz +Source5: node-gyp_7.1.2.tar.xz +# Only required to run unit tests in NodeJS 10+ +Source10: update_npm_tarball.sh Source11: node_modules.tar.xz Source20: bash_output_helper.bash @@ -135,6 +145,8 @@ 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 @@ -161,8 +173,8 @@ Patch305: qemu_timeouts_arches.patch Patch308: node-gyp-config.patch Patch309: gcc13.patch -BuildRequires: fdupes BuildRequires: pkg-config +BuildRequires: fdupes BuildRequires: procps BuildRequires: xz BuildRequires: zlib-devel @@ -182,10 +194,10 @@ BuildRequires: config(netcfg) %if 0%{?suse_version} == 1110 # GCC 5 is only available in the SUSE:SLE-11:SP4:Update repository (SDK). %if %node_version_number >= 8 -BuildRequires: gcc5-c++ +BuildRequires: gcc5-c++ %define forced_gcc_version 5 %else -BuildRequires: gcc48-c++ +BuildRequires: gcc48-c++ %define forced_gcc_version 4.8 %endif %endif @@ -195,15 +207,15 @@ BuildRequires: gcc48-c++ # for SLE-12:Update targets %if 0%{?suse_version} == 1315 %if %node_version_number >= 17 -BuildRequires: gcc12-c++ +BuildRequires: gcc12-c++ %define forced_gcc_version 12 %else %if %node_version_number >= 14 -BuildRequires: gcc9-c++ +BuildRequires: gcc9-c++ %define forced_gcc_version 9 %else %if %node_version_number >= 8 -BuildRequires: gcc7-c++ +BuildRequires: gcc7-c++ %define forced_gcc_version 7 %endif %endif @@ -212,7 +224,7 @@ BuildRequires: gcc7-c++ %if 0%{?suse_version} == 1500 %if %node_version_number >= 17 -BuildRequires: gcc12-c++ +BuildRequires: gcc12-c++ %define forced_gcc_version 12 %endif %endif @@ -223,6 +235,7 @@ BuildRequires: gcc12-c++ BuildRequires: gcc-c++ %endif + # Python dependencies %if %node_version_number >= 14 @@ -248,8 +261,8 @@ BuildRequires: python %endif %if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10 -BuildRequires: group(nobody) BuildRequires: user(nobody) +BuildRequires: group(nobody) %endif # shared openssl @@ -264,10 +277,11 @@ BuildRequires: openssl >= %{openssl_req_ver} BuildRequires: (libopenssl1_1-hmac if libopenssl-1_1-devel) BuildRequires: (libopenssl3-hmac if libopenssl-3-devel) %else -BuildRequires: libopenssl1_1-hmac BuildRequires: openssl-1_1 >= %{openssl_req_ver} +BuildRequires: libopenssl1_1-hmac %endif + # /suse_version %endif @@ -311,7 +325,7 @@ BuildRequires: valgrind %if %{with libalternatives} Suggests: alts %else -Requires(postun):%{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives %endif # either for update-alternatives, or their removal Requires(post): %{_sbindir}/update-alternatives @@ -350,8 +364,8 @@ ExclusiveArch: not_buildable %endif %endif -Provides: bundled(libuv) = 1.46.0 Provides: bundled(uvwasi) = 0.0.19 +Provides: bundled(libuv) = 1.46.0 Provides: bundled(v8) = 11.8.172.17 %if %{with intree_brotli} Provides: bundled(brotli) = 1.0.9 @@ -359,9 +373,10 @@ Provides: bundled(brotli) = 1.0.9 BuildRequires: pkgconfig(libbrotlidec) %endif -Provides: bundled(base64) = 0.5.1 + Provides: bundled(llhttp) = 9.1.3 Provides: bundled(ngtcp2) = 0.8.1 +Provides: bundled(base64) = 0.5.1 Provides: bundled(simdutf) = 3.2.18 # bundled url-ada parser, not ada Provides: bundled(ada) = 2.7.2 @@ -385,8 +400,8 @@ provided by npm. Summary: Development headers for NodeJS 21.x Group: Development/Languages/NodeJS Provides: nodejs-devel = %{version} -Requires: %{name} = %{version} Requires: npm21 = %{version} +Requires: %{name} = %{version} %description devel This package provides development headers for Node.js needed for creation @@ -403,12 +418,12 @@ Requires: nodejs-common Requires: nodejs21 = %{version} Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 -Provides: npm = %{version} Provides: npm(npm) = 10.2.3 +Provides: npm = %{version} %if 0%{?suse_version} >= 1500 %if %{node_version_number} >= 10 -Requires: group(nobody) Requires: user(nobody) +Requires: group(nobody) %endif %endif Provides: bundled(node-abbrev) = 2.0.0 @@ -575,9 +590,9 @@ Provides: bundled(node-spdx-exceptions) = 2.3.0 Provides: bundled(node-spdx-expression-parse) = 3.0.1 Provides: bundled(node-spdx-license-ids) = 3.0.16 Provides: bundled(node-ssri) = 10.0.5 +Provides: bundled(node-string_decoder) = 1.3.0 Provides: bundled(node-string-width) = 4.2.3 Provides: bundled(node-string-width) = 5.1.2 -Provides: bundled(node-string_decoder) = 1.3.0 Provides: bundled(node-strip-ansi) = 6.0.1 Provides: bundled(node-strip-ansi) = 7.1.0 Provides: bundled(node-supports-color) = 9.4.0 @@ -701,6 +716,8 @@ find -name \*~ -print0 -delete # abnormalities from patching find \( -name \*.js.orig -or -name \*.md.orig -or -name \*.1.orig \) -delete + + %build # normalize shebang %if %{node_version_number} >= 12 @@ -1060,7 +1077,6 @@ update-alternatives --remove npm-default %{_bindir}/npm%{node_version_number} update-alternatives --remove npx-default %{_bindir}/npx%{node_version_number} %else - %pre # remove files that are no longer owned but provided by update-alternatives if ! [ -L %{_mandir}/man1/node.1%{ext_man} ]; then