Beta channel bump. Backport nss-3.15 compatibility patch.

Package-Manager: portage-2.2.0_alpha181/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 53 insertions, 13 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c0f26b186840..eed5545cb7ec 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.899 2013/06/20 03:58:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.900 2013/06/21 04:09:19 floppym Exp $
+
+*chromium-28.0.1500.52 (21 Jun 2013)
+
+  21 Jun 2013; Mike Gilbert <floppym@gentoo.org> +chromium-28.0.1500.52.ebuild,
+  +files/chromium-nss-3.15.patch, -chromium-28.0.1500.36.ebuild:
+  Beta channel bump. Backport nss-3.15 compatibility patch.
 
 *chromium-29.0.1541.2 (20 Jun 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 120df959e450..2962d3f36bfd 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -6,6 +6,7 @@ AUX chromium-gpsd-r0.patch 592 SHA256 9af056bd99e5176af6f5d8acb7d54241731b64fb3f
 AUX chromium-jsoncpp-path-r0.patch 521 SHA256 eb26d8574f0980a16d2237a6d69503558b37105e80b032c18495e97a69859346 SHA512 836aafcf43b1a41b2b3586c4409f878a34c5784f5bec2557f6fa67523bf693ad6e7965b8e8b8f502bd895c34959b4c8dc15a1e90c779a5674f0217e3b50af949 WHIRLPOOL 6a332363ebfe7ec5f769696908bbfe1992efe2e26ceb78ece8282f5da3b08166f99fbb684c311e93831d682da0ce9bbbb5f20dcb544d50b1040edc55ca810576
 AUX chromium-launcher-r2.sh 940 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e SHA512 64ec5e0a4f524bd6164fe33a022419d6cf54822754b172e85ea003c47f9bfe6ed996353af707a4e16369a68d2f2e7d51f186397a48da42f13eb3dccb7e4ae4f8 WHIRLPOOL 4a2284957bb462ded600f14b1aaa7e29389181cda149b9090cb7b6fe8303dc5692519da6281769925b2122578ba2ea0ef8a1563077a62d7cdf7ca243c165805a
 AUX chromium-launcher-r3.sh 932 SHA256 2025eb484eb1a86da9aff3946847ffc47162080b7a7700102b1608235b87ba3e SHA512 92ce9e24e8862b4a437fb1eb97613cbb3f596650efd6bf4a46ded92d99d6c7549f4e184db48d1695ef4390145665a3acc4714427292ba19414d3d2e1f9ba0e34 WHIRLPOOL e0735b33e003dca28356a83194ca949f7799a513b24f44efbf60af877a67fd14d3ad7a860e5ba5b1f533a5a891001ac173465f664a4ee398b3c0b71e24f84370
+AUX chromium-nss-3.15.patch 675 SHA256 74aecba709e4ef69bb317b65819efcf38d8802fdcfe5d5ba3e652b6713e8eec4 SHA512 a25a78bef8d6e11607f1b36a789ca7221806612df4fb2ad709f39102be451a0ba6780f04cb7af71d4e566b5406511ad9901e1849b6be7d0271cc1f02bda4e893 WHIRLPOOL f28fa51a7339c8a90b16bce7b07a5246ddad23710ca3a6e275b853f12c8593e727f64641eaa2901b8d4eddff6f1952a68c79a0d6cd9c45f6b9ec4110f700e538
 AUX chromium-pnacl-r0.patch 710 SHA256 9875ffcc0e9ae9420876ac66b130b1b017d445a031d43cbe0119793e1fb3781c SHA512 1446bd48f61ac11764232be959d5eb507d6bb42b66a77e10ddd41d3ea884e655e412e4e12fba06c716a1cae779ad030a3b347d1e4552be12e4722a09368eee55 WHIRLPOOL 2603f431b6bc647ccb808a6ea3e80702ba3cca8af346b10647f7457968c1bd1e0a84592e531fec31f06156f7113d34cf59ec16817f49051b3cd109f0fa4ff979
 AUX chromium-ppapi-r0.patch 422 SHA256 1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd SHA512 c809500724543e6a32a995ad547f19a8768f4e59ee4f4c9d7ad0b11dfbdc2a4795db2d5f272356a879bb31f305401b898c942f11207bb281430bc7c0c218f4a9 WHIRLPOOL 1e648552d740da7e1bd36fdd28f30464f725283d08c5293317a546d69b75144c383f74614dae29405581fb17bc2a52e6dfeb0c139fb62117dbead20b4d4db6fa
 AUX chromium-shim-headers-r0.patch 511 SHA256 7a0f87a9de048c1561bdee1c9fb9bfe8e22508f0fe4c1fd75d5c2f0da09f62ce SHA512 c4a2a6c63885e73c90308133b159a4b246ca9db85fd6aecae6377dbe6e168461c560d61adc9003311fc55a62ae24df0427b1080ebf8f9d0b17e8d8f252d9d1d8 WHIRLPOOL a856d9b75c0a3cc0800110d78b088721dd2cc538bceed68cbc293580d8bf542a52e3f358cb6387cf07d69891496ba9be82e9292540e7a312a898a7c26d9ea175
@@ -26,27 +27,27 @@ AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a4
 AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf SHA512 96d4ffd01fec2773d7beaf2bc82b8eb969556f6e859e39136b4044521c5b8bfd36c13a7f2fcc64613935d4703d8ede8a56c7ce581a7732642cb8ee71039c801e WHIRLPOOL 6a65521487fa353a22f192c567b487c77a405e068c88898e0d8045b3de26bdd54ed736f104e495598e0cc8703d3f6abc80f8b2ea1e254007dfb18f50294e8c07
 DIST chromium-27.0.1453.110-lite.tar.xz 108383068 SHA256 008aa2f833d5e1117a4dbd354e61937137edae90c5542e80875772878a15ac63 SHA512 d0296a870a4419d9c80483b3e8191e655c7ddf5d27749a8714c7b0c3c056e5ebfb44459f3993c79d62a80583330d72b9f96fccca790bdee0ca388ee68e9b61b2 WHIRLPOOL c06b5563442b52f499a53051265fd415ad9b5e367f938a8d8d516c46e4753a6e2df8d01c65bb3b7d475861ba4a5caba1dda00955e126088822b61914a9b29af2
 DIST chromium-27.0.1453.110-testdata.tar.xz 138686492 SHA256 4c79dbc29b4a5e770451e5808de7ba78090199149cdf45a1af6026ba7c2ebb08 SHA512 649f0af962edaa05406ca5b4022caf494d3a9d312ea0abac08cc1d8ba485a8d99fd30cab703bec16e18b77d2e074bd940935acc682490f7d7d0d9239819899a4 WHIRLPOOL 3416a1f7bdeb77c983dedc9724ee876f2fae793b024df79351b5818a77d68afa4b1910a86a5a9d06940c81f157f277b9c8a55aa8724a45e3aee4199ab5a64152
-DIST chromium-28.0.1500.36-lite.tar.xz 113762612 SHA256 0ef0397b491167b5dc54bf224f524997a7d0feb3a24cd902020ede9dbf1aeec1 SHA512 2d650349ab3501058e02524e6d70a92ceb06689216acece1859d8c689008109d9e7dc53d8102cfff810533275a3039a4d8ce113d8429ee1d02d9a44d29aa2d1c WHIRLPOOL 4fe302cd422ca9e20af2aa6e013ca5c93d7bc0e36d73cf6181256ee27b01832e2c18ff90caef17c0854d4c6acc226d4687c328318e43acb0a7b67954e1590ff6
-DIST chromium-28.0.1500.36-testdata.tar.xz 140997796 SHA256 c874554d2f18c0049c9550e6be50db2f031ea7eeb396915ae61a20ea63b94caa SHA512 1edbe42dae755578e4e55e06d392e244d743105d2b1600f59f4d74476f3dcd758d44f7db4e9c2d677a54dddb090e6a3ef8cebdccdb67bd43a2e455951fa3ddc7 WHIRLPOOL e52dce31f7765428fc082effcf313065c0656db0aba8dae5405ca224c4760699f79ca6b8ceb4cd745f55912868f958d78e90132ae3199743c0a84bcb4a402dae
 DIST chromium-28.0.1500.45-lite.tar.xz 113762700 SHA256 216ff0b1c4cfe48d1c2bf35f946e4a68f0a957501f5aaaf1c948fe680817ec7a SHA512 57f2d3ca2c87d6db8e8181a088f41f09375873ea6a60657831c30ed7d9efe9d7cbe154a754cb87bcbca73a779a4f7bf99daae16b2aaea284b27cfbd2edefbcbd WHIRLPOOL 34d7f430091bdbfb7d666abd22e4a2b0b530c8e8ad8570db17a076bfa346aa656be60a27867ce101859ff15fd1e7231f399dd8da6925be172075b72fa779bf90
 DIST chromium-28.0.1500.45-testdata.tar.xz 141031428 SHA256 39db78bb09992b89f3dfc06a4aa7f9ddafc93aeddb76acc63eba8d51eb81f20b SHA512 4140d61bd7cb0f14456261f39f0036c40288bd3db64552f18baf15f36bac266950b5aa83a9e48d18e2f04ec870dffe11c502a486c60932152368cf4f90078500 WHIRLPOOL 43ae1dc6657acd347c576e1d7999f860479c63c0e6e39697edaeccb5daaf6864f5c5da2f6ff5af191d9d707f81b7c77c39d3cc00ed81242ef253a658bdbf3198
+DIST chromium-28.0.1500.52-lite.tar.xz 113769820 SHA256 5a8cc5cf12ad731fb1f96876917328c993971f80900c5e0f196137b39c59cf8e SHA512 12769d65d9306ac670364914c0c19ef32647fe0c518cd6461ad1a58622cca45e012deaa519cfef498e2132e3f7f48fd8e7fa0b0744f8f87a7ad4d09ec7b3e751 WHIRLPOOL 5482030185f3464afde5d9d02e5cc1fda045747fe96678e3c28d74ada18116101929c5f0d0172fc590c146529474b22470d89d464786f35b0b280cc885c557bc
+DIST chromium-28.0.1500.52-testdata.tar.xz 141017340 SHA256 e2ad54c2a773fb5692ef746c2c564a99aa75f034927ef0537a2fd4b242023ab5 SHA512 cf7940abb4ade4ff9258508a250aa4416c8fb644518bd39d3741ab7bac284bba2ffb5c6da4a59d414786ed11ff18c1534eff9b9df6d7dd9ae0564c7a8aa4eaad WHIRLPOOL 7cdd10fe57301be0047ef8579a72d2981d7fd1a3957d1577e1dff8111cffdc6c74a8180dfd9f93fe1574f72b0a0076e663cdb653d104e8cda318f14f71e1c66c
 DIST chromium-29.0.1521.3-lite.tar.xz 117883412 SHA256 9d6616d24f8533ae37fe65d155c8a3899d23261ab60b63496d95773d57e83f5b SHA512 0c993ce92f25255077c5f1306c0ac54c0d83f8eaec39aad66740425b73019a5b699f6f5b0bb9e1b74d0b3f8073deae54f4dfd0e09c0a9d80085bc708f13fa2a5 WHIRLPOOL 5f6edb9724a5f5170908d68d8870b9a4632a9632fcec9835c3772b0b3bc2c9d89ce3d57dfad39ad05dc8157b6cfeafc15a334a00c8c1a9e08d8b2ffb3376199f
 DIST chromium-29.0.1521.3-testdata.tar.xz 116031060 SHA256 f01988d430921d1c84a7e54c639cb4278005c9db1cfc08c7901c6cad49bc6dc9 SHA512 eb1b017fa860e3aa9ef6e512f51ec0add9f66fe3800cffa41284bebc30a90e10811ab45ea09ba1f26561a29c34e72f892c605453ba8fbd99f1b572b5f2f01481 WHIRLPOOL ee0b8fb9ff4b9e9a3e4078e8fd74481cc312d7e064e8f27979ead511942f0c0c24bddbf604c4f89841f167ed90e868c3b3429f5e6fc7179092b8d14f7ecfac88
 DIST chromium-29.0.1541.2-lite.tar.xz 123176312 SHA256 f7acfb98f788fd81eafff20693f3f005cd7a55ed24c9ee52b8c964b48b9c7216 SHA512 6ebdce920ef0484b38de73b23edf0f891da665f9ea5ac7e7796bfd9460eb74fb3285b5f133c70a1ef5170afcdab662a832358dc9d53e4cf434085b7811978826 WHIRLPOOL 45af9ed6001b74593f8f68ea4d674bf8d22448e9437b28dfb4d3dd4e2d183af7aaf8d5bd473ab42949662d1e6e0ecb83d3a7f5f40fb037b062ec8e74ab99762c
 DIST chromium-29.0.1541.2-testdata.tar.xz 108853320 SHA256 0b6fa8e6059e498a8298aeb515473b2345f31ce80daaacfed55039951e93cac3 SHA512 18cae839080af6e477c2fc711b1e39236e073cd00efd00843c0a5836952de7224b75fc266b4ffa71a0123442ca0ed80489bd38e85bd89340e79d91cde6997072 WHIRLPOOL f1512875f21d2daa4d3c678a36155c15edd6030360dbb61562688203e6724f7e608d5c32a9d0b0437fce0cc7ef13df9cd209142fc21e866eb9cd0e0a67eb6d12
 EBUILD chromium-27.0.1453.110.ebuild 17002 SHA256 efea4635ef9462b15e542706618610f725071c1f7c6bb379120402ee907bf513 SHA512 8763e481fe61887898789719d132ecd2258bc1034d8141365c4b7c96f4e94223e75e4265774b5c380d0b783e8020faa25b2f0fb3b0bcc3b5db458d47aabbc219 WHIRLPOOL 92d9d28a60d96c7ea34c341f1f34e9002619fc9ac59f5e5098d43ed329b8316ae61866e12c4e686f4bde8083d03d8f931de476d5773c321e6eaff6865784a8ad
-EBUILD chromium-28.0.1500.36.ebuild 16983 SHA256 5fbaaedffabf7b5f021e59cf0acdf02d0e2f8533a0b83809368cb69766ec1d8c SHA512 c6ee9ca65d73eb46205cc8f77565834b91df060fa828ff8f813d2c93fb2b5bc79ed59b717fccac1da697b28699ee2d6038cb4317225bbcb77ffcb1d5212ea951 WHIRLPOOL 58dc7ee0231d1304baff9b0ab1f5be885e64b81aa4b61ca6731a911a5e19b7e49a03050eb4ccf20e568e6a61ab4d5a3746f45d9ccadcc1a8c592bc736502238b
 EBUILD chromium-28.0.1500.45.ebuild 17101 SHA256 2300f55c10646dc823af0750c229377d2e377ea9df681a0c1fd9bf6326dcdf2c SHA512 077b1f2af8c6074851dab09e960dfe06da00038a799a555bc8cb2a5901159b933814ebbacd266d5a120d5b9c34b3e5f9becd863201eba5c7dcec9b783f89ad04 WHIRLPOOL 6720df6fce685ed8603287f946c1cfbd41cc888a046df3aaa954961484ec2eb83856e9832b910ddcef12eca39cb13aa99f4f95bd363267e052e328b735745998
+EBUILD chromium-28.0.1500.52.ebuild 17145 SHA256 061ef303257b543bca9611643be1a4fdb3659e5a1bb28b3875f70ec26d1d97ae SHA512 32ecdb0cfa2ce93c1fb10cb191bc96e10cedcd564bd07063903830490628c10367faa844777a0448c467869fbc4e55ab57486de3076de026bc8ede4e37418200 WHIRLPOOL a4980356aa658bbbe7444ca3206ca1041c65ac1c24def9b57856fbe2fcaf0e4377cb147d69d7d93c79c0e0233d280332557cbcfa9ad4d773516d54a4f5634fd1
 EBUILD chromium-29.0.1521.3.ebuild 17225 SHA256 d0cb9944394abf6dcd5f6c95f13e9c58ae969d8193c50941394d5f110c3438a6 SHA512 f50e29ca347819db308432b35b6224bd92ce1889c98282b7a5f79bf59c9e16ab18fddb187ed2157fe946386831b287887c8043da96808d966a78dad203df2b14 WHIRLPOOL a46dca152aa4b880a3b171fa97a58e12206b4276f049058c3e316d0432cd92ee382d15ba66a678959cdb279d63c2038c8407cbb10804ff6efab15fe6ebf0bbb7
 EBUILD chromium-29.0.1541.2.ebuild 17213 SHA256 a18216bb6c32542ce196bde8930a676ac65756084794015e844c855be4928243 SHA512 c4b8f90359af86851e2e9f238140b21efda74bba0f921441b25fac94ab7d21b7f842fd802d0861bfe1a9ec3ec189d41122339874a7c01bbec4e6374e7b96c35c WHIRLPOOL efd272083dc439f25b70a824577a2c1105c76627cf17ac09dc0c64b8bd5e59cba67f9fc6446adac634c9983409c8e44aab8fcbdd4ec395de89c9a2c231a6ac86
 EBUILD chromium-9999-r1.ebuild 18981 SHA256 2caf56eb58301c3e64b0e956f5f98d6b2889552b0462016e412576406de9e6f4 SHA512 bfb828e690f11b2150a171b870276c11e170efd29d6be96403187afdd7de8be899f00fdb0a035bd6e261058132ae979d7d271fc06d8fe2b11427fb4ff7cda704 WHIRLPOOL 76909572c7fc08af3e8a3d2f4750bfa8cbf7a0ac8c2d79d3672d1ac73fce829693c7c6c16ea5818734552a32b651bf82a768d3ee1d598ac8083b351c3d5f1113
-MISC ChangeLog 72498 SHA256 597504976efac98c17bc168001d6f3913a90ff6f27443daf6ece7e33436c01e2 SHA512 841b75b561c8047ff8127b21e4de7107c5cc5320da5045e06e03a0afaa912a0c98588dee506b8509b38f1b64c2828ab9e18a43253dd6b78b9612fe48f6af1e04 WHIRLPOOL 3a6171ce538677a094507ae1a93fad38ef7d9eecda5bd1a0abfb9e0ba3dfa8b2518db526a26e77cc777feeda9e518e8be2fd6a2c3d90aed49ef7965b4771ec34
+MISC ChangeLog 72739 SHA256 929cb0ea957f885f1b88b2a589ec9bc0b436692f87636a369adda37fafadc31b SHA512 5b6668c35e3f6d9377c1c7bdef1a2bcb1b3828cb7fa14b6ebdf3e94bda6a3705b2dcf8cb995082dd53c50e1c7b3f9137c78a765c6cd0a99528ecf44e0b465baa WHIRLPOOL 4432a0aa1a2e10fd36f8ad1df2601f2ad8e36942e72d6c1df7774caa502bff94bf8d5c8964759d1d4be285c9be4073b009138160c2aff193d5c884568a145a82
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHCdv8ACgkQuUQtlDBCeQJIHgCfRpqkEYWkNoZI0BA8f2TnmgNA
-IHYAn2yJBZsQ6yrW1SRYFBuNZ69DO/mP
-=QkFZ
+iF4EAREIAAYFAlHD0fcACgkQC77qH+pIQ6TUZAD+IJX9p4i9djpvqDDwS/I7+Onn
+MaQnjvAWne6mYkc2QYoA/2blkpmNTFuukk9FjI+OtUGuCcNsD5csaeZBLmNRM7zK
+=2Bdy
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-28.0.1500.36.ebuild b/www-client/chromium/chromium-28.0.1500.52.ebuild
index f6d2c761f808..f4253b40cd58 100644
--- a/www-client/chromium/chromium-28.0.1500.36.ebuild
+++ b/www-client/chromium/chromium-28.0.1500.52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1500.36.ebuild,v 1.1 2013/06/07 01:06:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1500.52.ebuild,v 1.1 2013/06/21 04:09:19 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -25,7 +25,7 @@ IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-f
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
 
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+RDEPEND="app-accessibility/speech-dispatcher:=
 	app-arch/bzip2:=
 	app-arch/snappy:=
 	system-sqlite? ( dev-db/sqlite:3 )
@@ -136,6 +136,8 @@ src_prepare() {
 	# Fix build with harfbuzz-0.9.18, bug #472416 .
 	epatch "${FILESDIR}/${PN}-system-harfbuzz-r0.patch"
 
+	epatch "${FILESDIR}/${PN}-nss-3.15.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
@@ -287,8 +289,13 @@ src_configure() {
 	myconf+="
 		-Dlinux_link_gsettings=1
 		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
+		-Dlinux_link_libspeechd=1"
+
+	if has_version '>=app-accessibility/speech-dispatcher-0.8'; then
+		myconf+=" -Dlibspeechd_h_prefix=speech-dispatcher/"
+	else
+		myconf+=" -Dlibspeechd_h_prefix="
+	fi
 
 	# TODO: use the file at run time instead of effectively compiling it in.
 	myconf+="
diff --git a/www-client/chromium/files/chromium-nss-3.15.patch b/www-client/chromium/files/chromium-nss-3.15.patch
new file mode 100644
index 000000000000..312614ed7897
--- /dev/null
+++ b/www-client/chromium/files/chromium-nss-3.15.patch
@@ -0,0 +1,26 @@
+--- a/net/third_party/nss/ssl/bodge/secitem_array.c
++++ b/net/third_party/nss/ssl/bodge/secitem_array.c
+@@ -6,6 +6,7 @@
+  * Support routines for SECItemArray data structure.
+  */
+ 
++#include "nssutil.h"
+ #include "seccomon.h"
+ #include "secitem.h"
+ #include "secerr.h"
+@@ -13,10 +14,15 @@
+ 
+ typedef struct SECItemArrayStr SECItemArray;
+ 
++#define NSSUTIL_VERSION_NUM \
++    (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH)
++#if NSSUTIL_VERSION_NUM < 31500
++// Added in NSS 3.15.
+ struct SECItemArrayStr {
+     SECItem *items;
+     unsigned int len;
+ };
++#endif
+ 
+ SECItemArray *
+ SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)