[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Jeroen Roovers]

commit:     6f2fbe4cdc8784a5317a7c1ca6f66a51e79bb232
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  1 11:41:46 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Nov  1 11:42:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f2fbe4c

net-libs/nodejs: Drop obsolete patch.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../nodejs/files/nodejs-8.4.0-shared-nghttp2.patch | 105 ---------------------
 1 file changed, 105 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-8.4.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.4.0-shared-nghttp2.patch
deleted file mode 100644
index 1f1a2e6ea63..00000000000
--- a/net-libs/nodejs/files/nodejs-8.4.0-shared-nghttp2.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -182,6 +182,27 @@
-     dest='shared_http_parser_libpath',
-     help='a directory to search for the shared http_parser DLL')
- 
-+shared_optgroup.add_option('--shared-nghttp2',
-+    action='store_true',
-+    dest='shared_nghttp2',
-+    help='link to a shared nghttp2 DLL instead of static linking')
-+
-+shared_optgroup.add_option('--shared-nghttp2-includes',
-+    action='store',
-+    dest='shared_nghttp2_includes',
-+    help='directory containing nghttp2 header files')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libname',
-+    action='store',
-+    dest='shared_nghttp2_libname',
-+    default='nghttp2',
-+    help='alternative lib name to link to [default: %default]')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libpath',
-+    action='store',
-+    dest='shared_nghttp2_libpath',
-+    help='a directory to search for the shared nghttp2 DLL')
-+
- shared_optgroup.add_option('--shared-libuv',
-     action='store_true',
-     dest='shared_libuv',
-@@ -1381,6 +1381,7 @@
- configure_node(output)
- configure_library('zlib', output)
- configure_library('http_parser', output)
-+configure_library('nghttp2', output)
- configure_library('libuv', output)
- configure_library('libcares', output)
- # stay backwards compatible with shared cares builds
---- a/node.gyp
-+++ b/node.gyp
-@@ -14,6 +14,7 @@
-     'node_module_version%': '',
-     'node_shared_zlib%': 'false',
-     'node_shared_http_parser%': 'false',
-+    'node_shared_nghttp2%': 'false',
-     'node_shared_cares%': 'false',
-     'node_shared_libuv%': 'false',
-     'node_use_openssl%': 'true',
-@@ -149,10 +150,17 @@
-       'type': '<(node_target_type)',
-
-       'dependencies': [
--        'node_js2c#host',
--        'deps/nghttp2/nghttp2.gyp:nghttp2'
-+        'node_js2c#host'
-       ],
-
-+      'conditions': [
-+        [ 'node_shared_nghttp2=="false"', {
-+          'dependencies': [
-+            'deps/nghttp2/nghttp2.gyp:nghttp2'
-+          ]
-+        }]
-+      ],
-+
-       'includes': [
-         'node.gypi'
-       ],
-@@ -161,8 +161,7 @@
-         'src',
-         'tools/msvs/genfiles',
-         'deps/uv/src/ares',
--        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
--        'deps/nghttp2/lib/includes'
-+        '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
-       ],
- 
-       'sources': [
-@@ -275,9 +274,7 @@
-         'NODE_PLATFORM="<(OS)"',
-         'NODE_WANT_INTERNALS=1',
-         # Warn when using deprecated V8 APIs.
--        'V8_DEPRECATION_WARNINGS=1',
--        # We're using the nghttp2 static lib
--        'NGHTTP2_STATICLIB'
-+        'V8_DEPRECATION_WARNINGS=1'
-       ],
-     },
-     {
-@@ -687,6 +684,15 @@
-                 'deps/http_parser/http_parser.gyp:http_parser'
-               ]
-             }],
-+            [ 'node_shared_nghttp2=="false"', {
-+              'dependencies': [
-+                'deps/nghttp2/nghttp2.gyp:nghttp2'
-+              ],
-+              'defines': [
-+                # We're using the nghttp2 static lib
-+                'NGHTTP2_STATICLIB'
-+              ]
-+            }],
-             [ 'node_shared_libuv=="false"', {
-               'dependencies': [
-                 'deps/uv/uv.gyp:libuv'

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Jeroen Roovers]

commit:     d904f25f8d73ab12e9a0a6e33da052d9f5f8a1ed
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 12:00:09 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 12:01:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d904f25f

net-libs/nodejs: Use upstream patches for shared nghttp2 support.

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 .../nodejs/files/nodejs-8.9.0-shared-nghttp2.patch | 95 ++++++++++------------
 .../nodejs/files/nodejs-9.2.0-shared-nghttp2.patch | 75 +++++++++--------
 2 files changed, 88 insertions(+), 82 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
index dfccb1b0aea..c5e0d837f30 100644
--- a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
+++ b/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
@@ -1,8 +1,10 @@
+diff --git a/configure b/configure
+index 5703a70cb2d..3b6fc7347db 100755
 --- a/configure
 +++ b/configure
-@@ -182,6 +182,27 @@
-     dest='shared_http_parser_libpath',
-     help='a directory to search for the shared http_parser DLL')
+@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath',
+     dest='shared_libuv_libpath',
+     help='a directory to search for the shared libuv DLL')
  
 +shared_optgroup.add_option('--shared-nghttp2',
 +    action='store_true',
@@ -23,48 +25,40 @@
 +shared_optgroup.add_option('--shared-nghttp2-libpath',
 +    action='store',
 +    dest='shared_nghttp2_libpath',
-+    help='a directory to search for the shared nghttp2 DLL')
++    help='a directory to search for the shared nghttp2 DLLs')
 +
- shared_optgroup.add_option('--shared-libuv',
+ shared_optgroup.add_option('--shared-openssl',
      action='store_true',
-     dest='shared_libuv',
-@@ -1360,6 +1381,7 @@
- configure_node(output)
- configure_library('zlib', output)
+     dest='shared_openssl',
+@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
  configure_library('http_parser', output)
-+configure_library('nghttp2', output)
  configure_library('libuv', output)
  configure_library('libcares', output)
++configure_library('nghttp2', output)
  # stay backwards compatible with shared cares builds
+ output['variables']['node_shared_cares'] = \
+     output['variables'].pop('node_shared_libcares')
+diff --git a/node.gyp b/node.gyp
+index 86a4331a4ed..38241302e26 100644
 --- a/node.gyp
 +++ b/node.gyp
-@@ -14,6 +14,7 @@
-     'node_module_version%': '',
-     'node_shared_zlib%': 'false',
+@@ -16,6 +16,7 @@
      'node_shared_http_parser%': 'false',
-+    'node_shared_nghttp2%': 'false',
      'node_shared_cares%': 'false',
      'node_shared_libuv%': 'false',
++    'node_shared_nghttp2%': 'false',
      'node_use_openssl%': 'true',
-@@ -151,8 +152,15 @@
-       'type': '<(node_target_type)',
+     'node_shared_openssl%': 'false',
+     'node_v8_options%': '',
+@@ -177,7 +178,6 @@
  
        'dependencies': [
--        'node_js2c#host',
+         'node_js2c#host',
 -        'deps/nghttp2/nghttp2.gyp:nghttp2'
-+        'node_js2c#host'
-+      ],
-+
-+      'conditions': [
-+        [ 'node_shared_nghttp2=="false"', {
-+          'dependencies': [
-+            'deps/nghttp2/nghttp2.gyp:nghttp2'
-+          ]
-+        }]
        ],
  
        'includes': [
-@@ -180,8 +180,7 @@
+@@ -187,8 +187,7 @@
        'include_dirs': [
          'src',
          'tools/msvs/genfiles',
@@ -74,32 +68,33 @@
        ],
  
        'sources': [
-@@ -691,6 +696,15 @@
-                 'deps/http_parser/http_parser.gyp:http_parser'
-               ]
-             }],
-+            [ 'node_shared_nghttp2=="false"', {
-+              'dependencies': [
-+                'deps/nghttp2/nghttp2.gyp:nghttp2'
-+              ],
-+              'defines': [
-+                # We're using the nghttp2 static lib
-+                'NGHTTP2_STATICLIB'
-+              ]
-+            }],
-             [ 'node_shared_libuv=="false"', {
-               'dependencies': [
-                 'deps/uv/uv.gyp:libuv'
+@@ -930,6 +929,14 @@
+             'deps/uv/uv.gyp:libuv'
+           ]
+         }],
++        [ 'node_shared_nghttp2=="false"', {
++          'dependencies': [
++            'deps/nghttp2/nghttp2.gyp:nghttp2'
++          ],
++          'include_dirs': [
++            'deps/nghttp2/lib/includes'
++          ]
++        }],
+         [ 'node_use_v8_platform=="true"', {
+           'dependencies': [
+             'deps/v8/src/v8.gyp:v8_libplatform',
+diff --git a/node.gypi b/node.gypi
+index ec78df2a339..3990c59ef98 100644
 --- a/node.gypi
 +++ b/node.gypi
-@@ -251,6 +251,10 @@
-       'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
+@@ -259,6 +259,10 @@
+     [ 'node_shared_libuv=="false"', {
+       'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
      }],
- 
++
 +    [ 'node_shared_nghttp2=="false"', {
 +      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
 +    }],
-+
-     [ 'node_shared_cares=="false"', {
-       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
-     }],
+ 
+     [ 'OS=="win"', {
+       'sources': [

diff --git a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
index a145c0c7116..e8483ab279f 100644
--- a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
+++ b/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
@@ -1,8 +1,10 @@
+diff --git a/configure b/configure
+index 5703a70cb2d..3b6fc7347db 100755
 --- a/configure
 +++ b/configure
-@@ -182,6 +182,27 @@
-     dest='shared_http_parser_libpath',
-     help='a directory to search for the shared http_parser DLL')
+@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath',
+     dest='shared_libuv_libpath',
+     help='a directory to search for the shared libuv DLL')
  
 +shared_optgroup.add_option('--shared-nghttp2',
 +    action='store_true',
@@ -23,48 +25,40 @@
 +shared_optgroup.add_option('--shared-nghttp2-libpath',
 +    action='store',
 +    dest='shared_nghttp2_libpath',
-+    help='a directory to search for the shared nghttp2 DLL')
++    help='a directory to search for the shared nghttp2 DLLs')
 +
- shared_optgroup.add_option('--shared-libuv',
+ shared_optgroup.add_option('--shared-openssl',
      action='store_true',
-     dest='shared_libuv',
-@@ -1360,6 +1381,7 @@
- configure_node(output)
- configure_library('zlib', output)
+     dest='shared_openssl',
+@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
  configure_library('http_parser', output)
-+configure_library('nghttp2', output)
  configure_library('libuv', output)
  configure_library('libcares', output)
++configure_library('nghttp2', output)
  # stay backwards compatible with shared cares builds
+ output['variables']['node_shared_cares'] = \
+     output['variables'].pop('node_shared_libcares')
+diff --git a/node.gyp b/node.gyp
+index 43a6576206d..c8ba6759246 100644
 --- a/node.gyp
 +++ b/node.gyp
-@@ -14,6 +14,7 @@
-     'node_module_version%': '',
-     'node_shared_zlib%': 'false',
+@@ -16,6 +16,7 @@
      'node_shared_http_parser%': 'false',
-+    'node_shared_nghttp2%': 'false',
      'node_shared_cares%': 'false',
      'node_shared_libuv%': 'false',
++    'node_shared_nghttp2%': 'false',
      'node_use_openssl%': 'true',
-@@ -151,8 +152,15 @@
-       'type': '<(node_target_type)',
+     'node_shared_openssl%': 'false',
+     'node_v8_options%': '',
+@@ -176,7 +177,6 @@
  
        'dependencies': [
--        'node_js2c#host',
+         'node_js2c#host',
 -        'deps/nghttp2/nghttp2.gyp:nghttp2'
-+        'node_js2c#host'
-+      ],
-+
-+      'conditions': [
-+        [ 'node_shared_nghttp2=="false"', {
-+          'dependencies': [
-+            'deps/nghttp2/nghttp2.gyp:nghttp2'
-+          ]
-+        }]
        ],
  
        'includes': [
-@@ -180,8 +180,7 @@
+@@ -186,8 +186,7 @@
        'include_dirs': [
          'src',
          'tools/msvs/genfiles',
@@ -74,16 +68,33 @@
        ],
  
        'sources': [
+@@ -929,6 +928,14 @@
+             'deps/uv/uv.gyp:libuv'
+           ]
+         }],
++        [ 'node_shared_nghttp2=="false"', {
++          'dependencies': [
++            'deps/nghttp2/nghttp2.gyp:nghttp2'
++          ],
++          'include_dirs': [
++            'deps/nghttp2/lib/includes'
++          ]
++        }],
+         [ 'node_use_v8_platform=="true"', {
+           'dependencies': [
+             'deps/v8/src/v8.gyp:v8_libplatform',
+diff --git a/node.gypi b/node.gypi
+index ec78df2a339..3990c59ef98 100644
 --- a/node.gypi
 +++ b/node.gypi
-@@ -251,6 +251,10 @@
-       'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
+@@ -133,6 +133,10 @@
+       'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
      }],
  
 +    [ 'node_shared_nghttp2=="false"', {
 +      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
 +    }],
 +
-     [ 'node_shared_cares=="false"', {
-       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
-     }],
+     [ 'OS=="mac"', {
+       # linking Corefoundation is needed since certain OSX debugging tools
+       # like Instruments require it for some features

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Jeroen Roovers]

commit:     54e6d659d80029fb46b334a49f6989008e56fc90
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  4 12:28:12 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan  4 12:30:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e6d659

net-libs/nodejs: Obsolete.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../nodejs/files/nodejs-8.9.0-shared-nghttp2.patch | 100 ---------------------
 .../nodejs/files/nodejs-9.2.0-shared-nghttp2.patch | 100 ---------------------
 2 files changed, 200 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
deleted file mode 100644
index c5e0d837f30..00000000000
--- a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/configure b/configure
-index 5703a70cb2d..3b6fc7347db 100755
---- a/configure
-+++ b/configure
-@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath',
-     dest='shared_libuv_libpath',
-     help='a directory to search for the shared libuv DLL')
- 
-+shared_optgroup.add_option('--shared-nghttp2',
-+    action='store_true',
-+    dest='shared_nghttp2',
-+    help='link to a shared nghttp2 DLL instead of static linking')
-+
-+shared_optgroup.add_option('--shared-nghttp2-includes',
-+    action='store',
-+    dest='shared_nghttp2_includes',
-+    help='directory containing nghttp2 header files')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libname',
-+    action='store',
-+    dest='shared_nghttp2_libname',
-+    default='nghttp2',
-+    help='alternative lib name to link to [default: %default]')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libpath',
-+    action='store',
-+    dest='shared_nghttp2_libpath',
-+    help='a directory to search for the shared nghttp2 DLLs')
-+
- shared_optgroup.add_option('--shared-openssl',
-     action='store_true',
-     dest='shared_openssl',
-@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
- configure_library('http_parser', output)
- configure_library('libuv', output)
- configure_library('libcares', output)
-+configure_library('nghttp2', output)
- # stay backwards compatible with shared cares builds
- output['variables']['node_shared_cares'] = \
-     output['variables'].pop('node_shared_libcares')
-diff --git a/node.gyp b/node.gyp
-index 86a4331a4ed..38241302e26 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -16,6 +16,7 @@
-     'node_shared_http_parser%': 'false',
-     'node_shared_cares%': 'false',
-     'node_shared_libuv%': 'false',
-+    'node_shared_nghttp2%': 'false',
-     'node_use_openssl%': 'true',
-     'node_shared_openssl%': 'false',
-     'node_v8_options%': '',
-@@ -177,7 +178,6 @@
- 
-       'dependencies': [
-         'node_js2c#host',
--        'deps/nghttp2/nghttp2.gyp:nghttp2'
-       ],
- 
-       'includes': [
-@@ -187,8 +187,7 @@
-       'include_dirs': [
-         'src',
-         'tools/msvs/genfiles',
--        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
--        'deps/nghttp2/lib/includes'
-+        '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
-       ],
- 
-       'sources': [
-@@ -930,6 +929,14 @@
-             'deps/uv/uv.gyp:libuv'
-           ]
-         }],
-+        [ 'node_shared_nghttp2=="false"', {
-+          'dependencies': [
-+            'deps/nghttp2/nghttp2.gyp:nghttp2'
-+          ],
-+          'include_dirs': [
-+            'deps/nghttp2/lib/includes'
-+          ]
-+        }],
-         [ 'node_use_v8_platform=="true"', {
-           'dependencies': [
-             'deps/v8/src/v8.gyp:v8_libplatform',
-diff --git a/node.gypi b/node.gypi
-index ec78df2a339..3990c59ef98 100644
---- a/node.gypi
-+++ b/node.gypi
-@@ -259,6 +259,10 @@
-     [ 'node_shared_libuv=="false"', {
-       'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
-     }],
-+
-+    [ 'node_shared_nghttp2=="false"', {
-+      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
-+    }],
- 
-     [ 'OS=="win"', {
-       'sources': [

diff --git a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
deleted file mode 100644
index e8483ab279f..00000000000
--- a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/configure b/configure
-index 5703a70cb2d..3b6fc7347db 100755
---- a/configure
-+++ b/configure
-@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath',
-     dest='shared_libuv_libpath',
-     help='a directory to search for the shared libuv DLL')
- 
-+shared_optgroup.add_option('--shared-nghttp2',
-+    action='store_true',
-+    dest='shared_nghttp2',
-+    help='link to a shared nghttp2 DLL instead of static linking')
-+
-+shared_optgroup.add_option('--shared-nghttp2-includes',
-+    action='store',
-+    dest='shared_nghttp2_includes',
-+    help='directory containing nghttp2 header files')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libname',
-+    action='store',
-+    dest='shared_nghttp2_libname',
-+    default='nghttp2',
-+    help='alternative lib name to link to [default: %default]')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libpath',
-+    action='store',
-+    dest='shared_nghttp2_libpath',
-+    help='a directory to search for the shared nghttp2 DLLs')
-+
- shared_optgroup.add_option('--shared-openssl',
-     action='store_true',
-     dest='shared_openssl',
-@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
- configure_library('http_parser', output)
- configure_library('libuv', output)
- configure_library('libcares', output)
-+configure_library('nghttp2', output)
- # stay backwards compatible with shared cares builds
- output['variables']['node_shared_cares'] = \
-     output['variables'].pop('node_shared_libcares')
-diff --git a/node.gyp b/node.gyp
-index 43a6576206d..c8ba6759246 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -16,6 +16,7 @@
-     'node_shared_http_parser%': 'false',
-     'node_shared_cares%': 'false',
-     'node_shared_libuv%': 'false',
-+    'node_shared_nghttp2%': 'false',
-     'node_use_openssl%': 'true',
-     'node_shared_openssl%': 'false',
-     'node_v8_options%': '',
-@@ -176,7 +177,6 @@
- 
-       'dependencies': [
-         'node_js2c#host',
--        'deps/nghttp2/nghttp2.gyp:nghttp2'
-       ],
- 
-       'includes': [
-@@ -186,8 +186,7 @@
-       'include_dirs': [
-         'src',
-         'tools/msvs/genfiles',
--        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
--        'deps/nghttp2/lib/includes'
-+        '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
-       ],
- 
-       'sources': [
-@@ -929,6 +928,14 @@
-             'deps/uv/uv.gyp:libuv'
-           ]
-         }],
-+        [ 'node_shared_nghttp2=="false"', {
-+          'dependencies': [
-+            'deps/nghttp2/nghttp2.gyp:nghttp2'
-+          ],
-+          'include_dirs': [
-+            'deps/nghttp2/lib/includes'
-+          ]
-+        }],
-         [ 'node_use_v8_platform=="true"', {
-           'dependencies': [
-             'deps/v8/src/v8.gyp:v8_libplatform',
-diff --git a/node.gypi b/node.gypi
-index ec78df2a339..3990c59ef98 100644
---- a/node.gypi
-+++ b/node.gypi
-@@ -133,6 +133,10 @@
-       'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
-     }],
- 
-+    [ 'node_shared_nghttp2=="false"', {
-+      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
-+    }],
-+
-     [ 'OS=="mac"', {
-       # linking Corefoundation is needed since certain OSX debugging tools
-       # like Instruments require it for some features

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Jeroen Roovers]

commit:     1efdc0143f027193a6784b6f3a594feb7fdf2a31
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 12:44:34 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 12:44:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efdc014

net-libs/nodejs: src/node_metadata.cc: Include node_internals.h

Fixes: https://bugs.gentoo.org/673068
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/nodejs/files/nodejs-11.4.0-llhttp.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/net-libs/nodejs/files/nodejs-11.4.0-llhttp.patch b/net-libs/nodejs/files/nodejs-11.4.0-llhttp.patch
index 1b6eb9fb7fa..07ac9af6c66 100644
--- a/net-libs/nodejs/files/nodejs-11.4.0-llhttp.patch
+++ b/net-libs/nodejs/files/nodejs-11.4.0-llhttp.patch
@@ -18,3 +18,13 @@
      [ 'node_shared_cares=="false"', {
        'dependencies': [ 'deps/cares/cares.gyp:cares' ],
      }],
+--- a/src/node_metadata.cc
++++ b/src/node_metadata.cc
+@@ -2,6 +2,7 @@
+ #include "ares.h"
+ #include "nghttp2/nghttp2ver.h"
+ #include "node.h"
++#include "node_internals.h"
+ #include "util.h"
+ #include "uv.h"
+ #include "v8.h"

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Magnus Granberg]

commit:     ba5e2dede2bbbb42a4c83debb273250fbe55dd73
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 19:52:02 2020 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 19:53:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5e2ded

net-libs/nodejs: Update patch for paxmarkings Bug:710596

Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.16

 net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch
index 0fb33cbee49..c29825df3cf 100644
--- a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch
+++ b/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch
@@ -93,7 +93,7 @@
 +          'action': [
 +            'bash',
 +            '-c',
-+            'mv <(mksnapshot_exec) <(mksnapshot_u_exec) && paxmark.mksnapshot_u_exec)',
++            'mv <(mksnapshot_exec) <(mksnapshot_u_exec) && paxmark.sh m <(mksnapshot_u_exec)',
 +          ],
 +        },
 +        {

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Marek Szuba]

commit:     395a79e92252013dc32270969a3338e1d191b962
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 18:15:32 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun May 16 18:17:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395a79e9

net-libs/nodejs: more collections.abc fixes in jinja

Suggested-by: Jens Brandt <gentoo <AT> brandt-george.de>
Closes: https://github.com/gentoo/gentoo/pull/20816
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../nodejs-12.22.1-jinja_collections_abc.patch     | 84 ++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
index 45be8cb07f8..5f0df09b6e2 100644
--- a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
+++ b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
@@ -9,3 +9,87 @@
  from jinja2.runtime import Undefined
  from jinja2._compat import text_type, string_types, integer_types
  import decimal
+--- a/deps/v8/third_party/jinja2/runtime.py
++++ b/deps/v8/third_party/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/deps/v8/third_party/jinja2/sandbox.py
++++ b/deps/v8/third_party/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/deps/v8/third_party/jinja2/utils.py
++++ b/deps/v8/third_party/jinja2/utils.py
+@@ -482,7 +482,7 @@ class LRUCache(object):
+ 
+ # register the LRU cache as mutable mapping if possible
+ try:
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+     MutableMapping.register(LRUCache)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/runtime.py
++++ b/tools/inspector_protocol/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/sandbox.py
++++ b/tools/inspector_protocol/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/tools/inspector_protocol/jinja2/tests.py
++++ b/tools/inspector_protocol/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Marek Szuba]

commit:     3d72ee4f976aa5c01f8593df0c993b8eed57d7d5
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat May 15 15:43:45 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun May 16 18:17:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d72ee4f

net-libs/nodejs: remove unused patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../nodejs/files/nodejs-13.2.0-paxmarking.patch    | 71 ----------------------
 1 file changed, 71 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
deleted file mode 100644
index 1061255e163..00000000000
--- a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-    Bug: 694100
-    Add actions for pax marking mkcodecache and node_mksnapshot
-    to disable mprotect for pax enable kernel.
-    Reported-by: Attila Tóth <atoth@atoth.sote.hu>
-    Co-developed-by: Attila Tóth <atoth@atoth.sote.hu>
-    Signed-off-by: Magnus Granberg <zorry@gentoo.org>
-
---- a/node.gyp	2019-10-23 11:52:41.000000000 +0200
-+++ a/node.gyp	2019-11-12 20:58:43.957881862 +0100
-@@ -233,7 +233,9 @@
-       'deps/acorn-plugins/acorn-static-class-features/index.js',
-     ],
-     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
-+    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
-+    'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
-     'conditions': [
-       [ 'node_shared=="true"', {
-         'node_target_type%': 'shared_library',
-@@ -436,10 +438,24 @@
-           ],
-           'actions': [
-             {
-+              'action_name': 'run_pax_mkcodecache',
-+              'inputs': [
-+                '<(mkcodecache_exec)',
-+              ],
-+              'outputs': [
-+                '<(mkcodecache_u_exec)',
-+              ],
-+              'action': [
-+                'bash',
-+                '-c',
-+                'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
-+              ],
-+            },
-+            {
-               'action_name': 'run_mkcodecache',
-               'process_outputs_as_sources': 1,
-               'inputs': [
--                '<(mkcodecache_exec)',
-+                '<(mkcodecache_u_exec)',
-               ],
-               'outputs': [
-                 '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
-@@ -461,10 +477,24 @@
-           ],
-           'actions': [
-             {
-+              'action_name': 'run_pax_mksnapshot',
-+              'inputs': [
-+                '<(node_mksnapshot_exec)',
-+              ],
-+              'outputs': [
-+                '<(node_mksnapshot_u_exec)',
-+              ],
-+              'action': [
-+                'bash',
-+                '-c',
-+                'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
-+              ],
-+            },
-+            {
-               'action_name': 'node_mksnapshot',
-               'process_outputs_as_sources': 1,
-               'inputs': [
--                '<(node_mksnapshot_exec)',
-+                '<(node_mksnapshot_u_exec)',
-               ],
-               'outputs': [
-                 '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Joonas Niilola]

commit:     553eb1d927158864d66881473770799759c6e6ea
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri May  6 05:19:46 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May  6 05:19:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553eb1d9

net-libs/nodejs: remove unneeded patch

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/nodejs-12.22.10-global-npm-config.patch    | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-12.22.10-global-npm-config.patch b/net-libs/nodejs/files/nodejs-12.22.10-global-npm-config.patch
deleted file mode 100644
index 09d9dbe47be0..000000000000
--- a/net-libs/nodejs/files/nodejs-12.22.10-global-npm-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js
-index 36420b3450..0afb0b6792 100644
---- a/deps/npm/lib/config/core.js
-+++ b/deps/npm/lib/config/core.js
-@@ -151,11 +151,10 @@ function load_ (builtin, rc, cli, cb) {
-     // Eg, `npm config get globalconfig --prefix ~/local` should
-     // return `~/local/etc/npmrc`
-     // annoying humans and their expectations!
--    if (conf.get('prefix')) {
--      var etc = path.resolve(conf.get('prefix'), 'etc')
--      defaults.globalconfig = path.resolve(etc, 'npmrc')
--      defaults.globalignorefile = path.resolve(etc, 'npmignore')
--    }
-+    // gentoo deviates wrt global config; store in /etc/npm
-+    var globalconfig = path.resolve('/etc', 'npm')
-+    defaults.globalconfig = path.resolve(globalconfig, 'npmrc')
-+    defaults.globalignorefile = path.resolve(globalconfig, 'npmignore')
- 
-     conf.addFile(conf.get('globalconfig'), 'global')
- 

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Sam James]

commit:     14f9d09a7eb2a7ea6feea175da1b074769bae59e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat May  7 15:09:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 13 20:03:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f9d09a

net-libs/nodejs: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25371
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/nodejs/files/nodejs-99999999-llhttp.patch | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
deleted file mode 100644
index 1b6eb9fb7fa1..000000000000
--- a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/node.gypi
-+++ b/node.gypi
-@@ -169,11 +169,15 @@
- 
-     [ 'node_shared_http_parser=="false"', {
-       'dependencies': [
--        'deps/http_parser/http_parser.gyp:http_parser',
--        'deps/llhttp/llhttp.gyp:llhttp'
-+        'deps/http_parser/http_parser.gyp:http_parser'
-       ],
-     } ],
- 
-+    [ '"true"', { 'dependencies': [
-+        'deps/llhttp/llhttp.gyp:llhttp'
-+      ],
-+    }],
-+
-     [ 'node_shared_cares=="false"', {
-       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
-     }],

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Sam James]

commit:     11a750365ff07537c93dc377f99f38450ce499d3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 03:58:04 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 30 03:58:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a75036

net-libs/nodejs: restore nodejs-12.22.1-jinja_collections_abc.patch

Closes: https://bugs.gentoo.org/848441
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../nodejs-12.22.1-jinja_collections_abc.patch     | 95 ++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
new file mode 100644
index 000000000000..5f0df09b6e2e
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
@@ -0,0 +1,95 @@
+--- a/deps/v8/third_party/jinja2/tests.py
++++ b/deps/v8/third_party/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
+--- a/deps/v8/third_party/jinja2/runtime.py
++++ b/deps/v8/third_party/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/deps/v8/third_party/jinja2/sandbox.py
++++ b/deps/v8/third_party/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/deps/v8/third_party/jinja2/utils.py
++++ b/deps/v8/third_party/jinja2/utils.py
+@@ -482,7 +482,7 @@ class LRUCache(object):
+ 
+ # register the LRU cache as mutable mapping if possible
+ try:
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+     MutableMapping.register(LRUCache)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/runtime.py
++++ b/tools/inspector_protocol/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/sandbox.py
++++ b/tools/inspector_protocol/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/tools/inspector_protocol/jinja2/tests.py
++++ b/tools/inspector_protocol/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Conrad Kostecki]

commit:     7610763728c358e032e12b8a1aa29a3e474b8063
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jun  4 18:46:50 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 23:03:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76107637

net-libs/nodejs: remove unused patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25750
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/nodejs-10.3.0-global-npm-config.patch      | 20 --------------------
 .../files/nodejs-12.22.1-uvwasi_shared_libuv.patch   | 12 ------------
 2 files changed, 32 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch
deleted file mode 100644
index 9c7fe6888fb8..000000000000
--- a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/deps/npm/lib/config/core.js
-+++ b/deps/npm/lib/config/core.js
-@@ -153,11 +153,12 @@
-     // Eg, `npm config get globalconfig --prefix ~/local` should
-     // return `~/local/etc/npmrc`
-     // annoying humans and their expectations!
--    if (conf.get('prefix')) {
--      var etc = path.resolve(conf.get('prefix'), 'etc')
--      defaults.globalconfig = path.resolve(etc, 'npmrc')
--      defaults.globalignorefile = path.resolve(etc, 'npmignore')
--    }
-+    // gentoo deviates wrt global config; store in /etc/npm
-+    var globalconfig = path.resolve('/etc', 'npm')
-+    mkdirp(globalconfig, function () {
-+      defaults.globalconfig = path.resolve(globalconfig, 'npmrc')
-+      defaults.globalignorefile = path.resolve(globalconfig, 'npmignore')
-+    })
- 
-     conf.addFile(conf.get('globalconfig'), 'global')
- 

diff --git a/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch b/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch
deleted file mode 100644
index eb56bb87d86d..000000000000
--- a/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/deps/uvwasi/uvwasi.gyp
-+++ b/deps/uvwasi/uvwasi.gyp
-@@ -18,9 +18,6 @@
-         'src/wasi_rights.c',
-         'src/wasi_serdes.c',
-       ],
--      'dependencies': [
--        '../uv/uv.gyp:libuv',
--      ],
-       'direct_dependent_settings': {
-         'include_dirs': ['include']
-       },

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Conrad Kostecki]

commit:     48ed59df16169b636531ca5c3fdbdd293f0133e7
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jun 13 18:48:27 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 21:41:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ed59df

net-libs/nodejs: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25880
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../nodejs/files/nodejs-18.0.0-paxmarking.patch    | 113 ---------------------
 1 file changed, 113 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-18.0.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-18.0.0-paxmarking.patch
deleted file mode 100644
index c778d1729384..000000000000
--- a/net-libs/nodejs/files/nodejs-18.0.0-paxmarking.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -urNp node-v15.8.0-orig/node.gyp node-v15.8.0-dwok/node.gyp
---- node-v15.8.0-orig/node.gyp	2021-02-24 22:21:44.202911780 +0100
-+++ node-v15.8.0-dwok/node.gyp	2021-02-24 22:25:34.298281739 +0100
-@@ -55,7 +55,9 @@
-       'deps/undici/undici.js',
-     ],
-     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
-+    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
-+    'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
-     'conditions': [
-       ['GENERATOR == "ninja"', {
-         'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
-@@ -293,10 +295,24 @@
-           ],
-           'actions': [
-             {
-+              'action_name': 'run_pax_mkcodecache',
-+              'inputs': [
-+                '<(mkcodecache_exec)',
-+              ],
-+              'outputs': [
-+                '<(mkcodecache_u_exec)',
-+              ],
-+              'action': [
-+                'bash',
-+                '-c',
-+                'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
-+              ],
-+            },
-+            {
-               'action_name': 'run_mkcodecache',
-               'process_outputs_as_sources': 1,
-               'inputs': [
--                '<(mkcodecache_exec)',
-+                '<(mkcodecache_u_exec)',
-               ],
-               'outputs': [
-                 '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
-@@ -340,10 +356,24 @@
-             }, {
-               'actions': [
-                 {
-+                  'action_name': 'run_pax_mksnapshot',
-+                  'inputs': [
-+                    '<(node_mksnapshot_exec)',
-+                  ],
-+                  'outputs': [
-+                    '<(node_mksnapshot_u_exec)',
-+                  ],
-+                  'action': [
-+                    'bash',
-+                    '-c',
-+                    'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
-+                  ],
-+                },
-+                {
-                   'action_name': 'node_mksnapshot',
-                   'process_outputs_as_sources': 1,
-                   'inputs': [
--                    '<(node_mksnapshot_exec)',
-+                    '<(node_mksnapshot_u_exec)',
-                   ],
-                   'outputs': [
-                     '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
-diff -urNp node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp node-v15.8.0-dwok/tools/v8_gypfiles/v8.gyp
---- node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp	2021-02-24 22:21:44.654910571 +0100
-+++ node-v15.8.0-dwok/tools/v8_gypfiles/v8.gyp	2021-02-24 22:25:54.834224791 +0100
-@@ -9,6 +9,7 @@
-     'v8_vector_stores%': 0,
-     'v8_embed_script%': "",
-     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
-+    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'v8_os_page_size%': 0,
-     'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
-     'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
-@@ -1413,7 +1414,7 @@
-       ],
-     },  # bytecode_builtins_list_generator
-     {
--      'target_name': 'mksnapshot',
-+      'target_name': 'mksnapshot_u',
-       'type': 'executable',
-       'dependencies': [
-         'v8_base_without_compiler',
-@@ -1432,6 +1433,27 @@
-           'toolsets': ['host'],
-         }],
-       ],
-+    },  # mksnapshot_u
-+    {
-+      'target_name': 'mksnapshot',
-+      'type': 'none',
-+      'dependencies': ['mksnapshot_u'],
-+      'actions': [
-+        {
-+          'action_name': 'paxmark_mksnapshot',
-+          'inputs': [
-+            '<(mksnapshot_u_exec)',
-+          ],
-+          'outputs': [
-+            '<(mksnapshot_exec)',
-+          ],
-+          'action': [
-+            'bash',
-+            '-c',
-+            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
-+          ],
-+        },
-+      ],
-     },  # mksnapshot
-     {
-       'target_name': 'torque',

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Conrad Kostecki]

commit:     fe6e577f6540d2970d16198ee187d7b984462a04
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul 19 15:27:15 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 17:09:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe6e577f

net-libs/nodejs: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.32 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26480
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../nodejs-12.22.1-jinja_collections_abc.patch     | 95 ----------------------
 1 file changed, 95 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
deleted file mode 100644
index 5f0df09b6e2e..000000000000
--- a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/deps/v8/third_party/jinja2/tests.py
-+++ b/deps/v8/third_party/jinja2/tests.py
-@@ -10,7 +10,7 @@
- """
- import operator
- import re
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.runtime import Undefined
- from jinja2._compat import text_type, string_types, integer_types
- import decimal
---- a/deps/v8/third_party/jinja2/runtime.py
-+++ b/deps/v8/third_party/jinja2/runtime.py
-@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
- 
- # register the context as mapping if possible
- try:
--    from collections import Mapping
-+    from collections.abc import Mapping
-     Mapping.register(Context)
- except ImportError:
-     pass
---- a/deps/v8/third_party/jinja2/sandbox.py
-+++ b/deps/v8/third_party/jinja2/sandbox.py
-@@ -14,7 +14,7 @@
- """
- import types
- import operator
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.environment import Environment
- from jinja2.exceptions import SecurityError
- from jinja2._compat import string_types, PY2
-@@ -79,7 +79,7 @@ except ImportError:
-     pass
- 
- #: register Python 2.6 abstract base classes
--from collections import MutableSet, MutableMapping, MutableSequence
-+from collections.abc import MutableSet, MutableMapping, MutableSequence
- _mutable_set_types += (MutableSet,)
- _mutable_mapping_types += (MutableMapping,)
- _mutable_sequence_types += (MutableSequence,)
---- a/deps/v8/third_party/jinja2/utils.py
-+++ b/deps/v8/third_party/jinja2/utils.py
-@@ -482,7 +482,7 @@ class LRUCache(object):
- 
- # register the LRU cache as mutable mapping if possible
- try:
--    from collections import MutableMapping
-+    from collections.abc import MutableMapping
-     MutableMapping.register(LRUCache)
- except ImportError:
-     pass
---- a/tools/inspector_protocol/jinja2/runtime.py
-+++ b/tools/inspector_protocol/jinja2/runtime.py
-@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
- 
- # register the context as mapping if possible
- try:
--    from collections import Mapping
-+    from collections.abc import Mapping
-     Mapping.register(Context)
- except ImportError:
-     pass
---- a/tools/inspector_protocol/jinja2/sandbox.py
-+++ b/tools/inspector_protocol/jinja2/sandbox.py
-@@ -14,7 +14,7 @@
- """
- import types
- import operator
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.environment import Environment
- from jinja2.exceptions import SecurityError
- from jinja2._compat import string_types, PY2
-@@ -79,7 +79,7 @@ except ImportError:
-     pass
- 
- #: register Python 2.6 abstract base classes
--from collections import MutableSet, MutableMapping, MutableSequence
-+from collections.abc import MutableSet, MutableMapping, MutableSequence
- _mutable_set_types += (MutableSet,)
- _mutable_mapping_types += (MutableMapping,)
- _mutable_sequence_types += (MutableSequence,)
---- a/tools/inspector_protocol/jinja2/tests.py
-+++ b/tools/inspector_protocol/jinja2/tests.py
-@@ -10,7 +10,7 @@
- """
- import operator
- import re
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.runtime import Undefined
- from jinja2._compat import text_type, string_types, integer_types
- import decimal

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Conrad Kostecki]

commit:     03a3dd43373cab68595d242d3e2c1645b552715e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:13:44 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03a3dd43

net-libs/nodejs: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-libs/nodejs/files/nodejs-20.8.1-gcc14.patch | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-20.8.1-gcc14.patch b/net-libs/nodejs/files/nodejs-20.8.1-gcc14.patch
deleted file mode 100644
index ee34d4ed2e7f..000000000000
--- a/net-libs/nodejs/files/nodejs-20.8.1-gcc14.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://chromium-review.googlesource.com/c/v8/v8/+/4583222
-
-From 6100b929273cffbd1377e21cce2cd0f83e99e459 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 04 Jun 2023 04:15:16 +0100
-Subject: [PATCH] heap: Add missing <algorithm> include for std::remove
-
-GCC 14 changes some internal includes within libstdc++ so this transient
-include gets lost. Include <algorithm> explicitly for std::remove.
-
-Change-Id: Iab8a2c751a0f9c9dc6a770d6296ad6de724ef3bb
----
-
-diff --git a/src/heap/cppgc/stats-collector.h b/src/heap/cppgc/stats-collector.h
-index 2cf7284..d8414ae 100644
---- a/deps/v8/src/heap/cppgc/stats-collector.h
-+++ b/deps/v8/src/heap/cppgc/stats-collector.h
-@@ -8,6 +8,7 @@
- #include <stddef.h>
- #include <stdint.h>
-
-+#include <algorithm>
- #include <atomic>
- #include <vector>

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Arthur Zamarin]

commit:     d61de80e0d21aaa7f273556a51cf66c56277560e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue May 28 16:28:14 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May 30 14:54:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61de80e

net-libs/nodejs: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/nodejs/files/nodejs-20.3.0-gcc14.patch | 31 -------------------------
 1 file changed, 31 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-20.3.0-gcc14.patch b/net-libs/nodejs/files/nodejs-20.3.0-gcc14.patch
deleted file mode 100644
index 8011c2bbdfb9..000000000000
--- a/net-libs/nodejs/files/nodejs-20.3.0-gcc14.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ad0bbaf34aa3150b4f3507b9973b6f5e8ed47474 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@cmpct.info>
-Date: Fri, 9 Jun 2023 18:29:00 +0100
-Subject: [PATCH] test: add missing <algorithm> include for std::find
-
-GCC 14 drops some transitive includes within libstdc++.
-
-Explicitly include <algorithm> for std::find.
-
-Signed-off-by: Sam James <sam@gentoo.org>
-PR-URL: https://github.com/nodejs/node/pull/48380
-Reviewed-By: LiviaMedeiros <livia@cirno.name>
-Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
-Reviewed-By: Matthew Aitken <maitken033380023@gmail.com>
----
- test/embedding/embedtest.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/embedding/embedtest.cc b/test/embedding/embedtest.cc
-index 3592ccb98132..dbb420f34682 100644
---- a/test/embedding/embedtest.cc
-+++ b/test/embedding/embedtest.cc
-@@ -5,6 +5,8 @@
- #include "uv.h"
- #include <assert.h>
- 
-+#include <algorithm>
-+
- // Note: This file is being referred to from doc/api/embedding.md, and excerpts
- // from it are included in the documentation. Try to keep these in sync.
- // Snapshot support is not part of the embedder API docs yet due to its

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/

[Joonas Niilola]

commit:     9149d66f644b76c4bd8222f49263efa4ef5dda03
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug 28 07:16:20 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 07:25:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9149d66f

net-libs/nodejs: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-libs/nodejs/files/nodejs-20.11.0-riscv.patch | 155 -----------------------
 1 file changed, 155 deletions(-)

diff --git a/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch b/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch
deleted file mode 100644
index 3bf7a80ea078..000000000000
--- a/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From dda5cdb15cfe5c7437f471054f5bd79a82b6eda2 Mon Sep 17 00:00:00 2001
-From: kxxt <rsworktech@outlook.com>
-Date: Wed, 17 Jan 2024 09:16:34 +0800
-Subject: [PATCH] Revert "deps: V8: cherry-pick 13192d6e10fa"
-
-This reverts commit bc2ebb972b34f54e042de9636e7451d2526436a9, which
-shouldn't be applied to v20.x.
-
-Fix https://github.com/nodejs/unofficial-builds/issues/106
----
- common.gypi                                      |  2 +-
- deps/v8/src/builtins/riscv/builtins-riscv.cc     |  2 +-
- deps/v8/src/codegen/riscv/assembler-riscv-inl.h  | 16 ++++++++--------
- deps/v8/src/codegen/riscv/assembler-riscv.h      |  2 +-
- deps/v8/src/execution/riscv/simulator-riscv.cc   |  8 ++++----
- .../regexp/riscv/regexp-macro-assembler-riscv.cc |  2 +-
- 6 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/common.gypi b/common.gypi
-index db09a8a33df06..fa0729ffe45e8 100644
---- a/common.gypi
-+++ b/common.gypi
-@@ -36,7 +36,7 @@
- 
-     # Reset this number to 0 on major V8 upgrades.
-     # Increment by one for each non-official patch applied to deps/v8.
--    'v8_embedder_string': '-node.17',
-+    'v8_embedder_string': '-node.18',
- 
-     ##### V8 defaults for Node.js #####
- 
-diff --git a/deps/v8/src/builtins/riscv/builtins-riscv.cc b/deps/v8/src/builtins/riscv/builtins-riscv.cc
-index d6091434b9b0a..3404562785991 100644
---- a/deps/v8/src/builtins/riscv/builtins-riscv.cc
-+++ b/deps/v8/src/builtins/riscv/builtins-riscv.cc
-@@ -1512,7 +1512,7 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) {
-   // Set the return address to the correct point in the interpreter entry
-   // trampoline.
-   Label builtin_trampoline, trampoline_loaded;
--  Tagged<Smi> interpreter_entry_return_pc_offset(
-+  Smi interpreter_entry_return_pc_offset(
-       masm->isolate()->heap()->interpreter_entry_return_pc_offset());
-   DCHECK_NE(interpreter_entry_return_pc_offset, Smi::zero());
- 
-diff --git a/deps/v8/src/codegen/riscv/assembler-riscv-inl.h b/deps/v8/src/codegen/riscv/assembler-riscv-inl.h
-index ca6d641e2c94e..55f191e6afe76 100644
---- a/deps/v8/src/codegen/riscv/assembler-riscv-inl.h
-+++ b/deps/v8/src/codegen/riscv/assembler-riscv-inl.h
-@@ -128,9 +128,9 @@ Handle<HeapObject> Assembler::compressed_embedded_object_handle_at(
- }
- 
- void Assembler::deserialization_set_special_target_at(
--    Address instruction_payload, Tagged<Code> code, Address target) {
-+    Address instruction_payload, Code code, Address target) {
-   set_target_address_at(instruction_payload,
--                        !code.is_null() ? code->constant_pool() : kNullAddress,
-+                        !code.is_null() ? code.constant_pool() : kNullAddress,
-                         target);
- }
- 
-@@ -159,13 +159,12 @@ void Assembler::deserialization_set_target_internal_reference_at(
-   }
- }
- 
--Tagged<HeapObject> RelocInfo::target_object(PtrComprCageBase cage_base) {
-+HeapObject RelocInfo::target_object(PtrComprCageBase cage_base) {
-   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-   if (IsCompressedEmbeddedObject(rmode_)) {
--    return HeapObject::cast(
--        Tagged<Object>(V8HeapCompressionScheme::DecompressTagged(
--            cage_base,
--            Assembler::target_compressed_address_at(pc_, constant_pool_))));
-+    return HeapObject::cast(Object(V8HeapCompressionScheme::DecompressTagged(
-+        cage_base,
-+        Assembler::target_compressed_address_at(pc_, constant_pool_))));
-   } else {
-     return HeapObject::cast(
-         Object(Assembler::target_address_at(pc_, constant_pool_)));
-@@ -187,7 +186,8 @@ Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
-   }
- }
- 
--void RelocInfo::set_target_object(Tagged<HeapObject> target,
-+void RelocInfo::set_target_object(Heap* heap, HeapObject target,
-+                                  WriteBarrierMode write_barrier_mode,
-                                   ICacheFlushMode icache_flush_mode) {
-   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-   if (IsCompressedEmbeddedObject(rmode_)) {
-diff --git a/deps/v8/src/codegen/riscv/assembler-riscv.h b/deps/v8/src/codegen/riscv/assembler-riscv.h
-index bcd5a62d324ee..ed222b52d6927 100644
---- a/deps/v8/src/codegen/riscv/assembler-riscv.h
-+++ b/deps/v8/src/codegen/riscv/assembler-riscv.h
-@@ -286,7 +286,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase,
-   // This is for calls and branches within generated code.  The serializer
-   // has already deserialized the lui/ori instructions etc.
-   inline static void deserialization_set_special_target_at(Address location,
--                                                           Tagged<Code> code,
-+                                                           Code code,
-                                                            Address target);
- 
-   // Get the size of the special target encoded at 'instruction_payload'.
-diff --git a/deps/v8/src/execution/riscv/simulator-riscv.cc b/deps/v8/src/execution/riscv/simulator-riscv.cc
-index 052a2d67dd7e4..9582db489638a 100644
---- a/deps/v8/src/execution/riscv/simulator-riscv.cc
-+++ b/deps/v8/src/execution/riscv/simulator-riscv.cc
-@@ -1781,7 +1781,7 @@ void RiscvDebugger::Debug() {
-           sreg_t value;
-           StdoutStream os;
-           if (GetValue(arg1, &value)) {
--            Tagged<Object> obj(value);
-+            Object obj(value);
-             os << arg1 << ": \n";
- #ifdef DEBUG
-             obj.Print(os);
-@@ -1830,7 +1830,7 @@ void RiscvDebugger::Debug() {
-           PrintF("  0x%012" PRIxPTR " :  0x%016" REGIx_FORMAT
-                  "  %14" REGId_FORMAT " ",
-                  reinterpret_cast<intptr_t>(cur), *cur, *cur);
--          Tagged<Object> obj(*cur);
-+          Object obj(*cur);
-           Heap* current_heap = sim_->isolate_->heap();
-           if (obj.IsSmi() ||
-               IsValidHeapObject(current_heap, HeapObject::cast(obj))) {
-@@ -4692,7 +4692,7 @@ bool Simulator::DecodeRvvVS() {
- Builtin Simulator::LookUp(Address pc) {
-   for (Builtin builtin = Builtins::kFirst; builtin <= Builtins::kLast;
-        ++builtin) {
--    if (builtins_.code(builtin)->contains(isolate_, pc)) return builtin;
-+    if (builtins_.code(builtin).contains(isolate_, pc)) return builtin;
-   }
-   return Builtin::kNoBuiltinId;
- }
-@@ -4709,7 +4709,7 @@ void Simulator::DecodeRVIType() {
-         if (builtin != Builtin::kNoBuiltinId) {
-           auto code = builtins_.code(builtin);
-           if ((rs1_reg() != ra || imm12() != 0)) {
--            if ((Address)get_pc() == code->instruction_start()) {
-+            if ((Address)get_pc() == code.InstructionStart()) {
-               sreg_t arg0 = get_register(a0);
-               sreg_t arg1 = get_register(a1);
-               sreg_t arg2 = get_register(a2);
-diff --git a/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc b/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc
-index 72f89767eb348..4063b4b3d2194 100644
---- a/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc
-+++ b/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc
-@@ -1211,7 +1211,7 @@ static T* frame_entry_address(Address re_frame, int frame_offset) {
- int64_t RegExpMacroAssemblerRISCV::CheckStackGuardState(Address* return_address,
-                                                         Address raw_code,
-                                                         Address re_frame) {
--  Tagged<InstructionStream> re_code = InstructionStream::cast(Object(raw_code));
-+  InstructionStream re_code = InstructionStream::cast(Object(raw_code));
-   return NativeRegExpMacroAssembler::CheckStackGuardState(
-       frame_entry<Isolate*>(re_frame, kIsolateOffset),
-       static_cast<int>(frame_entry<int64_t>(re_frame, kStartIndexOffset)),
-