From owner-svn-ports-head@freebsd.org Wed Jan 22 20:53:42 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6CFDB1FD22D; Wed, 22 Jan 2020 20:53:42 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 482yLG2JY3z4WTP; Wed, 22 Jan 2020 20:53:42 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 308BF38A1; Wed, 22 Jan 2020 20:53:42 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00MKrg9o068443; Wed, 22 Jan 2020 20:53:42 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00MKrgIM068442; Wed, 22 Jan 2020 20:53:42 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <202001222053.00MKrgIM068442@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Wed, 22 Jan 2020 20:53:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523845 - head/www/chromium/files X-SVN-Group: ports-head X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: head/www/chromium/files X-SVN-Commit-Revision: 523845 X-SVN-Commit-Repository: ports 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.29 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: Wed, 22 Jan 2020 20:53:42 -0000 Author: cmt Date: Wed Jan 22 20:53:41 2020 New Revision: 523845 URL: https://svnweb.freebsd.org/changeset/ports/523845 Log: fix build in a 12.1amd64 poudriere, chromium failed: In file included from ../../third_party/leveldatabase/port/port_chromium.cc:10: ../../third_party/snappy/src/snappy.h:76:59: error: unknown type name 'string'; did you mean 'std::string'? size_t Compress(const char* input, size_t input_length, string* output); ^~~~~~ std::string /usr/include/c++/v1/iosfwd:211:65: note: 'std::string' declared here instead of trying to muck around with type aliasing (see snappy-stubs-public.h.in) just reference thy type directly, as there's only one file requiring patching. MFH: 2020Q1 (blanket: web browser, just fix it) Added: head/www/chromium/files/patch-third__party_snappy_src_snappy.h (contents, props changed) Added: head/www/chromium/files/patch-third__party_snappy_src_snappy.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third__party_snappy_src_snappy.h Wed Jan 22 20:53:41 2020 (r523845) @@ -0,0 +1,20 @@ +--- third_party/snappy/src/snappy.h.orig 2020-01-22 18:43:16 UTC ++++ third_party/snappy/src/snappy.h +@@ -73,7 +73,7 @@ namespace snappy { + // Original contents of *output are lost. + // + // REQUIRES: "input[]" is not an alias of "*output". +- size_t Compress(const char* input, size_t input_length, string* output); ++ size_t Compress(const char* input, size_t input_length, std::string* output); + + // Decompresses "compressed[0,compressed_length-1]" to "*uncompressed". + // Original contents of "*uncompressed" are lost. +@@ -82,7 +82,7 @@ namespace snappy { + // + // returns false if the message is corrupted and could not be decompressed + bool Uncompress(const char* compressed, size_t compressed_length, +- string* uncompressed); ++ std::string* uncompressed); + + // Decompresses "compressed" to "*uncompressed". + //