diff options
| author | dbj <dbj@pkgsrc.org> | 2015-01-27 05:20:10 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2015-01-27 05:20:10 +0000 |
| commit | 5c5992dad334769ec84d2f3e7e57fd4be16e94ea (patch) | |
| tree | 3b43d0ae7889d17fc12270c42b32ae3cb1125511 /x11 | |
| parent | 4ef5809ae9cc8b1aabef1a55c03e416410dc538a (diff) | |
| download | pkgsrc-5c5992dad334769ec84d2f3e7e57fd4be16e94ea.tar.gz | |
fix build issue on Darwin
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index f64a3f627f0..c6e1a92aacd 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.95 2014/11/28 21:07:51 spz Exp $ +$NetBSD: distinfo,v 1.96 2015/01/27 05:20:10 dbj Exp $ SHA1 (qt-everywhere-opensource-src-4.8.6.tar.gz) = ddf9c20ca8309a116e0466c42984238009525da6 RMD160 (qt-everywhere-opensource-src-4.8.6.tar.gz) = 0220d4e76ac761c9ecfb8ddab6f2c1dc6ad70c33 @@ -56,6 +56,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp) = 95e SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = c79d9ed7f60a63090aadabbe2fa399a911449cd8 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 25654a9f2cedb17b5f536b324e47d56eb4010029 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e +SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = 3c1dbd49e236669fe9849918e571eed58980421b SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.h) = fc4686c018471fcae375d9382737e0844a0f45a8 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = d5460bede6b3662df4d9dbec5826db98c6ef4f61 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7 diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h new file mode 100644 index 00000000000..50f561209e4 --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h @@ -0,0 +1,21 @@ +$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h,v 1.4 2015/01/27 05:20:10 dbj Exp $ + +--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig 2014-04-10 18:37:11.000000000 +0000 ++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h +@@ -39,6 +39,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + + #define HAVE_NULLPTR 1 + ++#if __APPLE__ ++#include <AvailabilityMacros.h> ++#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_8 ++namespace std ++{ ++ typedef decltype(nullptr) nullptr_t; ++} ++#endif ++#endif ++ + #else + + namespace std { |