[pkgsrc/trunk]: pkgsrc/x11/qt4-libs Sync src/3rdparty/javascriptcore/JavaScri...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce6d72fe231f
branches:  trunk
changeset: 572995:ce6d72fe231f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Mar 11 00:07:24 2010 +0000

description:
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:

 x11/qt4-libs/distinfo         |  4 ++--
 x11/qt4-libs/patches/patch-ay |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 9fe7dbfd8af4 -r ce6d72fe231f x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Thu Mar 11 00:05:29 2010 +0000
+++ b/x11/qt4-libs/distinfo     Thu Mar 11 00:07:24 2010 +0000
@@ -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-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
 SHA1 (patch-aw) = 1e716a1f39cb4aee4872184f700f3e4b455463b6
 SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9
-SHA1 (patch-ay) = 0080346d5551f0e623b2a8d99377e2efe4571871
+SHA1 (patch-ay) = d1e903fd7d4bf0f84d5151303db941702f02e5dc
diff -r 9fe7dbfd8af4 -r ce6d72fe231f x11/qt4-libs/patches/patch-ay
--- a/x11/qt4-libs/patches/patch-ay     Thu Mar 11 00:05:29 2010 +0000
+++ b/x11/qt4-libs/patches/patch-ay     Thu Mar 11 00:07:24 2010 +0000
@@ -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