update QTBUG-22829.patch to define _SYS_SYSMACROS_H (#1396755)
This commit is contained in:
parent
d30cfdc894
commit
d9b191b9ec
|
@ -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
|
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 08:14:44.000000000 -0600
|
--- 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-12-01 21:12:25.515488200 -0700
|
+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2016-12-08 12:32:46.638962448 -0600
|
||||||
@@ -188,8 +188,13 @@ int runMoc(int _argc, char **_argv)
|
@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv)
|
||||||
pp.macros["Q_MOC_RUN"];
|
pp.macros["Q_MOC_RUN"];
|
||||||
pp.macros["__cplusplus"];
|
pp.macros["__cplusplus"];
|
||||||
|
|
||||||
|
@ -11,8 +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_LEXICAL_CAST_INCLUDED"];
|
||||||
+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
|
+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
|
||||||
+ pp.macros["BOOST_TYPE_TRAITS_HPP"];
|
+ pp.macros["BOOST_TYPE_TRAITS_HPP"];
|
||||||
+ pp.macros["BOOST_PREDEF_VERSION_NUMBER_H"];
|
+ pp.macros["_SYS_SYSMACROS_H"];
|
||||||
+ pp.macros["__G_VERSION_MACROS_H__"];
|
|
||||||
|
|
||||||
QByteArray filename;
|
QByteArray filename;
|
||||||
QByteArray output;
|
QByteArray output;
|
||||||
|
|
1
qt.spec
1
qt.spec
|
@ -1395,6 +1395,7 @@ fi
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Dec 08 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-24
|
* Thu Dec 08 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-24
|
||||||
- namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
|
- namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
|
||||||
|
- update QTBUG-22829.patch to define _SYS_SYSMACROS_H (#1396755)
|
||||||
|
|
||||||
* Wed Dec 07 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-23
|
* Wed Dec 07 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-23
|
||||||
- (re)enable mysql support (#1400233)
|
- (re)enable mysql support (#1400233)
|
||||||
|
|
Loading…
Reference in New Issue