From d30cfdc8944eab1d9bd9617bd7827e02d2bdb529 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Dec 08 2016 18:17:29 +0000
Subject: namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)


---

diff --git a/qt-everywhere-opensource-src-4.8.7-QT_VERSION_CHECK.patch b/qt-everywhere-opensource-src-4.8.7-QT_VERSION_CHECK.patch
new file mode 100644
index 0000000..9bce98f
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.7-QT_VERSION_CHECK.patch
@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h
+--- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin	2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h	2016-12-08 12:10:29.677359701 -0600
+@@ -52,7 +52,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))
+ 
+ #define QT_PACKAGEDATE_STR "2015-05-07"
+ 
diff --git a/qt.spec b/qt.spec
index ccf297e..79f073f 100644
--- a/qt.spec
+++ b/qt.spec
@@ -44,7 +44,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.7
-Release: 23%{?dist}
+Release: 24%{?dist}
 
 # 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
@@ -110,6 +110,9 @@ Patch50: qt-everywhere-opensource-src-4.8.4-qmake_pkgconfig_requires_private.pat
 # FTBFS against newer firebird
 Patch51: qt-everywhere-opensource-src-4.8.7-firebird.patch
 
+# workaround major/minor macros possibly being defined already
+Patch52: qt-everywhere-opensource-src-4.8.7-QT_VERSION_CHECK.patch
+
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
@@ -576,6 +579,7 @@ and invoke methods on those objects.
 %patch28 -p1 -b .qt_plugin_path
 %patch50 -p1 -b .qmake_pkgconfig_requires_private
 %patch51 -p1 -b .firebird
+%patch52 -p1 -b .QT_VERSION_CHECK
 ## TODO: still worth carrying?  if so, upstream it.
 %patch53 -p1 -b .qatomic-inline-asm
 ## TODO: upstream me
@@ -1389,6 +1393,9 @@ fi
 
 
 %changelog
+* 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)
+
 * Wed Dec 07 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-23
 - (re)enable mysql support (#1400233)