Ticket #4659: qt5.patch

general.ent

@@ -571 +571 @@
 <!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 -->

x/lib/qt5.xml

@@ -9 +9 @@
 
   <!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 +96 @@
       <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 +111 @@
 
     <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 +216 @@
       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>
+    </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               \
+<screen><userinput>./configure -prefix         /usr               \
             -sysconfdir     /etc/xdg           \
             -bindir         /usr/lib/qt5/bin   \
             -headerdir      /usr/include/qt5   \
@@ -236 +238 @@
             -confirm-license   \
             -opensource        \
             -dbus-linked       \
-            -openssl-linked    \
-            -system-harfbuzz   \
+            -openssl-linked    \<!--
+            -system-harfbuzz   \-->
             -system-sqlite     \
             -no-nis            \
             -nomake examples   \
@@ -283 +285 @@
      '/^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 +311 @@
       and <application>Qt5</application> executables when needed.
     </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
+<screen><userinput>QT5DIR=/opt/qt-&qt5-version;
 
-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     \