Changeset 0fccf51


Ignore:
Timestamp:
02/08/2019 08:52:54 AM (3 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 8.4, 9.0, 9.1, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
f8594669
Parents:
cee65a2
Message:

Make Qt5 P3 only

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

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • general.ent

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

    rcee65a2 r0fccf51  
    4242    </listitem>
    4343    -->
     44
     45    <listitem>
     46      <para>February 8th, 2019</para>
     47      <itemizedlist>
     48        <listitem>
     49          <para>[pierre] - Allow using Python 3 to build Qt5.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
    4453
    4554    <listitem>
  • x/lib/qt5.xml

    rcee65a2 r0fccf51  
    131131      <xref linkend="pciutils"/> (required for QtWebEngine),
    132132      <xref linkend="postgresql"/>,
     133      <xref linkend="python2"/> (required for QtWebEngine),
    133134      <xref linkend="pulseaudio"/>,
    134135      <xref linkend="unixodbc"/>, and
     
    200201      </para>
    201202    </caution>
    202 <!--
    203     <para>
    204       If your system is using glibc-2.28, apply the patch to exclude certain
    205       system headers and to avoid redefining two functions which are now in
    206       glibc :
    207     </para>
    208 
    209 <screen><userinput>patch -Np1 -i ../qt-&qt5-version;-glibc228-1.patch</userinput></screen>
    210 -->
     203
    211204    <note>
    212205      <para>
     
    239232    </note>
    240233
    241 <!--  Not needed with mariadb-10.2.8, but a symlink for mysql_version.h
    242       on the mariadb page, is needed.
    243 
    244     <para>
    245       If you have <xref linkend="mariadb"/> installed, fix a build issue with
    246       with <application>MySQL</application> compatibility:
    247     </para>
    248 
    249 <screen><userinput>sed '/qsqlresult_p.h&gt;/a#include &lt;mysql/mysql_version.h&gt;' \
    250     -i qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp</userinput></screen>
    251 -->
    252 
    253234    <para>
    254235      Install <application>Qt5</application> by running the following commands:
    255236    </para>
    256237
    257 <screen><userinput>./configure -prefix $QT5PREFIX                          \
    258             -sysconfdir /etc/xdg                        \
    259             -confirm-license                            \
    260             -opensource                                 \
    261             -dbus-linked                                \
    262             -openssl-linked                             \
    263             -system-harfbuzz                            \
    264             -system-sqlite                              \
    265             -nomake examples                            \
    266             -no-rpath                                   \
    267             -skip qtwebengine                           &amp;&amp;
     238<screen><userinput>find . -name "*.pr[io]" | xargs sed -i 's/python/&amp;3/' &amp;&amp;
     239./configure -prefix $QT5PREFIX                        \
     240            -sysconfdir /etc/xdg                      \
     241            -confirm-license                          \
     242            -opensource                               \
     243            -dbus-linked                              \
     244            -openssl-linked                           \
     245            -system-harfbuzz                          \
     246            -system-sqlite                            \
     247            -nomake examples                          \
     248            -no-rpath                                 \
     249            -skip qtwebengine                         &amp;&amp;
    268250make</userinput></screen>
    269251
     
    382364  <sect2 role="commands">
    383365    <title>Command Explanations</title>
     366
     367    <para>
     368      <command>find ... | xargs sed ...</command>: Allows using
     369      <application>Python 3</application> instead of <application>Python
     370      2</application>. This command destroys the build for QtWebEngine, so do
     371      not use it if you remove the <parameter>-skip qtwebengine</parameter>
     372      switch.
     373    </para>
    384374
    385375    <para>
  • x/lib/qtwebengine.xml

    rcee65a2 r0fccf51  
    232232    <para>
    233233      <command>-- -system-ffmpeg -webengine-icu</command>: If any options are
    234       passed to qmake ithey must come after '--' which must follow '..' that points
     234      passed to qmake they must come after '--' which must follow '..' that points
    235235      to the main directory. The options here cause it to use system ffmpeg and
    236236      system icu.  If built as part of full Qt5, the system icu is automatically
Note: See TracChangeset for help on using the changeset viewer.