update QTBUG-22829.patch to use _SYS_SYSMACROS_H_OUTER instead (#1396755)
This commit is contained in:
parent
d9b191b9ec
commit
a1e7be54b8
|
@ -11,7 +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["_SYS_SYSMACROS_H"];
|
+ pp.macros["_SYS_SYSMACROS_H_OUTER"];
|
||||||
|
|
||||||
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: 24%{?dist}
|
Release: 25%{?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
|
||||||
|
* Fri Dec 09 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-25
|
||||||
|
- update QTBUG-22829.patch to use _SYS_SYSMACROS_H_OUTER instead (#1396755)
|
||||||
|
|
||||||
* 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)
|
- update QTBUG-22829.patch to define _SYS_SYSMACROS_H (#1396755)
|
||||||
|
|
Loading…
Reference in New Issue