Fix a build issue in Qt5 when pulseaudio is present.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15400 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2015-01-27 05:44:09 +00:00
parent 52716821f5
commit 47e6b60e5d
2 changed files with 18 additions and 1 deletions

View File

@ -47,6 +47,11 @@
<listitem>
<para>January 26th, 2015</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Fix a build issue in Qt5 when pulseaudio
is present. Fixes
<ulink url="&blfs-ticket-root;6028">#6028</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to whois-5.2.4. Fixes
<ulink url="&blfs-ticket-root;6077">#6077</ulink>.</para>

View File

@ -14,7 +14,7 @@
<!ENTITY qt5-md5sum "21843b00ecde8956217faab391bc007b">
<!ENTITY qt5-size "279 MB">
<!ENTITY qt5-buildsize "6.9 GB (266 MB installed)">
<!ENTITY qt5-time "138 SBU">
<!ENTITY qt5-time "27 SBU (parallelism=4, without Qt Web Engine), 138 SBU (parallelism=1, with Qt Web Engine)">
]>
<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
@ -191,6 +191,7 @@
-system-harfbuzz \-->
-system-sqlite \
-no-nis \
-skip qtwebengine \
-nomake examples \
-optimized-qmake &amp;&amp;
make</userinput></screen>
@ -247,6 +248,7 @@ export QT5LINK=/opt/qt5 &amp;&amp;
-system-sqlite \
-no-nis \
-nomake examples \
-skip qtwebengine \
-optimized-qmake &amp;&amp;
make</userinput></screen>
@ -422,6 +424,16 @@ EOF</userinput></screen>
<command>dlopen()</command>-ing them.
</para>
<para>
<parameter>-skip qtwebengine</parameter>: This switch disables
building the Qt Web Engine. It is not presently used by
any applications. If this option is removed, fix a build
problem with:
<screen><userinput>sed -i '$ a !contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0' \
qtwebengine/src/core/config/desktop_linux.pri</userinput></screen>
</para>
<para>
<parameter>-optimized-qmake</parameter>: This switch enables
building of the optimized <command>qmake</command> program.