From owner-svn-ports-head@FreeBSD.ORG Tue Nov 19 11:16:36 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E547878; Tue, 19 Nov 2013 11:16:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2E1A62843; Tue, 19 Nov 2013 11:16:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAJBGaiG073525; Tue, 19 Nov 2013 11:16:36 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAJBGaNi073524; Tue, 19 Nov 2013 11:16:36 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201311191116.rAJBGaNi073524@svn.freebsd.org> From: Rene Ladan Date: Tue, 19 Nov 2013 11:16:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334303 - head/www/chromium/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Nov 2013 11:16:36 -0000 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("", std::string(buf)); ++*/ + #if defined(__GCC__) + #pragma GCC diagnostic pop + #endif