Update -QTBUG-22829.patch to make Qt usable with new boost. Release 17

diff --git a/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch b/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
index b6f1c6fcdba2a5b8636d15fb628d129140bd2f01..b6f5525dcc0ddd72f83a58f9319b45ad4f7fa34b 100644 (file)
--- a/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
+++ b/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
@@ -1,7 +1,7 @@
 diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
 --- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829      2015-05-07 09:14:44.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp  2016-03-16 13:20:43.145899869 -0500
-@@ -188,8 +188,11 @@ int runMoc(int _argc, char **_argv)
++++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp  2016-12-08 12:32:46.638962448 -0600
+@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv)
      pp.macros["Q_MOC_RUN"];
      pp.macros["__cplusplus"];
  
@@ -11,6 +11,7 @@ diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 q
 +    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
 +    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
 +    pp.macros["BOOST_TYPE_TRAITS_HPP"];
++    pp.macros["_SYS_SYSMACROS_H_OUTER"];
  
      QByteArray filename;
      QByteArray output;

diff --git a/qt4.spec b/qt4.spec
index 62ed167bbc887e8db01738d7504fecb5d8854433..6038bf4a7ee7884fd4dd1e3afffb8e00f00c70db 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -63,7 +63,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.7
-Release:       16
+Release:       17
 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