From 08c9a6e2b0cba62dcedec4a2a00024704dda2001 Mon Sep 17 00:00:00 2001
From: Angel de Vicente <angel.de.vicente@iac.es>
Date: Sun, 29 Nov 2020 22:45:41 +0000
Subject: Qt: fix GCC (#19948)
tested only for gcc8.3.0 but should be safe for other compilers
---
var/spack/repos/builtin/packages/qt/package.py | 1 +
var/spack/repos/builtin/packages/qt/qt514.patch | 9 +++++++++
2 files changed, 10 insertions(+)
create mode 100644 var/spack/repos/builtin/packages/qt/qt514.patch
(limited to 'var')
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index b3a7fec6d3..0c8956681f 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -121,6 +121,7 @@ class Qt(Package):
patch('qt5-12-configure.patch', when='@5.12')
# https://bugreports.qt.io/browse/QTBUG-93402
patch('qt5-15-gcc-10.patch', when='@5.12.7:5.15 %gcc@8:')
+ patch('qt514.patch', when='@5.14')
conflicts('%gcc@10:', when='@5.9:5.12.6 +opengl')
# Build-only dependencies
diff --git a/var/spack/repos/builtin/packages/qt/qt514.patch b/var/spack/repos/builtin/packages/qt/qt514.patch
new file mode 100644
index 0000000000..d752a52bf7
--- /dev/null
+++ b/var/spack/repos/builtin/packages/qt/qt514.patch
@@ -0,0 +1,9 @@
+diff -ruN qt-everywhere-src-5.14.2.orig/qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp qt-everywhere-src-5.14.2/qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp
+--- qt-everywhere-src-5.14.2.orig/qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp 2020-03-03 13:10:30.000000000 +0000
++++ qt-everywhere-src-5.14.2/qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp 2020-11-16 19:57:56.792619032 +0000
+@@ -38,4 +38,5 @@
+ **
+ ****************************************************************************/
+
++#include <math.h>
+ #include "qjp2handler_p.h"
--
cgit v1.2.3-70-g09d2