add moc-boost-workaround.patch

diff --git a/moc-boost-workaround.patch b/moc-boost-workaround.patch
new file mode 100644 (file)
index 0000000..bec8774
--- /dev/null
+++ b/moc-boost-workaround.patch
@@ -0,0 +1,18 @@
+
+21:23:08  witekfl> https://projects.archlinux.org/svntogit/packages.git/tree/trunk/moc-boost-workaround.patch?h=packages/qt4
+                   Could someone add this patch to the qt4.spec and rebuild it?
+21:23:48  witekfl> This patch helps for example to build kde4-kdepim
+
+
+diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp     2014-04-10 21:37:12.000000000 +0300
++++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp  2014-11-06 02:24:44.287305916 +0200
+@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv)
+ 
+     // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
+     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
+ 
+     QByteArray filename;
+     QByteArray output;

diff --git a/qt4.spec b/qt4.spec
index 8ef3fa12457d3fd6700c45e2ac3f179e986f1885..349a2169982036af58297d4cd778dee07e0b7e22 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -60,7 +60,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.6
-Release:       11
+Release:       12
 License:       LGPL v2.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://download.qt-project.org/official_releases/qt/4.8/%{version}/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -104,6 +104,7 @@ Patch23:    0030-Memory-and-file-descriptor-leak-in-QFontCache.patch
 Patch24:       0034-Fix-raster-graphics-on-X11-RGB30.patch
 Patch25:       0065-Fix-QPainter-drawPolyline-painting-errors-with-cosme.patch
 Patch26:       0072-Fix-font-cache-check-in-QFontEngineFT-recalcAdvances.patch
+Patch27:       moc-boost-workaround.patch
 URL:           http://qt-project.org/
 %{?with_ibase:BuildRequires:   Firebird-devel}
 %{?with_openvg:BuildRequires:  Mesa-libOpenVG-devel}
@@ -1496,7 +1497,6 @@ Programas exemplo para o Qt versão.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-
 %patch17 -p0
 %patch18 -p0
 %patch19 -p1
@@ -1507,6 +1507,7 @@ Programas exemplo para o Qt versão.
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
        mkspecs/common/linux.conf