diff options
| author | wiz <wiz@pkgsrc.org> | 2011-09-16 13:19:40 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-09-16 13:19:40 +0000 |
| commit | 813a13fdc875d1a23eaee543595c3295139d25df (patch) | |
| tree | 0bfba0a594608bca08f24143d688eb14810314b7 /x11 | |
| parent | c04156161da5d61f91a21e7af243818199b0249e (diff) | |
| download | pkgsrc-813a13fdc875d1a23eaee543595c3295139d25df.tar.gz | |
Make patch apply.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 764e4b6c5ea..8087eab21c0 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.62 2011/09/14 17:58:32 hans Exp $ +$NetBSD: distinfo,v 1.63 2011/09/16 13:19:40 wiz Exp $ SHA1 (qt-everywhere-opensource-src-4.7.4.tar.gz) = ac7b4df34adaa6e9d1fb41743d1f15f5aac481db RMD160 (qt-everywhere-opensource-src-4.7.4.tar.gz) = 347ba2c4f855b40bf3ce90adb19c1a87925e6c61 @@ -46,7 +46,7 @@ SHA1 (patch-cg) = c5948cea47fb4134c626415b0b2c36660beea64a SHA1 (patch-ch) = 8efaa05e564022710ff978b59581c017bbece979 SHA1 (patch-ci) = a2ac5703503afcdb2a87f80a8ba373c8ff7a2697 SHA1 (patch-cj) = 49fd8ae10c5fc026101355596b91fcf3e1701b9d -SHA1 (patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h) = f619b189991c3b29033970320dbf5a0ec564248a +SHA1 (patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h) = a70438f480eb731b43784e97212469c1f1835478 SHA1 (patch-src_3rdparty_webkit_WebCore_WebCore.pro) = 41fbce9872c2d6b4977772d88391b1194ec37b2e SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 87c48f97ba2026f4bb553aa0b855bc1b1f653abf SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = e05f420bd532a8964d293e4bad848636dc716d0f diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h index 90c8bd36994..63d99554124 100644 --- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h @@ -1,13 +1,13 @@ -$NetBSD: patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h,v 1.1 2011/09/14 17:58:32 hans Exp $ +$NetBSD: patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h,v 1.2 2011/09/16 13:19:40 wiz Exp $ ---- src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h.orig 2010-11-06 02:55:19.000000000 +0100 -+++ src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h 2011-01-16 11:57:37.742721037 +0100 +--- src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h.orig 2011-08-23 12:02:27.000000000 +0000 ++++ src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h @@ -190,7 +190,7 @@ inline float deg2turn(float d) { return inline float rad2grad(float r) { return r * 200.0f / piFloat; } inline float grad2rad(float g) { return g * piFloat / 200.0f; } --#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(ANDROID) && !COMPILER(WINSCW) -+#if !COMPILER(MSVC) && !COMPILER(WINSCW) && !(COMPILER(RVCT) && (OS(SYMBIAN) || PLATFORM(BREWMP))) && !OS(SOLARIS) +-#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN) ++#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN) && !OS(SOLARIS) using std::isfinite; using std::isinf; using std::isnan; |