diff options
| author | markd <markd> | 2015-08-30 10:00:56 +0000 |
|---|---|---|
| committer | markd <markd> | 2015-08-30 10:00:56 +0000 |
| commit | e08b576d08350eb3a77a5e11dd52dd303e350b2f (patch) | |
| tree | 2c9433b966bc67caf203b2c14095728af981e64a /x11 | |
| parent | d9308abeff25d7c51513817fb8c24c949aa6fc11 (diff) | |
| download | pkgsrc-e08b576d08350eb3a77a5e11dd52dd303e350b2f.tar.gz | |
pick up correct pcre.h
Diffstat (limited to 'x11')
4 files changed, 34 insertions, 2 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 15177068a2a..e8c84141e80 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.102 2015/07/18 11:11:53 adam Exp $ +$NetBSD: distinfo,v 1.103 2015/08/30 10:04:08 markd Exp $ SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166 @@ -45,6 +45,7 @@ SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.cpp) = SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.h) = b822a84aae7e125cb56b01bffdcfec07060d88f6 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_RefCountedLeakCounter.h) = 3b70ecb3a95944a3dd4a26c7b5c53e44aa89de1a SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h) = f23437f6e4b47f999d4fc2c576c5e7a63446b9da +SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h) = b625c9edd3b3febc1338240549c32fb50ed0a5f4 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = c7c9c39b11007e7ec3884874a38d000e3238bf64 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h) = bf748efe8d150fe636cbc5b20dcd9a7d4945c8c9 diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h new file mode 100644 index 00000000000..290e0327789 --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h,v 1.1 2015/08/30 10:04:08 markd Exp $ + +pick up correct pcre.h (if pcre package pulled in by gtk2 option) + +--- src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h 2014-04-11 06:37:12.000000000 +1200 ++++ src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h +@@ -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) diff --git a/x11/qt5-qtscript/distinfo b/x11/qt5-qtscript/distinfo index 6dd536deb70..c6218825f1c 100644 --- a/x11/qt5-qtscript/distinfo +++ b/x11/qt5-qtscript/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/08/30 10:00:56 markd Exp $ SHA1 (qtscript-opensource-src-5.4.0.tar.xz) = 7ca8d6ccbc97fb24a9e76b69eeaa5e7e9c321955 RMD160 (qtscript-opensource-src-5.4.0.tar.xz) = c51fd51c5f3ada72fdd5397ed5fb71d209ecf3a4 @@ -6,3 +6,4 @@ Size (qtscript-opensource-src-5.4.0.tar.xz) = 2579768 bytes SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h) = c8044ceaab87091aba1f226e03afa681abad11b0 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = 6672e941f0ecbba35b5b932ab9f7b49a269fb6e6 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h) = 5467afc8dc5e2f93a267a6ab380bb647c501d145 +SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h) = bf6a3cbfcd5a237953f5fa6e213faaf5e5153aa8 diff --git a/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h new file mode 100644 index 00000000000..1b00d88f5df --- /dev/null +++ b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h,v 1.1 2015/08/30 10:00:57 markd Exp $ + +pick up correct pcre.h + +--- src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h.orig 2014-12-05 16:24:12.000000000 +0000 ++++ src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h +@@ -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) |