Date: Wed, 22 Jan 2020 22:01:03 +0100 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Christoph Moench-Tegeder <cmt@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r523845 - head/www/chromium/files Message-ID: <20200122210103.GA67462@KGPE-D16> In-Reply-To: <202001222053.00MKrgIM068442@repo.freebsd.org> References: <202001222053.00MKrgIM068442@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--LQksG6bCIzRHxTLp Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable www/iridium has the same problem, can you apply this patch there as well? On 20-01-22 20:53:42, Christoph Moench-Tegeder wrote: > Author: cmt > Date: Wed Jan 22 20:53:41 2020 > New Revision: 523845 > URL: https://svnweb.freebsd.org/changeset/ports/523845 >=20 > Log: > fix build > =20 > in a 12.1amd64 poudriere, chromium failed: > In file included from ../../third_party/leveldatabase/port/port_chromiu= m.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* outpu= t); > ^~~~~~ > std::string > /usr/include/c++/v1/iosfwd:211:65: note: 'std::string' declared here > =20 > 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. > =20 > MFH: 2020Q1 (blanket: web browser, just fix it) >=20 > Added: > head/www/chromium/files/patch-third__party_snappy_src_snappy.h (conte= nts, props changed) >=20 > Added: head/www/chromium/files/patch-third__party_snappy_src_snappy.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/chromium/files/patch-third__party_snappy_src_snappy.h Wed Ja= n 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* outpu= t); > ++ size_t Compress(const char* input, size_t input_length, std::string* = output); > +=20 > + // 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 decompr= essed > + bool Uncompress(const char* compressed, size_t compressed_length, > +- string* uncompressed); > ++ std::string* uncompressed); > +=20 > + // Decompresses "compressed" to "*uncompressed". > + // --LQksG6bCIzRHxTLp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAl4ouA8ACgkQelmbhSCD nJ06Hw//WqAVke2bRrvsc4GM7lN8MNWaFX/VlNXKOvVERpVuGo6MKB9mw+WYv3Nr M78XFquNB66y3vrC/RjjtT9Ny0aGYDplXCLCeowOO3rn7Cglz0hEwLdFF/VND81X cFuNAl1JD04RjN2hJvx6TZTLc4mqcVWN955qgCp4TEHUqS6ohgPGfdZJi0p5VqrY HJTfwo5n6AHxDNvz6egXDoO6mmye/Iwhskco4Y1bPe+Zq+4DP6ZuAW2Rfdneu0eW +ljcERt9YkdN069xR5NTE15TidXyG/Az25kB6Mi/3Z+ljyQpnEfrX76l4aQOwn/Q T3x6fWiX5Lev7XVQtYD4CfujrOZ9FwVKkNBKhKW33KPJAvOxszAshB6/Y+xNqL19 qUo7vZVTlhQ/ELWZtmaz2Ko8RDAlvpB4JIj8iaEBo6c2GHvSxsLlddB33swHOqfE 0XFqmFw+ETUEkupbm3dJBVswgi5lD2YJdY7utoMMaGWKMwAAfbB8hR3wkh//KTcE Mkxm10seXCoBmOeCNKZNYJfemzPkkvTXs0dX7+znbwNOiHf78MIq/88U8MEZBTjF 5f4tGw2TYK2DXjxInhiSRTkeHXE6PEOXBmTAtKQwNWJT/IuFeUsN5Pse1qjOZfB4 Yrj1Q+4m2U8+39r5Zo4l/TwmyUsR4Vea5MAo7noeSw7LLGxW0ro= =xopR -----END PGP SIGNATURE----- --LQksG6bCIzRHxTLp--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200122210103.GA67462>