Author: pierre
Date: Tue Dec 24 01:19:28 2019
New Revision: 22503
Log:
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
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/kde/kf5/kf5-frameworks.xml
trunk/BOOK/networking/netprogs/wpa_supplicant.xml
trunk/BOOK/x/lib/qt5.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Sun Dec 22 15:11:31 2019 (r22502)
+++ trunk/BOOK/general.ent Tue Dec 24 01:19:28 2019 (r22503)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "22"> <!-- Always 2 digits -->
+<!ENTITY day "24"> <!-- Always 2 digits -->
<!ENTITY month "12"> <!-- Always 2 digits -->
<!ENTITY year "2019">
<!ENTITY copyrightdate "2001-&year;">
<!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 #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sun Dec 22 15:11:31
2019 (r22502)
+++ trunk/BOOK/introduction/welcome/changelog.xml Tue Dec 24 01:19:28
2019 (r22503)
@@ -42,6 +42,16 @@
</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>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/kde/kf5/kf5-frameworks.xml
==============================================================================
--- trunk/BOOK/kde/kf5/kf5-frameworks.xml Sun Dec 22 15:11:31 2019
(r22502)
+++ trunk/BOOK/kde/kf5/kf5-frameworks.xml Tue Dec 24 01:19:28 2019
(r22503)
@@ -319,7 +319,20 @@
tar -xf $file
pushd $packagedir
-
+<!-- the following statement may be not needed in 5.66+ -->
+ case $name in
+ kitemviews*) sed -i '/<QList>/a #include
<QPersistentModelIndex>' \
+ src/kwidgetitemdelegatepool_p.h ;;
+ kplotting*) sed -i '/<QHash>/a #include <QHelpEvent>' \
+ src/kplotwidget.cpp ;;
+ knotifica*) sed -i '/<QUrl>/a #include <QVariant>' \
+ src/knotification.h ;;
+ kcompleti*) sed -i '/<QClipboard>/a #include <QKeyEvent>' \
+ src/klineedit.cpp ;;
+ kwayland*) sed -i '/<wayland-xdg-output-server-proto/a #include
<QHash>' \
+ src/server/xdgoutput_interface.cpp ;;
+ esac
+
mkdir build
cd build
@@ -356,6 +369,11 @@
<sect2 role="commands">
<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
to allow cmake to find the proper Qt libraries.
Modified: trunk/BOOK/networking/netprogs/wpa_supplicant.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/wpa_supplicant.xml Sun Dec 22 15:11:31
2019 (r22502)
+++ trunk/BOOK/networking/netprogs/wpa_supplicant.xml Tue Dec 24 01:19:28
2019 (r22503)
@@ -90,7 +90,9 @@
<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>
<bridgehead renderas="sect4">Optional</bridgehead>
Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml Sun Dec 22 15:11:31 2019 (r22502)
+++ trunk/BOOK/x/lib/qt5.xml Tue Dec 24 01:19:28 2019 (r22503)
@@ -77,15 +77,15 @@
</para>
</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>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -238,13 +238,13 @@
-translationdir /usr/share/qt5/translations \
-examplesdir /usr/share/doc/qt5/examples</userinput></screen>
</note>
-<!--
+
<para>
- First fix some issues found upstream:
+ First fix some issues with the cursor when using Wayland:
</para>
-<screen><userinput>patch -Np1 -i ../qt-&qt5-version;-upstream_fixes-1.patch
&&</userinput></screen>
--->
+<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:
</para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
