Changeset 5416b65f

Timestamp:

04/18/2023 10:25:39 PM (13 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.0, 12.1, kea, ken/TL2024, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

a647555

Parents:

6968baf1 (diff), 0869e91 (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:

• general/genlib/boost.xml (modified) (2 diffs)
• general/genlib/libpaper.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qtwebengine.xml (modified) (2 diffs)

general/genlib/boost.xml

@@ -228 +228 @@
           libboost_math_c99f.so, libboost_math_c99l.so, libboost_math_tr1.so,
           libboost_math_tr1f.so, libboost_math_tr1l.so,
-          libboost_nowide.so, libboost_numpy39.so,
+          libboost_nowide.so, libboost_numpy311.so,
           libboost_prg_exec_monitor.so, libboost_program_options.so,
           libboost_python3&python3-minor;.so, libboost_random.so,
@@ -236 +236 @@
           libboost_test_exec_monitor.a, libboost_thread.so, libboost_timer.so,
           libboost_type_erasure.so, libboost_unit_test_framework.so,
-          libboost_wave.so, and libboost_wserialization.so
+          libboost_url.so, libboost_wave.so, and libboost_wserialization.so
         </seg>
         <seg>

general/genlib/libpaper.xml

@@ -156 +156 @@
       <seglistitem>
         <seg>
-          paper
+          paper and
+          paperconf
         </seg>
         <seg>
@@ -184 +185 @@
       </varlistentry>
 
+      <varlistentry id="paperconf">
+        <term><command>paperconf</command></term>
+        <listitem>
+          <para>
+            prints paper configuration information in a compatibility mode
+          </para>
+          <indexterm zone="libpaper paperconf">
+            <primary sortas="b-paperconf">paperconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libpaper-lib">
         <term><filename class="libraryfile">libpaper.so</filename></term>

introduction/welcome/changelog.xml

@@ -43 +43 @@
      <itemizedlist>
        <listitem>
+         <para>[pierre] - Patch qtwebengine for ICU-73. Fixes
+         <ulink url="&blfs-ticket-root;17941">#17941</ulink>.</para>
+       </listitem>
+       <listitem>
          <para>[bdubbs] - Update to libXpm-3.5.16 (Xorg Library). Fixes
          <ulink url="&blfs-ticket-root;17949">#17949</ulink>.</para>

x/lib/qtwebengine.xml

@@ -251 +251 @@
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-icu_73-1.patch"/>
+        </para>
+      </listitem>
     </itemizedlist>
 
@@ -347 +353 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-ffmpeg5_fixes-1.patch</userinput></screen>
+
+    <para>
+      Apply a patch that resolves problems when building with icu-73 and later:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-icu_73-1.patch</userinput></screen>
 
 <!-- start of commands for git versions only -->