Changeset c960b368

Timestamp:

01/19/2019 09:27:19 PM (5 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.1, bdubbs/svn, 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, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

0d75a14c

Parents:

377f5f28

Message:

Change to docbook-xsl-nons

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@21002 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• pst/xml/docbook-xsl.xml (modified) (9 diffs)

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>January 18th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Change to docbook-xsl-nons. Fixes
+          <ulink url="&blfs-ticket-root;11559">#11559</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to gtk-vnc-0.9.0. Fixes

pst/xml/docbook-xsl.xml

@@ -7 +7 @@
   <!ENTITY path "https://github.com/docbook/xslt10-stylesheets/releases/download/release">
 
-  <!ENTITY docbook-xsl-download-http "&path;/&docbook-xsl-version;/docbook-xsl-&docbook-xsl-version;.tar.bz2">
+  <!ENTITY docbook-xsl-download-http "&path;/&docbook-xsl-version;/docbook-xsl-nons-&docbook-xsl-version;.tar.bz2">
   <!ENTITY docbook-xsl-download-ftp  " ">
-  <!ENTITY docbook-xsl-md5sum        "4a400f0264a19329c7f95f69e098744a">
+  <!ENTITY docbook-xsl-md5sum        "2666d1488d6ced1551d15f31d7ed8c38">
   <!ENTITY docbook-xsl-size          "22 MB">
   <!ENTITY docbook-xsl-buildsize     "58 MB (includes installing optional documentation)">
@@ -28 +28 @@
   </sect1info>
 
-  <title>docbook-xsl-&docbook-xsl-version;</title>
+  <title>docbook-xsl-nons-&docbook-xsl-version;</title>
 
   <indexterm zone="docbook-xsl">
@@ -70 +70 @@
       <listitem>
           <para>Required patch: <ulink
-            url="&patch-root;/docbook-xsl-&docbook-xsl-version;-stack_fix-1.patch"/>
+            url="&patch-root;/docbook-xsl-nons-&docbook-xsl-version;-stack_fix-1.patch"/>
          </para>
       </listitem>
@@ -124 +124 @@
     <para>First, fix a problem that causes stack overflows when doing recursion:</para>
 
-<screen><userinput>patch -Np1 -i ../docbook-xsl-&docbook-xsl-version;-stack_fix-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../docbook-xsl-nons-&docbook-xsl-version;-stack_fix-1.patch</userinput></screen>
 
     <para>If you downloaded the optional documentation tarball, unpack it
@@ -138 +138 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &amp;&amp;
+<screen role="root"><userinput>install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; &amp;&amp;
 
 cp -v -R VERSION assembly common eclipse epub epub3 extensions fo        \
@@ -144 +144 @@
          profiling roundtrip slides template tests tools webhelp website \
          xhtml xhtml-1_1 xhtml5                                          \
-    /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &amp;&amp;
-
-ln -s VERSION /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;/VERSION.xsl &amp;&amp;
+    /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; &amp;&amp;
+
+ln -s VERSION /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;/VERSION.xsl &amp;&amp;
 
 install -v -m644 -D README \
-                    /usr/share/doc/docbook-xsl-&docbook-xsl-version;/README.txt &amp;&amp;
+                    /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;/README.txt &amp;&amp;
 install -v -m644    RELEASE-NOTES* NEWS* \
-                    /usr/share/doc/docbook-xsl-&docbook-xsl-version;</userinput></screen>
+                    /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;</userinput></screen>
 
     <para>If you downloaded the optional documentation tarball, install the
@@ -157 +157 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>cp -v -R doc/* /usr/share/doc/docbook-xsl-&docbook-xsl-version;</userinput></screen>
+<screen role="root"><userinput>cp -v -R doc/* /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;</userinput></screen>
 
   </sect2>
@@ -177 +177 @@
     <sect3>
       <title>Configuration Information</title>
+
+      <note>
+        <para>If you are installing the current version of docbook-xsl-nons
+        over a previous version of docbook-xsl, then remove the old
+        rewrite entries in the catalog as the <systemitem
+        class="username">root</systemitem> user:</para>
+
+<screen><userinput>sed -i '/rewrite/d' /etc/xml/catalog</userinput></screen>
+      </note>
 
       <para>Create (or append) and populate the XML catalog file using the
@@ -188 +197 @@
 
 xmlcatalog --noout --add "rewriteSystem" \
-           "http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;" \
-           "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;" \
-           "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
+           "https://cdn.docbook.org/release/xsl-nons/1.79.2" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+    /etc/xml/catalog &amp;&amp;
+
+xmlcatalog --noout --add "rewriteURI" \
+           "https://cdn.docbook.org/release/xsl-nons/1.79.2" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+    /etc/xml/catalog &amp;&amp;
+
+xmlcatalog --noout --add "rewriteSystem" \
+           "https://cdn.docbook.org/release/xsl-nons/current" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+    /etc/xml/catalog &amp;&amp;
+
+xmlcatalog --noout --add "rewriteURI" \
+           "https://cdn.docbook.org/release/xsl-nons/current" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
     /etc/xml/catalog &amp;&amp;
 
 xmlcatalog --noout --add "rewriteSystem" \
            "http://docbook.sourceforge.net/release/xsl/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
     /etc/xml/catalog &amp;&amp;
 
 xmlcatalog --noout --add "rewriteURI" \
            "http://docbook.sourceforge.net/release/xsl/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
     /etc/xml/catalog</userinput></screen>