zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: patch JavaScriptCore to favour internal pcre headers (#4270)

Browse Source
This commit is contained in:
Milton Woods 2017-05-22 09:01:26 +10:00 committed by Adam J. Stewart
parent f9203d4281
commit 132b3c56bc
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/qt/package.py
View File

@ -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')

33
var/spack/repos/builtin/packages/qt/qt5-pcre.patch Normal file
View File

@ -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)