linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-06 00:48:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version upgrade Qt-5.10.0 and QtWebEngine-5.10.0

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19602 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Thomas Trepl 2017-12-17 07:01:39 +00:00
parent b13548d2bf
commit 08f2ed340b
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
general.ent
View File

@ -1,6 +1,6 @@
<!-- $LastChangedBy$ $Date$ --> <!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "16"> <!-- Always 2 digits --> <!ENTITY day "17"> <!-- Always 2 digits -->
<!ENTITY month "12"> <!-- Always 2 digits --> <!ENTITY month "12"> <!-- Always 2 digits -->
<!ENTITY year "2017"> <!ENTITY year "2017">
<!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyrightdate "2001-&year;">

10
introduction/welcome/changelog.xml
View File

@ -41,6 +41,16 @@
</itemizedlist> </itemizedlist>
</listitem> </listitem>
--> -->
<listitem>
<para>December 17th, 2017</para>
<itemizedlist>
<listitem>
<para>[thomas] - Update to Qt-5.10.0 and QtWebEngine-5.10.0. Fixes
<ulink url="&blfs-ticket-root;10139">#10139</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>December 16th, 2017</para> <para>December 16th, 2017</para>
<itemizedlist> <itemizedlist>

4
packages.ent
View File

@ -576,8 +576,8 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY libxklavier-version "5.4"> <!ENTITY libxklavier-version "5.4">
<!ENTITY pango-version "1.40.14"> <!ENTITY pango-version "1.40.14">
<!ENTITY pangomm-version "2.40.1"> <!ENTITY pangomm-version "2.40.1">
<!ENTITY qt5-version "5.9.3"> <!ENTITY qt5-version "5.10.0">
<!ENTITY qtwebengine-version "5.9.3"> <!ENTITY qtwebengine-version "5.10.0">
<!ENTITY qtwebkit-version "5.9.0"> <!ENTITY qtwebkit-version "5.9.0">
<!ENTITY qscintilla-version "2.10.2"> <!ENTITY qscintilla-version "2.10.2">
<!ENTITY shared-mime-info-version "1.9"> <!ENTITY shared-mime-info-version "1.9">

20
x/lib/qt5.xml
View File

@ -4,15 +4,15 @@
<!ENTITY % general-entities SYSTEM "../../general.ent"> <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities; %general-entities;
<!ENTITY qt5-major "5.9"> <!ENTITY qt5-major "5.10">
<!ENTITY qt5-url "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single"> <!ENTITY qt5-url "https://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-http "&qt5-url;/qt-everywhere-src-&qt5-version;.tar.xz">
<!ENTITY qt5-download-ftp " "> <!ENTITY qt5-download-ftp " ">
<!ENTITY qt5-md5sum "eae2435509493a2084405714e0a9bdf9"> <!ENTITY qt5-md5sum "c5e275ab0ed7ee61d0f4b82cd471770d">
<!ENTITY qt5-size "288 MB"> <!ENTITY qt5-size "289 MB">
<!ENTITY qt5-buildsize "8.7 GB (215 MB installed)"> <!ENTITY qt5-buildsize "9.6 GB (225 MB installed)">
<!ENTITY qt5-time "25 SBU (using parallelism=4)"> <!ENTITY qt5-time "29.8 SBU (using parallelism=4)">
]> ]>
<sect1 id="qt5" xreflabel="Qt-&qt5-version;"> <sect1 id="qt5" xreflabel="Qt-&qt5-version;">
@ -82,7 +82,6 @@
<bridgehead renderas="sect4">Required</bridgehead> <bridgehead renderas="sect4">Required</bridgehead>
<para role="required"> <para role="required">
<xref linkend="python2"/> and
<xref linkend="xorg7-lib"/> <xref linkend="xorg7-lib"/>
</para> </para>
@ -103,7 +102,6 @@
<xref linkend="libxkbcommon"/>, <xref linkend="libxkbcommon"/>,
<xref linkend="mesa"/>, <xref linkend="mesa"/>,
<xref linkend="mtdev"/>, <xref linkend="mtdev"/>,
<xref linkend="openssl10"/>,
<xref linkend="pcre2"/>, <xref linkend="pcre2"/>,
<xref linkend="sqlite"/>, <xref linkend="sqlite"/>,
<xref linkend="wayland"/> (<application>Mesa</application> <xref linkend="wayland"/> (<application>Mesa</application>
@ -240,11 +238,7 @@ ln -sfnv qt-&qt5-version; /opt/qt5</userinput></screen>
Install <application>Qt5</application> by running the following commands: Install <application>Qt5</application> by running the following commands:
</para> </para>
<screen><userinput>echo "INCLUDEPATH += /usr/include/openssl-1.0" >> \ <screen><userinput>./configure -prefix $QT5PREFIX \
qtbase/src/network/network.pro &amp;&amp;
export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' &amp;&amp;
./configure -prefix $QT5PREFIX \
-sysconfdir /etc/xdg \ -sysconfdir /etc/xdg \
-confirm-license \ -confirm-license \
-opensource \ -opensource \

8
x/lib/qtwebengine.xml
View File

@ -4,13 +4,13 @@
<!ENTITY % general-entities SYSTEM "../../general.ent"> <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities; %general-entities;
<!ENTITY qtwebengine-major "5.9"> <!ENTITY qtwebengine-major "5.10">
<!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-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-download-ftp " ">
<!ENTITY qtwebengine-md5sum "3d9a205f94117d1fcd61544b02d32d99"> <!ENTITY qtwebengine-md5sum "0ea0b32e97911cf80d32b31cf10a6d8b">
<!ENTITY qtwebengine-size "208 MB"> <!ENTITY qtwebengine-size "208 MB">
<!ENTITY qtwebengine-buildsize "3.2 GB (141 MB installed)"> <!ENTITY qtwebengine-buildsize "3.3 GB (144 MB installed)">
<!ENTITY qtwebengine-time "60 SBU (using 4 cores)"> <!ENTITY qtwebengine-time "95 SBU (using 4 cores)">
<!-- Both qmake and ninja will use all available cores, in fact ninja runs n+2 <!-- Both qmake and ninja will use all available cores, in fact ninja runs n+2
jobs at a time. Most of our readers do not have more than 4 cores. jobs at a time. Most of our readers do not have more than 4 cores.