Changeset 892352a

Timestamp:

04/19/2022 09:27:28 PM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

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/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

d0c81354

Parents:

3fca94e (diff), d2e6aa7d (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:

• archive/amtk.xml (moved) (moved from x/lib/amtk.xml )
• archive/tepl.xml (moved) (moved from x/lib/tepl.xml )
• general/prog/git.xml (modified) (1 diff)
• general/sysutils/pciutils.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (5 diffs)
• postlfs/filesystems/parted.xml (modified) (4 diffs)
• x/lib/lib.xml (modified) (2 diffs)
• xsoft/other/inkscape.xml (modified) (3 diffs)

general/prog/git.xml

@@ -9 +9 @@
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "d903e0016fa1fc38427334303a162f8b">
+  <!ENTITY git-md5sum        "a764a4b95dee25362a5f9696d5e0fd81">
 
   <!ENTITY git-size          "6.6 MB">
   <!-- but people keep forgetting that an install not only needs the net build
        space, it also needs the install space (or DESTDIR) -->
-  <!ENTITY git-buildsize     "346 MB (with downloaded documentation, add 16 MB to build documentation)">
+  <!ENTITY git-buildsize     "351 MB (with downloaded documentation, add 17 MB to build documentation)">
   <!-- With 2.23.0, there was a large increase in time for tests. Possibly disk related? -->
   <!-- Confirmed that it is disk related.-->
-  <!ENTITY git-time          "0.5 SBU (with parallelism=4; add 0.5 SBU for building documentation and 2.5 SBU for tests, both with parallelism=4)">
+  <!ENTITY git-time          "0.r SBU (with parallelism=4; add 0.4 SBU for building documentation and 6 SBU (disk speed dependent) for tests, both with parallelism=4)">
 ]>
 

general/sysutils/pciutils.xml

@@ -7 +7 @@
   <!ENTITY pciutils-download-http "&kernel-dl;/software/utils/pciutils/pciutils-&pciutils-version;.tar.xz">
   <!ENTITY pciutils-download-ftp  " ">
-  <!ENTITY pciutils-md5sum        "e6e20482b4f25c5186e6a753c5edc361">
-  <!ENTITY pciutils-size          "364 KB">
-  <!ENTITY pciutils-buildsize     "3.8 MB">
+  <!ENTITY pciutils-md5sum        "72ba4ca1eed8b2972a785ee5aac0b138">
+  <!ENTITY pciutils-size          "401 KB">
+  <!ENTITY pciutils-buildsize     "4.7 MB">
   <!ENTITY pciutils-time          "less than 0.1 SBU">
 ]>
@@ -142 +142 @@
       class="username">root</systemitem> user. This program requires the
       <xref linkend="which"/> script or program to find <xref linkend="curl"/>,
-      <xref linkend="lynx"/> or <xref linkend="wget"/> which are used to
+      <xref linkend="lynx"/>, or <xref linkend="wget"/> which are used to
       download the most current file, and then replace the existing file in
       <filename class="directory">/usr/share/hwdata</filename>.

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
-      <para>April 16th, 2022</para>
+      <para>April 19th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to git-2.36.0. Fixes
+          <ulink url="&blfs-ticket-root;16427">#16427</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to pciutils-3.8.0. Fixes
+          <ulink url="&blfs-ticket-root;16426">#16426</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to parted-3.5. Fixes
+          <ulink url="&blfs-ticket-root;16425">#16425</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Archive Amtk.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Archive Tepl.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Fix building Inkscape with poppler-22.04.0. Fixes
+          <ulink url="&blfs-ticket-root;16433">#16433</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>April 18th, 2022</para>
       <itemizedlist>
         <listitem>

packages.ent

@@ -54 +54 @@
 <!ENTITY ntfs-3g-version              "2021.8.22">
 <!ENTITY gptfdisk-version             "1.0.9">
-<!ENTITY parted-version               "3.4">
+<!ENTITY parted-version               "3.5">
 <!ENTITY reiser-version               "3.6.27">
 <!ENTITY smartmontools-version        "7.3">
@@ -313 +313 @@
 <!ENTITY p7zip-version                "17.04">
 <!ENTITY pax-version                  "20201030">
-<!ENTITY pciutils-version             "3.7.0">
+<!ENTITY pciutils-version             "3.8.0">
 <!ENTITY pm-utils-version             "1.4.1">
 <!ENTITY raptor-version               "2.0.15">
@@ -354 +354 @@
 <!ENTITY gc-version                   "8.0.6">
 <!ENTITY gdb-version                  "11.2">
-<!ENTITY git-version                  "2.35.3">
+<!ENTITY git-version                  "2.36.0">
 <!ENTITY guile-version                "3.0.8">
 <!ENTITY librep-version               "0.92.7">
@@ -745 +745 @@
 <!-- Chapter 25 -->
 <!ENTITY agg-version                  "2.5">
-<!ENTITY amtk-minor                   "5.2">
-<!ENTITY amtk-version                 "&amtk-minor;.0">
+<!--<!ENTITY amtk-minor                   "5.2">
+<!ENTITY amtk-version                 "&amtk-minor;.0">-->
 <!ENTITY atk-minor                    "2.38">
 <!ENTITY atk-version                  "&atk-minor;.0">
@@ -799 +799 @@
 <!ENTITY shared-mime-info-version     "2.2">
 <!ENTITY startup-notification-version "0.12">
-<!ENTITY tepl-version                 "6.00.0">
+<!--<!ENTITY tepl-version                 "6.00.0">-->
 <!ENTITY webkitgtk-version            "2.36.0">    <!-- Even minors only -->
 

postlfs/filesystems/parted.xml

@@ -7 +7 @@
   <!ENTITY parted-download-http "&gnu-http;/parted/parted-&parted-version;.tar.xz">
   <!ENTITY parted-download-ftp  "&gnu-ftp;/parted/parted-&parted-version;.tar.xz">
-  <!ENTITY parted-md5sum        "357d19387c6e7bc4a8a90fe2d015fe80">
-  <!ENTITY parted-size          "1.7 MB">
-  <!ENTITY parted-buildsize     "34 MB (additional 3 MB for the tests and additional 2 MB for optional PDF and Postscript documentation)">
-  <!ENTITY parted-time          "0.3 SBU (additional 2.5 SBU for the tests)">
+  <!ENTITY parted-md5sum        "336fde60786d5855b3876ee49ef1e6b2">
+  <!ENTITY parted-size          "1.8 MB">
+  <!ENTITY parted-buildsize     "33 MB (additional 3 MB for the tests and additional 2 MB for optional PDF and Postscript documentation)">
+  <!ENTITY parted-time          "0.3 SBU (additional 3.6 SBU for the tests)">
 ]>
 
@@ -101 +101 @@
   </sect2>
 
+  <sect2 role="kernel" id="parted-kernel">
+    <title>Optional Kernel Configuration for Tests</title>
+
+    <para>
+      About 20 % more tests are run if the following kernel module is built:
+    </para>
+
+<screen><literal>Device Drivers ---&gt;
+  SCSI device support ---&gt;
+    [*]  SCSI low-level drivers ---&gt;                 [CONFIG_SCSI_LOW_LEVEL]
+      &lt;M&gt; SCSI debugging host and device simulator   [CONFIG_SCSI_DEBUG]</literal></screen>
+
+    <indexterm zone="parted parted-kernel">
+      <primary sortas="d-parted">parted</primary>
+    </indexterm>
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of parted</title>
@@ -131 +148 @@
 dvips                -o doc/parted.ps  doc/parted.dvi</userinput></screen>
 
-<!-- Not needed with 3.4!
-    <para>
-      If you wish to run the test suite, first remove a couple of tests
-      that are known to fail in a BLFS environment.  And, adjust two Python
-      scripts to use Python 3, in case Python 2 is not installed:
-    </para>
- <!- - One of these is due to a C locale, and another is a problem in LVM. - ->
-<screen remap="test"><userinput>sed -i '/t0251-gpt-unicode.sh/d' tests/Makefile &amp;&amp;
-sed -i '/t6002-dm-busy.sh/d' tests/Makefile &amp;&amp;
-sed -i '1s/python/&amp;3/' tests/{gpt-header-move,msdos-overlap}</userinput></screen>
--->
     <para>
       To test the results, issue, as the <systemitem
@@ -150 +156 @@
         remap="test"><userinput>make check</userinput></screen>
 
+<!-- For devs: several tests are skipped with the message
+     "FS test with sector size != 512". This is expected since the same tests
+     are run with simulated sector of 1024, 2048, and 4096 bytes; only the
+     last group of tests is done with simulated sector size of 512, so that
+     less tests are skipped.-->
     <note>
       <para>

x/lib/lib.xml

@@ -22 +22 @@
   </para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="amtk.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="amtk.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atkmm.xml"/>
@@ -78 +78 @@
   <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>-->
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tepl.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tepl.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
 

xsoft/other/inkscape.xml

@@ -76 +76 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-
+      <listitem>
+        <para>
+          Required patch: <ulink
+          url="&patch-root;/inkscape-&inkscape-version;-poppler_22_04_fixes-1.patch"/>
+        </para>
+      </listitem>
     </itemizedlist>
-      <!\-\- These are not needed right now. Inkscape builds/runs fine with the
-           latest poppler as of this update (0.87.0). However, history says
-           that almost every poppler version has broke inkscape, and history
-           tends to repeat itself ;-). Keep these patches commented until
-           they are inevitably needed.
-
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/inkscape-&inkscape-version;-poppler_21.11.0-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+
     <note>
       <para>
@@ -169 +161 @@
     <title>Installation of Inkscape</title>
 
-<!--
-    Not needed with 1.0, but let's keep the template.
-
-    <para>
-      Now fix Inkscape to build with poppler-0.83.0:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_0_83_0_fixes-1.patch</userinput></screen>
--->
+    <para>
+      First, fix Inkscape to build with poppler-22.04.0:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_22_04_fixes-1.patch</userinput></screen>
+
 
 <!-- If there is no test suite, then this is not needed.
@@ -193 +182 @@
 
     <para>
-      First, fix the build with poppler-22.03.0:
+      Next, fix the build with poppler-22.03.0:
     </para>