Changeset f20fbb7


Ignore:
Timestamp:
06/23/2017 04:46:40 AM (5 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.1, 11.0, 11.1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, lazarus, perl-modules, qt5new, trunk, upgradedb, xry111/intltool, xry111/test-20220226
Children:
1c93cb78
Parents:
3ec206d
Message:

Fix a build issue with QT and MariaDB>10.2.

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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    r3ec206d rf20fbb7  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "22">                   <!-- Always 2 digits -->
     3<!ENTITY day          "23">                   <!-- Always 2 digits -->
    44<!ENTITY month        "06">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2017">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "June 22nd &year;">
     9<!ENTITY releasedate  "June 23rd &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • introduction/welcome/changelog.xml

    r3ec206d rf20fbb7  
    4343-->
    4444    <listitem>
     45      <para>June 23rd, 2017</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[dj] - Fix a build issue with QT and MariaDB>10.2.</para>
     49        </listitem>
     50      </itemizedlist>
     51    </listitem>
     52
     53    <listitem>
    4554      <para>June 22nd, 2017</para>
    4655      <itemizedlist>
  • x/lib/qt5.xml

    r3ec206d rf20fbb7  
    224224            -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
    225225    </note>
     226
     227    <para>
     228      If you have <xref linkend="mariadb"/> installed, fix a build issue with
     229      with <application>MySQL</application> compatibility:
     230    </para>
     231
     232<screen><userinput>sed '/qsqlresult_p.h&gt;/a#include &lt;mysql/mysql_version.h&gt;' \
     233    -i qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp</userinput></screen>
    226234
    227235    <para>
Note: See TracChangeset for help on using the changeset viewer.