Changeset f20fbb7

Timestamp:

06/23/2017 04:46:40 AM (6 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/inkscape-core-mods, lazarus, lxqt, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

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:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qt5.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "22">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 22nd &year;">
+<!ENTITY releasedate  "June 23rd &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <listitem>
+      <para>June 23rd, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Fix a build issue with QT and MariaDB>10.2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 22nd, 2017</para>
       <itemizedlist>

x/lib/qt5.xml

@@ -224 +224 @@
             -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
     </note>
+
+    <para>
+      If you have <xref linkend="mariadb"/> installed, fix a build issue with
+      with <application>MySQL</application> compatibility:
+    </para>
+
+<screen><userinput>sed '/qsqlresult_p.h&gt;/a#include &lt;mysql/mysql_version.h&gt;' \
+    -i qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp</userinput></screen>
 
     <para>