[qt] switch to upstream moc/boost patch

[Rex Dieter]

commit b21e1f54722abe258ca5fdf8cd0680820fe68f9b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 7 07:01:22 2013 -0600

    switch to upstream moc/boost patch

 0013-Fix-moc-from-choking-on-boost-headers.patch   |   33 ++++++++++++++++++++
 ...ere-opensource-src-4.8.0-rc1-moc-boost148.patch |   11 ------
 qt.spec                                            |    8 ++--
 3 files changed, 37 insertions(+), 15 deletions(-)
---
diff --git a/0013-Fix-moc-from-choking-on-boost-headers.patch b/0013-Fix-moc-from-choking-on-boost-headers.patch
new file mode 100644
index 0000000..1aea2c8
--- /dev/null
+++ b/0013-Fix-moc-from-choking-on-boost-headers.patch
@@ -0,0 +1,33 @@
+From a6305580b27f0bf1d268b5a3531c8332a57c3864 Mon Sep 17 00:00:00 2001
+From: Kevin Kofler <Kevin at tigcc.ticalc.org>
+Date: Sun, 25 Nov 2012 16:20:00 +0000
+Subject: [PATCH 13/90] Fix moc from choking on boost headers.
+
+Fixes several build failures with boost >= 1.48, for example
+the kdepim build: https://bugs.kde.org/show_bug.cgi?id=304111
+
+Task-number: QTBUG-22829
+Change-Id: Ic37a5290955fbfd18894a228cc9d57615edddea6
+Reviewed-by: Olivier Goffart <ogoffart at woboq.com>
+---
+ src/tools/moc/main.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
+index 33344fc..f558a5e 100644
+--- a/src/tools/moc/main.cpp
++++ b/src/tools/moc/main.cpp
+@@ -187,6 +187,10 @@ int runMoc(int _argc, char **_argv)
+     Moc moc;
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
++
++    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
++    pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++
+     QByteArray filename;
+     QByteArray output;
+     FILE *in = 0;
+-- 
+1.8.1
+
diff --git a/qt.spec b/qt.spec
index 6d4ee5a..ccc8f4b 100644
--- a/qt.spec
+++ b/qt.spec
@@ -48,9 +48,6 @@ Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 # workaround for gdal/grass crashers wrt glib_eventloop null deref's
 Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
 
-# workaround for a MOC issue with Boost 1.48 headers (#756395)
-Patch24: qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch
-
 # hack out largely useless (to users) warnings about qdbusconnection
 # (often in kde apps), keep an eye on https://git.reviewboard.kde.org/r/103699/
 Patch25: qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch
@@ -126,6 +123,8 @@ Patch101: 0054-Fix-binary-incompatibility-between-openssl-versions.patch
 # http://bugzilla.redhat.com/702493
 # https://bugreports.qt-project.org/browse/QTBUG-5545
 Patch102: qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch
+# workaround for a MOC issue with Boost 1.48 headers (#756395)
+Patch103: 0013-Fix-moc-from-choking-on-boost-headers.patch
 
 # security patches
 # CVE-2011-3922 qt: Stack-based buffer overflow in embedded harfbuzz code
@@ -445,7 +444,6 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 %patch4 -p1 -b .uic_multilib
 %patch15 -p1 -b .enable_ft_lcdfilter
 %patch23 -p1 -b .glib_eventloop_nullcheck
-%patch24 -p1 -b .moc-boost148
 %patch25 -p1 -b .qdbusconnection_no_debug
 %patch26 -p1 -b .linguist_qtmake-qt4
 %patch27 -p1 -b .qt3support_debuginfo
@@ -472,6 +470,8 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 %patch100 -p1 -b .QTgaHandler
 %patch101 -p1 -b .0054
 %patch102 -p1 -b .qgtkstyle_disable_gtk_theme_check
+%patch103 -p1 -b .moc-boost148
+
 
 # security fixes
 %patch200 -p1 -b .CVE-2011-3922