Author: bdubbs
Date: Mon Sep 9 10:09:36 2013
New Revision: 11805
Log:
Update to Qt-5.1.1.
Tag transmission and add patch to allow Qt4 builds
Add an additional config item for xorg
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/installing/xorg7.xml
trunk/BOOK/x/lib/qt5.xml
trunk/BOOK/xsoft/other/transmission.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Mon Sep 9 08:57:23 2013 (r11804)
+++ trunk/BOOK/general.ent Mon Sep 9 10:09:36 2013 (r11805)
@@ -575,7 +575,7 @@
<!ENTITY pangox-version "0.0.2">
<!ENTITY pangomm-version "2.34.0">
<!ENTITY qt4-version "4.8.5">
-<!ENTITY qt5-version "5.1.0">
+<!ENTITY qt5-version "5.1.1">
<!ENTITY shared-mime-info-version "1.1">
<!ENTITY startup-notification-version "0.12">
<!ENTITY webkitgtk-version "1.10.2"> <!-- Even minors only -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Mon Sep 9 08:57:23
2013 (r11804)
+++ trunk/BOOK/introduction/welcome/changelog.xml Mon Sep 9 10:09:36
2013 (r11805)
@@ -47,6 +47,10 @@
<para>September 9th, 2013</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Update to Qt-5.1.1. Fixes
+ <ulink url="&blfs-ticket-root;4010">#4010</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[ken] - Reinstate seahorse, link to it from epiphany.</para>
</listitem>
</itemizedlist>
Modified: trunk/BOOK/x/installing/xorg7.xml
==============================================================================
--- trunk/BOOK/x/installing/xorg7.xml Mon Sep 9 08:57:23 2013 (r11804)
+++ trunk/BOOK/x/installing/xorg7.xml Mon Sep 9 10:09:36 2013 (r11805)
@@ -208,6 +208,13 @@
<screen><userinput role="root">sed
"s@/usr/X11R6@<replaceable>$XORG_PREFIX</replaceable>@g" -i
/etc/man_db.conf</userinput></screen>
+ <para>Some applications look for shared files in <filename
+ class="directory">/usr/share/X11</filename>. Create a symbolic link to the
+ proper location as the <systemitem class="username">root</systemitem>
+ user:</para>
+
+<screen><userinput role="root">ln -s $XORG_PREFIX/share/X11
/usr/share/X11</userinput></screen>
+
<para>Finally, if building on x86_64, you will need to create the
<filename class="directory">$XORG_PREFIX/lib</filename> directory and the
<filename>$XORG_PREFIX/lib64</filename> symlink. Again, as the
Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml Mon Sep 9 08:57:23 2013 (r11804)
+++ trunk/BOOK/x/lib/qt5.xml Mon Sep 9 10:09:36 2013 (r11805)
@@ -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 "44a507beebef73eb364b5a2ec7bbe090">
+ <!ENTITY qt5-md5sum "697b7b8768ef8895e168366ab6b44760">
<!ENTITY qt5-size "169 MB">
<!ENTITY qt5-buildsize "2.5 GB">
- <!ENTITY qt5-time "50 SBU">
+ <!ENTITY qt5-time "94 SBU">
]>
<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
@@ -297,7 +297,11 @@
However, it has the disadvantage of needing some extra configuration.
</para>
-<screen><userinput>patch -Np1 -i ../qt-&qt5-version;-bison_fixes-1.patch
&&
+<screen><userinput>sed -i "s:Context\* context}:&\n%lex-param
{YYLEX_PARAM}:" \
+ qtwebkit/Source/ThirdParty/ANGLE/src/compiler/glslang.y &&
+
+sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
+ qtimageformats/config.tests/libmng/libmng.cpp &&
QT5DIR=/opt/qt-&qt5-version;
@@ -342,6 +346,7 @@
find $QT5DIR -name \*.prl \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
+<!-- This is not needed for method 2
<para>
Symlink the <application>Qt</application> executables into
<filename class="directory">/usr/bin</filename> by running the
@@ -354,7 +359,7 @@
for file in /opt/qt5/bin/*; do
ln -sfv $file /usr/bin/$(basename $file)-qt5
done</userinput></screen>
-
+-->
<para>
At this point is is useful to add some configuration items as
the <systemitem class="username">root</systemitem> user:
@@ -459,7 +464,15 @@
If you installed <application>Qt5</application> in a location other
than /usr, you need to update the following configuration files so
that <application>Qt5</application> is correctly found by other packages
- and system processes.</para>
+ and system processes.
+ </para>
+
+ <note><para>
+ If you also installed Qt4 and need to use the Qt5 version of an
+ executable such as qmake for building a program, make sure that
+ the Qt5 bin directory is listed prior to the Qt4 bin directory in
+ the PATH variable.
+ </para></note>
<para>As the <systemitem class="username">root</systemitem> user, update
the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
Modified: trunk/BOOK/xsoft/other/transmission.xml
==============================================================================
--- trunk/BOOK/xsoft/other/transmission.xml Mon Sep 9 08:57:23 2013
(r11804)
+++ trunk/BOOK/xsoft/other/transmission.xml Mon Sep 9 10:09:36 2013
(r11805)
@@ -37,7 +37,7 @@
bandwidth.
</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -73,26 +73,37 @@
</listitem>
</itemizedlist>
+ <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>
+ Optional patch:
+ <ulink
url="&patch-root;/transmission-&transmission-version;-qt4-1.patch"/>
+ </para>
+ </listitem>
+ </itemizedlist>
+
<bridgehead renderas="sect3">Transmission Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
<xref linkend="curl"/>,
<xref linkend="intltool"/>,
- <xref linkend="libevent"/> and
+ <xref linkend="libevent"/>, and
<xref linkend="openssl"/>
</para>
<bridgehead renderas="sect4">Recommended (to build a GUI)</bridgehead>
<para role="recommended">
- <xref linkend="gtk3"/> or
- <xref linkend="qt5"/> and
- <xref linkend="gdb"/>
+ <xref linkend="gtk3"/> and either
+ <xref linkend="qt4"/> or
+ <xref linkend="qt5"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="doxygen"/>
+ <xref linkend="doxygen"/> and
+ <xref linkend="gdb"/>
</para>
<para condition="html" role="usernotes">
@@ -103,6 +114,11 @@
<sect2 role="installation">
<title>Installation of Transmission</title>
+ <para>If you want to build the Qt interface using <xref linkend="qt4"/>,
+ apply the following patch:</para>
+
+<screen><userinput>patch -Np1 -i
../transmission-&transmission-version;-qt4-1.patch</userinput></screen>
+
<para>
Install <application>Transmission</application> by running the following
commands:
@@ -112,13 +128,13 @@
make</userinput></screen>
<para>
- If you have installed <xref linkend="qt5"/> and would like to compile the
+ If you have installed Qt and would like to compile the
Qt GUI, run the following commands:
</para>
-<screen><userinput>pushd qt &&
-qmake-qt5 &&
-make &&
+<screen><userinput>pushd qt &&
+ qmake qtr.pro &&
+ make &&
popd</userinput></screen>
<para>
@@ -136,9 +152,10 @@
as the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>INSTALL_ROOT=/usr make -C qt install &&
+<screen role="root"><userinput>make INSTALL_ROOT=/usr -C qt install &&
+
install -m644 qt/transmission-qt.desktop
/usr/share/applications/transmission-qt.desktop &&
-install -m644 qt/icons/transmission.png
/usr/share/pixmaps/transmission-qt.png</userinput></screen>
+install -m644 qt/icons/transmission.png
/usr/share/pixmaps/transmission-qt.png</userinput></screen>
</sect2>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
