Changeset 27ccef2d

Timestamp:

11/09/2022 12:29:07 AM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.3, 12.0, 12.1, 12.2, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/for-12.3, xry111/llvm18, xry111/spidermonkey128, xry111/xf86-video-removal

Children:

5e0cd08

Parents:

1ff37b54 (diff), fce78fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:

• general/genlib/nodejs.xml (modified) (6 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• xsoft/graphweb/firefox.xml (modified) (1 diff)

general/genlib/nodejs.xml

@@ -7 +7 @@
   <!ENTITY nodejs-download-http "https://nodejs.org/dist/v&nodejs-version;/node-v&nodejs-version;.tar.xz">
   <!ENTITY nodejs-download-ftp  " ">
-  <!ENTITY nodejs-md5sum        "d47153d56d60f00ffcb33d63eacc2663">
-  <!ENTITY nodejs-size          "34 MB">
-  <!ENTITY nodejs-buildsize     "772 MB (add 29 MB for tests)">
-  <!ENTITY nodejs-time          "13 SBU (add 4.4 SBU for tests: both using parallelism=4 and 4 CPUs online, parts of the tests will use all online CPUs)">
+  <!ENTITY nodejs-md5sum        "7322f55ce420f49378515b67d73faf88">
+  <!ENTITY nodejs-size          "37 MB">
+  <!ENTITY nodejs-buildsize     "930 MB (add 29 MB for tests)">
+  <!ENTITY nodejs-time          "18 SBU (add 4.6 SBU for tests: both using parallelism=4 and 4 CPUs online, parts of the tests will use all online CPUs)">
 ]>
 
@@ -82 +82 @@
     </itemizedlist>
 -->
-
-<!--<note>
-      <para>
-        This tarball was created using a BSD version of
-        <application>tar</application> and extracting it with a linux&trade;
-        version will produce harmless warnings about unknown extended header
-        keywords.
-      </para>
-    </note>-->
 
     <bridgehead renderas="sect3">Node.js Dependencies</bridgehead>
@@ -130 +121 @@
 <screen><userinput>patch -Np1 -i ../node-v&nodejs-version;-icu_69-1.patch</userinput></screen>
 -->
+    <para>
+      The <command>configure</command> script for this version of Node.js is
+      not aware of Python-3.11. If you have installed <xref linkend="python3"/>,
+      apply the following change (do not apply if you still have Python-3.10):
+    </para>
+
+<screen><userinput>sed -i s/10/11/g configure</userinput></screen>
 
     <para>
@@ -170 +168 @@
 
     <para>
-      <!-- FIXME : reinstate nghttp2 in this if build is fixed
-           FIXME cont: Seems to be fixed in 12.18.1 -renodr
-      <parameter>\-\-shared-{cares,libuv,nghttp2,openssl,zlib}</parameter>: -->
       <parameter>--shared-{cares,libuv,nghttp2,openssl,zlib}</parameter>:
       use the system installed libraries instead of local copies.
@@ -200 +195 @@
       <seglistitem>
         <seg>
-          node, npm, and npx
+          corepack, node, npm, and npx
         </seg>
         <seg>
@@ -219 +214 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="corepack">
+        <term><command>corepack</command></term>
+        <listitem>
+          <para>
+            is an experimental tool to help with managing versions of package
+            managers.
+          </para>
+          <indexterm zone="nodejs corepack">
+            <primary sortas="b-corepack">corepack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="node">
         <term><command>node</command></term>

introduction/welcome/changelog.xml

@@ -58 +58 @@
         </listitem>
         <listitem>
+          <para>[pierre] - Update to node.js-18.12.1. Fixes
+          <ulink url="&blfs-ticket-root;17228">#17228</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to sudo-1.9.12p1. Fixes
           <ulink url="&blfs-ticket-root;17270">#17270</ulink>.</para>

packages.ent

@@ -167 +167 @@
 <!ENTITY lzo-version                  "2.10">
 <!ENTITY mtdev-version                "1.1.6">
-<!ENTITY nodejs-version               "16.18.0">
+<!ENTITY nodejs-version               "18.12.1">
 <!ENTITY npth-version                 "1.6">
 <!ENTITY nspr-version                 "4.35">

xsoft/graphweb/firefox.xml

@@ -365 +365 @@
 
     <para>
+      Then fix an issue with regular expressions in python-3.11:
+    </para>
+
+<screen><userinput>sed -e 's/?s)\./?s:.)/'               \
+    -e '/?m)/{s/?m)/?m:/;s/\$"/$)"/}' \
+    -e '/?s)%/{s/?s)/?s:/;s/?"/?)"/}' \
+    -i xpcom/idl-parser/xpidl/xpidl.py</userinput></screen>
+
+    <para>
       Now invoke the Python <command>mach</command> script to compile the package.
     </para>
 
 <screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
-export MOZBUILD_STATE_PATH=${PWD}/mozbuild            &amp;&amp;
-./mach configure                                      &amp;&amp;
+export MOZBUILD_STATE_PATH=${PWD}/mozbuild          &amp;&amp;
+./mach configure                                    &amp;&amp;
 ./mach build</userinput></screen>