Changeset 79904cf for x/lib/qt5.xml

Timestamp:

02/07/2014 06:05:27 PM (10 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 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:

9db6c99

Parents:

8733e8e

Message:

Updates to git-1.8.5.4 and qt-5.2.1. Qt4 - Method 2: Installing in /opt/qt-4.8.5.

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

File:

• x/lib/qt5.xml (modified) (10 diffs)

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        "8f60b47ca9461831d940f579ee90517e">
+  <!ENTITY qt5-md5sum        "0c8d2aa45f38be9c3f7c9325eb059d9d">
   <!ENTITY qt5-size          "166 MB">
   <!ENTITY qt5-buildsize     "2.6 GB (160 MB installed)">
@@ -97 +97 @@
       <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"/>,
@@ -104 +104 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
+      <xref linkend="mtdev"/>,
       <xref linkend="openssl"/>,
       <xref linkend="pcre"/>, and
@@ -111 +112 @@
     <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"/>,
@@ -214 +217 @@
     </para>
 
+    <!-- This is rather a bad idea. Most apps that I've seen using Qt5 look for -qt5
+         suffixed programs.
+
     <note>
       <para>
@@ -219 +225 @@
         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&amp;:" \
-    -e "s:#endif:&amp;\n#endif:" \
-    -i qtimageformats/config.tests/libmng/libmng.cpp
-
-./configure -prefix         /usr               \
+    </note> -->
+
+<screen><userinput>./configure -prefix         /usr               \
             -sysconfdir     /etc/xdg           \
             -bindir         /usr/lib/qt5/bin   \
@@ -237 +239 @@
             -opensource        \
             -dbus-linked       \
-            -openssl-linked    \
-            -system-harfbuzz   \
+            -openssl-linked    \<!--
+            -system-harfbuzz   \-->
             -system-sqlite     \
             -no-nis            \
@@ -284 +286 @@
 
     <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
@@ -310 +312 @@
     </para>
 
-<screen><userinput>sed -e "s:#if MNG:#if defined(MNG_VERSION_MAJOR)\n&amp;:" \
-    -e "s:#endif:&amp;\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  \
@@ -321 +319 @@
             -opensource          \
             -dbus-linked         \
-            -openssl-linked      \
-            -system-harfbuzz     \
+            -openssl-linked      \<!--
+            -system-harfbuzz     \-->
             -system-sqlite       \
             -no-nis              \