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

Update to qt-5.6.0.

Browse Source 
Add qt5webkit as a separate page.
+ 


git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17135 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2016-03-20 22:03:04 +00:00
parent 0a63d2ef8a
commit 6b237ce2bd
5 changed files with 199 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
introduction/welcome/changelog.xml
View File

@ -47,6 +47,13 @@
<listitem>
<para>March 20th, 2016</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to qt-5.6.0. Fixes
<ulink url="&blfs-ticket-root;7598">#7598</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Add qt5webkit as a separate page.</para>
</listitem>
<listitem>
<para>[ken] - Update to postfix-3.1.0. Fixes
<ulink url="&blfs-ticket-root;7514">#7514</ulink>.</para>
@ -360,8 +367,8 @@
</listitem>
<listitem>
<para>[bdubbs] - Add a note that openssl does not support
parallel tets. Fixes
<ulink url="&blfs-ticket-root;7486">#7486</ulink>.</para>
parallel tests. Fixes
<ulink url="&blfs-ticket-root;7491">#7491</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Restore autoconf to libva-intel-driver. Fixes

3
packages.ent
View File

@ -501,7 +501,8 @@
<!ENTITY pango-version "1.38.1">
<!ENTITY pangomm-version "2.38.1">
<!ENTITY qt4-version "4.8.7">
<!ENTITY qt5-version "5.5.1">
<!ENTITY qt5-version "5.6.0">
<!ENTITY qtwebkit-version "5.6.0">
<!ENTITY shared-mime-info-version "1.6">
<!ENTITY startup-notification-version "0.12">
<!ENTITY webkitgtk2-version "2.4.10"> <!-- Even minors only -->

1
x/lib/lib.xml
View File

@ -56,6 +56,7 @@ $Date$
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>

12
x/lib/qt5.xml
View File

@ -9,10 +9,10 @@
<!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
<!ENTITY qt5-download-ftp " ">
<!ENTITY qt5-md5sum "c2a249e8795d45200d997d96860d0353">
<!ENTITY qt5-size "306 MB">
<!ENTITY qt5-buildsize "7.6 GB (187 MB installed)">
<!ENTITY qt5-time "98 SBU">
<!ENTITY qt5-md5sum "47763c168f58b1196271b231f03c8bae">
<!ENTITY qt5-size "284 MB">
<!ENTITY qt5-buildsize "7.2 GB (163 MB installed)">
<!ENTITY qt5-time "19.7 SBU (using parallelism=4)">
]>
<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
@ -267,10 +267,10 @@ make</userinput></screen>
commands as the <systemitem class="username">root</systemitem> user:
</para>
<screen role="root"><userinput>find $QT5PREFIX -name qt_lib_bootstrap_private.pri \
<screen role="root"><userinput>find $QT5PREFIX/ -name qt_lib_bootstrap_private.pri \
-exec sed -i -e "s:$PWD/qtbase:/$QT5PREFIX/lib/:g" {} \; &amp;&amp;
find $QT5PREFIX -name \*.prl \
find $QT5PREFIX/ -name \*.prl \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
<para>

181
x/lib/qtwebkit5.xml Normal file
View File

@ -0,0 +1,181 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
<!ENTITY qtwebkit-major "5.5">
<!ENTITY qtwebkit-url "http://download.qt.io/community_releases/&qtwebkit-major;/&qtwebkit-version;">
<!ENTITY qtwebkit-download-http "&qtwebkit-url;/qtwebkit-opensource-src-&qtwebkit-version;.tar.xz">
<!ENTITY qtwebkit-download-ftp " ">
<!ENTITY qtwebkit-md5sum "eba1382587add1c9b1293a532e7dd161">
<!ENTITY qtwebkit-size "34 MB">
<!ENTITY qtwebkit-buildsize "741 MB (37 MB installed)">
<!ENTITY qtwebkit-time "15.7 SBU (using parallelism=4)">
]>
<sect1 id="qtwebkit5" xreflabel="QtWebkit-&qtwebkit-version;">
<?dbhtml filename="qtwebkit5.html" ?>
<sect1info>
<othername>$LastChangedBy$</othername>
<date>$Date$</date>
</sect1info>
<title>QtWebkit-&qtwebkit-version;</title>
<indexterm zone="qtwebkit5">
<primary sortas="a-QtWebkit">QtWebkit</primary>
</indexterm>
<sect2 role="package">
<title>Introduction to QtWebkit</title>
<para>
<application>Qtwebkit</application> is a Qt based web browser engine.
</para>
&lfs79_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>
Download (HTTP): <ulink url="&qtwebkit-download-http;"/>
</para>
</listitem>
<listitem>
<para>
Download (FTP): <ulink url="&qtwebkit-download-ftp;"/>
</para>
</listitem>
<listitem>
<para>
Download MD5 sum: &qtwebkit-md5sum;
</para>
</listitem>
<listitem>
<para>
Download size: &qtwebkit-size;
</para>
</listitem>
<listitem>
<para>
Estimated disk space required: &qtwebkit-buildsize;
</para>
</listitem>
<listitem>
<para>
Estimated build time: &qtwebkit-time;
</para>
</listitem>
</itemizedlist>
<bridgehead renderas="sect3">Qtwebkit Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
<xref linkend="libjpeg"/>,
<xref linkend="libpng"/>,
<xref linkend="phonon"/> (built with <xref linkend='qt5'/>), and
<xref linkend="sqlite"/>
</para>
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/qtwebkit"/>
</para>
</sect2>
<sect2 role="installation">
<title>Installation of Qtwebkit</title>
<para>
Install <application>Qtwebkit</application> by running the following commands:
</para>
<screen><userinput>syncqt.pl -version 5.6.0 Source/sync.profile &amp;&amp;
qmake &amp;&amp;
make</userinput></screen>
<para>
This package does not come with a test suite.
</para>
<para>
Now, as the <systemitem class="username">root</systemitem> user:
</para>
<screen role="root"><userinput>make install</userinput></screen>
<note><para>The installation is automatically made to the
$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:
</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 \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
</sect2>
<sect2 role="commands">
<title>Command Explanations</title>
<para>
<command>syncqt.pl ...</command>: is a Qt internal development tool
that synchronizes Qt header files.
</para>
<para>
<command>qmake</command>: is a Qt tool that automates the generation of
Makefiles.
</para>
</sect2>
<sect2 role="content">
<title>Contents</title>
<segmentedlist>
<segtitle>Installed Programs</segtitle>
<segtitle>Installed Libraries</segtitle>
<segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>
None
</seg>
<seg>
libQt5WebKit.so and
libQt5WebKitWidgets.so
</seg>
<seg>
$QT5PREFIX/qml/QtWebKit,
$QT5PREFIX/lib/cmake/Qt5WebKit{,Widgets},
$QT5PREFIX/include/QtWebKit{,Widgets), and
$QT5PREFIX/plugins/webkit
</seg>
</seglistitem>
</segmentedlist>
</sect2>
</sect1>