Changeset 640f4c2


Ignore:
Timestamp:
06/01/2017 03:30:51 PM (4 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/refactor-virt, lazarus, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
a01d308
Parents:
d0db416
Message:

Update to qt-5.9.0. Includes qtwebkit and qtwebengine.

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

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    rd0db416 r640f4c2  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "31">                   <!-- Always 2 digits -->
    4 <!ENTITY month        "05">                   <!-- Always 2 digits -->
     3<!ENTITY day          "01">                   <!-- Always 2 digits -->
     4<!ENTITY month        "06">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2017">
    66<!ENTITY copyrightdate "2001-&year;">
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "May 31st &year;">
     9<!ENTITY releasedate  "June 1st &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • introduction/welcome/changelog.xml

    rd0db416 r640f4c2  
    4343-->
    4444    <listitem>
     45      <para>June 1st, 2017</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[bdubbs] - Update to qt-5.9.0. Includes
     49          qtwebkit and qtwebengine. Fixes
     50          <ulink url="&blfs-ticket-root;9300">#9300</ulink>.</para>
     51        </listitem>
     52      </itemizedlist>
     53    </listitem>
     54
     55    <listitem>
    4556      <para>May 31st, 2017</para>
    4657      <itemizedlist>
  • packages.ent

    rd0db416 r640f4c2  
    553553<!ENTITY pango-version                "1.40.5">
    554554<!ENTITY pangomm-version              "2.40.1">
    555 <!ENTITY qt5-version                  "5.8.0">
    556 <!ENTITY qtwebengine-version          "5.8.0">
    557 <!ENTITY qtwebkit-version             "5.8.0">
     555<!ENTITY qt5-version                  "5.9.0">
     556<!ENTITY qtwebengine-version          "5.9.0">
     557<!ENTITY qtwebkit-version             "5.9.0">
    558558<!ENTITY shared-mime-info-version     "1.8">
    559559<!ENTITY startup-notification-version "0.12">
  • x/lib/qt5.xml

    rd0db416 r640f4c2  
    55  %general-entities;
    66
    7   <!ENTITY qt5-major "5.8">
     7  <!ENTITY qt5-major "5.9">
    88  <!ENTITY qt5-url   "http://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
    99
    1010  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
    1111  <!ENTITY qt5-download-ftp  " ">
    12   <!ENTITY qt5-md5sum        "66660cd3d9e1a6fed36e88adcb72e9fe">
    13   <!ENTITY qt5-size          "354 MB">
    14   <!ENTITY qt5-buildsize     "8.8 GB (178 MB installed)">
    15   <!ENTITY qt5-time          "23 SBU (using parallelism=4)">
     12  <!ENTITY qt5-md5sum        "9c8bc8b828c2b56721980368266df9d9">
     13  <!ENTITY qt5-size          "439 MB">
     14  <!ENTITY qt5-buildsize     "8.9 GB (214 MB installed)">
     15  <!ENTITY qt5-time          "29 SBU (using parallelism=4)">
    1616]>
    1717
     
    4444
    4545    &lfs80_checked;
     46    &gcc7_checked;
    4647
    4748    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    251252<screen role="root"><userinput>make install</userinput></screen>
    252253
     254<!-- Not needed any more
    253255    <para>
    254256      Remove references to the build directory from the installed
     
    259261
    260262<screen role="root"><userinput>find $QT5PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
    261 
     263-->
    262264    <para>
    263265      Remove references to the build directory from installed library
    264       dependency (prl) and profile include (pri) files by running the following
    265       commands as the <systemitem class="username">root</systemitem> user:
    266     </para>
    267 
    268 <screen role="root"><userinput>find $QT5PREFIX/ -name qt_lib_bootstrap_private.pri \
     266      dependency (prl) <!--and profile include (pri)--> files by running the following
     267      command as the <systemitem class="username">root</systemitem> user:
     268    </para>
     269
     270<!-- Not needed any more
     271find $QT5PREFIX/ -name qt_lib_bootstrap_private.pri \
    269272   -exec sed -i -e "s:$PWD/qtbase:/$QT5PREFIX/lib/:g" {} \; &amp;&amp;
    270 
    271 find $QT5PREFIX/ -name \*.prl \
     273-->
     274
     275<screen role="root"><userinput>find $QT5PREFIX/ -name \*.prl \
    272276   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
    273277
  • x/lib/qtwebengine.xml

    rd0db416 r640f4c2  
    55  %general-entities;
    66
    7   <!ENTITY qtwebengine-major "5.8">
     7  <!ENTITY qtwebengine-major "5.9">
    88  <!ENTITY qtwebengine-download-http "https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-opensource-src-&qtwebengine-version;.tar.xz">
    99  <!ENTITY qtwebengine-download-ftp  " ">
    10   <!ENTITY qtwebengine-md5sum        "6e7fb2be161c6db4d988a4f5b329672f">
    11   <!ENTITY qtwebengine-size          "187 MB">
    12   <!ENTITY qtwebengine-buildsize     "2.5 GB (153 MB installed including docs)">
     10  <!ENTITY qtwebengine-md5sum        "d7ca5049baf5ff69d69ee58d5da392d4">
     11  <!ENTITY qtwebengine-size          "208 MB">
     12  <!ENTITY qtwebengine-buildsize     "3.2 GB (153 MB installed)">
    1313  <!ENTITY qtwebengine-time          "43 SBU (on a 4 core processor)">
    1414
     
    101101    <para role="required">
    102102      <xref linkend="nss"/>,
    103       <xref linkend="pulseaudio"/>,
     103      <xref linkend="pulseaudio"/>, and
    104104      <xref linkend='qt5'/>
    105105    </para>
     
    117117      <xref linkend="libwebp"/>,
    118118      <xref linkend="libxslt"/>,
    119       <xref linkend="opus"/>
     119      <xref linkend="opus"/>, and
     120      <xref linkend="rust"/>
    120121    </para>
    121122
     
    141142    </para>
    142143
    143 <screen><userinput>
    144 patch -Np1 -i ../qtwebengine-&qtwebengine-version;-gcc7-1.patch &amp;&amp;
    145 qmake -r                                        &amp;&amp;
     144<screen><userinput>mkdir build &amp;&amp;
     145cd    build &amp;&amp;
     146
     147qmake ..    &amp;&amp;
    146148make</userinput></screen>
    147 
     149<!--
    148150    <para>
    149151      if you wish to build the HTML documentation, issue:
     
    151153
    152154<screen><userinput>make docs</userinput></screen>
    153 
     155-->
    154156    <para>
    155157      This package does not come with a test suite.
     
    160162    </para>
    161163
    162 <screen role="root"><userinput>make install &amp;&amp;
    163 ldconfig</userinput></screen>
    164 
     164<screen role="root"><userinput>make install</userinput></screen>
     165<!--
    165166    <para>
    166167      If you built the HTML documentation, install it with:
     
    168169
    169170<screen role="root"><userinput>make install_docs</userinput></screen>
    170 
     171-->
    171172    <para>
    172173      Remove references to the build directory from installed library
     
    183184
    184185    <para>
    185       <command>qmake -r</command>: This will build the included copy of
    186       <application>ninja</application> and use it to configure the build.
    187       That and the subsequent <command>make</command> command will use all
    188       available CPU cores.
     186      <command>qmake</command>: This will build the included copy of
     187      <application>ninja</application> if it is not already installed
     188      and use it to configure the build.  That and the subsequent
     189      <command>make</command> command will use all available CPU cores.
    189190    </para>
    190191
     
    201202      <seglistitem>
    202203        <seg>
    203           qtwebengine_convert_dict,QtWebEngineProcess
     204          qtwebengine_convert_dict and
     205          QtWebEngineProcess
    204206        </seg>
    205207        <seg>
    206           libQt5WebEngineCore.so, libQt5WebEngine.so, libQt5WebEngineWidgets.so
     208          libQt5WebEngineCore.so,
     209          libQt5WebEngine.so, and
     210          libQt5WebEngineWidgets.so
    207211        </seg>
    208212        <seg>
    209213          $QT5PREFIX/doc/qtwebengine,
    210214          $QT5PREFIX/includeQtWebEngine,
    211           $QT5PREFIX/include/QtWebEngineCore,
     215          $QT5PREFIX/include/QtWebEngineCore, and
    212216          $QT5PREFIX/include/QtWebEngineWidgets
    213217        </seg>
  • x/lib/qtwebkit5.xml

    rd0db416 r640f4c2  
    55  %general-entities;
    66
    7   <!ENTITY qtwebkit-major "5.8">
     7  <!ENTITY qtwebkit-major "5.9">
    88  <!ENTITY qtwebkit-url   "http://download.qt.io/community_releases/&qtwebkit-major;/&qtwebkit-version;-final">
    99
    1010  <!ENTITY qtwebkit-download-http "&qtwebkit-url;/qtwebkit-opensource-src-&qtwebkit-version;.tar.xz">
    1111  <!ENTITY qtwebkit-download-ftp  " ">
    12   <!ENTITY qtwebkit-md5sum        "60a6935aca4a7c553d0ec4646ceed3b4">
     12  <!ENTITY qtwebkit-md5sum        "1fc0ed873cc9326b823a8a83126714f5">
    1313  <!ENTITY qtwebkit-size          "34 MB">
    14   <!ENTITY qtwebkit-buildsize     "766 MB (50 MB installed)">
     14  <!ENTITY qtwebkit-buildsize     "668 MB (38 MB installed)">
    1515  <!ENTITY qtwebkit-time          "11 SBU (using parallelism=4)">
    1616]>
     
    117117<screen><userinput>patch -Np1 -i ../qtwebkit-&qtwebkit-version;-icu_59-1.patch</userinput></screen>
    118118
     119    <para>If desired, adjust the build settings to avoid literally thousands
     120    of unneeded warning messages:</para>
     121
     122<screen><userinput>sed -e '/CONFIG/a QMAKE_CXXFLAGS += -Wno-expansion-to-defined' \
     123    -i Tools/qmake/mkspecs/features/unix/default_pre.prf</userinput></screen>
     124
    119125    <para>
    120126      Install <application>Qtwebkit</application> by running the following commands:
    121127    </para>
    122128
    123 <screen><userinput>SAVEPATH=$PATH             &amp;&amp;
    124 export PATH=$PWD/bin:$PATH &amp;&amp;
    125 
    126 mkdir -p build        &amp;&amp;
     129<screen><userinput>mkdir -p build        &amp;&amp;
    127130cd       build        &amp;&amp;
    128131
    129132qmake ../WebKit.pro   &amp;&amp;
    130 make                  &amp;&amp;
    131 
    132 export PATH=$SAVEPATH &amp;&amp;
    133 unset SAVEPATH </userinput></screen>
     133make</userinput></screen>
    134134
    135135    <para>
     
    147147
    148148    <para>
    149       Remove references to the build directory from the installed
    150       <filename class="extension">.pc</filename> files by running
    151       the following command as the
    152       <systemitem class="username">root</systemitem> user:
     149      Remove references to the build directory from installed
     150      profile include (pri) files by running the following
     151      command as the <systemitem class="username">root</systemitem> user:
    153152    </para>
    154153
    155 <screen role="root"><userinput>find $QT5DIR/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
    156 
    157     <para>
    158       Remove references to the build directory from installed library
    159       dependency (prl) and profile include (pri) files by running the following
    160       commands as the <systemitem class="username">root</systemitem> user:
    161     </para>
    162 
    163 <screen role="root"><userinput>find $QT5DIR/ -name qt_lib_bootstrap_private.pri \
    164    -exec sed -i -e "s:$PWD/qtbase:/$QT5DIR/lib/:g" {} \; &amp;&amp;
    165 
    166 find $QT5DIR/ -name \*.prl \
     154<screen role="root"><userinput>find $QT5DIR/ -name \*.prl \
    167155   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
    168156
     
    171159  <sect2 role="commands">
    172160    <title>Command Explanations</title>
    173 
    174     <para>
    175       <command>export PATH=$PWD/bin:$PATH</command>: sets a temporary path needed
    176       to complete the build and install process.
    177     </para>
    178161
    179162    <para>
Note: See TracChangeset for help on using the changeset viewer.