Changeset cf63c3d

Timestamp:

02/09/2022 12:49:51 AM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.1, 11.2, 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/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

0e0cb84

Parents:

0a18d81 (diff), d27e5b8 (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:

• introduction/welcome/changelog.xml (modified) (2 diffs)
• packages.ent (modified) (2 diffs)
• pst/typesetting/dvisvgm.xml (modified) (7 diffs)
• xsoft/graphweb/firefox.xml (modified) (4 diffs)

introduction/welcome/changelog.xml

@@ -61 +61 @@
           <ulink url="&blfs-ticket-root;16063">#16063</ulink>.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Update to firefox-91.6.0esr (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;16060">#16060</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Reverted dvisvgm-2.13.1, the release tarball
+          in the link is not what I tested and my altered commands will
+          not work.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
@@ -68 +77 @@
       <itemizedlist>
         <listitem>
-          <para>[ken] - Update to dvisvgm-2.13.1. Fixes
+          <para>[ken] - Updated to dvisvgm-2.13.1. Fixes
           <ulink url="&blfs-ticket-root;15995">#15995</ulink>.</para>
         </listitem>

packages.ent

@@ -941 +941 @@
 <!ENTITY falkon-version               "&falkon-major-version;.&falkon-minor-version;">
 <!-- for firefox-legacy-version use JS78-version: f-l archived at version 78.15.0 -->
-<!ENTITY firefox-version              "91.5.1">
+<!ENTITY firefox-version              "91.6.0">
 <!ENTITY flashplayer-version          "27.0.0.187">
 <!ENTITY qupzilla-version             "2.2.6">
@@ -1119 +1119 @@
 <!ENTITY biber-version                "2.16">
 <!ENTITY biblatex-version             "3.16">
-<!ENTITY dvisvgm-version              "2.13.1">
+<!ENTITY dvisvgm-version              "2.12">
 <!ENTITY xindy-version                "2.5.1">
 

pst/typesetting/dvisvgm.xml

@@ -7 +7 @@
   <!ENTITY dvisvgm-download-http "https://github.com/mgieseki/dvisvgm/releases/download/&dvisvgm-version;/dvisvgm-&dvisvgm-version;.tar.gz">
   <!ENTITY dvisvgm-download-ftp  " ">
-  <!ENTITY dvisvgm-md5sum        "591559df77b84e31c6520bcc9551d5be">
+  <!ENTITY dvisvgm-md5sum        "19f6b1fb0a9a8e9b93059c7c8592f799">
   <!ENTITY dvisvgm-size          "3.1 MB">
   <!ENTITY dvisvgm-buildsize     "274 MB (40 MB installed, add 706 MB for the tests)">
@@ -94 +94 @@
       <!-- version checked for dvisvgm-2.9, 0.7.3 is mentioned in the
            news and is the latest version at 2020-03-21
-           maybe change to 'a recent version' if that releases faster.
-           But this seems to keep abreast of xxHash changes. -->
+           maybe change to 'a recent version' if that releases faster -->
       <ulink url="https://github.com/Cyan4973/xxHash/releases/latest">xxHash</ulink>
       (the current version is included in the tarball)
@@ -120 +119 @@
 <screen role="root"><userinput>ln -svf /opt/texlive/&texlive-year;/lib/libkpathsea.so /usr/lib</userinput></screen>
 
-    <para>
+<!--<para>
       The testsuite assumes that a modern version of <application>Python</application>
       has been installed as plain <command>python</command>. Adjust it to use
@@ -126 +125 @@
     </para>
 
-<screen><userinput>sed -i 's/python/&amp;3/' tests/Makefile.am</userinput></screen>
-
-<!--<para>
+<screen><userinput>sed -i 's/python/&amp;3/' tests/Makefile.in</userinput></screen>
+
+-->
+    <para>
       The testsuite assumes that a modern version of <application>Python</application>
       has been installed as plain <command>python</command>. Changing this to use
@@ -137 +137 @@
 
     <para>
-      Now install <application>dvisvgm</application> by running the following-->
-    <para>
+<!--  Now install <application>dvisvgm</application> by running the following-->
       Install <application>dvisvgm</application> by running the following
       commands:
     </para>
 
-<screen><userinput>./autogen.sh                                  &amp;&amp;
+<screen><userinput>autoreconf -fiv                               &amp;&amp;
+sed -i 's/python/&amp;3/' tests/Makefile.in       &amp;&amp;
 ./configure                                    \
  --bindir=/opt/texlive/&texlive-year;/bin/${TEXARCH}     \
@@ -170 +170 @@
     </para>
 
-<!--<para>
+    <para>
       <command>autoreconf -fiv</command>: The versions of
       <application>autoconf</application> and <application>automake</application>
@@ -177 +177 @@
       unless autoreconf is forced to install missing (i.e. newer) auxiliary
       files.
-    </para>-->
+    </para>
 
     <!-- EDITORS: the doc target to rebuild the manpage (make man) is not

xsoft/graphweb/firefox.xml

@@ -7 +7 @@
   <!ENTITY firefox-download-http "&mozilla-http;/firefox/releases/&firefox-version;esr/source/firefox-&firefox-version;esr.source.tar.xz">
   <!ENTITY firefox-download-ftp  " ">
-  <!ENTITY firefox-md5sum        "6ff10e237eb9a991757ec62302df25fb">
-  <!ENTITY firefox-size          "371 MB">
+  <!ENTITY firefox-md5sum        "038c417db527350d4fdd039870af819b">
+  <!ENTITY firefox-size          "369 MB">
   <!-- NB with stylo, much of the build uses rust, and therefore cargo files.
     But the extra cached cargo files, if any, seem to be minimal -->
@@ -15 +15 @@
    most practical way to get a timing on a machine with more cores, if taking
    cores offline is not practical. If in doubt, round up -->
-  <!ENTITY firefox-time          "26 SBU (on a typical 4-core machine) without tests">
+  <!ENTITY firefox-time          "30 SBU (on a typical 4-core machine) without tests">
 ]>
 
@@ -79 +79 @@
       <listitem>
         <para>
-          Required patch:
-          <ulink url="&patch-root;/firefox-&firefox-version;esr-buildfix-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           Recommended patch:
           <ulink url="&patch-root;/firefox-&firefox-version;esr-disable_rust_test-1.patch"/>
@@ -318 +312 @@
 
     <para>
-      Next, apply a patch that fixes compilation on systems with Wayland-1.20
-      installed:
-    </para>
-
- <screen><userinput remap="pre">patch -Np1 -i ../firefox-&firefox-version;esr-buildfix-1.patch</userinput></screen>
-
-    <para>
       If the geolocation APIs are needed:
     </para>