Date: Sat, 25 Jan 2020 21:00:23 +0000 (UTC) From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524133 - head/devel/electron6/files Message-ID: <202001252100.00PL0N8L067647@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cmt Date: Sat Jan 25 21:00:22 2020 New Revision: 524133 URL: https://svnweb.freebsd.org/changeset/ports/524133 Log: devel/electron6: copy snappy fix from chromium electron6 comes with two copies of the chromium source code, of which seemingly only one is fully used - at least, the embedded leveldb fails in only one place after the update of archivers/snappy (the system-provided headers didn't match the embedded snappy anymore). PR: 243544 Reported by: Robert Cina Added: head/devel/electron6/files/patch-third__part_snappy_src_snappy.h - copied unchanged from r524048, head/www/chromium/files/patch-third__party_snappy_src_snappy.h Copied: head/devel/electron6/files/patch-third__part_snappy_src_snappy.h (from r524048, head/www/chromium/files/patch-third__party_snappy_src_snappy.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron6/files/patch-third__part_snappy_src_snappy.h Sat Jan 25 21:00:22 2020 (r524133, copy of r524048, 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?202001252100.00PL0N8L067647>