packages: qt4/qt4.spec, qt4/moc-boost148.patch (NEW)=?UTF-8?Q?=20?=- rel 5 - work around ...

[baggins]

Author: baggins                      Date: Mon Jun 25 11:42:01 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- work around a MOC issue with Boost 1.48 headers (RHBZ #756395)

---- Files affected:
packages/qt4:
   qt4.spec (1.319 -> 1.320) , moc-boost148.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.319 packages/qt4/qt4.spec:1.320
--- packages/qt4/qt4.spec:1.319	Sun Jun 24 23:32:01 2012
+++ packages/qt4/qt4.spec	Mon Jun 25 13:41:56 2012
@@ -56,7 +56,7 @@
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt4
 Version:	4.8.2
-Release:	4
+Release:	5
 License:	LGPL v2.1 or GPL v3.0
 Group:		X11/Libraries
 Source0:	http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -84,6 +84,7 @@
 Patch11:	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 Patch12:	gcc-4.7.patch
 Patch13:	webkit-no_Werror.patch
+Patch14:	moc-boost148.patch
 URL:		http://qt.nokia.com/
 %{?with_ibase:BuildRequires:	Firebird-devel}
 BuildRequires:	Mesa-libOpenVG-devel
@@ -1417,6 +1418,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
 	mkspecs/common/linux.conf
@@ -2424,6 +2426,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.320  2012/06/25 11:41:56  baggins
+- rel 5
+- work around a MOC issue with Boost 1.48 headers (RHBZ #756395)
+
 Revision 1.319  2012/06/24 21:32:01  arekm
 - release 4 (by relup.sh)
 

================================================================
Index: packages/qt4/moc-boost148.patch
diff -u /dev/null packages/qt4/moc-boost148.patch:1.1
--- /dev/null	Mon Jun 25 13:42:01 2012
+++ packages/qt4/moc-boost148.patch	Mon Jun 25 13:41:56 2012
@@ -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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/qt4/qt4.spec?r1=1.319&r2=1.320