From 9fc9bf147213e6b814048357be8e6b7af47bc4bf30e3381728e39629688dd17d Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Thu, 16 May 2024 08:23:18 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs22?expand=0&rev=2

---
 node-gyp-config.patch | 13 -------------
 nodejs22.spec         |  8 +-------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 node-gyp-config.patch

diff --git a/node-gyp-config.patch b/node-gyp-config.patch
deleted file mode 100644
index b4257d3..0000000
--- a/node-gyp-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: node-v19.1.0/deps/npm/node_modules/node-gyp/lib/configure.js
-===================================================================
---- node-v19.1.0.orig/deps/npm/node_modules/node-gyp/lib/configure.js
-+++ node-v19.1.0/deps/npm/node_modules/node-gyp/lib/configure.js
-@@ -96,7 +96,7 @@ function configure (gyp, argv, callback)
- 
-     log.verbose('build/' + configFilename, 'creating config file')
- 
--    var config = process.config || {}
-+    var config = JSON.parse(JSON.stringify(process.config || {}))
-     var defaults = config.target_defaults
-     var variables = config.variables
- 
diff --git a/nodejs22.spec b/nodejs22.spec
index c333824..9c0f071 100644
--- a/nodejs22.spec
+++ b/nodejs22.spec
@@ -134,10 +134,6 @@ 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 
 Source11:       node_modules.tar.xz
@@ -175,7 +171,6 @@ Patch132:       test-skip-y2038-on-32bit-time_t.patch
 Patch200:       versioned.patch
 
 Patch305:       qemu_timeouts_arches.patch
-Patch308:       node-gyp-config.patch
 Patch309:       gcc13.patch
 
 BuildRequires:  pkg-config
@@ -648,7 +643,7 @@ tar Jxf %{SOURCE11}
 %endif
 
 # downgrade node-gyp to last version that supports python 3.4 for SLE12
-%if 0%{?suse_version} && 0%{?suse_version} < 1500 && %{node_version_number} >= 16
+%if 0%{?suse_version} && 0%{?suse_version} < 1500 && %{node_version_number} >= 16 && %{node_version_number} < 22
 rm -r  deps/npm/node_modules/node-gyp
 mkdir deps/npm/node_modules/node-gyp
 pushd deps/npm/node_modules/node-gyp
@@ -656,7 +651,6 @@ tar Jxf %{SOURCE5}
 popd
 
 %if %{node_version_number} >= 19
-%patch -P 308 -p1
 %else
 %endif
 %endif