From 060db3c767b670dc1e168252644c937abc9fe607 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 4 Dec 2011 00:31:37 +0100 Subject: [PATCH] * Sat Dec 03 2011 Kevin Kofler 4.8.0-0.27.rc1 - work around a MOC issue with Boost 1.48 headers (#756395) --- ...ywhere-opensource-src-4.8.0-rc1-moc-boost148.patch | 11 +++++++++++ qt.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch diff --git a/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch b/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch new file mode 100644 index 0000000..f0ce656 --- /dev/null +++ b/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch @@ -0,0 +1,11 @@ +diff -ur qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp +--- qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp 2011-10-04 05:44:32.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp 2011-12-04 00:11:25.000000000 +0100 +@@ -187,6 +187,7 @@ + Moc moc; + pp.macros["Q_MOC_RUN"]; + pp.macros["__cplusplus"]; ++ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // rh#756395 + QByteArray filename; + QByteArray output; + FILE *in = 0; diff --git a/qt.spec b/qt.spec index 51194e9..a8ccf64 100644 --- a/qt.spec +++ b/qt.spec @@ -11,7 +11,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.0 -Release: 0.26.rc1%{?dist} +Release: 0.27.rc1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -49,6 +49,9 @@ 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 + ## upstreamable bits # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch @@ -402,6 +405,7 @@ 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 ## TODO: still worth carrying? if so, upstream it. %patch53 -p1 -b .qatomic-inline-asm ## TODO: upstream me @@ -1059,6 +1063,9 @@ fi %changelog +* Sat Dec 03 2011 Kevin Kofler 4.8.0-0.27.rc1 +- work around a MOC issue with Boost 1.48 headers (#756395) + * Wed Nov 30 2011 Than Ngo - 4.8.0-0.26.rc1 - workaround crash on ppc64