summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2010-02-08 10:38:26 +0000
committeradam <adam@pkgsrc.org>2010-02-08 10:38:26 +0000
commitb1583c41d51cdeeb90b6a0cc5fc02fee41618031 (patch)
tree7023518ad05be6bd282a00f2cbccb96ba4dc2136 /x11
parente08a5700aa84b890fabaf1998f619c20c53ba671 (diff)
downloadpkgsrc-b1583c41d51cdeeb90b6a0cc5fc02fee41618031.tar.gz
Fix crashing on amd64; courtesy of Sverre Froyen
Diffstat (limited to 'x11')
-rw-r--r--x11/qt4-libs/distinfo3
-rw-r--r--x11/qt4-libs/patches/patch-ay11
2 files changed, 13 insertions, 1 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index ba1e5b52d3a..6ab849ed50f 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2010/01/29 18:19:09 adam Exp $
+$NetBSD: distinfo,v 1.38 2010/02/08 10:38:26 adam Exp $
SHA1 (qt-everywhere-opensource-src-4.6.1.tar.gz) = d3b44ae6d9bc9c44fc57f32e545b92daf0b54775
RMD160 (qt-everywhere-opensource-src-4.6.1.tar.gz) = 7365dfe3c688df36002d2c9aaef6b79ba8175402
@@ -27,3 +27,4 @@ SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12
SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
SHA1 (patch-aw) = 1e716a1f39cb4aee4872184f700f3e4b455463b6
SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9
+SHA1 (patch-ay) = befbac889cd0519ef1a6a2b55dc0c05528f5bc4c
diff --git a/x11/qt4-libs/patches/patch-ay b/x11/qt4-libs/patches/patch-ay
new file mode 100644
index 00000000000..1f737ffa8a4
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-ay
@@ -0,0 +1,11 @@
+--- 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
+@@ -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))
+ #define WTF_USE_JSVALUE64 1
+ #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64)
+ #define WTF_USE_JSVALUE64 1