Changeset 4f406ea for general/genlib

Timestamp:

11/17/2022 07:58:32 AM (19 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.3, 12.0, 12.1, 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/llvm18, xry111/xf86-video-removal

Children:

11c62aa

Parents:

41f908a (diff), 84f972c1 (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' into plabs/python-mods

Location:

general/genlib

Files:

• brotli.xml (modified) (1 diff)
• genlib.xml (modified) (1 diff)
• js102.xml (added)
• libxml2.xml (modified) (1 diff)
• nodejs.xml (modified) (6 diffs)
• wayland-protocols.xml (modified) (1 diff)

general/genlib/brotli.xml

@@ -166 +166 @@
         <seg>
           /usr/include/brotli
-          /usr/lib/python3.10/site-packages/Brotli-&brotli-version;.dist-info
+          /usr/lib/python&python3-majorver;/site-packages/Brotli-&brotli-version;.dist-info
         </seg>
       </seglistitem>

general/genlib/genlib.xml

@@ -77 +77 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inih.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jansson.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js91.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js91.xml"/>-->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js102.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-c.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-glib.xml"/>

general/genlib/libxml2.xml

@@ -112 +112 @@
   <sect2 role="installation">
     <title>Installation of libxml2</title>
-<!--  No longer needed with 2.10.2.
-    <para>
-      First, fix a problem recognizing Python-3.10:
-    </para>
-
-<screen><userinput>autoreconf -fiv</userinput></screen>
--->
+
     <para>
       Install <application>libxml2</application> by running the following

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:
+    </para>
+
+<screen><userinput>sed -e '/=.*exec/a command -v python3.11 >/dev/null &amp;&amp; exec python3.11 "$0" "$@"' \
+    -e s'/((/((3, 11), (/'  \
+    -i configure</userinput></screen>
 
     <para>
@@ -170 +170 @@
 
     <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 +197 @@
       <seglistitem>
         <seg>
-          node, npm, and npx
+          corepack, node, npm, and npx
         </seg>
         <seg>
@@ -219 +216 @@
       <?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>

general/genlib/wayland-protocols.xml

@@ -7 +7 @@
   <!ENTITY wayland-protocols-download-http "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/&wayland-protocols-version;/downloads/wayland-protocols-&wayland-protocols-version;.tar.xz">
   <!ENTITY wayland-protocols-download-ftp  " ">
-  <!ENTITY wayland-protocols-md5sum        "883fa28a6094871421491086ba50f01a">
-  <!ENTITY wayland-protocols-size          "81 KB">
-  <!ENTITY wayland-protocols-buildsize     "7.2 MB (with tests)">
+  <!ENTITY wayland-protocols-md5sum        "391ac1ac30e96d2f5559e2cc40a4d924">
+  <!ENTITY wayland-protocols-size          "84 KB">
+  <!ENTITY wayland-protocols-buildsize     "6.7 MB (with tests)">
   <!ENTITY wayland-protocols-time          "0.1 SBU (with tests)">
 ]>