rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

respin boost/moc patch for boost-1.60 (BOOST_TYPE_TRAITS_HPP)

This commit is contained in:
Rex Dieter 2016-03-16 17:41:19 -05:00
parent 92af7f7a88
commit 44cdae5230
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
View File

@ -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;

5
qt.spec
View File

@ -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 <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
- -x11: back to Recommends: sni-qt (#1317481)