diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2011-10-01 00:02:39 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2011-10-01 00:02:39 +0000 |
| commit | 0bd3d6f9906515fb444aa962b692489f53cdd28a (patch) | |
| tree | 12b9ed7044915503e24ae50fa51792cdba71466b /www-client | |
| parent | Version bumped, bug #385149. (diff) | |
| download | gentoo-2-0bd3d6f9906515fb444aa962b692489f53cdd28a.tar.gz gentoo-2-0bd3d6f9906515fb444aa962b692489f53cdd28a.tar.bz2 gentoo-2-0bd3d6f9906515fb444aa962b692489f53cdd28a.zip | |
Fix build with Heimdal, bug #383121 by Ben Carrell, patch by Martin von Gagern.
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/chromium/chromium-15.0.874.54.ebuild | 5 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-kerberos-r0.patch | 22 |
3 files changed, 32 insertions, 2 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 7d37de616472..ec9dbbdb5758 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/chromium # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.454 2011/09/30 18:33:46 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.455 2011/10/01 00:02:39 phajdan.jr Exp $ + + 01 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> + +files/chromium-kerberos-r0.patch, chromium-15.0.874.54.ebuild: + Fix build with Heimdal, bug #383121 by Ben Carrell, patch by Martin von + Gagern. *chromium-15.0.874.54 (30 Sep 2011) diff --git a/www-client/chromium/chromium-15.0.874.54.ebuild b/www-client/chromium/chromium-15.0.874.54.ebuild index b13a443060b1..8e691b4d8044 100644 --- a/www-client/chromium/chromium-15.0.874.54.ebuild +++ b/www-client/chromium/chromium-15.0.874.54.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.54.ebuild,v 1.1 2011/09/30 18:33:46 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.54.ebuild,v 1.2 2011/10/01 00:02:39 phajdan.jr Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -129,6 +129,9 @@ src_prepare() { third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \ chrome/common/zip.cc || die + # Backport http://codereview.chromium.org/8038051, fix for bug #383121. + epatch "${FILESDIR}/${PN}-kerberos-r0.patch" + epatch_user # Remove most bundled libraries. Some are still needed. diff --git a/www-client/chromium/files/chromium-kerberos-r0.patch b/www-client/chromium/files/chromium-kerberos-r0.patch new file mode 100644 index 000000000000..2e92b7c834f7 --- /dev/null +++ b/www-client/chromium/files/chromium-kerberos-r0.patch @@ -0,0 +1,22 @@ +Index: net/http/http_auth_gssapi_posix.cc +diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc +index 431cfc4f2b54730fa6b46a6801c25cf691b7c878..aff2ac1114e09ec202b1ce4bd8d63ebd41483632 100644 +--- a/net/http/http_auth_gssapi_posix.cc ++++ b/net/http/http_auth_gssapi_posix.cc +@@ -55,6 +55,16 @@ static gss_OID_desc GSS_C_NT_EXPORT_NAME_VAL = { + + } // namespace + ++// Heimdal >= 1.4 will define the following as preprocessor macros. ++// To avoid conflicting declarations, we have to undefine these. ++#undef GSS_C_NT_USER_NAME ++#undef GSS_C_NT_MACHINE_UID_NAME ++#undef GSS_C_NT_STRING_UID_NAME ++#undef GSS_C_NT_HOSTBASED_SERVICE_X ++#undef GSS_C_NT_HOSTBASED_SERVICE ++#undef GSS_C_NT_ANONYMOUS ++#undef GSS_C_NT_EXPORT_NAME ++ + gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_VAL; + gss_OID GSS_C_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHINE_UID_NAME_VAL; + gss_OID GSS_C_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_VAL; |