Add additional workarounds for boost/glib parsing (#1396755)
This commit is contained in:
parent
c6f3e912b2
commit
46567fbafb
|
@ -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 09:14:44.000000000 -0500
|
--- 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 2016-03-16 13:20:43.145899869 -0500
|
+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2016-12-01 21:12:25.515488200 -0700
|
||||||
@@ -188,8 +188,11 @@ int runMoc(int _argc, char **_argv)
|
@@ -188,8 +188,13 @@ int runMoc(int _argc, char **_argv)
|
||||||
pp.macros["Q_MOC_RUN"];
|
pp.macros["Q_MOC_RUN"];
|
||||||
pp.macros["__cplusplus"];
|
pp.macros["__cplusplus"];
|
||||||
|
|
||||||
|
@ -11,6 +11,8 @@ 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["__G_VERSION_MACROS_H__"];
|
||||||
|
|
||||||
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: 21%{?dist}
|
Release: 22%{?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
|
||||||
|
@ -1393,6 +1393,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 1 2016 Orion Poplawski <orion@cora.nwra.com> - 1:4.8.7-22
|
||||||
|
- Add additional workarounds for boost/glib parsing (#1396755)
|
||||||
|
|
||||||
* Wed Nov 30 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-21
|
* Wed Nov 30 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-21
|
||||||
- BR: compat-openssl10-devel, restore -openssl-linked (#1328659)
|
- BR: compat-openssl10-devel, restore -openssl-linked (#1328659)
|
||||||
- -no-sql-mysql (#1400233)
|
- -no-sql-mysql (#1400233)
|
||||||
|
|
Loading…
Reference in New Issue