Changeset 1ef4048


Ignore:
Timestamp:
05/14/2016 09:15:35 PM (8 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
systemd-13485
Children:
6d27308
Parents:
f080ae0e
Message:

Updated to Qt-5.6.0 (merged from trunk... not tested yet)
Added qtwebkit5 page from trunk
Force gst-plugins-base to use Qt5
Added qt5 as a dependency for gst-plugins-bad
Forced wpa_supplicant to use Qt5
Removed the Qt4 dependency from NetworkManager
Forced VLC to use Qt5
Archived qtchooser
Archived Amarok (will probably be readded when an official Qt5/KF5 ready release is provided)
Archived k3b (will probably be readded whan an official Qt5/KF5 ready release is made)
Dependency changes to Qt5

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17355 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
1 added
10 edited
3 moved

Legend:

Unmodified
Added
Removed

  • general/genutils/genutils.xml

    rf080ae0e r1ef4048  
    3535  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>
    3636  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
    37   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtchooser.xml"/>
     37<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtchooser.xml"/> -->
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rep-gtk.xml"/>

  • introduction/welcome/changelog.xml

    rf080ae0e r1ef4048  
    4949      <itemizedlist>
    5050        <listitem>
     51          <para>[renodr] - Major changes to Qt5 - Updated to 5.6.0, added
     52          QtWebkit5 page from trunk.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[renodr] - Force gst-plugins-base to use Qt5.</para>
     56        </listitem>
     57        <listitem>
     58          <para>[renodr] - Add qt5 as a dependency for gst-plugins-bad.</para>
     59        </listitem>
     60        <listitem>
     61          <para>[renodr] - Force wpa_supplicant to use Qt5.</para>
     62        </listitem>
     63        <listitem>
     64          <para>[renodr] - Remove Qt4 dependency from NetworkManager.</para>
     65        </listitem>
     66        <listitem>
     67          <para>[renodr] - Forced VLC to use Qt5.</para>
     68        </listitem>
     69        <listitem>
     70          <para>[renodr] - Archived qtchooser.</para>
     71        </listitem>
     72        <listitem>
     73          <para>[renodr] - Archived Amarok. This will likely be readded when
     74          a newer version with Qt5/KF5 support is released.</para>
     75        </listitem>
     76        <listitem>
     77          <para>[renodr] - Archived k3b. This will likely be readded when
     78          a newer version with Qt5/KF5 support is released.</para>
     79        </listitem>
     80        <listitem>
    5181          <para>[renodr] - Merged to trunk r17352.</para>
    5282        </listitem>

  • multimedia/libdriv/gst10-plugins-bad.xml

    rf080ae0e r1ef4048  
    123123      <xref linkend="openjpeg"/> or
    124124      <xref linkend="openjpeg2"/>,
     125      <xref linkend="qt5"/> (used for examples),
    125126      <xref linkend="sdl"/>,
    126127      <xref linkend="valgrind"/>,

  • multimedia/libdriv/gst10-plugins-base.xml

    rf080ae0e r1ef4048  
    105105      <xref linkend="gtk3"/>,
    106106      <xref linkend="gtk-doc"/>,
    107       <xref linkend="qt4"/>,
     107      <xref linkend="qt5"/> (used in examples),
    108108      <xref linkend="valgrind"/>,
    109109      <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>,

  • multimedia/videoutils/vlc.xml

    rf080ae0e r1ef4048  
    182182    <bridgehead renderas="sect4">Optional interface plugins</bridgehead>
    183183    <para role="optional">
    184       <xref linkend="qt4"/> (required for the graphical user interface),
    185       <xref linkend="qt5"/> (for some plugins, but currently broken with
    186       Qt-5.5),
     184      <xref linkend="qt5"/> (for the GUI and plugins),
    187185      <ulink url="http://pkgbuild.com/~giovanni/libtar/">libtar</ulink>, and
    188186      <ulink url="http://www.lirc.org/">LIRC</ulink>

  • networking/netprogs/wpa_supplicant.xml

    rf080ae0e r1ef4048  
    8989      <xref linkend="dbus"/>,
    9090      <xref linkend="libxml2"/>, and
    91       <xref linkend="qt4"/>
     91      <xref linkend="qt5"/>
    9292    </para>
    9393

  • networking/netutils/networkmanager.xml

    rf080ae0e r1ef4048  
    117117      <xref linkend="ModemManager"/>,
    118118      <xref linkend="pygobject3"/>,
    119       <xref linkend="qt4"/>,
    120119      <xref linkend="valgrind"/>,
    121120      <ulink url="http://libteam.org/">libteam</ulink>,

  • packages.ent

    rf080ae0e r1ef4048  
    529529<!ENTITY pangomm-version              "2.40.0">
    530530<!ENTITY qt4-version                  "4.8.7">
    531 <!ENTITY qt5-version                  "5.5.1">
     531<!ENTITY qt5-version                  "5.6.0">
     532<!ENTITY qtwebkit-version             "5.6.0">
    532533<!ENTITY shared-mime-info-version     "1.6">
    533534<!ENTITY startup-notification-version "0.12">

  • x/lib/lib.xml

    rf080ae0e r1ef4048  
    5959  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
    6060  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
     61  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/>
    6162  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
    6263  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>

  • x/lib/qt5.xml

    rf080ae0e r1ef4048  
    55  %general-entities;
    66
    7   <!ENTITY qt5-major "5.5">
     7  <!ENTITY qt5-major "5.6">
    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        "65d5282f3dee0336da9ed1f77148952f">
    13   <!ENTITY qt5-size          "305 MB">
    14   <!ENTITY qt5-buildsize     "7.3 GB (184 MB installed)">
    15   <!ENTITY qt5-time          "90 SBU">
     12  <!ENTITY qt5-md5sum        "47763c168f58b1196271b231f03c8bae">
     13  <!ENTITY qt5-size          "284 MB">
     14  <!ENTITY qt5-buildsize     "7.2 GB (163 MB installed, add 1.0 GB build size and 102 MB installed size for qtwebengine))">
     15  <!ENTITY qt5-time          "19.7 SBU (using parallelism=4, add 19 SBU for qtwebengine)">
    1616]>
    1717
    … …  
    8383    <bridgehead renderas="sect4">Required</bridgehead>
    8484    <para role="required">
     85      <xref linkend="python2"/> and
    8586      <xref linkend="xorg7-lib"/>
    8687    </para>
    … …  
    9192      <xref linkend="cacerts"/>,
    9293      <xref linkend="cups"/>,
    93       <xref linkend="dbus"/> (required for QtWebKit),
    9494      <xref linkend="glib2"/>,
    95       <xref linkend="gst10-plugins-base"/> (QtWebKit HTML5 Video Support),
    96       <xref linkend="icu"/> (required for QtWebKit),
     95      <xref linkend="gst10-plugins-base"/> (QtMultimedia backend),
     96      <xref linkend="icu"/>,
    9797      <xref linkend="jasper"/>,
    9898      <xref linkend="libjpeg"/>,
    … …  
    100100      <xref linkend="libpng"/>,
    101101      <xref linkend="libtiff"/>,
    102       <xref linkend="libwebp"/>,
    103102      <xref linkend="libxkbcommon"/>,
    104103      <xref linkend="mesa"/>,
    105104      <xref linkend="mtdev"/>,
     105      <xref linkend="nss"/> (required for QtWebEngine),
    106106      <xref linkend="openssl"/>,
    107107      <xref linkend="pcre"/>,
    108108      <xref linkend="sqlite"/>,
    109       <xref linkend="ruby"/> (required for QtWebKit),
    110109      <xref linkend="wayland"/> (<xref linkend="mesa"/> must be built with
    111110      support for wayland.),
    … …  
    118117    <bridgehead renderas="sect4">Optional</bridgehead>
    119118    <para role="optional">
    120       <xref linkend="bluez"/>,
    121       <xref linkend="geoclue"/>,
    122       <xref linkend="gtk2"/> (GTK+ Theme Support),
    123       <xref linkend="harfbuzz"/>, <!-- Doesn't have all the features that the included one has. -->
     119      <xref linkend="bluez"/> (runtime, used by the QtConnectivity module),
     120      <!-- dropped from 5.5      <xref linkend="geoclue"/>, -->
     121      <!-- dropped from 5.6     <xref linkend="gtk2"/> (GTK+ Theme Support), -->
     122      <xref linkend="harfbuzz"/>, <!-- Doesn't have all the features that the in
     123cluded one has. -->
     124      <xref linkend="libinput"/>, <!-- needs -libinput switch -->
    124125      <xref linkend="ibus"/>,
    125126      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
    … …  
    127128      <xref linkend="pulseaudio"/>,
    128129      <xref linkend="unixodbc"/>, and
    129       <ulink url="https://code.google.com/p/ibus/">IBus</ulink>.
     130      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>
    130131    </para>
    131132
    … …  
    214215        <application>Qt5</application> in /usr, the directories need to
    215216        be specified explicitly.  In this case, set QT5PREFIX=/usr and add
    216         the following to the configure arguments below:</para>
    217 
    218         <screen><userinput>-bindir         /usr/bin/qt5                \
     217        the following to the configure arguments below:
     218      </para>
     219
     220<screen role="nodump"><userinput>-bindir         /usr/bin/qt5                \
    219221-plugindir      /usr/lib/qt5/plugins        \
    220222-importdir      /usr/lib/qt5/imports        \
    … …  
    224226-translationdir /usr/share/qt5/translations \
    225227-demosdir       /usr/share/doc/qt5/demos    \
    226 -examplesdir    /usr/share/doc/qt5/examples </userinput></screen>
     228-examplesdir    /usr/share/doc/qt5/examples \</userinput></screen>
    227229    </note>
    228230
    … …  
    258260      Remove references to the build directory from the installed
    259261      <filename class="extension">.pc</filename> files by running
    260       the following command:
    261     </para>
    262 
    263 <screen><userinput>find $QT5PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
     262      the following command as the
     263      <systemitem class="username">root</systemitem> user:
     264    </para>
     265
     266<screen role="root"><userinput>find $QT5PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
    264267
    265268    <para>
    … …  
    269272    </para>
    270273
    271 <screen role="root"><userinput>find $QT5PREFIX -name qt_lib_bootstrap_private.pri \
     274<screen role="root"><userinput>find $QT5PREFIX/ -name qt_lib_bootstrap_private.pri \
    272275   -exec sed -i -e "s:$PWD/qtbase:/$QT5PREFIX/lib/:g" {} \; &amp;&amp;
    273276
    274 find $QT5PREFIX -name \*.prl \
     277find $QT5PREFIX/ -name \*.prl \
    275278   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
    276279
    … …  
    355358EOF</userinput></screen>
    356359
    357     <para>Some packages such as <xref linkend='vlc'/> look for certain
    358     executables with a -qt5 suffix.  Run the following command as the root user
    359     to create the necessary symlinks:</para>
     360  <para>
     361    Some packages such as <xref linkend='vlc'/> look for certain
     362    executables with a -qt5 suffix.  Run the following command as the
     363    <systemitem class="username">root</systemitem> user
     364    to create the necessary symlinks:
     365  </para>
    360366
    361367<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
    … …  
    445451      </para>
    446452
    447 <screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; EOF
     453<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
    448454<literal># Begin /etc/profile.d/qt5.sh
    449455
    450456QT5DIR=/usr
    451457export QT5DIR
     458pathappend $QT5DIR/bin/qt5
    452459
    453460# End /etc/profile.d/qt5.sh</literal>
    … …  
    467474      </para>
    468475
    469 <screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
     476<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
    470477<literal># Begin Qt addition
    471478
    … …  
    682689          <para>
    683690            takes a C++ source file and generates a D-Bus XML definition
    684             of the interface. 
     691            of the interface.
    685692          </para>
    686693          <indexterm zone="qt5 qdbuscpp2xml-qt5">
    … …  
    759766          <para>
    760767            is a tool used to generate a <application>Qt</application>
    761             compressed help file. 
     768            compressed help file.
    762769          </para>
    763770          <indexterm zone="qt5 qhelpgenerator-qt5">
Note: See TracChangeset for help on using the changeset viewer.