Changeset 4584c7b


Ignore:
Timestamp:
12/24/2019 09:19:28 AM (21 months ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 9.1, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
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:
5 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    r81210e4 r4584c7b  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "22">                   <!-- Always 2 digits -->
     3<!ENTITY day          "24">                   <!-- Always 2 digits -->
    44<!ENTITY month        "12">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2019">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "December 22nd, &year;">
     9<!ENTITY releasedate  "December 24th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • introduction/welcome/changelog.xml

    r81210e4 r4584c7b  
    4242    </listitem>
    4343       -->
     44    <listitem>
     45      <para>December 24th, 2019</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[pierre] - Patch Qt-5.14.0 to fix a cursor problem in Wayland,
     49            and fix building KDE Frameworks with Qt-5.14.0.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
    4454    <listitem>
    4555      <para>December 22nd, 2019</para>
  • kde/kf5/kf5-frameworks.xml

    r81210e4 r4584c7b  
    320320    tar -xf $file
    321321    pushd $packagedir
    322    
     322<!-- the following statement may be not needed in 5.66+ -->
     323      case $name in
     324        kitemviews*) sed -i '/&lt;QList&gt;/a #include &lt;QPersistentModelIndex&gt;' \
     325          src/kwidgetitemdelegatepool_p.h ;;
     326        kplotting*) sed -i '/&lt;QHash&gt;/a #include &lt;QHelpEvent&gt;' \
     327          src/kplotwidget.cpp ;;
     328        knotifica*) sed -i '/&lt;QUrl&gt;/a #include &lt;QVariant&gt;' \
     329          src/knotification.h ;;
     330        kcompleti*) sed -i '/&lt;QClipboard&gt;/a #include &lt;QKeyEvent&gt;' \
     331          src/klineedit.cpp ;;
     332        kwayland*) sed -i '/&lt;wayland-xdg-output-server-proto/a #include &lt;QHash&gt;' \
     333          src/server/xdgoutput_interface.cpp ;;
     334      esac 
     335
    323336      mkdir build
    324337      cd    build
     
    357370    <title>Command Explanations</title>
    358371
     372<!-- the following statement may be not needed in 5.66+ -->
     373    <para>
     374      <command>case ...</command>: Those modifications are required to build
     375      with <xref linkend="qt5"/>.
     376    </para>
    359377    <para>
    360378      <parameter>-DCMAKE_PREFIX_PATH=$QT5DIR</parameter>: This switch is used
  • networking/netprogs/wpa_supplicant.xml

    r81210e4 r4584c7b  
    9191    <bridgehead renderas="sect4">Recommended</bridgehead>
    9292    <para role="recommended">
    93       <xref linkend="libnl"/>
     93      <xref linkend="desktop-file-utils"/> (for running
     94        <command>update-desktop-database</command>) and
     95      <xref linkend="libnl"/>
    9496    </para>
    9597
  • x/lib/qt5.xml

    r81210e4 r4584c7b  
    7878      </listitem>
    7979    </itemizedlist>
    80 <!--
     80
    8181   <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    8282    <itemizedlist spacing='compact'>
    8383      <listitem>
    8484        <para>Required Patch: <ulink
    85         url="&patch-root;/qt-&qt5-version;-upstream_fixes-1.patch"/></para>
     85        url="&patch-root;/qt-&qt5-version;-qtwayland_cursor_fix-1.patch"/></para>
    8686      </listitem>
    8787    </itemizedlist>
    88 -->
     88
    8989    <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
    9090
     
    239239            -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
    240240    </note>
    241 <!--
    242     <para>
    243       First fix some issues found upstream:
    244     </para>
    245 
    246 <screen><userinput>patch -Np1 -i ../qt-&qt5-version;-upstream_fixes-1.patch &amp;&amp;</userinput></screen>
    247 -->
     241
     242    <para>
     243      First fix some issues with the cursor when using Wayland:
     244    </para>
     245
     246<screen><userinput>patch -Np1 -i ../qt-&qt5-version;-qtwayland_cursor_fix-1.patch</userinput></screen>
     247
    248248    <para>
    249249      Install <application>Qt5</application> by running the following commands:
Note: See TracChangeset for help on using the changeset viewer.