Changeset 927e12e

Timestamp:

10/09/2021 09:49:42 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:

9e2ff85

Parents:

2d3195c

Message:

Fix qtwebengine FTBFS with system harfbuzz-3.

Files:

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

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
-      <para>October 8th, 2021</para>
-      <itemizedlist>
-        <listitem>
-          <para>[thomas] - Update to wireshark-3.4.9. Fixes
-          <ulink url="&blfs-ticket-root;15649">#15649</ulink>.</para>
+      <para>October 9th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch qtwebengine to build with harfbuzz-3.0. Fixes
+          <ulink url="&blfs-ticket-root;15660">#15660</ulink>.</para>
         </listitem>
       </itemizedlist>

x/lib/qtwebengine.xml

@@ -234 +234 @@
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-harfbuzz3-1.patch"/>
+        </para>
+      </listitem>
     </itemizedlist>
 
@@ -319 +325 @@
 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-1.patch</userinput></screen>
 
+    <para>
+      If you are using harfbuzz-3.0 or later, apply a patch to let the build
+      complete:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-harfbuzz3-1.patch</userinput></screen>
+
 <!-- start of commands for git versions only -->
     <para>
-      Although the patch has ensured that git is not invoked during the build,
+      Although the first patch has ensured that git is not invoked during the build,
       the build system has labyrinthine rules of byzantine complexity, and in
       particular trying to build without two <filename>.git</filename> directories