svn commit: r334303 - head/www/chromium/files

[Rene Ladan]

Author: rene
Date: Tue Nov 19 11:16:35 2013
New Revision: 334303
URL: http://svnweb.freebsd.org/changeset/ports/334303

Log:
  The safe_sprintf unittest builds fine with the GCC option, so move the
  workaround for it to extra-patch-clang

Deleted:
  head/www/chromium/files/patch-base__strings__safe_sprintf_unittest.cc
Modified:
  head/www/chromium/files/extra-patch-clang

Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang	Tue Nov 19 11:15:38 2013	(r334302)
+++ head/www/chromium/files/extra-patch-clang	Tue Nov 19 11:16:35 2013	(r334303)
@@ -233,3 +233,20 @@
  
    RETURN_IF_EMPTY_HANDLE(isolate,
        JSObject::SetLocalPropertyIgnoreAttributes(
+--- base/strings/safe_sprintf_unittest.cc.orig	2013-11-08 07:42:08.000000000 +0100
++++ base/strings/safe_sprintf_unittest.cc	2013-11-15 15:04:45.000000000 +0100
+@@ -733,12 +733,14 @@
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wconversion-null"
+ #endif
++/* Avoid compiler error: http://pastebin.com/1edWUE84
+   EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL));
+   EXPECT_EQ("0", std::string(buf));
+   EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL));
+   EXPECT_EQ("0x0", std::string(buf));
+   EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL));
+   EXPECT_EQ("<NULL>", std::string(buf));
++*/
+ #if defined(__GCC__)
+ #pragma GCC diagnostic pop
+ #endif