[swift: 1/2] hack moc-qt4 execution to not parse boost headers

[Jan Kaluža]

commit bd024275c6e92e394dfa84cbda1d45a6c999be39
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Thu Dec 1 12:16:34 2011 +0100

    hack moc-qt4 execution to not parse boost headers

 swift-moc-boost-join.patch |   13 +++++++++++++
 swift.spec                 |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/swift-moc-boost-join.patch b/swift-moc-boost-join.patch
new file mode 100644
index 0000000..bc251dd
--- /dev/null
+++ b/swift-moc-boost-join.patch
@@ -0,0 +1,13 @@
+diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
+index 0f2e976..af3ec05 100644
+--- a/BuildTools/SCons/Tools/qt4.py
++++ b/BuildTools/SCons/Tools/qt4.py
+@@ -254,7 +254,7 @@ def generate(env):
+ 	env.Replace(
+ 		QTDIR  = _detect(env),
+ 		# TODO: This is not reliable to QTDIR value changes but needed in order to support '-qt4' variants
+-		QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']),
++		QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']) + " -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED",
+ 		QT4_UIC = locateQt4Command(env,'uic', env['QTDIR']),
+ 		QT4_RCC = locateQt4Command(env,'rcc', env['QTDIR']),
+ 		QT4_LUPDATE = locateQt4Command(env,'lupdate', env['QTDIR']),
diff --git a/swift.spec b/swift.spec
index b077a77..8ff0dfd 100644
--- a/swift.spec
+++ b/swift.spec
@@ -1,7 +1,7 @@
 Summary: XMPP client
 Name: swift
 Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Applications/Internet
 License: GPLv3
 # The source for this package was pulled from upstream's vcs.  Use the
@@ -15,6 +15,7 @@ Source1: %{name}.desktop
 Patch0: swift-build.patch
 Patch1: swift-login-crash.patch
 Patch2: swift-vector-refs.patch
+Patch3: swift-moc-boost-join.patch
 URL: http://swift.im/
 BuildRequires: scons
 BuildRequires: qt-devel
@@ -39,6 +40,7 @@ application.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Remove 3rd party libraries.
 find 3rdParty/Boost -delete
@@ -85,6 +87,9 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Nov 22 2011 Jan Kaluza <jkaluza at redhat.com> - 1.0-6
+- hack moc-qt4 execution to not parse boost headers
+
 * Tue Nov 22 2011 Jan Kaluza <jkaluza at redhat.com> - 1.0-5
 - rebuild for new boost