From 132b3c56bc09e3cafef1355024d7efdee0e13744 Mon Sep 17 00:00:00 2001
From: Milton Woods <miltonjwoods@gmail.com>
Date: Mon, 22 May 2017 09:01:26 +1000
Subject: qt: patch JavaScriptCore to favour internal pcre headers (#4270)

---
 var/spack/repos/builtin/packages/qt/package.py     |  3 ++
 var/spack/repos/builtin/packages/qt/qt5-pcre.patch | 33 ++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 var/spack/repos/builtin/packages/qt/qt5-pcre.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 3737c70f5a..c0b08d86f1 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -73,6 +73,9 @@ class Qt(Package):
     # https://github.com/xboxdrv/xboxdrv/issues/188
     patch('btn_trigger_happy.patch', when='@5.7.0:')
 
+    # https://github.com/LLNL/spack/issues/1517
+    patch('qt5-pcre.patch', when='@5:')
+
     patch('qt4-corewlan-new-osx.patch', when='@4')
     patch('qt4-pcre-include-conflict.patch', when='@4')
     patch('qt4-el-capitan.patch', when='@4')
diff --git a/var/spack/repos/builtin/packages/qt/qt5-pcre.patch b/var/spack/repos/builtin/packages/qt/qt5-pcre.patch
new file mode 100644
index 0000000000..8fdf25661c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/qt/qt5-pcre.patch
@@ -0,0 +1,33 @@
+--- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp	2016-09-17 20:55:14.000000000 +0000
++++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp	2017-05-17 01:55:10.000000000 +0000
+@@ -44,7 +44,7 @@
+ #include "JIT.h"
+ #include "WRECGenerator.h"
+ #endif
+-#include <pcre/pcre.h>
++#include "../pcre/pcre.h"
+ 
+ #endif
+ 
+--- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp	2016-09-17 20:55:14.000000000 +0000
++++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp	2017-05-17 01:55:51.000000000 +0000
+@@ -32,7 +32,7 @@
+ #include "MacroAssembler.h"
+ #include "RegexCompiler.h"
+ 
+-#include "pcre.h" // temporary, remove when fallback is removed.
++#include "../pcre/pcre.h" // temporary, remove when fallback is removed.
+ 
+ #if ENABLE(YARR_JIT)
+ 
+--- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h	2016-09-17 20:55:14.000000000 +0000
++++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h	2017-05-17 01:55:36.000000000 +0000
+@@ -34,7 +34,7 @@
+ #include "RegexPattern.h"
+ #include <UString.h>
+ 
+-#include <pcre.h>
++#include "../pcre/pcre.h"
+ struct JSRegExp; // temporary, remove when fallback is removed.
+ 
+ #if CPU(X86) && !COMPILER(MSVC)
-- 
cgit v1.2.3-60-g2f50