Changeset 204fe99 for x

Timestamp:

09/09/2013 05:09:36 PM (11 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

fcf9527

Parents:

754b81f

Message:

Update to Qt-5.1.1.
Tag transmission and add patch to allow Qt4 builds
Add an additional config item for xorg

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

Location:

x

Files:

• installing/xorg7.xml (modified) (1 diff)
• lib/qt5.xml (modified) (5 diffs)

x/installing/xorg7.xml

@@ -209 +209 @@
 <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

x/lib/qt5.xml

@@ -10 +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">
 ]>
 
@@ -298 +298 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../qt-&qt5-version;-bison_fixes-1.patch &amp;&amp;
+<screen><userinput>sed -i "s:Context\* context}:&amp;\n%lex-param {YYLEX_PARAM}:" \
+     qtwebkit/Source/ThirdParty/ANGLE/src/compiler/glslang.y &amp;&amp;
+
+sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
+     qtimageformats/config.tests/libmng/libmng.cpp &amp;&amp;
 
 QT5DIR=/opt/qt-&qt5-version;
@@ -343 +347 @@
    -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
@@ -355 +360 @@
   ln -sfv $file /usr/bin/$(basename $file)-qt5
 done</userinput></screen>
-
+-->
     <para>
       At this point is is useful to add some configuration items as 
@@ -460 +465 @@
       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