Changeset 0b664be0 for general

Timestamp:

10/16/2021 01:00:57 PM (3 years ago)

Author:

Ken Moffat <ken@…>

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

Children:

c99889d9

Parents:

580ce98 (diff), 97b8038 (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

Location:

general

Files:

• genutils/genutils.xml (modified) (1 diff)
• prog/git.xml (modified) (2 diffs)
• prog/jinja2.xml (modified) (1 diff)
• prog/python3.xml (modified) (1 diff)

general/genutils/genutils.xml

@@ -38 +38 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rep-gtk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="screen.xml"/>

general/prog/git.xml

@@ -9 +9 @@
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "0990ff97af1511be0d9f0d3223dd4359">
+  <!ENTITY git-md5sum        "3462f34d9c17288eee854b7645f6a0a1">
 
   <!ENTITY git-size          "6.2 MB">
@@ -18 +18 @@
   <!-- 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.4 SBU (with parallelism=4; add 0.4 SBU for building documentation and 2.1 SBU for tests, both with parallelism=4)">
+  <!ENTITY git-time          "0.5 SBU (with parallelism=4; add 0.4 SBU for building documentation and 2.1 SBU for tests, both with parallelism=4)">
 ]>
 

general/prog/jinja2.xml

@@ -7 +7 @@
   <!ENTITY Jinja2-download-http "&pymodules-dl;/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
   <!ENTITY Jinja2-download-ftp  " ">
-  <!ENTITY Jinja2-md5sum        "25ba6ef98c164878acff1036fbd72a1d">
+  <!ENTITY Jinja2-md5sum        "059f89375d7ea60eb7013f341f0b89e7">
   <!ENTITY Jinja2-size          "264 KB">
   <!ENTITY Jinja2-buildsize     "2.3 MB">

general/prog/python3.xml

@@ -8 +8 @@
            "https://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
   <!ENTITY python3-download-ftp  " ">
-  <!ENTITY python3-md5sum        "fddb060b483bc01850a3f412eea1d954">
+  <!ENTITY python3-md5sum        "3e7035d272680f80e3ce4e8eb492d580">
   <!ENTITY python3-size          "18 MB">
-  <!ENTITY python3-buildsize     "193 MB (add 36 MB for tests)">
-  <!ENTITY python3-time          "2.4 SBU (using parallelism=4; add 1.7 SBU for tests)">
+  <!ENTITY python3-buildsize     "200 MB (add 38 MB for tests)">
+  <!ENTITY python3-time          "2.4 SBU (using parallelism=4; add 1.6 SBU for tests)">
   <!--
   Note: Size does not reflect docs that were install in LFS.