summaryrefslogtreecommitdiff
path: root/x11/qt4-libs
diff options
context:
space:
mode:
authormarkd <markd>2015-08-30 10:00:56 +0000
committermarkd <markd>2015-08-30 10:00:56 +0000
commit6c2a540a7ad32fe6dbd4951382198b38aafb4ab7 (patch)
tree2c9433b966bc67caf203b2c14095728af981e64a /x11/qt4-libs
parentb078e075265c43709efb5c7065b049b15d5932c4 (diff)
downloadpkgsrc-6c2a540a7ad32fe6dbd4951382198b38aafb4ab7.tar.gz
pick up correct pcre.h
Diffstat (limited to 'x11/qt4-libs')
-rw-r--r--x11/qt4-libs/distinfo3
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h15
2 files changed, 17 insertions, 1 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)