From cd109234a52e0e07b36a910469f67294ba290c37 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Hajdan?= Date: Sat, 1 Oct 2011 00:02:39 +0000 Subject: [PATCH] Fix build with Heimdal, bug #383121 by Ben Carrell, patch by Martin von Gagern. Package-Manager: portage-2.1.10.11/cvs/Linux i686 --- www-client/chromium/ChangeLog | 7 +++++- www-client/chromium/Manifest | 13 ++++++----- .../chromium/chromium-15.0.874.54.ebuild | 5 ++++- .../chromium/files/chromium-kerberos-r0.patch | 22 +++++++++++++++++++ 4 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 www-client/chromium/files/chromium-kerberos-r0.patch 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 + +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/Manifest b/www-client/chromium/Manifest index b1b8df484997..a61e279ce5fc 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,8 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99 +AUX chromium-kerberos-r0.patch 944 RMD160 25fccaa4406b1f964d72c94fd414a9955fc69ddd SHA1 b8b8f2cf6df1bade7af45d8f24b65acc602e781f SHA256 75b75f241675178dff914e0ddacc910a2583b2e2077e805f3ea1b2eed8513e21 AUX chromium-launcher-r2.sh 940 RMD160 7a64e597998a8f95a7e3d1c26377842ff8106f89 SHA1 9630a36af707a810cbd646f3bac5deba984439f6 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e AUX chromium-system-libevent-r0.patch 404 RMD160 0dc32cfbd0770e4be1b6f9d3cf8ac08987a5992d SHA1 f6127a903eeb4ce13a4f8fc75dda0102e68d759a SHA256 127945ad45ede0e2aefbc28d8d5eb241675abb83f3aedc2569133e437f98a841 AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1cdcbcd4a3517f70ba67c749da95c2a307971846 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9 @@ -14,15 +15,15 @@ DIST chromium-15.0.874.54.tar.bz2 151234989 RMD160 93e199903ad1b9138dd316f9bf846 DIST chromium-16.0.891.0.tar.bz2 151985642 RMD160 af0dd6ef72b41a143b697a225b75898b8f2e022e SHA1 adf8904a32d062fb3c569d57c47ff689cee614d7 SHA256 d5289707ac4cf3057d2c0b14455e76e840920ba1202ccc90a5e09bb8e9b7be70 EBUILD chromium-14.0.835.163.ebuild 13690 RMD160 517fe75786dabe160892afa24d3e0f38cf485a6d SHA1 6670def7f3058d06cedf10f2a0e955c145786eb5 SHA256 fe6c30231eae1b79e4a3aee376e84bd65c4dae77bdc7f77394bec970cfc2f314 EBUILD chromium-15.0.874.51.ebuild 14104 RMD160 abce2e57101e27b8b970e84c74e5ae2bc83cf003 SHA1 fbea777bdf0ac6ed5c690c14d2c04f9d10e13ac3 SHA256 41a71beccef275664852a5e368fa766977c9641f70cef87bb994f58f695ccc2f -EBUILD chromium-15.0.874.54.ebuild 14104 RMD160 fb6e3f6946e720f50011d70aa3feffa930d4cb32 SHA1 4559ed187cea4dcc6a0171e95442bf7c45f11128 SHA256 37100a594a242ac3fd244516031590710cc6607a6678a9e2287c99114be96436 +EBUILD chromium-15.0.874.54.ebuild 14227 RMD160 2c8a036c62d559ff393752f0ad3b0fabe109e6fc SHA1 e36fe0058dfba3b9744a148e684d036d02e7bc26 SHA256 1545bf16b0cf8925e601b87fdb90584455809905a71ed356d4b4ee1f0f66daee EBUILD chromium-16.0.891.0.ebuild 14103 RMD160 098fa82235316a6af183f320a17b214d8ee519ac SHA1 222dab051197d7b9f3ced6ec37362fcf54b97822 SHA256 fd880ac2a26ed9e90f41570703d5c510081a170da7b1de604e0813dc9a0027f9 EBUILD chromium-9999-r1.ebuild 16651 RMD160 77d0c708ea3729d78f3344be783d79bd2dee46d8 SHA1 b707a400622bf548e3d883eb5c0e4e55b5da47a7 SHA256 6ff63c2455a1ee708c76ba30f448e08c38f97d61572ea3b9a3430422ddeab867 -MISC ChangeLog 100599 RMD160 29ba011655aed4df46f075ae9866523d7a1b548f SHA1 424797405c288f9487e56db9faa65f7d44bb0e64 SHA256 b81b7e8147e771a0274dca0d508b9125a55639cfe672ac2fa9803b275d4a3075 +MISC ChangeLog 100808 RMD160 87d5d23390ccfd3e76a196c5d6985e8eec09938e SHA1 67a6b7bf426aba6ad431e5a12298c931566b76fd SHA256 e25d06de27b8fb3ee9738bbedf4b8f6d0c55e6a68e3c33c182c2444e5b4b93b9 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk6GC5IACgkQC77qH+pIQ6QhFQEAiwQ627h7AyQrBrfaRng+iFut -OwYKNJu/DMtORpPtyjYA/A9oo8/gnmUJPyqGQdr8IJB094jE9Ssjb/Db5QXEj7Rm -=LbP+ +iEYEAREKAAYFAk6GWWQACgkQuUQtlDBCeQIq7gCdHRwGnn90uFnsG1MnXwsDu27S +L8cAnRzVlK9Spu0xORL7/YQA3Cp8/s1Z +=n5z1 -----END PGP SIGNATURE----- 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; -- 2.26.2