Changeset f13c0e16 for x/lib/qt5.xml

Timestamp:

07/02/2017 03:51:17 AM (7 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

12b2d1d6

Parents:

8819e5e7

Message:

Update to Qt and QtWebEngine-5.9.1

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

File:

• x/lib/qt5.xml (modified) (7 diffs)

x/lib/qt5.xml

@@ -10 +10 @@
   <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "9c8bc8b828c2b56721980368266df9d9">
-  <!ENTITY qt5-size          "439 MB">
-  <!ENTITY qt5-buildsize     "8.9 GB (214 MB installed)">
-  <!ENTITY qt5-time          "29 SBU (using parallelism=4)">
+  <!ENTITY qt5-md5sum        "77b4af61c49a09833d4df824c806acaf">
+  <!ENTITY qt5-size          "440 MB">
+  <!ENTITY qt5-buildsize     "8.8 GB (214 MB installed)">
+  <!ENTITY qt5-time          "26 SBU (using parallelism=4)">
 ]>
 
@@ -241 +241 @@
 export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' &amp;&amp;
 
+sed -e "/qsql_mysql_p.h/ a #include &lt;mysql/mysql_version.h&gt;" \
+     -i qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp  &amp;&amp;
+
+
 ./configure -prefix $QT5PREFIX                          \
             -sysconfdir /etc/xdg                        \
@@ -264 +268 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-<!-- Not needed any more
-    <para>
-      Remove references to the build directory from the installed
-      <filename class="extension">.pc</filename> files by running
-      the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find $QT5PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
--->
     <para>
       Remove references to the build directory from installed library
@@ -279 +273 @@
       command as the <systemitem class="username">root</systemitem> user:
     </para>
-
-<!-- Not needed any more
-find $QT5PREFIX/ -name qt_lib_bootstrap_private.pri \
-   -exec sed -i -e "s:$PWD/qtbase:/$QT5PREFIX/lib/:g" {} \; &amp;&amp;
--->
 
 <screen role="root"><userinput>find $QT5PREFIX/ -name \*.prl \
@@ -385 +374 @@
 
     <para>
+      <command>sed ... qsql_mysql.cpp </command>: The
+      <command>configure</command> now searches for mysql/mariadb and sets up
+      Qt to use it if found.  This command compensates for a change in the
+      mariadb-10.2 include files.
+    </para>
+
+    <para>
       <parameter>-confirm-license</parameter>: Accept license
       without prompting user during configuration.
@@ -393 +389 @@
       version of <application>Qt</application>.
     </para>
-<!-- default as of QT-5.7:
-    <para>
-      <parameter>-release</parameter>: This switch disables
-      building with debugging symbols.
-    </para>-->
 
     <para>
@@ -410 +401 @@
       of the system version of <application>SQLite</application>.
     </para>
-<!-- Tested during configure, and not built if not found:
-    <para>
-      <parameter>-no-nis</parameter>: This switch disables support
-      for Network Information Service (NIS) which has been
-      removed from recent versions of <application>Glibc</application>.
-    </para>-->
 
     <para>