From 15b5003df84e433c12676d4ca52f6cc23cf531ef Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 8 Dec 2016 12:25:26 -0600 Subject: [PATCH] namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755) --- qt5-qtbase.spec | 7 ++++++- qtbase-opensource-src-5.7.1-QT_VERSION_CHECK.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 qtbase-opensource-src-5.7.1-QT_VERSION_CHECK.patch diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index cda4c7a..b9e0aa7 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: 5%{?dist} +Release: 6%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -94,6 +94,8 @@ Patch2: qtbase-multilib_optflags.patch Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch # upstreamable patches +# namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755) +Patch50: qtbase-opensource-src-5.7.1-QT_VERSION_CHECK.patch # Workaround moc/multilib issues # https://bugzilla.redhat.com/show_bug.cgi?id=1290020 @@ -956,6 +958,9 @@ fi %changelog +* Thu Dec 08 2016 Rex Dieter - 5.7.1-6 +- namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755) + * Thu Dec 08 2016 Rex Dieter - 5.7.1-5 - 5.7.1 dec5 snapshot diff --git a/qtbase-opensource-src-5.7.1-QT_VERSION_CHECK.patch b/qtbase-opensource-src-5.7.1-QT_VERSION_CHECK.patch new file mode 100644 index 0000000..1b3a0e9 --- /dev/null +++ b/qtbase-opensource-src-5.7.1-QT_VERSION_CHECK.patch @@ -0,0 +1,12 @@ +diff -up qtbase-opensource-src-5.7.1/src/corelib/global/qglobal.h.QT_VERSION_CHECK qtbase-opensource-src-5.7.1/src/corelib/global/qglobal.h +--- qtbase-opensource-src-5.7.1/src/corelib/global/qglobal.h.QT_VERSION_CHECK 2016-12-01 02:17:04.000000000 -0600 ++++ qtbase-opensource-src-5.7.1/src/corelib/global/qglobal.h 2016-12-08 12:19:41.165310158 -0600 +@@ -54,7 +54,7 @@ + /* + can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) + */ +-#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) ++#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch)) + + #if !defined(QT_BUILD_QMAKE) && !defined(QT_BUILD_CONFIGURE) + #include