From 44cdae5230500ef45200a7757bf4eed4451ee54d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 16 Mar 2016 17:41:19 -0500 Subject: [PATCH] respin boost/moc patch for boost-1.60 (BOOST_TYPE_TRAITS_HPP) --- qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch | 9 +++++---- qt.spec | 5 ++++- 2 files changed, 9 insertions(+), 5 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 87b8eb2..b6f1c6f 100644 --- 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.6/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp.QTBUG-22829 2014-04-10 13:37:12.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp 2015-01-29 11:12:31.169465097 -0600 -@@ -188,8 +188,10 @@ int runMoc(int _argc, char **_argv) +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) pp.macros["Q_MOC_RUN"]; pp.macros["__cplusplus"]; @@ -10,6 +10,7 @@ diff -up qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp.QTBUG-22829 q pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; + pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; + pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; ++ pp.macros["BOOST_TYPE_TRAITS_HPP"]; QByteArray filename; QByteArray output; diff --git a/qt.spec b/qt.spec index 10d7799..ff66fd9 100644 --- a/qt.spec +++ b/qt.spec @@ -44,7 +44,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.7 -Release: 12%{?dist} +Release: 13%{?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 @@ -1352,6 +1352,9 @@ fi %changelog +* Wed Mar 16 2016 Rex Dieter - 1:4.8.7-13 +- respin boost/moc patch for boost-1.60 (BOOST_TYPE_TRAITS_HPP) + * Mon Mar 14 2016 Rex Dieter - 1:4.8.7-12 - -x11: back to Recommends: sni-qt (#1317481)