cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r523845

Browse Source 
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)
This commit is contained in:
Christoph Moench-Tegeder 2020-01-22 20:56:05 +00:00
parent 1497f12128
commit 514d795a58
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q1/; revision=523846
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
www/chromium/files/patch-third__party_snappy_src_snappy.h Normal file
View File

@ -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".
//