Changeset 54d09e7

Timestamp:

11/06/2022 07:36:09 PM (18 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

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/xf86-video-removal

Children:

acd69075

Parents:

33f878a9 (diff), d7ba6b4d (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 plabs/python-mods

Files:

• general/genlib/js91.xml (modified) (1 diff)
• general/genutils/dos2unix.xml (added)
• general/genutils/genutils.xml (modified) (1 diff)
• general/genutils/hd2u.xml (deleted)
• general/prog/perl-modules/perl-html-parser.xml (modified) (1 diff)
• general/prog/perl-modules/perl-uri.xml (modified) (1 diff)
• general/prog/python3.xml (modified) (4 diffs)
• general/sysutils/systemd.xml (modified) (5 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/audioutils/mpg123.xml (modified) (1 diff)
• packages.ent (modified) (6 diffs)
• xsoft/graphweb/firefox.xml (modified) (3 diffs)
• xsoft/graphweb/seamonkey.xml (modified) (1 diff)
• xsoft/other/thunderbird.xml (modified) (3 diffs)

general/genlib/js91.xml

@@ -170 +170 @@
     </para>
 
-     <note>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <note>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
          href="../../xincludes/mozshm.xml"/>
 
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
          href="../../xincludes/mozconfigure.xml"/>
 
-        <para>
-          Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
-          the rust code will use all processors.
-        </para>
-     </note>
-
+      <para>
+        Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
+        the rust code will use all processors.
+      </para>
+    </note>
+
+    <para>
+      First remove an obsolete flag in python code, that has been removed
+      in python-3.11:
+    </para>
+
+<screen><userinput>grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/'</userinput></screen>
+
+    <para>
+      Then run:
+    </para>
 
 <screen><userinput>mkdir obj &amp;&amp;

general/genutils/genutils.xml

@@ -28 +28 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop-file-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dos2unix.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphviz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-doc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hd2u.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="highlight.xml"/>

general/prog/perl-modules/perl-html-parser.xml

@@ -6 +6 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/O/OA/OALDERS/HTML-Parser-&HTML-Parser-version;.tar.gz">
-  <!ENTITY my-md5sum "e39bbc692fa8955f87eea92f38f973a0">
+  <!ENTITY my-md5sum "8e7151d08f30457a2ba80020b936285f">
 
 ]>

general/prog/perl-modules/perl-uri.xml

@@ -6 +6 @@
 
   <!ENTITY my-download-http "&perl_authors;/id/O/OA/OALDERS/URI-&URI-version;.tar.gz">
-  <!ENTITY my-md5sum "edde5a8b973b9a762d3a7af6f353fd61">
+  <!ENTITY my-md5sum "63675c429cfb1df73d7d21a9302e1000">
 ]>
 

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        "e92356b012ed4d0e09675131d39b1bde">
+  <!ENTITY python3-md5sum        "fe92acfa0db9b9f5044958edb451d463">
   <!ENTITY python3-size          "19 MB">
-  <!ENTITY python3-buildsize     "202 MB (add 23 MB for tests)">
-  <!ENTITY python3-time          "2.3 SBU (add 1.7 SBU for tests; both using parallelism=4)">
+  <!ENTITY python3-buildsize     "282 MB (add 63 MB for tests)">
+  <!ENTITY python3-time          "2.1 SBU (add 1.2 SBU for tests; both using parallelism=4)">
   <!--
   Note: Size does not reflect docs that were install in LFS.
@@ -17 +17 @@
   <!ENTITY python3htmldoc-download-http
   "https://www.python.org/ftp/python/doc/&python3-version;/python-&python3-version;-docs-html.tar.bz2">
-  <!ENTITY python3-docs-md5sum "e19fa51f7055c0e869d609f2dfbcc5d9" >
+  <!ENTITY python3-docs-md5sum "b740495c9f6714e0998894ed8d1cb379" >
 ]>
 
@@ -146 +146 @@
     <para>
       To test the result, issue <command>make test</command>.
-      Some tests may need an Internet connection. Two tests, test_distutils
-      and test_peg_generator are known to fail.
+      Some tests may need an Internet connection. <!--Two tests, test_distutils
+      and test_peg_generator are known to fail.-->
     </para>
 
@@ -161 +161 @@
     </para>
 
-<screen role="root"><userinput>tar --strip-components=1  \
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/python-&python3-version;/html
+
+tar --strip-components=1  \
     --no-same-owner       \
     --no-same-permissions \

general/sysutils/systemd.xml

@@ -8 +8 @@
   <!ENTITY systemd-download-http "https://github.com/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
   <!ENTITY systemd-download-ftp  " ">
-  <!ENTITY systemd-md5sum        "8090fcccc3a2ec20995e89d56fed61b1">
+  <!ENTITY systemd-md5sum        "b9456750a212dd54d81caeb3c38134b6">
   <!ENTITY systemd-size          "11 MB">
   <!ENTITY systemd-buildsize     "307 MB (with tests)">
-  <!ENTITY systemd-time          "2.5 SBU (with tests)">
+  <!ENTITY systemd-time          "2.8 SBU (with tests)">
 
 ]>
@@ -79 +79 @@
 
 <!--  Keep here in case a patch will be needed.-->
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -88 +89 @@
       </listitem>
     </itemizedlist>
+-->
 
     <bridgehead renderas="sect3">systemd Dependencies</bridgehead>
@@ -151 +153 @@
     <title>Installation of systemd</title>
 
+<!--
     <para>
       First, fix building <application>systemd</application> with glibc-2.36:
@@ -156 +159 @@
 
 <screen><userinput>patch -Np1 -i ../systemd-&systemd-version;-glibc_2.36_fix-1.patch</userinput></screen>
+-->
 
     <para>

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
+      <para>November 3rd, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to URI-5.17 (perl module). Fixes
+          <ulink url="&blfs-ticket-root;17263">#17263</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to HTML-Parser-3.80 (Perl Module). Fixes
+          <ulink url="&blfs-ticket-root;17256">#17256</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to systemd-252. Fixes
+          <ulink url="&blfs-ticket-root;17250">#17250</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Replace hd2u-1.0.4 with dos2unix-7.4.3, in
+          response to improper maintainance of hd2u.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 1st, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to mpg123-1.31.1. Fixes
+          <ulink url="&blfs-ticket-root;17251">#17251</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python3-3.11.0. Fixes
+          <ulink url="&blfs-ticket-root;17223">#17223</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 31st, 2022</para>
       <itemizedlist>

multimedia/audioutils/mpg123.xml

@@ -7 +7 @@
   <!ENTITY mpg123-download-http "&sourceforge-dl;/mpg123/mpg123-&mpg123-version;.tar.bz2">
   <!ENTITY mpg123-download-ftp  " ">
-  <!ENTITY mpg123-md5sum        "99523f565a665bdcea06c8aa369ec315">
+  <!ENTITY mpg123-md5sum        "fd400780d6a56473e8f17fc4fcd317d4">
   <!ENTITY mpg123-size          "1.0 MB">
   <!ENTITY mpg123-buildsize     "16 MB (with tests)">

packages.ent

@@ -233 +233 @@
 <!ENTITY compface-version             "1.5.2">
 <!ENTITY desktop-file-utils-version   "0.26">
+<!ENTITY dos2unix-version             "7.4.3">
 <!ENTITY graphviz-version             "6.0.2">
 <!ENTITY gtk-doc-major                "1.33">
 <!ENTITY gtk-doc-version              "1.33.2">
-<!ENTITY hd2u-version                 "1.0.4">
 <!ENTITY highlight-version            "4.3">
 <!ENTITY ibus-version                 "1.5.27">
@@ -287 +287 @@
 <!ENTITY sg3_utils-version            "1.47">
 <!ENTITY sysstat-version              "12.6.0">
-<!ENTITY systemd-version              "251">
+<!ENTITY systemd-version              "252">
 <!ENTITY udisks2-version              "2.9.4">    <!-- stable lt .90 micro version -->
 <!ENTITY unrar-version                "6.2.1">
@@ -324 +324 @@
 
 <!ENTITY python3-major                "3">
-<!ENTITY python3-minor                "10">
-<!ENTITY python3-patch                "8">
+<!ENTITY python3-minor                "11">
+<!ENTITY python3-patch                "0">
 <!ENTITY python3-majorver             "&python3-major;.&python3-minor;">
 <!ENTITY python3-version              "&python3-majorver;.&python3-patch;">
@@ -371 +371 @@
 <!ENTITY File-Slurper-version         "0.013">
 <!ENTITY File-Which-version           "1.27">
-<!ENTITY HTML-Parser-version          "3.79">
+<!ENTITY HTML-Parser-version          "3.80">
 <!ENTITY HTTP-Daemon-version          "6.14">
 <!ENTITY IO-Socket-SSL-version        "2.075">
@@ -398 +398 @@
 <!ENTITY Unicode-Collate-version      "1.31">
 <!ENTITY Unicode-LineBreak-version    "2019.001">
-<!ENTITY URI-version                  "5.16">
+<!ENTITY URI-version                  "5.17">
 <!ENTITY XML-LibXML-Simple-version    "1.01">
 <!ENTITY XML-LibXSLT-version          "2.002000">
@@ -979 +979 @@
 <!-- kwave version is the same as KDE applications -->
 <!ENTITY lame-version                 "3.100">
-<!ENTITY mpg123-version               "1.31.0">
+<!ENTITY mpg123-version               "1.31.1">
 <!ENTITY pavucontrol-version          "5.0">
 <!ENTITY pnmixer-version              "0.7.2">

xsoft/graphweb/firefox.xml

@@ -358 +358 @@
 
     <para>
+      First remove an obsolete flag in python code, that has been removed
+      in python-3.11:
+    </para>
+
+<screen><userinput>grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/'</userinput></screen>
+
+    <para>
       Now invoke the Python <command>mach</command> script to compile the package.
     </para>
 
-<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system &amp;&amp;
+<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
 export MOZBUILD_STATE_PATH=${PWD}/mozbuild            &amp;&amp;
 ./mach configure                                      &amp;&amp;
@@ -381 +388 @@
     </para>
 
-<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system ./mach install</userinput></screen>
+<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none ./mach install</userinput></screen>
 
     <para>
@@ -415 +422 @@
 
     <para>
-      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system</command>: Use the
+      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none</command>: Use the
       system python to create a virtual environment for <command>mach</command>
-      without downloading any python wheels.
+      without downloading any python wheels nor using the system python modules.
+      This prevent version mismatches between system modules and bundled ones.
     </para>
 

xsoft/graphweb/seamonkey.xml

@@ -269 +269 @@
 <screen><userinput>patch -Np1 -i ../seamonkey-&seamonkey-version;-security_fix-1.patch</userinput></screen>
 -->
+
+    <para>
+      First remove an obsolete flag in python code, that has been removed
+      in python-3.11:
+    </para>
+
+<screen><userinput>grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/'</userinput></screen>
 
     <para>

xsoft/other/thunderbird.xml

@@ -248 +248 @@
     </note>
 
-<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system &amp;&amp;
+    <para>
+      First remove an obsolete flag in python code, that has been removed
+      in python-3.11:
+    </para>
+
+<screen><userinput>grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/'</userinput></screen>
+
+<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
 export MOZBUILD_STATE_PATH=./mozbuild                 &amp;&amp;
 ./mach configure                                      &amp;&amp;
@@ -262 +269 @@
     </para>
 
-<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system ./mach install</userinput></screen>
+<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none ./mach install</userinput></screen>
 <!-- devs: For DESTDIR install, prepend DESTDIR=<dest> to the above -->
     <para>
@@ -276 +283 @@
 
     <para>
-      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system</command>: Use the
+      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none</command>: Use the
       system python to create a virtual environment for <command>mach</command>
-      without downloading any python wheels.
+      without downloading any python wheels nor using the system python modules.
+      This prevent version mismatches between system modules and bundled ones.
     </para>