Changeset 68954249

Timestamp:

07/17/2023 06:02:36 PM (10 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

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

Children:

81a1d5fb

Parents:

38703f5d

Message:

qt-components: Apply the KF5 patches before building anything.

All of the modules listed in the page have fixes in the KF5 patchset, so
let's make sure that we apply that prior to building anything

Location:

x/lib

Files:

• qt5-alternate.xml (modified) (1 diff)
• qt5-components.xml (modified) (2 diffs)

x/lib/qt5-alternate.xml

@@ -224 +224 @@
 
     <para>
-      First apply a patch to pull in the fixes curated by kde for those
+      First, apply a patch to pull in the fixes curated by kde for those
       modules which are required by packages mentioned in this book:
     </para>

x/lib/qt5-components.xml

@@ -70 +70 @@
       </listitem>
 -->
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Now that <application>qt5</application> updates are restricted to
+          commercial customers, upstream patches for the various modules are
+          being curated at kde.
+          Patches for the modules required by packages in BLFS have been
+          aggregated for the non-modular qt5 build we use.
+        </para>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch"/>
+        </para>
+        <para>
+          Details of the kde curation can be found at
+          <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
+          and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
+        </para>
+      </listitem>
     </itemizedlist>
 
@@ -116 +138 @@
 
     <para>
+      First, apply a patch to pull in the fixes curated by KDE for some of the
+      modules listed above:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-opensource-src-5.15.10-kf5-1.patch</userinput></screen>
+
+    <para>
       Install each desired component by running the following commands:
     </para>
 
-<screen><userinput role="nodep">cd &lt;component&gt;
+<screen><userinput>cd &lt;component&gt;
 qmake &lt;component&gt;.pro
 make</userinput></screen>