From a1e7be54b8e04c114f90f12ee58658017bd18ff6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 9 Dec 2016 05:18:46 -0600 Subject: [PATCH] update QTBUG-22829.patch to use _SYS_SYSMACROS_H_OUTER instead (#1396755) --- qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch | 2 +- qt.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 cfb554e..b6f5525 100644 --- a/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch +++ b/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch @@ -11,7 +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"]; ++ pp.macros["_SYS_SYSMACROS_H_OUTER"]; QByteArray filename; QByteArray output; diff --git a/qt.spec b/qt.spec index b4bc531..8b99711 100644 --- a/qt.spec +++ b/qt.spec @@ -44,7 +44,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.7 -Release: 24%{?dist} +Release: 25%{?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 @@ -1393,6 +1393,9 @@ fi %changelog +* Fri Dec 09 2016 Rex Dieter - 1:4.8.7-25 +- update QTBUG-22829.patch to use _SYS_SYSMACROS_H_OUTER instead (#1396755) + * Thu Dec 08 2016 Rex Dieter - 1:4.8.7-24 - namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755) - update QTBUG-22829.patch to define _SYS_SYSMACROS_H (#1396755)