Author: fernando
Date: Fri Feb 7 10:05:27 2014
New Revision: 12680
Log:
Updates to git-1.8.5.4 and qt-5.2.1. Qt4 - Method 2: Installing in
/opt/qt-4.8.5.
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/prog/git.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/lib/qt4.xml
trunk/BOOK/x/lib/qt5.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Fri Feb 7 05:15:53 2014 (r12679)
+++ trunk/BOOK/general.ent Fri Feb 7 10:05:27 2014 (r12680)
@@ -376,7 +376,7 @@
<!ENTITY gcc-version "4.8.2">
<!ENTITY gc-version "7.4.0">
<!ENTITY gdb-version "7.7">
-<!ENTITY git-version "1.8.5.3">
+<!ENTITY git-version "1.8.5.4">
<!ENTITY guile-version "2.0.9">
<!ENTITY librep-version "0.92.3">
<!ENTITY llvm-version "3.4">
@@ -572,7 +572,7 @@
<!ENTITY pangox-version "0.0.2">
<!ENTITY pangomm-version "2.34.0">
<!ENTITY qt4-version "4.8.5">
-<!ENTITY qt5-version "5.2.0">
+<!ENTITY qt5-version "5.2.1">
<!ENTITY shared-mime-info-version "1.2">
<!ENTITY startup-notification-version "0.12">
<!ENTITY webkitgtk-version "1.10.2"> <!-- Even minors only -->
Modified: trunk/BOOK/general/prog/git.xml
==============================================================================
--- trunk/BOOK/general/prog/git.xml Fri Feb 7 05:15:53 2014 (r12679)
+++ trunk/BOOK/general/prog/git.xml Fri Feb 7 10:05:27 2014 (r12680)
@@ -8,10 +8,10 @@
<!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
<!ENTITY git-download-ftp " ">
- <!ENTITY git-md5sum "2a8a515c3e69e26d5e027aec7c9e9150">
+ <!ENTITY git-md5sum "d9ded03c71c4cd2eafa38a6f74b69870">
<!ENTITY git-size "3.2 MB">
- <!ENTITY git-buildsize "190 MB (additional 14 MB with downloaded docs
and man pages, or 24 MB building docs and man pages)">
- <!ENTITY git-time "0.7 SBU (additional 8 SBU for tests and 2.7 SBU
+ <!ENTITY git-buildsize "190 MB (additional 15 MB with downloaded docs
and man pages, or 24 MB building docs and man pages)">
+ <!ENTITY git-time "0.7 SBU (additional 4.7 SBU for tests and 2.6 SBU
for docs and man creation)">
]>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Fri Feb 7 05:15:53
2014 (r12679)
+++ trunk/BOOK/introduction/welcome/changelog.xml Fri Feb 7 10:05:27
2014 (r12680)
@@ -47,7 +47,19 @@
<para>February 7th, 2014</para>
<itemizedlist>
<listitem>
- <para>[fernando] - Update to MesaLib-10.0.3, split GLU. Fixes
+ <para>[fernando] - Qt4 - Method 2: Installing in /opt/qt-4.8.5. Fixes
+ <ulink url="&blfs-ticket-root;4669">#4669</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[fernando] - Update to qt-5.2.1. Thanks Armin K. Fixes
+ <ulink url="&blfs-ticket-root;4659">#4659</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[fernando] - Update to git-1.8.5.4. Fixes
+ <ulink url="&blfs-ticket-root;4666">#4666</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[igor] - Update to MesaLib-10.0.3, split GLU. Fixes
<ulink url="&blfs-ticket-root;4546">#4546</ulink>.</para>
</listitem>
</itemizedlist>
Modified: trunk/BOOK/x/lib/qt4.xml
==============================================================================
--- trunk/BOOK/x/lib/qt4.xml Fri Feb 7 05:15:53 2014 (r12679)
+++ trunk/BOOK/x/lib/qt4.xml Fri Feb 7 10:05:27 2014 (r12680)
@@ -326,7 +326,7 @@
export QTDIR=/opt/qt-&qt4-version;
-./configure -prefix $QTDIR \
+./configure -prefix $QTDIR \
-sysconfdir /etc/xdg \
-confirm-license \
-opensource \
@@ -349,8 +349,7 @@
Now, as the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>make install &&
-ln -svfn qt-&qt4-version; /opt/qt &&
+<screen role="root"><userinput>make install &&
install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
/usr/share/pixmaps/qt4logo.png &&
@@ -377,6 +376,19 @@
unset file</userinput></screen>
+ <para>
+ Symlink the <application>Qt4</application> executables into
+ <filename class="directory">/usr/bin</filename> by running the
+ following commands as the
+ <systemitem class="username">root</systemitem> user:
+ </para>
+
+<screen role="root"><userinput>ln -svf $QTDIR /opt/qt &&
+
+for file in /opt/qt/bin/*; do
+ ln -sfvn $file /usr/bin/$(basename $file)-qt4
+done</userinput></screen>
+
</sect2>
<sect2 role="commands">
Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml Fri Feb 7 05:15:53 2014 (r12679)
+++ trunk/BOOK/x/lib/qt5.xml Fri Feb 7 10:05:27 2014 (r12680)
@@ -9,7 +9,7 @@
<!ENTITY qt5-download-http
"&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
<!ENTITY qt5-download-ftp " ">
- <!ENTITY qt5-md5sum "8f60b47ca9461831d940f579ee90517e">
+ <!ENTITY qt5-md5sum "0c8d2aa45f38be9c3f7c9325eb059d9d">
<!ENTITY qt5-size "166 MB">
<!ENTITY qt5-buildsize "2.6 GB (160 MB installed)">
<!ENTITY qt5-time "60 SBU">
@@ -96,13 +96,14 @@
<xref linkend="cups"/>,
<xref linkend="dbus"/>,
<xref linkend="glib2"/>,
- <xref linkend="gst-plugins-base"/>,
- <xref linkend="harfbuzz"/>,
+ <xref linkend="gst-plugins-base"/>,<!--
+ <xref linkend="harfbuzz"/>, Doesn't have all the features that the
shipped one has. -->
<xref linkend="icu"/>,
<xref linkend="libjpeg"/>,
<xref linkend="libmng"/>,
<xref linkend="libpng"/>,
<xref linkend="libtiff"/>,
+ <xref linkend="mtdev"/>,
<xref linkend="openssl"/>,
<xref linkend="pcre"/>, and
<xref linkend="sqlite"/>
@@ -110,8 +111,10 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
+ <xref linkend="geoclue"/>,
<xref linkend="gst10-plugins-base"/> (QtWebKit HTML5 Video Support),
<xref linkend="gtk2"/> (GTK+ Theme Support),
+ <ulink url="https://code.google.com/p/ibus/";>IBus</ulink>,
<ulink url="http://xkbcommon.org/";>libxkbcommon</ulink>,
<xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="postgresql"/>,
@@ -213,18 +216,17 @@
following commands:
</para>
+ <!-- This is rather a bad idea. Most apps that I've seen using Qt5 look
for -qt5
+ suffixed programs.
+
<note>
<para>
If <emphasis>not</emphasis> also installing
<application>Qt4</application>
into the /usr directory, change the entry for -bindir below to
/usr/bin.
</para>
- </note>
-
-<screen><userinput>sed -e "s:#if MNG:#if defined(MNG_VERSION_MAJOR)\n&:" \
- -e "s:#endif:&\n#endif:" \
- -i qtimageformats/config.tests/libmng/libmng.cpp
+ </note> -->
-./configure -prefix /usr \
+<screen><userinput>./configure -prefix /usr \
-sysconfdir /etc/xdg \
-bindir /usr/lib/qt5/bin \
-headerdir /usr/include/qt5 \
@@ -236,8 +238,8 @@
-confirm-license \
-opensource \
-dbus-linked \
- -openssl-linked \
- -system-harfbuzz \
+ -openssl-linked \<!--
+ -system-harfbuzz \-->
-system-sqlite \
-no-nis \
-nomake examples \
@@ -283,7 +285,7 @@
'/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {}
\;</userinput></screen>
<para>
- If you didn't modify the -bindir switch above, symlink the
+ <!-- If you didn't modify the -bindir switch above, -->Symlink the
<application>Qt5</application> executables into
<filename class="directory">/usr/bin</filename> by running the
following commands as the
@@ -309,19 +311,15 @@
and <application>Qt5</application> executables when needed.
</para>
-<screen><userinput>sed -e "s:#if MNG:#if defined(MNG_VERSION_MAJOR)\n&:" \
- -e "s:#endif:&\n#endif:" \
- -i qtimageformats/config.tests/libmng/libmng.cpp
-
-QT5DIR=/opt/qt-&qt5-version;
+<screen><userinput>export QT5DIR=/opt/qt-&qt5-version;
./configure -prefix $QT5DIR \
-sysconfdir /etc/xdg \
-confirm-license \
-opensource \
-dbus-linked \
- -openssl-linked \
- -system-harfbuzz \
+ -openssl-linked \<!--
+ -system-harfbuzz \-->
-system-sqlite \
-no-nis \
-nomake examples \
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
