respin boost/moc patch for boost-1.60 (BOOST_TYPE_TRAITS_HPP)
This commit is contained in:
parent
92af7f7a88
commit
44cdae5230
@ -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
|
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.6/src/tools/moc/main.cpp.QTBUG-22829 2014-04-10 13:37:12.000000000 -0500
|
--- 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.6/src/tools/moc/main.cpp 2015-01-29 11:12:31.169465097 -0600
|
+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2016-03-16 13:20:43.145899869 -0500
|
||||||
@@ -188,8 +188,10 @@ int runMoc(int _argc, char **_argv)
|
@@ -188,8 +188,11 @@ int runMoc(int _argc, char **_argv)
|
||||||
pp.macros["Q_MOC_RUN"];
|
pp.macros["Q_MOC_RUN"];
|
||||||
pp.macros["__cplusplus"];
|
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_TT_HAS_OPERATOR_HPP_INCLUDED"];
|
||||||
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
|
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
|
||||||
+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
|
+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
|
||||||
|
+ pp.macros["BOOST_TYPE_TRAITS_HPP"];
|
||||||
|
|
||||||
QByteArray filename;
|
QByteArray filename;
|
||||||
QByteArray output;
|
QByteArray output;
|
||||||
|
5
qt.spec
5
qt.spec
@ -44,7 +44,7 @@ Summary: Qt toolkit
|
|||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.8.7
|
Version: 4.8.7
|
||||||
Release: 12%{?dist}
|
Release: 13%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# 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
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
||||||
@ -1352,6 +1352,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 16 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-13
|
||||||
|
- respin boost/moc patch for boost-1.60 (BOOST_TYPE_TRAITS_HPP)
|
||||||
|
|
||||||
* Mon Mar 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-12
|
* Mon Mar 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-12
|
||||||
- -x11: back to Recommends: sni-qt (#1317481)
|
- -x11: back to Recommends: sni-qt (#1317481)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user