Date: Wed, 22 Jan 2020 20:56:06 +0000 (UTC) From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r523846 - branches/2020Q1/www/chromium/files Message-ID: <202001222056.00MKu6UR068735@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cmt Date: Wed Jan 22 20:56:05 2020 New Revision: 523846 URL: https://svnweb.freebsd.org/changeset/ports/523846 Log: MFH: r523845 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. Approved by: portmgr (blanket: web browser, just fix it) Added: branches/2020Q1/www/chromium/files/patch-third__party_snappy_src_snappy.h - copied unchanged from r523845, head/www/chromium/files/patch-third__party_snappy_src_snappy.h Modified: Directory Properties: branches/2020Q1/ (props changed) Copied: branches/2020Q1/www/chromium/files/patch-third__party_snappy_src_snappy.h (from r523845, head/www/chromium/files/patch-third__party_snappy_src_snappy.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/www/chromium/files/patch-third__party_snappy_src_snappy.h Wed Jan 22 20:56:05 2020 (r523846, copy of r523845, head/www/chromium/files/patch-third__party_snappy_src_snappy.h) @@ -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". + //
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001222056.00MKu6UR068735>