diff options
| author | wiz <wiz> | 2010-03-11 00:07:24 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2010-03-11 00:07:24 +0000 |
| commit | ff27c1e96874ea06d5b772ec07040ebd31f27509 (patch) | |
| tree | 52141708251afa7db19c48121e1f1c3506f650b1 /x11 | |
| parent | aaf9c5a95572b89f3668ba243c1217faa43b077f (diff) | |
| download | pkgsrc-ff27c1e96874ea06d5b772ec07040ebd31f27509.tar.gz | |
Sync src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
(which we patch in pkgsrc) with
src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
which works fine without patches.
From Sverre Froyen in private mail.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-ay | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 4ca1c30421a..801879a76ac 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.40 2010/02/16 13:08:09 adam Exp $ +$NetBSD: distinfo,v 1.41 2010/03/11 00:07:24 wiz Exp $ SHA1 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 977c10b88a2230e96868edc78a9e3789c0fcbf70 RMD160 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 5f3fea120f2dba274c4150b02162bba40b65a872 @@ -27,4 +27,4 @@ SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12 SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf SHA1 (patch-aw) = 1e716a1f39cb4aee4872184f700f3e4b455463b6 SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9 -SHA1 (patch-ay) = 0080346d5551f0e623b2a8d99377e2efe4571871 +SHA1 (patch-ay) = d1e903fd7d4bf0f84d5151303db941702f02e5dc diff --git a/x11/qt4-libs/patches/patch-ay b/x11/qt4-libs/patches/patch-ay index f28b5300bc0..5146056bfb9 100644 --- a/x11/qt4-libs/patches/patch-ay +++ b/x11/qt4-libs/patches/patch-ay @@ -1,13 +1,13 @@ -$NetBSD: patch-ay,v 1.4 2010/02/08 10:49:07 wiz Exp $ +$NetBSD: patch-ay,v 1.5 2010/03/11 00:07:24 wiz Exp $ ---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-01-15 10:01:33.000000000 -0700 -+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2010-02-07 15:59:53.000000000 -0700 +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-02-11 15:55:20.000000000 +0000 ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -718,7 +718,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX)) -+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX) || PLATFORM(NETBSD)) ++#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA) #define WTF_USE_JSVALUE64 1 #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) #define WTF_USE_JSVALUE64 1 |