Changeset 104ff4e for general/genlib/libxslt.xml

Timestamp:

01/04/2023 06:05:12 PM (17 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

qt5new

Children:

c0ef2f9

Parents:

1daaab6d (diff), 811d39b (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 qt5new

File:

• general/genlib/libxslt.xml (modified) (9 diffs)

general/genlib/libxslt.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY libxslt-download-http "http://xmlsoft.org/sources/libxslt-&libxslt-version;.tar.gz">
-  <!ENTITY libxslt-download-ftp  "ftp://xmlsoft.org/libxslt/libxslt-&libxslt-version;.tar.gz">
-  <!ENTITY libxslt-md5sum        "db8765c8d076f1b6caafd9f2542a304a">
-  <!ENTITY libxslt-size          "3.4 MB">
-  <!ENTITY libxslt-buildsize     "36 MB (with tests)">
-  <!ENTITY libxslt-time          "0.3 SBU (with tests)">
+  <!ENTITY libxslt-download-http "https://download.gnome.org/sources/libxslt/1.1/libxslt-&libxslt-version;.tar.xz">
+  <!ENTITY libxslt-download-ftp  " ">
+  <!ENTITY libxslt-md5sum        "84e86fc8a1b7495674016e05e4c5da44">
+  <!ENTITY libxslt-size          "1.5 MB">
+  <!ENTITY libxslt-buildsize     "35 MB (with tests)">
+  <!ENTITY libxslt-time          "0.2 SBU (with tests)">
 ]>
 
@@ -16 +16 @@
   <?dbhtml filename="libxslt.html"?>
 
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
 
   <title>libxslt-&libxslt-version;</title>
@@ -36 +33 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -89 +86 @@
     </para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
     <para role="recommended">
-      <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/>
+      <xref role="runtime" linkend="DocBook"/> and
+      <xref role="runtime" linkend="docbook-xsl"/>
     </para>
 
@@ -106 +103 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libgcrypt"/> and
+      <xref linkend="libgcrypt"/>
+<!--
       <xref linkend="libxml2py2"/>
-      <!-- Seems to be used for tests -->
+      <!- - Seems to be used for tests - ->
       <note><simpara>The <xref role="nodep" linkend="libxml2py2"/>
       dependency is only appropriate if the <application>Python2</application>
@@ -116 +114 @@
       <application>Python2</application> modules which reference it.
       </simpara></note>
+-->
     </para>
 
@@ -125 +124 @@
   <sect2 role="installation">
     <title>Installation of libxslt</title>
-<!--
-    <para>
-      First, install a security patch to fix a security framework bypass:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../libxslt-&libxslt-version;-security_fix-1.patch</userinput></screen>
--->
+
     <para>
       Install <application>libxslt</application> by running the following
@@ -137 +130 @@
     </para>
 
-<screen><userinput>sed -i s/3000/5000/ libxslt/transform.c doc/xsltproc.{1,xml} &amp;&amp;
-sed -i -r '/max(Parser)?Depth/d' ./tests/fuzz/fuzz.c &amp;&amp;
-./configure --prefix=/usr --disable-static --without-python  &amp;&amp;
+<screen><userinput>./configure --prefix=/usr                          \
+            --disable-static                       \
+            --docdir=/usr/share/doc/libxslt-&libxslt-version; \
+            PYTHON=/usr/bin/python3 &amp;&amp;
 make</userinput></screen>
-
-    <para>
-      A shipped man page is glitched.  If the recommended dependencies are
-      installed, regenerate it by running the following commands:
-         </para>
-
-<screen><userinput>sed -e 's@http://cdn.docbook.org/release/xsl@https://cdn.docbook.org/release/xsl-nons@' \
-    -e 's@\$Date\$@31 October 2019@' -i doc/xsltproc.xml &amp;&amp;
-xsltproc/xsltproc --nonet doc/xsltproc.xml -o doc/xsltproc.1</userinput></screen>
 
     <para>
@@ -165 +150 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i s/3000/5000/ ...</command>: this increases the recursion
-      limit in libxslt. This is needed by some packages for their documentation.
-    </para>
-
-    <para>
-      <command>sed -i -r '/max(Parser)?Depth/d' ...</command>: this works
-      around an issue running test suite of libxslt with libxml-2.9.12.
-    </para>
-
-    <para>
-      <parameter>--without-python</parameter>: This parameter disables the libxslt
+<!--
+    <para>
+      <parameter>- -without-python</parameter>: This parameter disables the libxslt
       python module since it does not support Python3. If you wish to enable
       this module, make sure that <xref role="nodep" linkend="libxml2py2"/> is
       installed, and remove this parameter.
     </para>
-
+-->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>