From 13963ffa1a45ea09ea8005a5e20ed9be0b92547c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 25 Jun 2012 11:41:56 +0000 Subject: [PATCH] - rel 5 - work around a MOC issue with Boost 1.48 headers (RHBZ #756395) Changed files: moc-boost148.patch -> 1.1 qt4.spec -> 1.320 --- moc-boost148.patch | 11 +++++++++++ qt4.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 moc-boost148.patch diff --git a/moc-boost148.patch b/moc-boost148.patch new file mode 100644 index 0000000..f0ce656 --- /dev/null +++ b/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/qt4.spec b/qt4.spec index 315fc0c..76b8250 100644 --- a/qt4.spec +++ b/qt4.spec @@ -55,7 +55,7 @@ Summary(pl.UTF-8): Biblioteka Qt do tworzenia GUI 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 @@ -83,6 +83,7 @@ Patch10: %{name}-git.patch 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 @@ -1416,6 +1417,7 @@ Programas exemplo para o Qt versão. %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 -- 2.44.0