Changeset 4584c7b

Timestamp:

12/24/2019 09:19:28 AM (4 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 9.1, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

9b51413

Parents:

81210e4

Message:

Patch Qt-5.14.0 for a cursor problem in Wayland
Fix building KDE Frameworks with Qt-5.14.0
Add a recommended dep to wpa_supplicant

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22503 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• kde/kf5/kf5-frameworks.xml (modified) (2 diffs)
• networking/netprogs/wpa_supplicant.xml (modified) (1 diff)
• x/lib/qt5.xml (modified) (2 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "22">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 22nd, &year;">
+<!ENTITY releasedate  "December 24th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
        -->
+    <listitem>
+      <para>December 24th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Patch Qt-5.14.0 to fix a cursor problem in Wayland,
+            and fix building KDE Frameworks with Qt-5.14.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>December 22nd, 2019</para>

kde/kf5/kf5-frameworks.xml

@@ -320 +320 @@
     tar -xf $file
     pushd $packagedir
-   
+<!-- the following statement may be not needed in 5.66+ -->
+      case $name in
+        kitemviews*) sed -i '/&lt;QList&gt;/a #include &lt;QPersistentModelIndex&gt;' \
+          src/kwidgetitemdelegatepool_p.h ;;
+        kplotting*) sed -i '/&lt;QHash&gt;/a #include &lt;QHelpEvent&gt;' \
+          src/kplotwidget.cpp ;;
+        knotifica*) sed -i '/&lt;QUrl&gt;/a #include &lt;QVariant&gt;' \
+          src/knotification.h ;;
+        kcompleti*) sed -i '/&lt;QClipboard&gt;/a #include &lt;QKeyEvent&gt;' \
+          src/klineedit.cpp ;;
+        kwayland*) sed -i '/&lt;wayland-xdg-output-server-proto/a #include &lt;QHash&gt;' \
+          src/server/xdgoutput_interface.cpp ;;
+      esac  
+
       mkdir build
       cd    build
@@ -357 +370 @@
     <title>Command Explanations</title>
 
+<!-- the following statement may be not needed in 5.66+ -->
+    <para>
+      <command>case ...</command>: Those modifications are required to build
+      with <xref linkend="qt5"/>.
+    </para>
     <para>
       <parameter>-DCMAKE_PREFIX_PATH=$QT5DIR</parameter>: This switch is used

networking/netprogs/wpa_supplicant.xml

@@ -91 +91 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libnl"/> 
+      <xref linkend="desktop-file-utils"/> (for running
+        <command>update-desktop-database</command>) and
+      <xref linkend="libnl"/>
     </para>
 

x/lib/qt5.xml

@@ -78 +78 @@
       </listitem>
     </itemizedlist>
-<!--
+
    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
         <para>Required Patch: <ulink
-        url="&patch-root;/qt-&qt5-version;-upstream_fixes-1.patch"/></para>
+        url="&patch-root;/qt-&qt5-version;-qtwayland_cursor_fix-1.patch"/></para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
 
@@ -239 +239 @@
             -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
     </note>
-<!--
-    <para>
-      First fix some issues found upstream:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../qt-&qt5-version;-upstream_fixes-1.patch &amp;&amp;</userinput></screen> 
--->
+
+    <para>
+      First fix some issues with the cursor when using Wayland:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../qt-&qt5-version;-qtwayland_cursor_fix-1.patch</userinput></screen> 
+
     <para>
       Install <application>Qt5</application> by running the following commands: