linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-25 07:42:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to qt-5.9.0. Includes qtwebkit and qtwebengine.

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18776 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2017-06-01 15:30:51 +00:00
parent d0db4161e2
commit 640f4c21cb
6 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
general.ent
View File

@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "31"> <!-- Always 2 digits -->
<!ENTITY month "05"> <!-- Always 2 digits -->
<!ENTITY day "01"> <!-- Always 2 digits -->
<!ENTITY month "06"> <!-- Always 2 digits -->
<!ENTITY year "2017">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
<!ENTITY releasedate "May 31st &year;">
<!ENTITY releasedate "June 1st &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->

11
introduction/welcome/changelog.xml
View File

@ -41,6 +41,17 @@
</itemizedlist>
</listitem>
-->
<listitem>
<para>June 1st, 2017</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to qt-5.9.0. Includes
qtwebkit and qtwebengine. Fixes
<ulink url="&blfs-ticket-root;9300">#9300</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>May 31st, 2017</para>
<itemizedlist>

6
packages.ent
View File

@ -552,9 +552,9 @@
<!ENTITY libxklavier-version "5.4">
<!ENTITY pango-version "1.40.5">
<!ENTITY pangomm-version "2.40.1">
<!ENTITY qt5-version "5.8.0">
<!ENTITY qtwebengine-version "5.8.0">
<!ENTITY qtwebkit-version "5.8.0">
<!ENTITY qt5-version "5.9.0">
<!ENTITY qtwebengine-version "5.9.0">
<!ENTITY qtwebkit-version "5.9.0">
<!ENTITY shared-mime-info-version "1.8">
<!ENTITY startup-notification-version "0.12">
<!ENTITY webkitgtk-version "2.16.3"> <!-- Even minors only -->

24
x/lib/qt5.xml
View File

@ -4,15 +4,15 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
<!ENTITY qt5-major "5.8">
<!ENTITY qt5-major "5.9">
<!ENTITY qt5-url "http://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
<!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
<!ENTITY qt5-download-ftp " ">
<!ENTITY qt5-md5sum "66660cd3d9e1a6fed36e88adcb72e9fe">
<!ENTITY qt5-size "354 MB">
<!ENTITY qt5-buildsize "8.8 GB (178 MB installed)">
<!ENTITY qt5-time "23 SBU (using parallelism=4)">
<!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)">
]>
<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
@ -43,6 +43,7 @@
</para>
&lfs80_checked;
&gcc7_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@ -250,6 +251,7 @@ make</userinput></screen>
<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
@ -258,17 +260,19 @@ make</userinput></screen>
</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
dependency (prl) and profile include (pri) files by running the following
commands as the <systemitem class="username">root</systemitem> user:
dependency (prl) <!--and profile include (pri)--> files by running the following
command as the <systemitem class="username">root</systemitem> user:
</para>
<screen role="root"><userinput>find $QT5PREFIX/ -name qt_lib_bootstrap_private.pri \
<!-- Not needed any more
find $QT5PREFIX/ -name qt_lib_bootstrap_private.pri \
-exec sed -i -e "s:$PWD/qtbase:/$QT5PREFIX/lib/:g" {} \; &amp;&amp;
-->
find $QT5PREFIX/ -name \*.prl \
<screen role="root"><userinput>find $QT5PREFIX/ -name \*.prl \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
<para>

48
x/lib/qtwebengine.xml
View File

@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
<!ENTITY qtwebengine-major "5.8">
<!ENTITY qtwebengine-major "5.9">
<!ENTITY qtwebengine-download-http "https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-opensource-src-&qtwebengine-version;.tar.xz">
<!ENTITY qtwebengine-download-ftp " ">
<!ENTITY qtwebengine-md5sum "6e7fb2be161c6db4d988a4f5b329672f">
<!ENTITY qtwebengine-size "187 MB">
<!ENTITY qtwebengine-buildsize "2.5 GB (153 MB installed including docs)">
<!ENTITY qtwebengine-md5sum "d7ca5049baf5ff69d69ee58d5da392d4">
<!ENTITY qtwebengine-size "208 MB">
<!ENTITY qtwebengine-buildsize "3.2 GB (153 MB installed)">
<!ENTITY qtwebengine-time "43 SBU (on a 4 core processor)">
<!-- Both qmake and ninja will use all available cores, in fact ninja runs n+2
@ -100,7 +100,7 @@
<!-- the qmake output tends to be misleading. 'khr' is from Mesa -->
<para role="required">
<xref linkend="nss"/>,
<xref linkend="pulseaudio"/>,
<xref linkend="pulseaudio"/>, and
<xref linkend='qt5'/>
</para>
@ -116,7 +116,8 @@
<para role="recommended">
<xref linkend="libwebp"/>,
<xref linkend="libxslt"/>,
<xref linkend="opus"/>
<xref linkend="opus"/>, and
<xref linkend="rust"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
@ -140,17 +141,18 @@
commands:
</para>
<screen><userinput>
patch -Np1 -i ../qtwebengine-&qtwebengine-version;-gcc7-1.patch &amp;&amp;
qmake -r &amp;&amp;
make</userinput></screen>
<screen><userinput>mkdir build &amp;&amp;
cd build &amp;&amp;
qmake .. &amp;&amp;
make</userinput></screen>
<!--
<para>
if you wish to build the HTML documentation, issue:
</para>
<screen><userinput>make docs</userinput></screen>
-->
<para>
This package does not come with a test suite.
</para>
@ -159,15 +161,14 @@ make</userinput></screen>
Now, as the <systemitem class="username">root</systemitem> user:
</para>
<screen role="root"><userinput>make install &amp;&amp;
ldconfig</userinput></screen>
<screen role="root"><userinput>make install</userinput></screen>
<!--
<para>
If you built the HTML documentation, install it with:
</para>
<screen role="root"><userinput>make install_docs</userinput></screen>
-->
<para>
Remove references to the build directory from installed library
dependency (prl) files by running the following
@ -182,10 +183,10 @@ ldconfig</userinput></screen>
<title>Command Explanations</title>
<para>
<command>qmake -r</command>: This will build the included copy of
<application>ninja</application> and use it to configure the build.
That and the subsequent <command>make</command> command will use all
available CPU cores.
<command>qmake</command>: This will build the included copy of
<application>ninja</application> if it is not already installed
and use it to configure the build. That and the subsequent
<command>make</command> command will use all available CPU cores.
</para>
</sect2>
@ -200,15 +201,18 @@ ldconfig</userinput></screen>
<seglistitem>
<seg>
qtwebengine_convert_dict,QtWebEngineProcess
qtwebengine_convert_dict and
QtWebEngineProcess
</seg>
<seg>
libQt5WebEngineCore.so, libQt5WebEngine.so, libQt5WebEngineWidgets.so
libQt5WebEngineCore.so,
libQt5WebEngine.so, and
libQt5WebEngineWidgets.so
</seg>
<seg>
$QT5PREFIX/doc/qtwebengine,
$QT5PREFIX/includeQtWebEngine,
$QT5PREFIX/include/QtWebEngineCore,
$QT5PREFIX/include/QtWebEngineCore, and
$QT5PREFIX/include/QtWebEngineWidgets
</seg>
</seglistitem>

47
x/lib/qtwebkit5.xml
View File

@ -4,14 +4,14 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
<!ENTITY qtwebkit-major "5.8">
<!ENTITY qtwebkit-major "5.9">
<!ENTITY qtwebkit-url "http://download.qt.io/community_releases/&qtwebkit-major;/&qtwebkit-version;-final">
<!ENTITY qtwebkit-download-http "&qtwebkit-url;/qtwebkit-opensource-src-&qtwebkit-version;.tar.xz">
<!ENTITY qtwebkit-download-ftp " ">
<!ENTITY qtwebkit-md5sum "60a6935aca4a7c553d0ec4646ceed3b4">
<!ENTITY qtwebkit-md5sum "1fc0ed873cc9326b823a8a83126714f5">
<!ENTITY qtwebkit-size "34 MB">
<!ENTITY qtwebkit-buildsize "766 MB (50 MB installed)">
<!ENTITY qtwebkit-buildsize "668 MB (38 MB installed)">
<!ENTITY qtwebkit-time "11 SBU (using parallelism=4)">
]>
@ -116,21 +116,21 @@
<screen><userinput>patch -Np1 -i ../qtwebkit-&qtwebkit-version;-icu_59-1.patch</userinput></screen>
<para>If desired, adjust the build settings to avoid literally thousands
of unneeded warning messages:</para>
<screen><userinput>sed -e '/CONFIG/a QMAKE_CXXFLAGS += -Wno-expansion-to-defined' \
-i Tools/qmake/mkspecs/features/unix/default_pre.prf</userinput></screen>
<para>
Install <application>Qtwebkit</application> by running the following commands:
</para>
<screen><userinput>SAVEPATH=$PATH &amp;&amp;
export PATH=$PWD/bin:$PATH &amp;&amp;
mkdir -p build &amp;&amp;
<screen><userinput>mkdir -p build &amp;&amp;
cd build &amp;&amp;
qmake ../WebKit.pro &amp;&amp;
make &amp;&amp;
export PATH=$SAVEPATH &amp;&amp;
unset SAVEPATH </userinput></screen>
make</userinput></screen>
<para>
This package does not come with a test suite.
@ -146,24 +146,12 @@ unset SAVEPATH </userinput></screen>
$QT5DIR directory tree.</para></note>
<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:
Remove references to the build directory from installed
profile include (pri) files by running the following
command as the <systemitem class="username">root</systemitem> user:
</para>
<screen role="root"><userinput>find $QT5DIR/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
dependency (prl) and profile include (pri) files by running the following
commands as the <systemitem class="username">root</systemitem> user:
</para>
<screen role="root"><userinput>find $QT5DIR/ -name qt_lib_bootstrap_private.pri \
-exec sed -i -e "s:$PWD/qtbase:/$QT5DIR/lib/:g" {} \; &amp;&amp;
find $QT5DIR/ -name \*.prl \
<screen role="root"><userinput>find $QT5DIR/ -name \*.prl \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
</sect2>
@ -171,11 +159,6 @@ find $QT5DIR/ -name \*.prl \
<sect2 role="commands">
<title>Command Explanations</title>
<para>
<command>export PATH=$PWD/bin:$PATH</command>: sets a temporary path needed
to complete the build and install process.
</para>
<para>
<command>qmake</command>: is a Qt tool that automates the generation of
Makefiles.