summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2011-11-01 15:52:23 +0000
committerhans <hans@pkgsrc.org>2011-11-01 15:52:23 +0000
commitb6b3fa3b6e900d6016c8e82007a37b27a56207de (patch)
treee209e0af0ef77b8802366f4c3afdf041f8a9a202 /x11
parentb2c167efebfc415920afbce8a6d8ab366f24b47e (diff)
downloadpkgsrc-b6b3fa3b6e900d6016c8e82007a37b27a56207de.tar.gz
Fix the build fix for SunOS, it is not needed with gcc 4.6.
Diffstat (limited to 'x11')
-rw-r--r--x11/qt4-libs/distinfo4
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index e239278a845..dee1a47837b 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2011/09/18 09:01:30 adam Exp $
+$NetBSD: distinfo,v 1.65 2011/11/01 15:52:23 hans Exp $
SHA1 (qt4/qt-everywhere-opensource-src-4.7.4.tar.gz) = af9016aa924a577f7b06ffd28c9773b56d74c939
RMD160 (qt4/qt-everywhere-opensource-src-4.7.4.tar.gz) = 3e47b09663a89973b1c8628506c995dfc2a5387c
@@ -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) = a70438f480eb731b43784e97212469c1f1835478
+SHA1 (patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h) = 6485889496bd6e23466a4ae3c938a9e1592e1989
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 63d99554124..19255c645a8 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,4 +1,4 @@
-$NetBSD: patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h,v 1.2 2011/09/16 13:19:40 wiz Exp $
+$NetBSD: patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h,v 1.3 2011/11/01 15:52:23 hans Exp $
--- src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h.orig 2011-08-23 12:02:27.000000000 +0000
+++ src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h
@@ -7,7 +7,7 @@ $NetBSD: patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h,v 1.2 2011/09
inline float grad2rad(float g) { return g * piFloat / 200.0f; }
-#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN)
-+#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN) && !OS(SOLARIS)
++#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN) && !(OS(SOLARIS) && COMPILER(GCC) && (GCC_VERSION < 40600))
using std::isfinite;
using std::isinf;
using std::isnan;