From 28a55141fc7d5429ac813a5e2ae0f22f6f60c2e2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 9 Dec 2016 05:20:15 -0600 Subject: [PATCH] update moc patch to define _SYS_SYSMACROS_H_OUTER instead (#1396755) --- qt5-qtbase.spec | 5 ++++- qtbase-opensource-src-5.7.1-moc_macros.patch | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 0f3b832..1051cf6 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -66,7 +66,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.7.1 -Release: 7%{?dist} +Release: 8%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -960,6 +960,9 @@ fi %changelog +* Fri Dec 09 2016 Rex Dieter - 5.7.1-8 +- update moc patch to define _SYS_SYSMACROS_H_OUTER instead (#1396755) + * Thu Dec 08 2016 Rex Dieter - 5.7.1-7 - really apply QT_VERSION_CHECK workaround (#1396755) diff --git a/qtbase-opensource-src-5.7.1-moc_macros.patch b/qtbase-opensource-src-5.7.1-moc_macros.patch index b147b2d..75dc9ff 100644 --- a/qtbase-opensource-src-5.7.1-moc_macros.patch +++ b/qtbase-opensource-src-5.7.1-moc_macros.patch @@ -5,7 +5,7 @@ diff -up qtbase-opensource-src-5.7.1/src/tools/moc/main.cpp.moc_WORDSIZE qtbase- Moc moc; pp.macros["Q_MOC_RUN"]; pp.macros["__cplusplus"]; -+ pp.macros["_SYS_SYSMACROS_H"]; ++ pp.macros["_SYS_SYSMACROS_H_OUTER"]; + Macro macro; + macro.symbols = Preprocessor::tokenize(QByteArray::number(Q_PROCESSOR_WORDSIZE*8), 1, Preprocessor::TokenizeDefine); + macro.symbols.removeLast(); // remove the EOF symbol