From b5815e2629d9e331f84e7fec0211dfd4fc8dc1c5 Mon Sep 17 00:00:00 2001
From: Neil Flood <neilflood@fastmail.fm>
Date: Fri, 19 Oct 2018 06:28:53 +1000
Subject: [PATCH] qt4: Patch configure to allow webkit with recent gcc (#9264)
---
.../repos/builtin/packages/qt/package.py | 6 ++++++
.../packages/qt/qt4-gcc-and-webkit.patch | 20 +++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 100644 var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index e122c1d3b8..f956d77219 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -72,6 +72,12 @@ class Qt(Package):
patch('qt4-pcre-include-conflict.patch', when='@4')
patch('qt4-el-capitan.patch', when='@4')
+ # Allow Qt's configure script to build the webkit option with more
+ # recent versions of gcc.
+ # https://github.com/spack/spack/issues/9205
+ # https://github.com/spack/spack/issues/9209
+ patch('qt4-gcc-and-webkit.patch', when='@4')
+
# Use system openssl for security.
depends_on("openssl")
depends_on("glib", when='@4:')
diff --git a/var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch b/var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch
new file mode 100644
index 0000000000..38a1c350f3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch
@@ -0,0 +1,20 @@
+--- a/configure.orig 2018-09-18 07:02:33.866633000 +1000
++++ b/configure 2018-09-18 07:05:21.935194000 +1000
+@@ -7708,7 +7708,7 @@
+
+ # Check gcc's version
+ case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+- 4*)
++ [4-8]*)
+ ;;
+ 3.4*)
+ canBuildQtXmlPatterns="no"
+@@ -7729,7 +7729,7 @@
+ *-g++*)
+ # Check gcc's version
+ case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+- 4*|3.4*)
++ [4-8]*|3.4*)
+ ;;
+ 3.3*)
+ canBuildWebKit="no"
--
GitLab