diff options
| author | adam <adam> | 2012-02-26 22:16:16 +0000 |
|---|---|---|
| committer | adam <adam> | 2012-02-26 22:16:16 +0000 |
| commit | a636e85f00eb96239541d34d83d184aa6b75a212 (patch) | |
| tree | e66b58a0d3c2f675e21d31fd08b5077834cede00 /x11 | |
| parent | d9e634903c8919c0ff9f5123fda3ae4be1112622 (diff) | |
| download | pkgsrc-a636e85f00eb96239541d34d83d184aa6b75a212.tar.gz | |
Rewritten patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp, so it only affects compiling with Clang
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 6a95bfd8d01..c0b7acd15fe 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.70 2012/02/16 20:42:46 hans Exp $ +$NetBSD: distinfo,v 1.71 2012/02/26 22:16:16 adam Exp $ SHA1 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 2ba35adca8fb9c66a58eca61a15b21df6213f22e RMD160 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 7506dce7743215481fd9fe56920b8a47f07a112e @@ -44,7 +44,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38e SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 384bfccabae5e3a4ea6dea39b912a941133c5632 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h) = 10bfe59d623db5047e2a4c678ee79a217ea8b7ec SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908fcec294b2a833aeb6d93f40 -SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 9e4a68fe02204e5fda7272f988d991992dfd281e +SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 0377066bd28d5eae02e8fcf200da4360c286ad84 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1 SHA1 (patch-src_dbus_qdbusserver.cpp) = 6b49a383ea561e8024184a5939ff143e91a10171 SHA1 (patch-src_dbus_qdbusserver.h) = 67cc43c0f5e46a0e84b21d5af3ea1e949f26c7b1 diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp index 930f9412a2c..f1d2cea2feb 100644 --- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp @@ -1,15 +1,18 @@ -$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp,v 1.1 2012/01/12 22:59:58 adam Exp $ +$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp,v 1.2 2012/02/26 22:16:16 adam Exp $ Fix C++ error. --- src/3rdparty/webkit/Source/WebCore/platform/DefaultLocalizationStrategy.cpp.orig 2012-01-12 19:51:48.000000000 +0100 +++ src/3rdparty/webkit/Source/WebCore/platform/DefaultLocalizationStrategy.cpp 2012-01-12 20:07:06.000000000 +0100 -@@ -59,7 +59,7 @@ +@@ -59,7 +59,11 @@ return result.get(); #elif PLATFORM(QT) va_list arguments; -- va_start(arguments, format); ++#ifdef __clang__ + va_start(arguments, format.charactersWithNullTermination()); ++#else + va_start(arguments, format); ++#endif QString result; result.vsprintf(format.latin1().data(), arguments); va_end(arguments); |