diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2013-11-19 11:16:35 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2013-11-19 11:16:35 +0000 |
| commit | e1b1102ee811e2467f801036fe7ea1acfbd4fa37 (patch) | |
| tree | 10697c7a2517b068a1ab4078ad30141a5100e239 /www/chromium | |
| parent | 137f0d684c1eced883a3ec434a4d9fe1cb8d0595 (diff) | |
| download | ports-e1b1102ee811e2467f801036fe7ea1acfbd4fa37.tar.gz ports-e1b1102ee811e2467f801036fe7ea1acfbd4fa37.zip | |
Notes
Diffstat (limited to 'www/chromium')
| -rw-r--r-- | www/chromium/files/extra-patch-clang | 17 | ||||
| -rw-r--r-- | www/chromium/files/patch-base__strings__safe_sprintf_unittest.cc | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index ea7f7209f0b3..527c45d46a73 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -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 diff --git a/www/chromium/files/patch-base__strings__safe_sprintf_unittest.cc b/www/chromium/files/patch-base__strings__safe_sprintf_unittest.cc deleted file mode 100644 index aa371eec5780..000000000000 --- a/www/chromium/files/patch-base__strings__safe_sprintf_unittest.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 |