diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2012-08-30 14:54:17 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2012-08-30 14:54:17 +0000 |
| commit | 2f4c3550c50b8b9afa1652eff05e983b4e0d3f51 (patch) | |
| tree | 2e5e88926978106511a58859840701a45059d65c /www | |
| parent | c02b0fd529dbb7b95c859505ecb285011a16a3d5 (diff) | |
| download | ports-2f4c3550c50b8b9afa1652eff05e983b4e0d3f51.tar.gz ports-2f4c3550c50b8b9afa1652eff05e983b4e0d3f51.zip | |
Notes
Diffstat (limited to 'www')
180 files changed, 3327 insertions, 2888 deletions
diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile index 17dedf11a711..d4eca4dc5932 100644 --- a/www/firefox-esr-i18n/Makefile +++ b/www/firefox-esr-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= firefox-i18n -PORTVERSION= 10.0.6 +PORTVERSION= 10.0.7 CATEGORIES= www MASTER_SITE_SUBDIR= firefox/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= diff --git a/www/firefox-esr-i18n/distinfo b/www/firefox-esr-i18n/distinfo index 876c72c09d77..654e35e872af 100644 --- a/www/firefox-esr-i18n/distinfo +++ b/www/firefox-esr-i18n/distinfo @@ -1,164 +1,164 @@ -SHA256 (xpi/firefox-i18n-10.0.6/af.xpi) = 10c6017909b20de980d106a12d987616da899a7c0272b1e3d798dff3fcc6c920 -SIZE (xpi/firefox-i18n-10.0.6/af.xpi) = 238745 -SHA256 (xpi/firefox-i18n-10.0.6/ak.xpi) = 2399ba4cb1762b110d9851df73a097e07db6219addd5fcd752c632f9e79d061b -SIZE (xpi/firefox-i18n-10.0.6/ak.xpi) = 240572 -SHA256 (xpi/firefox-i18n-10.0.6/ar.xpi) = 2646d869de8f25dc3ddfc5e5cbe1fbbccb2be2ef2d1ed2e5eb546b7b644f172b -SIZE (xpi/firefox-i18n-10.0.6/ar.xpi) = 263703 -SHA256 (xpi/firefox-i18n-10.0.6/ast.xpi) = 693dcf5ca51445fb819f06576f4dbf88f009888548c08fdb220016064bf79adc -SIZE (xpi/firefox-i18n-10.0.6/ast.xpi) = 237975 -SHA256 (xpi/firefox-i18n-10.0.6/be.xpi) = 0b919085607f82d292b9ec1dd209425753e003c862d60b4ac9a6fe654906eeb2 -SIZE (xpi/firefox-i18n-10.0.6/be.xpi) = 245758 -SHA256 (xpi/firefox-i18n-10.0.6/bg.xpi) = 8971cc2266fa8792d50dd3d2056ffd2a1f8660b8eba9eb33ee5fc35bf8788431 -SIZE (xpi/firefox-i18n-10.0.6/bg.xpi) = 276757 -SHA256 (xpi/firefox-i18n-10.0.6/bn-BD.xpi) = e347b8ab7dbbbe82c5307f86e54124d51621e7659e87f05309e452b23feec59f -SIZE (xpi/firefox-i18n-10.0.6/bn-BD.xpi) = 288294 -SHA256 (xpi/firefox-i18n-10.0.6/bn-IN.xpi) = 7efe3f87ec6361adc2ea3d4c8a2dfd65f153df0fc7518c4c5ccc02c587576fef -SIZE (xpi/firefox-i18n-10.0.6/bn-IN.xpi) = 319305 -SHA256 (xpi/firefox-i18n-10.0.6/br.xpi) = 711e340366af7f37c93ce4810aaa5fd3bd20fb40748e0f32048cfed59a18c9ed -SIZE (xpi/firefox-i18n-10.0.6/br.xpi) = 247652 -SHA256 (xpi/firefox-i18n-10.0.6/bs.xpi) = 3e26878d409e9fcdf5fb37e79dfa34728c9d6a0295697d03da17ff1c722ef8c0 -SIZE (xpi/firefox-i18n-10.0.6/bs.xpi) = 245309 -SHA256 (xpi/firefox-i18n-10.0.6/ca.xpi) = c11cc996602b84401d104f0cb8bfaa554e690631d4d5ddcdee96b968d3533440 -SIZE (xpi/firefox-i18n-10.0.6/ca.xpi) = 248222 -SHA256 (xpi/firefox-i18n-10.0.6/cs.xpi) = 92167d82e7147d37491f4d1d82459eeb119cc08237b458af63131df0da85538a -SIZE (xpi/firefox-i18n-10.0.6/cs.xpi) = 248770 -SHA256 (xpi/firefox-i18n-10.0.6/cy.xpi) = 53d3f45d0f100104bbda99f8a1089edd7fa57b2f5088886441b148a0f35186b7 -SIZE (xpi/firefox-i18n-10.0.6/cy.xpi) = 244198 -SHA256 (xpi/firefox-i18n-10.0.6/da.xpi) = 8f4a2747f812f88f6112fec3703435c9fd3ae8def414cb85e136fd99b43a48a8 -SIZE (xpi/firefox-i18n-10.0.6/da.xpi) = 240329 -SHA256 (xpi/firefox-i18n-10.0.6/de.xpi) = 8d0a6464ee98177971d7ec20e1df4af517c7e48403b9026d0776ecdfe925b8d5 -SIZE (xpi/firefox-i18n-10.0.6/de.xpi) = 249298 -SHA256 (xpi/firefox-i18n-10.0.6/el.xpi) = 73c6eae12969b8b7e5b20bc96ae6b870317faa3fff754e3ea9cfcfac64a7ba03 -SIZE (xpi/firefox-i18n-10.0.6/el.xpi) = 264380 -SHA256 (xpi/firefox-i18n-10.0.6/en-GB.xpi) = dbdb2adc7e324b5eac7d31516785e063856574d35079dad19afc2e595d9e8d44 -SIZE (xpi/firefox-i18n-10.0.6/en-GB.xpi) = 231194 -SHA256 (xpi/firefox-i18n-10.0.6/en-US.xpi) = b2217f011802848b0927cc3a2d4ea704d900980abfc82c8b9249637a5af72a38 -SIZE (xpi/firefox-i18n-10.0.6/en-US.xpi) = 230682 -SHA256 (xpi/firefox-i18n-10.0.6/en-ZA.xpi) = e7eed628b1697df9aed2f4f9cad48bca599329731f9ca1b4c8f9cd17f7ec7bee -SIZE (xpi/firefox-i18n-10.0.6/en-ZA.xpi) = 233920 -SHA256 (xpi/firefox-i18n-10.0.6/eo.xpi) = d39877ff8175bd6818ab511efcffcfecb3bee6487d664d693664c350dd744a6b -SIZE (xpi/firefox-i18n-10.0.6/eo.xpi) = 240903 -SHA256 (xpi/firefox-i18n-10.0.6/es-AR.xpi) = 4aa9273a193b6c2df90fd2a489dee796dcb2de5d4fd2f914406701b2c43d2a3c -SIZE (xpi/firefox-i18n-10.0.6/es-AR.xpi) = 245347 -SHA256 (xpi/firefox-i18n-10.0.6/es-CL.xpi) = 478dd9e5e32da2f50765c3b75b7e8d9eda1980f1580600837da058bfbbb16d26 -SIZE (xpi/firefox-i18n-10.0.6/es-CL.xpi) = 250206 -SHA256 (xpi/firefox-i18n-10.0.6/es-ES.xpi) = cb398f47eb32eb167f5fdd07ac5f6f0de3dcfe068b92abee5cc37fa883c3587e -SIZE (xpi/firefox-i18n-10.0.6/es-ES.xpi) = 215379 -SHA256 (xpi/firefox-i18n-10.0.6/es-MX.xpi) = 912041a15b11c2b91ee77061e6c4dadcef03eb78c0db32aa45747763e3eaa39c -SIZE (xpi/firefox-i18n-10.0.6/es-MX.xpi) = 224152 -SHA256 (xpi/firefox-i18n-10.0.6/et.xpi) = 97ad3fa377128ea18642e296dcd8ac69a11ee9c30e5ee2013a2100e01ccc6a80 -SIZE (xpi/firefox-i18n-10.0.6/et.xpi) = 242631 -SHA256 (xpi/firefox-i18n-10.0.6/eu.xpi) = ae67b5c40d5cb1906b628a76f29fdd29ce5277aeb0bd99f6cb00eee245550f2f -SIZE (xpi/firefox-i18n-10.0.6/eu.xpi) = 240252 -SHA256 (xpi/firefox-i18n-10.0.6/fa.xpi) = 070319a33fa625ffc7f746c8caeaa30de2203a6ae220507e147977b28dd18584 -SIZE (xpi/firefox-i18n-10.0.6/fa.xpi) = 272853 -SHA256 (xpi/firefox-i18n-10.0.6/fi.xpi) = c7060dfe81a684ea2e44edf1fd26c1ab85ad660866f090c47109c436fc48c57d -SIZE (xpi/firefox-i18n-10.0.6/fi.xpi) = 243630 -SHA256 (xpi/firefox-i18n-10.0.6/fr.xpi) = d344e7047d5e1f2c9c6bcd5801803be54425c4258d32fc3622372a4c7e4685c7 -SIZE (xpi/firefox-i18n-10.0.6/fr.xpi) = 249569 -SHA256 (xpi/firefox-i18n-10.0.6/fy-NL.xpi) = 38c50af58aa4d59cddf263aae32dcd7fb37f448793dd9a932fc92ce143083d3c -SIZE (xpi/firefox-i18n-10.0.6/fy-NL.xpi) = 249344 -SHA256 (xpi/firefox-i18n-10.0.6/ga-IE.xpi) = c7a818db2eb1d0c7ecf2547c6056f074252ff8d4cd2192707d78a428f8aacbde -SIZE (xpi/firefox-i18n-10.0.6/ga-IE.xpi) = 252022 -SHA256 (xpi/firefox-i18n-10.0.6/gl.xpi) = 711483ba680433000f99ebf504a24b157b46c5961553f65b4fcdd28c55bd6aa5 -SIZE (xpi/firefox-i18n-10.0.6/gl.xpi) = 243250 -SHA256 (xpi/firefox-i18n-10.0.6/gu-IN.xpi) = 6459ed353bf0afe0c95f811bb4ab98d683c301f440b931db50f3d87b6fb98e7e -SIZE (xpi/firefox-i18n-10.0.6/gu-IN.xpi) = 275222 -SHA256 (xpi/firefox-i18n-10.0.6/he.xpi) = 072102774068cff442cac177c6bc365cdce7fef8db41863ee9ed585d4c155bc2 -SIZE (xpi/firefox-i18n-10.0.6/he.xpi) = 264936 -SHA256 (xpi/firefox-i18n-10.0.6/hi-IN.xpi) = 4876f9028b759e95ba5ef387d2bd9b437a9fc35c8b03d91e7d6537c1ef6effe6 -SIZE (xpi/firefox-i18n-10.0.6/hi-IN.xpi) = 280001 -SHA256 (xpi/firefox-i18n-10.0.6/hr.xpi) = 3e70e99c8a6f8876e2b3a4614cb77ebf2593a30d4b2c348025a138ea0b238276 -SIZE (xpi/firefox-i18n-10.0.6/hr.xpi) = 249334 -SHA256 (xpi/firefox-i18n-10.0.6/hu.xpi) = bde22b4888ae6731a9cf57124786f3a0983841b2ff940d783525a98667e8fd1e -SIZE (xpi/firefox-i18n-10.0.6/hu.xpi) = 253774 -SHA256 (xpi/firefox-i18n-10.0.6/hy-AM.xpi) = 007e555ca1c630fc9e70097084072b114080dbf5ab30d34de702dcaf8ff08036 -SIZE (xpi/firefox-i18n-10.0.6/hy-AM.xpi) = 445453 -SHA256 (xpi/firefox-i18n-10.0.6/id.xpi) = 9c63b92492b28044053632bb5ffc1b3d4d3621a48600e9d358f3dec37b728142 -SIZE (xpi/firefox-i18n-10.0.6/id.xpi) = 236825 -SHA256 (xpi/firefox-i18n-10.0.6/is.xpi) = 0e709be9d9e59ab4ac3ad7318fcfd6e04e60451f8f23d93f37d7688f97e6404e -SIZE (xpi/firefox-i18n-10.0.6/is.xpi) = 243068 -SHA256 (xpi/firefox-i18n-10.0.6/it.xpi) = 854a0a014b3d43c8d48a642ce4db0576170607d3f0934b10463754e716404f09 -SIZE (xpi/firefox-i18n-10.0.6/it.xpi) = 212717 -SHA256 (xpi/firefox-i18n-10.0.6/ja.xpi) = 6e4e5382b86939f111d48d48874181fba7992a1dc4f144b1fa89a475aabd3627 -SIZE (xpi/firefox-i18n-10.0.6/ja.xpi) = 273116 -SHA256 (xpi/firefox-i18n-10.0.6/kk.xpi) = 1543dfae6d57791c1f7cd1450fef6156d7b25af679f9e095aa8bda3423ed0132 -SIZE (xpi/firefox-i18n-10.0.6/kk.xpi) = 279778 -SHA256 (xpi/firefox-i18n-10.0.6/kn.xpi) = e518d094d7de424cd471f248916b0e12a9c91b44ea7ef30d61be4e515b6d5f8a -SIZE (xpi/firefox-i18n-10.0.6/kn.xpi) = 299831 -SHA256 (xpi/firefox-i18n-10.0.6/ko.xpi) = da302d37e3b379c88f36fed33572297fa53aa1f4aa351cdc74006ed0a6efdb8a -SIZE (xpi/firefox-i18n-10.0.6/ko.xpi) = 227946 -SHA256 (xpi/firefox-i18n-10.0.6/ku.xpi) = e223385556e2a2b01a67e846c3779140b0cd0683bbc1129f150eda85fdf439f3 -SIZE (xpi/firefox-i18n-10.0.6/ku.xpi) = 254710 -SHA256 (xpi/firefox-i18n-10.0.6/lg.xpi) = 47bd7f943d0299f8e45363ce90432a7f8db73556a177b2e89542c1415a87c213 -SIZE (xpi/firefox-i18n-10.0.6/lg.xpi) = 247675 -SHA256 (xpi/firefox-i18n-10.0.6/lt.xpi) = 29153ea93d598db938aaface4bc9d434929d626eab262257db22ac567f1fd451 -SIZE (xpi/firefox-i18n-10.0.6/lt.xpi) = 330632 -SHA256 (xpi/firefox-i18n-10.0.6/lv.xpi) = d4396d3383523a10fea0e8c21fed6c6718d033adaf3dadf36de772f6478d1fc1 -SIZE (xpi/firefox-i18n-10.0.6/lv.xpi) = 244353 -SHA256 (xpi/firefox-i18n-10.0.6/mai.xpi) = adc09beb1c7d225286b8c80c3cd025b77d1a062b4572bf68947744f820ba793a -SIZE (xpi/firefox-i18n-10.0.6/mai.xpi) = 279254 -SHA256 (xpi/firefox-i18n-10.0.6/mk.xpi) = 90926bd25619c52852a95169fe1a1e8e43345252ab77235b6a780a43e9f27383 -SIZE (xpi/firefox-i18n-10.0.6/mk.xpi) = 272940 -SHA256 (xpi/firefox-i18n-10.0.6/ml.xpi) = a8a732904dfad27625ace4a9d30b60efad5e68dca5562c589b3e6f74ab80d7bc -SIZE (xpi/firefox-i18n-10.0.6/ml.xpi) = 306677 -SHA256 (xpi/firefox-i18n-10.0.6/mr.xpi) = ee899bcb18f75349af02781c1622a64c79afe11875a347e83959214198cbc4de -SIZE (xpi/firefox-i18n-10.0.6/mr.xpi) = 281458 -SHA256 (xpi/firefox-i18n-10.0.6/nb-NO.xpi) = 22ab0722eb3ca0e09c38135740b2f28ea46b35bfdcfde546727780aa20fa9efd -SIZE (xpi/firefox-i18n-10.0.6/nb-NO.xpi) = 241211 -SHA256 (xpi/firefox-i18n-10.0.6/nl.xpi) = 0010196c9155c131fa0b714859b725c1175b258b9c5b370adf82bafb40d3fd59 -SIZE (xpi/firefox-i18n-10.0.6/nl.xpi) = 242401 -SHA256 (xpi/firefox-i18n-10.0.6/nn-NO.xpi) = a839839df074e65e5f9cf8dea73222839c399456dc31e22369955cef8d9927e1 -SIZE (xpi/firefox-i18n-10.0.6/nn-NO.xpi) = 242454 -SHA256 (xpi/firefox-i18n-10.0.6/nso.xpi) = 2ddaa475bd94205c8879d7ebade9e335e0d095450967e795aa1c2fca6b51071c -SIZE (xpi/firefox-i18n-10.0.6/nso.xpi) = 245696 -SHA256 (xpi/firefox-i18n-10.0.6/or.xpi) = 24ba406736cd813e308e243f8740254719ca712632eab44161964423c94153e0 -SIZE (xpi/firefox-i18n-10.0.6/or.xpi) = 281686 -SHA256 (xpi/firefox-i18n-10.0.6/pa-IN.xpi) = fdda80c487d8d41b99801e2667d5a550b5bbfbae8b531e77d1bb108f5d0ee1e4 -SIZE (xpi/firefox-i18n-10.0.6/pa-IN.xpi) = 282146 -SHA256 (xpi/firefox-i18n-10.0.6/pl.xpi) = 9b088358c6142a1f9dea8095aa1d76632d0b4a4e7b6507030f20e799b34f519d -SIZE (xpi/firefox-i18n-10.0.6/pl.xpi) = 252047 -SHA256 (xpi/firefox-i18n-10.0.6/pt-BR.xpi) = 800b17a268cb1c9bc01dfd02f75a57901e168d1a365124be7d545261f23362eb -SIZE (xpi/firefox-i18n-10.0.6/pt-BR.xpi) = 246850 -SHA256 (xpi/firefox-i18n-10.0.6/pt-PT.xpi) = bee12dbd880df017857fce00ca96e2971b042c636a47a8006d4ac5fb8af907c9 -SIZE (xpi/firefox-i18n-10.0.6/pt-PT.xpi) = 246477 -SHA256 (xpi/firefox-i18n-10.0.6/rm.xpi) = 986cbc3b656a44ef299507677cf3aa2fb7285ff8cdbb9a8dfcd32284d9759fdd -SIZE (xpi/firefox-i18n-10.0.6/rm.xpi) = 245772 -SHA256 (xpi/firefox-i18n-10.0.6/ro.xpi) = 08f554cca27cc747941c8c16f79f48d59ef79fcfa16e91e52a6fa78407af8d3d -SIZE (xpi/firefox-i18n-10.0.6/ro.xpi) = 263252 -SHA256 (xpi/firefox-i18n-10.0.6/ru.xpi) = 2ccc52e9782d07dfd48e37befadfc2a988a9dffa78181a67735e048c8ae55b59 -SIZE (xpi/firefox-i18n-10.0.6/ru.xpi) = 254985 -SHA256 (xpi/firefox-i18n-10.0.6/si.xpi) = 303e3effa6882a75033851866162e143438daa3294baf9da449b67e465e6ad24 -SIZE (xpi/firefox-i18n-10.0.6/si.xpi) = 271990 -SHA256 (xpi/firefox-i18n-10.0.6/sk.xpi) = f06bdc827385e392bf1d7beacd6d1a27f8142e62f725e124d56dfe1911730d8f -SIZE (xpi/firefox-i18n-10.0.6/sk.xpi) = 254290 -SHA256 (xpi/firefox-i18n-10.0.6/sl.xpi) = 6f3d840c7eb96aff3d8cc85ae811442b479c5df4ba11ad05e8f2461b45268130 -SIZE (xpi/firefox-i18n-10.0.6/sl.xpi) = 241036 -SHA256 (xpi/firefox-i18n-10.0.6/son.xpi) = b46ac6193addbc2bdc927d3132786fc280f954a1e6565b15343f2cb8db13f285 -SIZE (xpi/firefox-i18n-10.0.6/son.xpi) = 239061 -SHA256 (xpi/firefox-i18n-10.0.6/sq.xpi) = e441e6c6275cb4812a2cfcae1204ed749b7137c4a3b1e204840583a600ab8f80 -SIZE (xpi/firefox-i18n-10.0.6/sq.xpi) = 227697 -SHA256 (xpi/firefox-i18n-10.0.6/sr.xpi) = 76c08f49cd5a93c6a6941c9c1b0c428aef745364da66635c4828e70d0c7b7cee -SIZE (xpi/firefox-i18n-10.0.6/sr.xpi) = 277746 -SHA256 (xpi/firefox-i18n-10.0.6/sv-SE.xpi) = c2f9b3b8573a0a0846af49d83f22927f0a96570e2eba8fc2515d72b2c445974d -SIZE (xpi/firefox-i18n-10.0.6/sv-SE.xpi) = 278881 -SHA256 (xpi/firefox-i18n-10.0.6/ta-LK.xpi) = f5023259018b3c6ab82cbb5bdf4805e1c5b29c89b7f2e7918827efc64ad9e8f3 -SIZE (xpi/firefox-i18n-10.0.6/ta-LK.xpi) = 290619 -SHA256 (xpi/firefox-i18n-10.0.6/ta.xpi) = ce5678df5858058551380c610c881ff4cd0427996ec6668a92463a03dc1dfad7 -SIZE (xpi/firefox-i18n-10.0.6/ta.xpi) = 274057 -SHA256 (xpi/firefox-i18n-10.0.6/te.xpi) = b1039acba0357763748d9ebacecf549e87c460fb428f16007c41bb0a06df2d04 -SIZE (xpi/firefox-i18n-10.0.6/te.xpi) = 289046 -SHA256 (xpi/firefox-i18n-10.0.6/th.xpi) = 7de6fae68724137d911c96f5edb7bdb0c3a458e3c7afe9e210ddbbdd4bfe442f -SIZE (xpi/firefox-i18n-10.0.6/th.xpi) = 272423 -SHA256 (xpi/firefox-i18n-10.0.6/tr.xpi) = 9678556c04f63dde415c8725769ddd4283c263ea231f758e957f2dfb2fe3ce0b -SIZE (xpi/firefox-i18n-10.0.6/tr.xpi) = 249918 -SHA256 (xpi/firefox-i18n-10.0.6/uk.xpi) = 445e60cbbe3564db1a23d281544f396c59bb2229be774bb5cc75e7d83b515a5b -SIZE (xpi/firefox-i18n-10.0.6/uk.xpi) = 279133 -SHA256 (xpi/firefox-i18n-10.0.6/vi.xpi) = d1022e161a0373603506b83a7a9ccfbc7f70e49f085f666f26ef530f3d500a6a -SIZE (xpi/firefox-i18n-10.0.6/vi.xpi) = 262787 -SHA256 (xpi/firefox-i18n-10.0.6/zh-CN.xpi) = 1c4d65bf07004888d5d51c2618580ca776bd809a298cb9c8dde5067a5bae6c61 -SIZE (xpi/firefox-i18n-10.0.6/zh-CN.xpi) = 256547 -SHA256 (xpi/firefox-i18n-10.0.6/zh-TW.xpi) = e20b85a2932da0d92860a153a0ad79fc5b7d0102fc988952e0520be6b5e2e407 -SIZE (xpi/firefox-i18n-10.0.6/zh-TW.xpi) = 257493 -SHA256 (xpi/firefox-i18n-10.0.6/zu.xpi) = d29b68ca21afa2c07b2d5789a205d30fd5c1b01294f5759933790c2e08b30330 -SIZE (xpi/firefox-i18n-10.0.6/zu.xpi) = 246396 +SHA256 (xpi/firefox-i18n-10.0.7/af.xpi) = 9b1d55555de4c4ba192e7267b2a3580d5c72c02d264bf769d5cf5941dc5073bc +SIZE (xpi/firefox-i18n-10.0.7/af.xpi) = 238744 +SHA256 (xpi/firefox-i18n-10.0.7/ak.xpi) = dc654681229024ddb55bef9d695e7dee095252af7937e3e91dd811f9e1bbf16d +SIZE (xpi/firefox-i18n-10.0.7/ak.xpi) = 240572 +SHA256 (xpi/firefox-i18n-10.0.7/ar.xpi) = b129533b324cdb14506620b2930b3fb19dc43b6e3fa2877d3c455f81e5239cc7 +SIZE (xpi/firefox-i18n-10.0.7/ar.xpi) = 263703 +SHA256 (xpi/firefox-i18n-10.0.7/ast.xpi) = e72c721e68e10844cb731f424e46fa9a3cf155db7cf0eeff58d45f9eb4953d36 +SIZE (xpi/firefox-i18n-10.0.7/ast.xpi) = 237975 +SHA256 (xpi/firefox-i18n-10.0.7/be.xpi) = 1350c18fd62ee8a3aff20b669d12c738cad4c0f5d2796371422c91bd23ff14ce +SIZE (xpi/firefox-i18n-10.0.7/be.xpi) = 245757 +SHA256 (xpi/firefox-i18n-10.0.7/bg.xpi) = e48a67e65ec3085021b3a3a83a0dbc8c808c555c2da23d26378525eb74f0ac17 +SIZE (xpi/firefox-i18n-10.0.7/bg.xpi) = 276757 +SHA256 (xpi/firefox-i18n-10.0.7/bn-BD.xpi) = 80d80907f1b4fad336b08285446b2bfd362cd360f2a74bcbde09a6e9c7570a09 +SIZE (xpi/firefox-i18n-10.0.7/bn-BD.xpi) = 288293 +SHA256 (xpi/firefox-i18n-10.0.7/bn-IN.xpi) = 2363c0fab01a49cb8dcc9f09e19515a8bd7161bbc1837a256d7dd28fb6aa59d8 +SIZE (xpi/firefox-i18n-10.0.7/bn-IN.xpi) = 319305 +SHA256 (xpi/firefox-i18n-10.0.7/br.xpi) = 8f35bfd22ba015f38a2e6cdfe672900399e01205450dd4be0fd7bb74ec32930e +SIZE (xpi/firefox-i18n-10.0.7/br.xpi) = 247652 +SHA256 (xpi/firefox-i18n-10.0.7/bs.xpi) = 93c384ca5d2d8ca5a131d29f6d9ad4e51e3eba12807cb6a8e324445e26a589ed +SIZE (xpi/firefox-i18n-10.0.7/bs.xpi) = 245309 +SHA256 (xpi/firefox-i18n-10.0.7/ca.xpi) = aa30dfc276fc90c5cdac4c4b53ddc3131bcb23ecd81c27f3fad9e1d4a381138f +SIZE (xpi/firefox-i18n-10.0.7/ca.xpi) = 248222 +SHA256 (xpi/firefox-i18n-10.0.7/cs.xpi) = dd8ed750dee9ff4f90dc320191efc24e354f440f6f63a14de06e1295370d3ca9 +SIZE (xpi/firefox-i18n-10.0.7/cs.xpi) = 248770 +SHA256 (xpi/firefox-i18n-10.0.7/cy.xpi) = 2aa3c66d864e861fb52ac52a652cfa43095ed3b1844b0f079ad21d249fc59846 +SIZE (xpi/firefox-i18n-10.0.7/cy.xpi) = 244197 +SHA256 (xpi/firefox-i18n-10.0.7/da.xpi) = 80a2fbd2e6092199a6e59507cf43582129c58b571f6750997318df9776519faa +SIZE (xpi/firefox-i18n-10.0.7/da.xpi) = 240328 +SHA256 (xpi/firefox-i18n-10.0.7/de.xpi) = 1b543c9942ba2c98a6ec0e307c6c12600de021c3402a6d992c0053748af4edff +SIZE (xpi/firefox-i18n-10.0.7/de.xpi) = 249298 +SHA256 (xpi/firefox-i18n-10.0.7/el.xpi) = 2c1992ddbe059c67bae113d56d76279d24436167c2fa7b46935856b5e39fcb12 +SIZE (xpi/firefox-i18n-10.0.7/el.xpi) = 264380 +SHA256 (xpi/firefox-i18n-10.0.7/en-GB.xpi) = 0cecb64b475e661cd659f51540a22a9273e0e5cbbbc1b6cd8b43c7a8b4e291f8 +SIZE (xpi/firefox-i18n-10.0.7/en-GB.xpi) = 231194 +SHA256 (xpi/firefox-i18n-10.0.7/en-US.xpi) = da378bf4be6785bcd1fbe6285578af69528dafff4adb587b214e776076710439 +SIZE (xpi/firefox-i18n-10.0.7/en-US.xpi) = 230681 +SHA256 (xpi/firefox-i18n-10.0.7/en-ZA.xpi) = fb8b217fe8b96f0b9091af03f720a42f7d2d50dac52df054d699ba075cf1ced1 +SIZE (xpi/firefox-i18n-10.0.7/en-ZA.xpi) = 233919 +SHA256 (xpi/firefox-i18n-10.0.7/eo.xpi) = 59d8cab2c36c489e69f4e879177adfed367293e2cf89d1b29282fee5af6119af +SIZE (xpi/firefox-i18n-10.0.7/eo.xpi) = 240903 +SHA256 (xpi/firefox-i18n-10.0.7/es-AR.xpi) = 272479971d91f2659a5d43572784a3142bf29750f71c09035f9f4c3e62938935 +SIZE (xpi/firefox-i18n-10.0.7/es-AR.xpi) = 245347 +SHA256 (xpi/firefox-i18n-10.0.7/es-CL.xpi) = d9ddf207e774888eb51c43a9ce27b5f59ea6992e7b8758fac4ece5467691b1e3 +SIZE (xpi/firefox-i18n-10.0.7/es-CL.xpi) = 250206 +SHA256 (xpi/firefox-i18n-10.0.7/es-ES.xpi) = 9cdc6c00adbc89eb7701f9a6cf007bc2b9c66590d7a3f6ea458927df6b184e1f +SIZE (xpi/firefox-i18n-10.0.7/es-ES.xpi) = 215379 +SHA256 (xpi/firefox-i18n-10.0.7/es-MX.xpi) = 1425fba6c1307ace6ead6655f99a55908a0a28eac8d3b34e4df42c7de331eaf5 +SIZE (xpi/firefox-i18n-10.0.7/es-MX.xpi) = 224152 +SHA256 (xpi/firefox-i18n-10.0.7/et.xpi) = 4849d05a5ed93b42937b2793a6c4d0fa23dc022c8248953acc161aa0e0b45c6b +SIZE (xpi/firefox-i18n-10.0.7/et.xpi) = 242631 +SHA256 (xpi/firefox-i18n-10.0.7/eu.xpi) = 37e130868396b12b132a5c3c3435f4ccb1f0c8180ec6800fb8c2ee25b77f216e +SIZE (xpi/firefox-i18n-10.0.7/eu.xpi) = 240252 +SHA256 (xpi/firefox-i18n-10.0.7/fa.xpi) = ee491601405c293f5bda16b08ffcdf053639e3d4deec4bfcb4fc510fd723decb +SIZE (xpi/firefox-i18n-10.0.7/fa.xpi) = 272853 +SHA256 (xpi/firefox-i18n-10.0.7/fi.xpi) = 459124222e825d3de647e0cc100e353c70a737a4879566097eda096408d160b3 +SIZE (xpi/firefox-i18n-10.0.7/fi.xpi) = 243630 +SHA256 (xpi/firefox-i18n-10.0.7/fr.xpi) = 5ae21783a4c5641d4d4b81eed0448402f434ad5e4fdd028c83acb2dec47ee425 +SIZE (xpi/firefox-i18n-10.0.7/fr.xpi) = 249569 +SHA256 (xpi/firefox-i18n-10.0.7/fy-NL.xpi) = 875df35099a97296c9777edb33bc3ee304246eccb9af2891d955240cbe78892f +SIZE (xpi/firefox-i18n-10.0.7/fy-NL.xpi) = 249344 +SHA256 (xpi/firefox-i18n-10.0.7/ga-IE.xpi) = 7de925d9df77d5a64cdc9ef35f487d30993294db72b4c88505930e44b637079a +SIZE (xpi/firefox-i18n-10.0.7/ga-IE.xpi) = 252023 +SHA256 (xpi/firefox-i18n-10.0.7/gl.xpi) = 1e049a6c250c3b11603e29592a852f49b4c710a4378ad0153c8236e6d8b5f74f +SIZE (xpi/firefox-i18n-10.0.7/gl.xpi) = 243250 +SHA256 (xpi/firefox-i18n-10.0.7/gu-IN.xpi) = 7cf8cb1a81a7e3655368f2e9c7d39a5327b8d0f0a830c0649bbe24fd2e1ad1cd +SIZE (xpi/firefox-i18n-10.0.7/gu-IN.xpi) = 275223 +SHA256 (xpi/firefox-i18n-10.0.7/he.xpi) = 643ebdf36a7c8c77e59e6214cfeedd76a9a3a5485c9e05a5977a80616d130464 +SIZE (xpi/firefox-i18n-10.0.7/he.xpi) = 264936 +SHA256 (xpi/firefox-i18n-10.0.7/hi-IN.xpi) = 944c8e5c4ca2ed6cfa720a8525a95f8a6f5e7d39db57f45b949b7e64d217dfb8 +SIZE (xpi/firefox-i18n-10.0.7/hi-IN.xpi) = 280001 +SHA256 (xpi/firefox-i18n-10.0.7/hr.xpi) = 29f0d39a79b73aa17da86462c5cf1569e5dd2c193540bbc83ac0e9514698fa27 +SIZE (xpi/firefox-i18n-10.0.7/hr.xpi) = 249334 +SHA256 (xpi/firefox-i18n-10.0.7/hu.xpi) = 962add2e75e93b10e2985798809a7ace215939b9c2da13bc0b2b16410c4bd28f +SIZE (xpi/firefox-i18n-10.0.7/hu.xpi) = 253774 +SHA256 (xpi/firefox-i18n-10.0.7/hy-AM.xpi) = c11bc7a7408b3ed28bb8ea149c62e0c2b198df6ecaa0b233419679e8d5b0aee5 +SIZE (xpi/firefox-i18n-10.0.7/hy-AM.xpi) = 445453 +SHA256 (xpi/firefox-i18n-10.0.7/id.xpi) = 4ad16b0956a81dd5df744226b60c345edd228ae6d48d1bc582c8444d8f7990ab +SIZE (xpi/firefox-i18n-10.0.7/id.xpi) = 236824 +SHA256 (xpi/firefox-i18n-10.0.7/is.xpi) = cd3836f93949d43922123d9e5d944587077b28a68f01ce0f9ab8f2b28090c523 +SIZE (xpi/firefox-i18n-10.0.7/is.xpi) = 243068 +SHA256 (xpi/firefox-i18n-10.0.7/it.xpi) = 5e9b774f4a721eb48b516323ec7c0b998e7c732b32022f3790cfe00b697cc7ae +SIZE (xpi/firefox-i18n-10.0.7/it.xpi) = 212717 +SHA256 (xpi/firefox-i18n-10.0.7/ja.xpi) = c6febfa49571180b0fdedc5ad889e6c095585a4ecc3b406fb36fe0f32b38ed51 +SIZE (xpi/firefox-i18n-10.0.7/ja.xpi) = 273116 +SHA256 (xpi/firefox-i18n-10.0.7/kk.xpi) = 8586fe598dbee8fe90d127c8a440df5a788202f53af6a2c78c858e99ef18663e +SIZE (xpi/firefox-i18n-10.0.7/kk.xpi) = 279779 +SHA256 (xpi/firefox-i18n-10.0.7/kn.xpi) = 9f90eadf9a0cfccaeb5ec6be5bfcd1fec02755de6ae3ea6aabbbf2712ca52ccb +SIZE (xpi/firefox-i18n-10.0.7/kn.xpi) = 299831 +SHA256 (xpi/firefox-i18n-10.0.7/ko.xpi) = 67a98a1756a76075bccd6b5828d0c68120f4251a4af61304a9903d72772195f9 +SIZE (xpi/firefox-i18n-10.0.7/ko.xpi) = 227946 +SHA256 (xpi/firefox-i18n-10.0.7/ku.xpi) = 34e09f46e60bc5221b85473914a1891a330b5525b565a6fdea44262dee9f53d5 +SIZE (xpi/firefox-i18n-10.0.7/ku.xpi) = 254711 +SHA256 (xpi/firefox-i18n-10.0.7/lg.xpi) = 35be3ee1f04799fbff1478a0a26f3caa904fe931f7d9232372179b6aa1d6482a +SIZE (xpi/firefox-i18n-10.0.7/lg.xpi) = 247674 +SHA256 (xpi/firefox-i18n-10.0.7/lt.xpi) = b84a1e12035d5e3f4b7c248e2f1bd54e52749c5c150c43fff5398e87a817d418 +SIZE (xpi/firefox-i18n-10.0.7/lt.xpi) = 330632 +SHA256 (xpi/firefox-i18n-10.0.7/lv.xpi) = 80db8149989623b9011b3d460b36effe3b95dccea972ce442ed64b71661b9df0 +SIZE (xpi/firefox-i18n-10.0.7/lv.xpi) = 244353 +SHA256 (xpi/firefox-i18n-10.0.7/mai.xpi) = 8a35d226dad386a049c3fc2481a868fc75544a38a1c7c20f5b079cdded3796f0 +SIZE (xpi/firefox-i18n-10.0.7/mai.xpi) = 279253 +SHA256 (xpi/firefox-i18n-10.0.7/mk.xpi) = 5517af241028c802fb0d14dd9c17fb8e6c75e1b16d0a8d93277279476ee70750 +SIZE (xpi/firefox-i18n-10.0.7/mk.xpi) = 272940 +SHA256 (xpi/firefox-i18n-10.0.7/ml.xpi) = 3799026d79645755e1aa3340407c16578f2037910550776e1d78c56a18c18f56 +SIZE (xpi/firefox-i18n-10.0.7/ml.xpi) = 306676 +SHA256 (xpi/firefox-i18n-10.0.7/mr.xpi) = 06d6da54de467475fd006323fabbcdfe2a015e7a0156c1f7098e9d91fa58a5ed +SIZE (xpi/firefox-i18n-10.0.7/mr.xpi) = 281458 +SHA256 (xpi/firefox-i18n-10.0.7/nb-NO.xpi) = efc505ca46745843d5c20e13a4d744c1246aece71a794f5313a3816e30ebb72c +SIZE (xpi/firefox-i18n-10.0.7/nb-NO.xpi) = 241211 +SHA256 (xpi/firefox-i18n-10.0.7/nl.xpi) = 3abbe4145f9f8ddaa7e9e2e08cb3d58e78f4c04d31bfbca42d1dcb208f968523 +SIZE (xpi/firefox-i18n-10.0.7/nl.xpi) = 242401 +SHA256 (xpi/firefox-i18n-10.0.7/nn-NO.xpi) = 7623fc038a2e59f8f6201f3f4ca9f6161b50d53482ea695391e5ff8f672b3188 +SIZE (xpi/firefox-i18n-10.0.7/nn-NO.xpi) = 242454 +SHA256 (xpi/firefox-i18n-10.0.7/nso.xpi) = efa5b65056248586520c79f875d18747a3142cff9a64f7332dc0c6b19516b890 +SIZE (xpi/firefox-i18n-10.0.7/nso.xpi) = 245696 +SHA256 (xpi/firefox-i18n-10.0.7/or.xpi) = 49a4426d6bba6dce494bb7618e6d6bd5b2e22dbca1e5e4e8bd87d5d9f592825b +SIZE (xpi/firefox-i18n-10.0.7/or.xpi) = 281686 +SHA256 (xpi/firefox-i18n-10.0.7/pa-IN.xpi) = f287c257353ad268e28e18e50da1d907b6cc908403cc9b6d10feb7d205ea356b +SIZE (xpi/firefox-i18n-10.0.7/pa-IN.xpi) = 282146 +SHA256 (xpi/firefox-i18n-10.0.7/pl.xpi) = b193c806d5cbbb78600ffe06f0d3a02dd32a72e2a78b3756ac8b8afcc97e400c +SIZE (xpi/firefox-i18n-10.0.7/pl.xpi) = 252047 +SHA256 (xpi/firefox-i18n-10.0.7/pt-BR.xpi) = ee10ef80f74999655453ef1360c686e731e261ec3738609cd063496aedae8315 +SIZE (xpi/firefox-i18n-10.0.7/pt-BR.xpi) = 246849 +SHA256 (xpi/firefox-i18n-10.0.7/pt-PT.xpi) = 24bbe57d5cfc29b5da617b2b46ca874c672a62ece767c8f8cb620ec604a56d64 +SIZE (xpi/firefox-i18n-10.0.7/pt-PT.xpi) = 246477 +SHA256 (xpi/firefox-i18n-10.0.7/rm.xpi) = 5fc8d7472a56937d6b42eb72d50368b7afe7ed03036f901b66aa5828fdf85175 +SIZE (xpi/firefox-i18n-10.0.7/rm.xpi) = 245772 +SHA256 (xpi/firefox-i18n-10.0.7/ro.xpi) = 93ce61b2a42665211e03a719f335aec5dcf0e03ae2b363013a9c48900e6e705e +SIZE (xpi/firefox-i18n-10.0.7/ro.xpi) = 263252 +SHA256 (xpi/firefox-i18n-10.0.7/ru.xpi) = 4db26813b6b0737c5c716ab5500d83c01cf470377a76512a151581a4a5c3981e +SIZE (xpi/firefox-i18n-10.0.7/ru.xpi) = 254985 +SHA256 (xpi/firefox-i18n-10.0.7/si.xpi) = 2b56646eac624568b63627631a7a2c4bea56c76209e9edb86d0e9b1088c14657 +SIZE (xpi/firefox-i18n-10.0.7/si.xpi) = 271990 +SHA256 (xpi/firefox-i18n-10.0.7/sk.xpi) = 09be69e73aee27c595f33eaafea81fce88206c9fd84c15ecbdec216f53f53418 +SIZE (xpi/firefox-i18n-10.0.7/sk.xpi) = 254289 +SHA256 (xpi/firefox-i18n-10.0.7/sl.xpi) = fa80d530d881cad89325b9c35941187667762abcf1d61beb634f921f78cfd5c4 +SIZE (xpi/firefox-i18n-10.0.7/sl.xpi) = 241036 +SHA256 (xpi/firefox-i18n-10.0.7/son.xpi) = e70a5f2ba41b71c1e8fbd63b6d0872bcaf89d2cf97005b20bec3767ccfa0a088 +SIZE (xpi/firefox-i18n-10.0.7/son.xpi) = 239061 +SHA256 (xpi/firefox-i18n-10.0.7/sq.xpi) = 13e6c16bc90271bee1436451ce1e7ab65fddfec1d633efdd8335d3957a222eaa +SIZE (xpi/firefox-i18n-10.0.7/sq.xpi) = 227698 +SHA256 (xpi/firefox-i18n-10.0.7/sr.xpi) = 50359e09855bf39e42648ad5afb11d2e982e27e3afd058c8444dfd463818610d +SIZE (xpi/firefox-i18n-10.0.7/sr.xpi) = 277745 +SHA256 (xpi/firefox-i18n-10.0.7/sv-SE.xpi) = 20146c531c7b1f854ed322584093ffffcb3c95286e322ab2d0f20e6515a652b6 +SIZE (xpi/firefox-i18n-10.0.7/sv-SE.xpi) = 278881 +SHA256 (xpi/firefox-i18n-10.0.7/ta-LK.xpi) = 70531a3b5883d39de0ef1f891a9ea923bc306339e3fa064c892f47e5971dbf70 +SIZE (xpi/firefox-i18n-10.0.7/ta-LK.xpi) = 290619 +SHA256 (xpi/firefox-i18n-10.0.7/ta.xpi) = fff4cdf1f675ff59bfc87ca2b28466b10b9e617cd6619bf38ac741a15636c8d3 +SIZE (xpi/firefox-i18n-10.0.7/ta.xpi) = 274057 +SHA256 (xpi/firefox-i18n-10.0.7/te.xpi) = 538c3b0fc716ebf846d0844fd9af5292c6c0caadb97c9d0d54006f9f4ebd6593 +SIZE (xpi/firefox-i18n-10.0.7/te.xpi) = 289046 +SHA256 (xpi/firefox-i18n-10.0.7/th.xpi) = 6fa5d1d7f3eaed3b338d5ac109050a8d681d75f796bd8af5bbd783d74fe951e9 +SIZE (xpi/firefox-i18n-10.0.7/th.xpi) = 272423 +SHA256 (xpi/firefox-i18n-10.0.7/tr.xpi) = e246203187d58ededa2d52fbb48ff02b04c190632aa7793b9efee0b76dd379c0 +SIZE (xpi/firefox-i18n-10.0.7/tr.xpi) = 249918 +SHA256 (xpi/firefox-i18n-10.0.7/uk.xpi) = 5af8e98430dc2fda14720350ad5056ff5a0332d3b7b027b4e1504b692530eb9f +SIZE (xpi/firefox-i18n-10.0.7/uk.xpi) = 279133 +SHA256 (xpi/firefox-i18n-10.0.7/vi.xpi) = 7ba320ab0a52cab45834db007502598afd4d3da029b924a0957f0d069d7956e2 +SIZE (xpi/firefox-i18n-10.0.7/vi.xpi) = 262786 +SHA256 (xpi/firefox-i18n-10.0.7/zh-CN.xpi) = ba531a5357c0bc0eaf51da3e4faa5490155f37329b477654ee0a1623601d539d +SIZE (xpi/firefox-i18n-10.0.7/zh-CN.xpi) = 256547 +SHA256 (xpi/firefox-i18n-10.0.7/zh-TW.xpi) = 88ed992ff277ae9652cdd6e877fd060b44af2b80fe2c04a4381e1ffc232d5b72 +SIZE (xpi/firefox-i18n-10.0.7/zh-TW.xpi) = 257493 +SHA256 (xpi/firefox-i18n-10.0.7/zu.xpi) = 58cee12ab9daa8ce6c6c3a6b4b608255d16810952ee9b3ccf5d7d6fb7905278a +SIZE (xpi/firefox-i18n-10.0.7/zu.xpi) = 246396 diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index c95732e9f18f..c8c98bf4ba4b 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -6,8 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 10.0.6 -PORTREVISION= 1 +DISTVERSION= 10.0.7 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -23,8 +22,6 @@ BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -CONFLICTS_BUILD= spidermonkey-* - USE_AUTOTOOLS= autoconf213:env LATEST_LINK= firefox-esr USE_GECKO= gecko @@ -78,8 +75,8 @@ USE_DISPLAY= yes MOZ_OPTIONS+= ${CONFIGURE_TARGET} MAKEFILE= ${WRKSRC}/client.mk ALL_TARGET= profiledbuild -MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \ - @MOZ_OBJDIR@/_profile/pgo/profileserver.py"' +MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \ + @MOZ_OBJDIR@/_profile/pgo/profileserver.py" .endif .if ${ARCH} == amd64 || ${ARCH} == i386 diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index 17bb1850703c..4302c68e47ba 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-10.0.6esr.source.tar.bz2) = 03e5766cdc866bfb065fb1d0ecba9bb3530bdbe2041c52cdad5126e38f7184b5 -SIZE (firefox-10.0.6esr.source.tar.bz2) = 75450691 +SHA256 (firefox-10.0.7esr.source.tar.bz2) = 91b0dab3168d75a4f157dabfdf6a95367cd3a8767298d88fb43be251f37f4423 +SIZE (firefox-10.0.7esr.source.tar.bz2) = 75624327 diff --git a/www/firefox-esr/files/patch-bug691898 b/www/firefox-esr/files/patch-bug691898 new file mode 100644 index 000000000000..977cae2b5bff --- /dev/null +++ b/www/firefox-esr/files/patch-bug691898 @@ -0,0 +1,285 @@ +From: Mike Hommey <mh@glandium.org> +Date: Sat, 24 Dec 2011 09:56:58 +0100 +Subject: Bug 691898 - Use YARR interpreter instead of PCRE on platforms where + YARR JIT is not supported + +--- + js/src/Makefile.in | 21 +++++++++++++-------- + js/src/vm/RegExpObject-inl.h | 28 ++++++---------------------- + js/src/vm/RegExpObject.cpp | 36 ------------------------------------ + js/src/vm/RegExpObject.h | 27 ++++++--------------------- + js/src/yarr/wtfbridge.h | 2 -- + 5 files changed, 25 insertions(+), 89 deletions(-) + +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index fc48cbd..49f0bdc 100644 +--- js/src/Makefile.in ++++ js/src/Makefile.in +@@ -416,15 +416,20 @@ CPPSRCS += checks.cc \ + + ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU))) + +-VPATH += $(srcdir)/yarr/pcre \ ++VPATH += $(srcdir)/assembler \ ++ $(srcdir)/assembler/wtf \ ++ $(srcdir)/yarr \ + $(NULL) + + CPPSRCS += \ +- pcre_compile.cpp \ +- pcre_exec.cpp \ +- pcre_tables.cpp \ +- pcre_xclass.cpp \ +- pcre_ucp_searchfuncs.cpp \ ++ Assertions.cpp \ ++ OSAllocatorOS2.cpp \ ++ OSAllocatorPosix.cpp \ ++ OSAllocatorWin.cpp \ ++ PageBlock.cpp \ ++ YarrInterpreter.cpp \ ++ YarrPattern.cpp \ ++ YarrSyntaxChecker.cpp \ + $(NULL) + else + +@@ -1015,10 +1020,10 @@ endif + # Needed to "configure" it correctly. Unfortunately these + # flags wind up being applied to all code in js/src, not just + # the code in js/src/assembler. +-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 ++CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 + + ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT)) +-CXXFLAGS += -DENABLE_JIT=1 ++CXXFLAGS += -DENABLE_JIT=1 -DENABLE_ASSEMBLER=1 + endif + + INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr +diff --git a/js/src/vm/RegExpObject-inl.h b/js/src/vm/RegExpObject-inl.h +index 5f7817d..91108a7 100644 +--- js/src/vm/RegExpObject-inl.h ++++ js/src/vm/RegExpObject-inl.h +@@ -327,6 +327,7 @@ RegExpPrivate::create(JSContext *cx, JSString *source, RegExpFlag flags, TokenSt + return RetType(self); + } + ++#if ENABLE_YARR_JIT + /* This function should be deleted once bad Android platforms phase out. See bug 604774. */ + inline bool + RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx) +@@ -337,12 +338,12 @@ RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx) + return true; + #endif + } ++#endif + + inline bool + RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, + uintN *parenCount, RegExpFlag flags) + { +-#if ENABLE_YARR_JIT + /* Parse the pattern. */ + ErrorCode yarrError; + YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag), +@@ -359,7 +360,7 @@ RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream * + * case we have to bytecode compile it. + */ + +-#ifdef JS_METHODJIT ++#if ENABLE_YARR_JIT && defined(JS_METHODJIT) + if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) { + if (!cx->compartment->ensureJaegerCompartmentExists(cx)) + return false; +@@ -371,21 +372,11 @@ RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream * + } + #endif + ++#if ENABLE_YARR_JIT + codeBlock.setFallBack(true); ++#endif + byteCode = byteCompile(yarrPattern, cx->compartment->regExpAllocator).get(); + return true; +-#else /* !defined(ENABLE_YARR_JIT) */ +- int error = 0; +- compiled = jsRegExpCompile(pattern.chars(), pattern.length(), +- ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase, +- multiline() ? JSRegExpMultiline : JSRegExpSingleLine, +- parenCount, &error); +- if (error) { +- reportPCREError(cx, error); +- return false; +- } +- return true; +-#endif + } + + inline bool +@@ -431,19 +422,12 @@ RegExpPrivateCode::execute(JSContext *cx, const jschar *chars, size_t start, siz + else + result = JSC::Yarr::execute(codeBlock, chars, start, length, output); + #else +- result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount); ++ result = JSC::Yarr::interpret(byteCode, chars, start, length, output); + #endif + + if (result == -1) + return Success_NotFound; + +-#if !ENABLE_YARR_JIT +- if (result < 0) { +- reportPCREError(cx, result); +- return Error; +- } +-#endif +- + JS_ASSERT(result >= 0); + return Success; + } +diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp +index f75c6a5..7631dd5 100644 +--- js/src/vm/RegExpObject.cpp ++++ js/src/vm/RegExpObject.cpp +@@ -251,7 +251,6 @@ Class js::RegExpClass = { + NULL /* trace */ + }; + +-#if ENABLE_YARR_JIT + void + RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error) + { +@@ -283,41 +282,6 @@ RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode err + } + } + +-#else /* !ENABLE_YARR_JIT */ +- +-void +-RegExpPrivateCode::reportPCREError(JSContext *cx, int error) +-{ +-#define REPORT(msg_) \ +- JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_ERROR, js_GetErrorMessage, NULL, msg_); \ +- return +- switch (error) { +- case -2: REPORT(JSMSG_REGEXP_TOO_COMPLEX); +- case 0: JS_NOT_REACHED("Precondition violation: an error must have occurred."); +- case 1: REPORT(JSMSG_TRAILING_SLASH); +- case 2: REPORT(JSMSG_TRAILING_SLASH); +- case 3: REPORT(JSMSG_REGEXP_TOO_COMPLEX); +- case 4: REPORT(JSMSG_BAD_QUANTIFIER); +- case 5: REPORT(JSMSG_BAD_QUANTIFIER); +- case 6: REPORT(JSMSG_BAD_CLASS_RANGE); +- case 7: REPORT(JSMSG_REGEXP_TOO_COMPLEX); +- case 8: REPORT(JSMSG_BAD_CLASS_RANGE); +- case 9: REPORT(JSMSG_BAD_QUANTIFIER); +- case 10: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN); +- case 11: REPORT(JSMSG_REGEXP_TOO_COMPLEX); +- case 12: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN); +- case 13: REPORT(JSMSG_REGEXP_TOO_COMPLEX); +- case 14: REPORT(JSMSG_MISSING_PAREN); +- case 15: REPORT(JSMSG_BAD_BACKREF); +- case 16: REPORT(JSMSG_REGEXP_TOO_COMPLEX); +- case 17: REPORT(JSMSG_REGEXP_TOO_COMPLEX); +- default: +- JS_NOT_REACHED("Precondition violation: unknown PCRE error code."); +- } +-#undef REPORT +-} +-#endif /* ENABLE_YARR_JIT */ +- + bool + js::ParseRegExpFlags(JSContext *cx, JSString *flagStr, RegExpFlag *flagsOut) + { +diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h +index 1449d56..279f3c0 100644 +--- js/src/vm/RegExpObject.h ++++ js/src/vm/RegExpObject.h +@@ -49,8 +49,6 @@ + #include "yarr/Yarr.h" + #if ENABLE_YARR_JIT + #include "yarr/YarrJIT.h" +-#else +-#include "yarr/pcre/pcre.h" + #endif + + namespace js { +@@ -153,48 +151,39 @@ ResetRegExpObject(JSContext *cx, AlreadyIncRefed<RegExpPrivate> rep); + /* Abstracts away the gross |RegExpPrivate| backend details. */ + class RegExpPrivateCode + { +-#if ENABLE_YARR_JIT + typedef JSC::Yarr::BytecodePattern BytecodePattern; + typedef JSC::Yarr::ErrorCode ErrorCode; ++ typedef JSC::Yarr::YarrPattern YarrPattern; ++#if ENABLE_YARR_JIT + typedef JSC::Yarr::JSGlobalData JSGlobalData; + typedef JSC::Yarr::YarrCodeBlock YarrCodeBlock; +- typedef JSC::Yarr::YarrPattern YarrPattern; + + /* Note: Native code is valid only if |codeBlock.isFallBack() == false|. */ + YarrCodeBlock codeBlock; +- BytecodePattern *byteCode; +-#else +- JSRegExp *compiled; + #endif ++ BytecodePattern *byteCode; + + public: + RegExpPrivateCode() + : + #if ENABLE_YARR_JIT + codeBlock(), +- byteCode(NULL) +-#else +- compiled(NULL) + #endif ++ byteCode(NULL) + { } + + ~RegExpPrivateCode() { + #if ENABLE_YARR_JIT + codeBlock.release(); ++#endif + if (byteCode) + Foreground::delete_<BytecodePattern>(byteCode); +-#else +- if (compiled) +- jsRegExpFree(compiled); +-#endif + } + + #if ENABLE_YARR_JIT + static inline bool isJITRuntimeEnabled(JSContext *cx); +- void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error); +-#else +- void reportPCREError(JSContext *cx, int error); + #endif ++ void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error); + + inline bool compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount, + RegExpFlag flags); +@@ -205,11 +194,7 @@ class RegExpPrivateCode + int *output, size_t outputCount); + + static size_t getOutputSize(size_t pairCount) { +-#if ENABLE_YARR_JIT + return pairCount * 2; +-#else +- return pairCount * 3; /* Should be x2, but PCRE has... needs. */ +-#endif + } + }; + +diff --git a/js/src/yarr/wtfbridge.h b/js/src/yarr/wtfbridge.h +index ac41d08..fb8eb86 100644 +--- js/src/yarr/wtfbridge.h ++++ js/src/yarr/wtfbridge.h +@@ -49,9 +49,7 @@ + #include "jsprvtd.h" + #include "vm/String.h" + #include "assembler/wtf/Platform.h" +-#if ENABLE_YARR_JIT + #include "assembler/jit/ExecutableAllocator.h" +-#endif + + namespace JSC { namespace Yarr { + diff --git a/www/firefox-esr/files/patch-bug714312 b/www/firefox-esr/files/patch-bug714312 new file mode 100644 index 000000000000..114144d18388 --- /dev/null +++ b/www/firefox-esr/files/patch-bug714312 @@ -0,0 +1,73 @@ +commit c104d9b +Author: Landry Breuil <landry@openbsd.org> +Date: Mon Jan 9 17:32:00 2012 -0600 + + Bug 714312 - Use <machine/endian.h> to get endianess on BSD systems, fixing the BSD build. r=ted + + --HG-- + extra : rebase_source : 8b418bdb2d713093d138ffed20bf1630c05f396b +--- + js/src/configure.in | 5 +++++ + js/src/js-config.h.in | 4 ++++ + js/src/jscpucfg.h | 17 +++++++++++++++++ + 3 files changed, 26 insertions(+) + +diff --git js/src/configure.in js/src/configure.in +index 164c896..361b29e 100644 +--- js/src/configure.in ++++ js/src/configure.in +@@ -2934,6 +2934,11 @@ if test "$ac_cv_header_endian_h" = yes; + AC_DEFINE(JS_HAVE_ENDIAN_H) + fi + ++AC_CHECK_HEADERS(machine/endian.h) ++if test "$ac_cv_header_machine_endian_h" = yes; then ++ AC_DEFINE(JS_HAVE_MACHINE_ENDIAN_H) ++fi ++ + AC_CHECK_HEADERS(sys/isa_defs.h) + if test "$ac_cv_header_sys_isa_defs_h" = yes; then + AC_DEFINE(JS_HAVE_SYS_ISA_DEFS_H) +diff --git js/src/js-config.h.in js/src/js-config.h.in +index fb009fa..402262e 100644 +--- js/src/js-config.h.in ++++ js/src/js-config.h.in +@@ -59,6 +59,10 @@ + useable. See jscpucfg.h. */ + #undef JS_HAVE_ENDIAN_H + ++/* Define to 1 if the <machine/endian.h> header is present and ++ useable. See jscpucfg.h. */ ++#undef JS_HAVE_MACHINE_ENDIAN_H ++ + /* Define to 1 if the <sys/isa_defs.h> header is present and + useable. See jscpucfg.h. */ + #undef JS_HAVE_SYS_ISA_DEFS_H +diff --git js/src/jscpucfg.h js/src/jscpucfg.h +index dd32bce..5fd8415 100644 +--- js/src/jscpucfg.h ++++ js/src/jscpucfg.h +@@ -92,6 +92,23 @@ + # error "endian.h does not define __BYTE_ORDER. Cannot determine endianness." + # endif + ++/* BSDs */ ++#elif defined(JS_HAVE_MACHINE_ENDIAN_H) ++# include <sys/types.h> ++# include <machine/endian.h> ++ ++# if defined(_BYTE_ORDER) ++# if _BYTE_ORDER == _LITTLE_ENDIAN ++# define IS_LITTLE_ENDIAN 1 ++# undef IS_BIG_ENDIAN ++# elif _BYTE_ORDER == _BIG_ENDIAN ++# undef IS_LITTLE_ENDIAN ++# define IS_BIG_ENDIAN 1 ++# endif ++# else /* !defined(_BYTE_ORDER) */ ++# error "machine/endian.h does not define _BYTE_ORDER. Cannot determine endianness." ++# endif ++ + #elif defined(JS_HAVE_SYS_ISA_DEFS_H) + # include <sys/isa_defs.h> + diff --git a/www/firefox-esr/files/patch-bug725655 b/www/firefox-esr/files/patch-bug725655 new file mode 100644 index 000000000000..ec331a5ccb73 --- /dev/null +++ b/www/firefox-esr/files/patch-bug725655 @@ -0,0 +1,53 @@ +commit 18b9c9d +Author: Martin Stránský <stransky@redhat.com> +Date: Fri Feb 10 16:07:41 2012 +0100 + + Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin +--- + ipc/chromium/src/base/file_util_linux.cc | 3 +++ + ipc/chromium/src/base/message_pump_libevent.cc | 3 +++ + ipc/chromium/src/base/time_posix.cc | 3 +++ + 3 files changed, 9 insertions(+) + +diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc +index cca706f..171e44f 100644 +--- ipc/chromium/src/base/file_util_linux.cc ++++ ipc/chromium/src/base/file_util_linux.cc +@@ -5,6 +5,9 @@ + #include "base/file_util.h" + + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <string> + #include <vector> +diff --git ipc/chromium/src/base/message_pump_libevent.cc ipc/chromium/src/base/message_pump_libevent.cc +index 6194f79..9f31dbb 100644 +--- ipc/chromium/src/base/message_pump_libevent.cc ++++ ipc/chromium/src/base/message_pump_libevent.cc +@@ -6,6 +6,9 @@ + + #include <errno.h> + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" +diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc +index 8d1a1d5..abf2a56 100644 +--- ipc/chromium/src/base/time_posix.cc ++++ ipc/chromium/src/base/time_posix.cc +@@ -13,6 +13,9 @@ + #else + #include <time.h> + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <limits> + diff --git a/www/firefox-esr/files/patch-bug729155 b/www/firefox-esr/files/patch-bug729155 new file mode 100644 index 000000000000..a8f2a6623493 --- /dev/null +++ b/www/firefox-esr/files/patch-bug729155 @@ -0,0 +1,18 @@ +--- dom/plugins/ipc/PluginMessageUtils.cpp ++++ dom/plugins/ipc/PluginMessageUtils.cpp +@@ -114,6 +114,7 @@ MediateRace(const RPCChannel::Message& parent, + } + } + ++#if defined(OS_LINUX) + static string + ReplaceAll(const string& haystack, const string& needle, const string& with) + { +@@ -127,6 +128,7 @@ ReplaceAll(const string& haystack, const string& needle, const string& with) + + return munged; + } ++#endif + + string + MungePluginDsoPath(const string& path) diff --git a/www/firefox-esr/files/patch-bug753046 b/www/firefox-esr/files/patch-bug753046 index 4500d44bd9f3..2971fe61bf64 100644 --- a/www/firefox-esr/files/patch-bug753046 +++ b/www/firefox-esr/files/patch-bug753046 @@ -4,15 +4,14 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/06 12:34:09 r --- dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.cpp -@@ -33,6 +33,8 @@ - #include "nsPluginsDir.h" - #include "nsXULAppAPI.h" +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#include <unistd.h> -+ - #ifdef MOZ_X11 - # include "mozilla/X11Util.h" - #endif + #ifdef MOZ_WIDGET_QT ++#include <unistd.h> // for _exit() + #include <QtCore/QTimer> + #include "nsQAppInstance.h" + #include "NestedLoopTimer.h" @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -65,7 +64,7 @@ $NetBSD: patch-ipc_chromium_Makefile.in,v 1.1 2012/03/06 12:34:09 ryoon Exp $ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -218,21 +217,23 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:1 #include <errno.h> #include <fcntl.h> -@@ -17,8 +17,13 @@ +@@ -17,9 +17,16 @@ #include <unistd.h> #if MOZ_HAVE_EXECINFO_H #include <execinfo.h> --#include <sys/sysctl.h> ++#endif ++ ++#if defined(OS_MACOSX) || defined(OS_BSD) + #include <sys/sysctl.h> #endif + +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include <sys/user.h> -+#elif defined(OS_FREEBSD) -+#include <sys/proc.h> +#endif -+#include <sys/sysctl.h> - ++ #include "base/basictypes.h" #include "base/eintr_wrapper.h" + #include "base/logging.h" @@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u return false; } @@ -242,7 +243,7 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:1 // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -250,6 +251,8 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:1 + being_debugged = (info.kp_flags & P_TRACED) != 0; +#elif defined(OS_FREEBSD) + being_debugged = (info.ki_flag & P_TRACED) != 0; ++#elif defined(OS_OPENBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif @@ -392,105 +395,19 @@ index 9a34492..62b280c 100644 #else typedef DirReaderFallback DirReaderPosix; #endif -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include <sys/stat.h> - #elif defined(OS_POSIX) - #include <sys/types.h> --#include <fts.h> - #include <sys/stat.h> -+#include <fts.h> - #endif +diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc +index 171e44f..0c6dfcc 100644 +--- ipc/chromium/src/base/file_util_linux.cc ++++ ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } - #include <stdio.h> -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,80 @@ -+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include <fcntl.h> -+#include <unistd.h> -+ -+#include <string> -+#include <vector> -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector<char> buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -500,7 +417,7 @@ $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34 // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef OS_LINUX ++#ifndef HAVE_STAT64 #define stat64 stat #endif @@ -526,27 +443,19 @@ $NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.1 2012/03/06 12:34:09 pump_ = new base::MessagePumpForUI(); #endif // OS_LINUX } else if (type_ == TYPE_IO) { -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $ - ---- ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include <linux/stat.h> - #endif -+#include <sys/stat.h> /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE + #elif defined(OS_POSIX) + #include <pthread.h> + typedef pthread_t PlatformThreadHandle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) #include <unistd.h> typedef pid_t PlatformThreadId; -+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include <mach/mach.h> @@ -555,7 +464,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 --- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,18 @@ +@@ -9,9 +9,23 @@ #if defined(OS_MACOSX) #include <mach/mach.h> @@ -567,14 +476,19 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 +#elif defined(OS_DRAGONFLY) +#include <unistd.h> +#elif defined(OS_FREEBSD) ++#include <sys/param.h> ++#if __FreeBSD_version > 802500 ++#include <sys/thr.h> ++#else +_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); // XXX #include <sys/thr.h> ++extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") ++#endif +#include <pthread_np.h> #endif #if defined(OS_MACOSX) -@@ -38,7 +45,19 @@ +@@ -38,9 +45,20 @@ // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); @@ -592,9 +506,12 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 + return lwpid; +# endif +#elif defined(OS_OPENBSD) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); +- // TODO(BSD): find a better thread ID +- return (intptr_t)(pthread_self()); ++ return (intptr_t) (pthread_self()); #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -636,7 +553,7 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,326 @@ +@@ -0,0 +1,318 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -645,36 +562,20 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 + +#include "base/process_util.h" + -+#include <ctype.h> -+#include <fcntl.h> -+#include <unistd.h> -+#include <string> -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ -+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") -+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") -+#else -+#define PRE_SYS_INCLUDE -+#define POST_SYS_INCLUDE -+#endif -+PRE_SYS_INCLUDE -+#include <kvm.h> -+POST_SYS_INCLUDE ++#include <sys/param.h> +#include <sys/sysctl.h> -+#include <sys/types.h> +#include <sys/wait.h> -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include <sys/user.h> -+POST_SYS_INCLUDE -+#define HAVE_POSIX_SPAWN 1 -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include <sys/user.h> -+POST_SYS_INCLUDE +#endif + ++#include <ctype.h> ++#include <fcntl.h> ++#include <kvm.h> ++#include <unistd.h> ++ ++#include <string> ++ +#include "base/debug_util.h" +#include "base/eintr_wrapper.h" +#include "base/file_util.h" @@ -682,17 +583,21 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 600000000 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 +#endif ++ ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif +#endif + +#ifdef HAVE_POSIX_SPAWN -+PRE_SYS_INCLUDE +#include <spawn.h> -+POST_SYS_INCLUDE +extern "C" char **environ __dso_public; +#endif + @@ -933,7 +838,11 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue; @@ -1105,24 +1014,30 @@ $NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.4 2012/04/01 15:18:45 --- ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -27,9 +33,16 @@ #error Please add support for your platform in build/build_config.h #endif ++// For access to standard BSD features, use OS_BSD instead of a ++// more specific macro. ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) ++#define OS_BSD 1 ++#endif ++ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) @@ -1164,7 +1079,7 @@ $NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.1 2012/0 #endif -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) ++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) // There size_t is a synonym for |unsigned long| ... template <> struct ParamTraits<size_t> { @@ -1173,7 +1088,7 @@ $NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.1 2012/0 #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) ++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| template <> struct ParamTraits<int64> { @@ -1195,7 +1110,7 @@ $NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.1 2012/03/06 }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#elif defined(OS_MACOSX) || defined(OS_BSD) typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; @@ -1250,16 +1165,31 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/03/15 08:30:06 ryoo newEnvVars, #endif false, &process, arch); +diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h +index f37998d..b05dc7b 100644 +--- ipc/glue/SharedMemorySysV.h ++++ ipc/glue/SharedMemorySysV.h +@@ -8,7 +8,7 @@ + #ifndef mozilla_ipc_SharedMemorySysV_h + #define mozilla_ipc_SharedMemorySysV_h + +-#if defined(OS_LINUX) && !defined(ANDROID) ++#if (defined(OS_LINUX) && !defined(ANDROID)) || defined(OS_BSD) + + // SysV shared memory isn't available on Windows, but we define the + // following macro so that #ifdefs are clearer (compared to #ifdef $NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $ --- toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000 +++ toolkit/library/Makefile.in -@@ -534,6 +538,10 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle +@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle endif endif +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) ++# keep `environ' unresolved, see bug 14426 for binutils ++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols +endif + ifeq ($(OS_ARCH),WINNT) diff --git a/www/firefox-esr/files/patch-bug761077 b/www/firefox-esr/files/patch-bug761077 new file mode 100644 index 000000000000..922fa55131e8 --- /dev/null +++ b/www/firefox-esr/files/patch-bug761077 @@ -0,0 +1,88 @@ +diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl +index b8a87a5..918c4cf 100644 +--- xpcom/reflect/xptcall/public/genstubs.pl ++++ xpcom/reflect/xptcall/public/genstubs.pl +@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n"; + print OUTFILE "* 1 is AddRef\n"; + print OUTFILE "* 2 is Release\n"; + print OUTFILE "*/\n"; +-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n"; ++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n"; + for($i = 0; $i < $entry_count; $i++) { + print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n"; + } +diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc +index eb66761..807db26 100644 +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); +diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in +index ae6ed66..2783957 100644 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in +@@ -70,7 +70,7 @@ endif + endif + endif + # IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -269,7 +269,7 @@ endif + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) ++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp + ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -278,7 +278,7 @@ endif + # + # Linux/PPC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) ++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp + ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -350,7 +350,7 @@ endif + # + # OpenBSD/SPARC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif +diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h +index d903ced..e4ec832 100644 +--- xpcom/reflect/xptcall/src/xptcprivate.h ++++ xpcom/reflect/xptcall/src/xptcprivate.h +@@ -14,7 +14,7 @@ + + class xptiInterfaceEntry; + +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; + #else + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; +@@ -31,7 +31,7 @@ public: + #undef STUB_ENTRY + #undef SENTINEL_ENTRY + +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); + #else + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); diff --git a/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp b/www/firefox-esr/files/patch-bug778056 index 2730ffbfc594..2730ffbfc594 100644 --- a/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp +++ b/www/firefox-esr/files/patch-bug778056 diff --git a/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp b/www/firefox-esr/files/patch-bug778078 index 48220793cb59..a68f07ab34ed 100644 --- a/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp +++ b/www/firefox-esr/files/patch-bug778078 @@ -5,7 +5,7 @@ #endif #if defined(MOZ_WIDGET_GTK2) -#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) // Disable the slice allocator, since jemalloc already uses similar layout // algorithms, and using a sub-allocator tends to increase fragmentation. // This must be done before g_thread_init() is called. diff --git a/www/firefox-esr/files/patch-bug779847 b/www/firefox-esr/files/patch-bug779847 new file mode 100644 index 000000000000..f431c4a8d3c5 --- /dev/null +++ b/www/firefox-esr/files/patch-bug779847 @@ -0,0 +1,28 @@ +--- gfx/ycbcr/Makefile.in ++++ gfx/ycbcr/Makefile.in +@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \ + $(NULL) + endif + else +-ifeq ($(OS_ARCH),Linux) +-CPPSRCS += yuv_row_posix.cpp \ +- $(NULL) +-else +-ifeq ($(OS_ARCH),SunOS) +-CPPSRCS += yuv_row_posix.cpp \ +- $(NULL) +-else +-ifeq ($(OS_ARCH),Darwin) ++ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH))) + CPPSRCS += yuv_row_posix.cpp \ + $(NULL) + else + CPPSRCS += yuv_row_other.cpp \ + $(NULL) +-endif # Darwin +-endif # SunOS +-endif # linux ++endif # posix + endif # windows + + ifeq (arm,$(findstring arm,$(OS_TEST))) diff --git a/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp b/www/firefox-esr/files/patch-bug781457 index 32c3073071ff..8cf3cfb70c14 100644 --- a/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp +++ b/www/firefox-esr/files/patch-bug781457 @@ -1,14 +1,5 @@ --- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 02:03:41.000000000 +0100 +++ xpcom/base/nsStackWalk.cpp 2010-12-15 11:28:20.000000000 +0100 -@@ -1137,7 +1137,7 @@ - #define __USE_GNU - #endif - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__) - #include <dlfcn.h> - #endif - @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb #elif defined(HAVE__UNWIND_BACKTRACE) diff --git a/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h b/www/firefox-esr/files/patch-bug781474 index 8239b2e8b8fd..8239b2e8b8fd 100644 --- a/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h +++ b/www/firefox-esr/files/patch-bug781474 diff --git a/www/firefox-esr/files/patch-bug783463 b/www/firefox-esr/files/patch-bug783463 new file mode 100644 index 000000000000..56ec54b3fcc3 --- /dev/null +++ b/www/firefox-esr/files/patch-bug783463 @@ -0,0 +1,20 @@ +--- widget/src/qt/nsNativeThemeQt.cpp~ ++++ widget/src/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,6 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" +-#include <malloc.h> + + + #include "gfxASurface.h" +--- widget/src/qt/nsSound.cpp~ ++++ widget/src/qt/nsSound.cpp +@@ -40,6 +40,7 @@ + #include <QSound> + + #include <string.h> ++#include <unistd.h> + + #include "nscore.h" + #include "plstr.h" diff --git a/www/firefox-esr/files/patch-bug784776 b/www/firefox-esr/files/patch-bug784776 new file mode 100644 index 000000000000..2036b3d441e3 --- /dev/null +++ b/www/firefox-esr/files/patch-bug784776 @@ -0,0 +1,22 @@ +--- intl/locale/src/unix/nsDateTimeFormatUnix.cpp~ ++++ intl/locale/src/unix/nsDateTimeFormatUnix.cpp +@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr + struct tm *tmc; + int i; + +- tt = time((time_t)NULL); ++ tt = time(NULL); + tmc = localtime(&tt); + + tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM +--- xpcom/glue/nsBaseHashtable.h~ ++++ xpcom/glue/nsBaseHashtable.h +@@ -147,7 +147,7 @@ public: + { + EntryType* ent = this->GetEntry(aKey); + if (!ent) +- return NULL; ++ return 0; + + return ent->mData; + } diff --git a/www/firefox-esr/files/patch-bug785638 b/www/firefox-esr/files/patch-bug785638 new file mode 100644 index 000000000000..6e1f63d64971 --- /dev/null +++ b/www/firefox-esr/files/patch-bug785638 @@ -0,0 +1,168 @@ +diff --git configure.in configure.in +index cef992b..3bd39ca 100644 +--- configure.in ++++ configure.in +@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then + + dnl See if we have assembly on this platform. + case "$OS_ARCH:$CPU_ARCH" in +- Linux:x86) +- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" +- VPX_X86_ASM=1 +- ;; +- Linux:x86_64) +- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" +- VPX_X86_ASM=1 +- ;; +- SunOS:x86) +- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" +- VPX_X86_ASM=1 +- ;; +- SunOS:x86_64) +- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" +- VPX_X86_ASM=1 +- ;; + Darwin:x86) + VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 +@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then + VPX_ASM_SUFFIX="$ASM_SUFFIX" + VPX_ARM_ASM=1 + fi ++ ;; ++ *:x86) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" ++ VPX_X86_ASM=1 ++ fi ++ ;; ++ *:x86_64) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" ++ VPX_X86_ASM=1 ++ fi ++ ;; + esac + + if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then +@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + + dnl Do we support libjpeg-turbo on this platform? + case "$OS_ARCH:$OS_TEST" in +- Linux:x86|Linux:i?86) +- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" +- LIBJPEG_TURBO_X86_ASM=1 +- ;; +- Linux:x86_64) +- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" +- LIBJPEG_TURBO_X64_ASM=1 +- ;; +- SunOS:i?86) +- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" +- LIBJPEG_TURBO_X86_ASM=1 +- ;; +- SunOS:x86_64) +- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" +- LIBJPEG_TURBO_X64_ASM=1 +- ;; + Darwin:i?86) + LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO" + LIBJPEG_TURBO_X86_ASM=1 +@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon" + LIBJPEG_TURBO_ARM_ASM=1 + ;; ++ *:x86|*:i?86) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ fi ++ ;; ++ *:x86_64) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ fi ++ ;; + esac + + fi +diff --git media/libvpx/update.sh media/libvpx/update.sh +index 79e0fb1..51956af 100755 +--- media/libvpx/update.sh ++++ media/libvpx/update.sh +@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h + # Should be same for all platforms... + cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h + +-# Config files for x86-linux-gcc and Solaris x86 ++# Config files for x86-linux-gcc and other x86 elf platforms + cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c + cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm + cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h + +-# Config files for x86_64-linux-gcc and Solaris x86_64 ++# Config files for x86_64-linux-gcc and other x86_64 elf platforms + cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c + cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm + cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h +diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h +index 55433f3..36e1780 100644 +--- media/libvpx/vpx_config.h ++++ media/libvpx/vpx_config.h +@@ -16,20 +16,12 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.h" + +-#elif defined(__linux__) && defined(__i386__) +-/* 32 bit Linux. */ ++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) ++/* 32 bit ELF platforms. */ + #include "vpx_config_x86-linux-gcc.h" + +-#elif defined(__linux__) && defined(__x86_64__) +-/* 64 bit Linux. */ +-#include "vpx_config_x86_64-linux-gcc.h" +- +-#elif defined(__sun) && defined(__i386) +-/* 32 bit Solaris. */ +-#include "vpx_config_x86-linux-gcc.h" +- +-#elif defined(__sun) && defined(__x86_64) +-/* 64 bit Solaris. */ ++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) ++/* 64 bit ELF platforms. */ + #include "vpx_config_x86_64-linux-gcc.h" + + #else +diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c +index eedd515..c8b5375 100644 +--- media/libvpx/vpx_config_c.c ++++ media/libvpx/vpx_config_c.c +@@ -12,22 +12,14 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.c" + +-#elif defined(__linux__) && defined(__i386__) +-/* 32 bit Linux. */ ++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) ++/* 32 bit ELF platforms. */ + #include "vpx_config_x86-linux-gcc.c" + +-#elif defined(__linux__) && defined(__x86_64__) +-/* 64 bit Linux. */ ++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) ++/* 64 bit ELF platforms. */ + #include "vpx_config_x86_64-linux-gcc.c" + +-#elif defined(__sun) && defined(__i386) +-/* 32 bit Solaris. */ +-#include "vpx_config_x86-linux-gcc.h" +- +-#elif defined(__sun) && defined(__x86_64) +-/* 64 bit Solaris. */ +-#include "vpx_config_x86_64-linux-gcc.h" +- + #elif defined(_MSC_VER) && defined(_M_X64) + #include "vpx_config_x86_64-win64-vs8.c" + diff --git a/www/firefox-esr/files/patch-config_autoconf.mk.in b/www/firefox-esr/files/patch-config_autoconf.mk.in index 0c6127366c69..877c48294fc6 100644 --- a/www/firefox-esr/files/patch-config_autoconf.mk.in +++ b/www/firefox-esr/files/patch-config_autoconf.mk.in @@ -19,12 +19,3 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ diff --git a/www/firefox-esr/files/patch-config_config.mk b/www/firefox-esr/files/patch-config_config.mk deleted file mode 100644 index c01a1463e5d4..000000000000 --- a/www/firefox-esr/files/patch-config_config.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 -+++ config/config.mk 2009-08-09 20:50:05.000000000 +0200 -@@ -506,6 +506,7 @@ - -I$(srcdir) \ - -I. \ - -I$(DIST)/include -I$(DIST)/include/nsprpub \ -+ -I$(LOCALBASE)/include \ - $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ - $(OS_INCLUDES) \ - $(NULL) diff --git a/www/firefox-esr/files/patch-config_mkdepend_Makefile.in b/www/firefox-esr/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index 59df0d99a4df..000000000000 --- a/www/firefox-esr/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100 -+++ config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100 -@@ -71,7 +71,8 @@ - - include $(topsrcdir)/config/rules.mk - --HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I$(LOCALBASE)/include -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox-esr/files/patch-configure.in b/www/firefox-esr/files/patch-configure.in index 5218c6a5a986..aa16f00016b8 100644 --- a/www/firefox-esr/files/patch-configure.in +++ b/www/firefox-esr/files/patch-configure.in @@ -50,33 +50,3 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -6022,6 +6024,14 @@ - VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" - VPX_X86_ASM=1 - ;; -+ FreeBSD:i386) -+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -+ VPX_X86_ASM=1 -+ ;; -+ FreeBSD:x86_64) -+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -+ VPX_X86_ASM=1 -+ ;; - SunOS:x86) - VPX_ASFLAGS="-f elf32 -rnasm -pnasm" - VPX_X86_ASM=1 -@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then - LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" - LIBJPEG_TURBO_X64_ASM=1 - ;; -+ FreeBSD:i386) -+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -+ LIBJPEG_TURBO_X86_ASM=1 -+ ;; -+ FreeBSD:x86_64) -+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -+ LIBJPEG_TURBO_X64_ASM=1 -+ ;; - SunOS:i?86) - LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" - LIBJPEG_TURBO_X86_ASM=1 diff --git a/www/firefox-esr/files/patch-dom-ipc-ContentChild.cpp b/www/firefox-esr/files/patch-dom-ipc-ContentChild.cpp new file mode 100644 index 000000000000..5a2826f3a41d --- /dev/null +++ b/www/firefox-esr/files/patch-dom-ipc-ContentChild.cpp @@ -0,0 +1,10 @@ +--- dom/ipc/ContentChild.cpp~ ++++ dom/ipc/ContentChild.cpp +@@ -42,6 +42,7 @@ + #endif + + #ifdef MOZ_WIDGET_QT ++#include <unistd.h> + #include "nsQAppInstance.h" + #endif + diff --git a/www/firefox-esr/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp b/www/firefox-esr/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp deleted file mode 100644 index 1dfabdbe21bd..000000000000 --- a/www/firefox-esr/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- dom/plugins/ipc/PluginMessageUtils.cpp~ -+++ dom/plugins/ipc/PluginMessageUtils.cpp -@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const - i += with.length(); - } - -- return munged; -+ return munged.c_str(); - } - #endif - diff --git a/www/firefox-esr/files/patch-gfx-ycbcr-Makefile.in b/www/firefox-esr/files/patch-gfx-ycbcr-Makefile.in deleted file mode 100644 index bf6c28297222..000000000000 --- a/www/firefox-esr/files/patch-gfx-ycbcr-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- gfx/ycbcr/Makefile.in~ -+++ gfx/ycbcr/Makefile.in -@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) - else -+ifeq ($(OS_ARCH),FreeBSD) -+CPPSRCS += yuv_row_posix.cpp \ -+ $(NULL) -+else - ifeq ($(OS_ARCH),SunOS) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) -@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \ - $(NULL) - endif # Darwin - endif # SunOS -+endif # FreeBSD - endif # linux - endif # windows -
\ No newline at end of file diff --git a/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc b/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc deleted file mode 100644 index 2d4606bfc9cf..000000000000 --- a/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc +++ /dev/null @@ -1,8 +0,0 @@ ---- ipc/chromium/src/base/file_util_linux.cc~ -+++ ipc/chromium/src/base/file_util_linux.cc -@@ -5,6 +5,7 @@ - #include "base/file_util.h" - - #include <fcntl.h> -+#include <unistd.h> - diff --git a/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc b/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc index dbabc6c5680c..7d4dc959eedf 100644 --- a/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc +++ b/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc @@ -1,13 +1,5 @@ --- ipc/chromium/src/base/message_pump_libevent.cc~ +++ ipc/chromium/src/base/message_pump_libevent.cc -@@ -6,6 +6,7 @@ - - #include <errno.h> - #include <fcntl.h> -+#include <unistd.h> - - #include "eintr_wrapper.h" - #include "base/logging.h" @@ -15,7 +15,7 @@ #include "base/scoped_nsautorelease_pool.h" #include "base/scoped_ptr.h" diff --git a/www/firefox-esr/files/patch-ipc-chromium-src-base-time_posix.cc b/www/firefox-esr/files/patch-ipc-chromium-src-base-time_posix.cc deleted file mode 100644 index 61c059866013..000000000000 --- a/www/firefox-esr/files/patch-ipc-chromium-src-base-time_posix.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- ipc/chromium/src/base/time_posix.cc~ -+++ ipc/chromium/src/base/time_posix.cc -@@ -8,6 +9,7 @@ - #include <mach/mach_time.h> - #endif - #include <sys/time.h> -+#include <unistd.h> - #ifdef ANDROID - #include <time64.h> - #else diff --git a/www/firefox-esr/files/patch-js-src-Makefile.in b/www/firefox-esr/files/patch-js-src-Makefile.in deleted file mode 100644 index ece0ecdf76f2..000000000000 --- a/www/firefox-esr/files/patch-js-src-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 -+++ js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 -@@ -793,7 +796,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 diff --git a/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in b/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in deleted file mode 100644 index 460b5d7850b0..000000000000 --- a/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- js/src/config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100 -+++ js/src/config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100 -@@ -71,7 +71,8 @@ - - include $(topsrcdir)/config/rules.mk - --HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I$(LOCALBASE)/include -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox-esr/files/patch-js-src-config_config.mk b/www/firefox-esr/files/patch-js-src-config_config.mk deleted file mode 100644 index 58873f3b1e9c..000000000000 --- a/www/firefox-esr/files/patch-js-src-config_config.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 -+++ js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200 -@@ -506,6 +506,7 @@ - -I$(srcdir) \ - -I. \ - -I$(DIST)/include -I$(DIST)/include/nsprpub \ -+ -I$(LOCALBASE)/include \ - $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ - $(OS_INCLUDES) \ - $(NULL) diff --git a/www/firefox-esr/files/patch-js-src-jscpucfg.h b/www/firefox-esr/files/patch-js-src-jscpucfg.h deleted file mode 100644 index 85fe261572cf..000000000000 --- a/www/firefox-esr/files/patch-js-src-jscpucfg.h +++ /dev/null @@ -1,22 +0,0 @@ ---- js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100 -+++ js/src/jscpucfg.h 2012-01-18 17:38:59.522462164 +0100 -@@ -77,6 +77,19 @@ - #define IS_BIG_ENDIAN 1 - #endif - -+#elif defined(__FreeBSD__) -+#include <sys/endian.h> -+ -+#if defined(BYTE_ORDER) -+#if BYTE_ORDER == LITTLE_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#elif BYTE_ORDER == BIG_ENDIAN -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#endif -+#endif -+ - #elif defined(JS_HAVE_ENDIAN_H) - #include <endian.h> - diff --git a/www/firefox-esr/files/patch-layout_generic_Makefile.in b/www/firefox-esr/files/patch-layout_generic_Makefile.in deleted file mode 100644 index ad2bc6b2ae3d..000000000000 --- a/www/firefox-esr/files/patch-layout_generic_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200 -+++ layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200 -@@ -159,9 +159,10 @@ - -I$(srcdir)/../../content/html/content/src \ - -I$(srcdir)/../../dom/base \ - -I$(srcdir)/../../dom/plugins/base \ -- $(MOZ_CAIRO_CFLAGS) \ - $(NULL) - -+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) -+ - ifdef MOZ_ENABLE_GTK2 - CXXFLAGS += $(MOZ_GTK2_CFLAGS) - endif diff --git a/www/firefox-esr/files/patch-media-libvpx-vpx_config.c b/www/firefox-esr/files/patch-media-libvpx-vpx_config.c deleted file mode 100644 index 1cc3dab5b8bb..000000000000 --- a/www/firefox-esr/files/patch-media-libvpx-vpx_config.c +++ /dev/null @@ -1,16 +0,0 @@ ---- media/libvpx/vpx_config_c.c~ -+++ media/libvpx/vpx_config_c.c -@@ -12,11 +12,11 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.c" - --#elif defined(__linux__) && defined(__i386__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) - /* 32 bit Linux. */ - #include "vpx_config_x86-linux-gcc.c" - --#elif defined(__linux__) && defined(__x86_64__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) - /* 64 bit Linux. */ - #include "vpx_config_x86_64-linux-gcc.c" - diff --git a/www/firefox-esr/files/patch-media-libvpx-vpx_config.h b/www/firefox-esr/files/patch-media-libvpx-vpx_config.h deleted file mode 100644 index d813ca8c608b..000000000000 --- a/www/firefox-esr/files/patch-media-libvpx-vpx_config.h +++ /dev/null @@ -1,16 +0,0 @@ ---- media/libvpx/vpx_config.h~ -+++ media/libvpx/vpx_config.h -@@ -12,11 +12,11 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.h" - --#elif defined(__linux__) && defined(__i386__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) - /* 32 bit Linux. */ - #include "vpx_config_x86-linux-gcc.h" - --#elif defined(__linux__) && defined(__x86_64__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) - /* 64 bit Linux. */ - #include "vpx_config_x86_64-linux-gcc.h" - diff --git a/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg b/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg deleted file mode 100644 index 2236b6f5788c..000000000000 --- a/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg +++ /dev/null @@ -1,100 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.cfg.orig 2010-12-23 17:34:06.000000000 +0100 -+++ nsprpub/pr/include/md/_freebsd.cfg 2010-12-23 17:34:44.000000000 +0100 -@@ -283,6 +283,97 @@ - #define PR_ALIGN_OF_POINTER 8 - #define PR_ALIGN_OF_WORD 8 - -+#elif defined(__powerpc64__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__powerpc__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" diff --git a/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.h b/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.h deleted file mode 100644 index f6d36d5c5e64..000000000000 --- a/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.h +++ /dev/null @@ -1,30 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100 -+++ nsprpub/pr/include/md/_freebsd.h 2010-12-23 17:34:46.000000000 +0100 -@@ -57,6 +57,10 @@ - #define _PR_SI_ARCHITECTURE "ia64" - #elif defined(__amd64__) - #define _PR_SI_ARCHITECTURE "amd64" -+#elif defined(__powerpc64__) -+#define _PR_SI_ARCHITECTURE "powerpc64" -+#elif defined(__powerpc__) -+#define _PR_SI_ARCHITECTURE "powerpc" - #else - #error "Unknown CPU architecture" - #endif -@@ -106,6 +110,16 @@ - #define _PR_IPV6_V6ONLY_PROBE - #endif - -+#if (__FreeBSD_version >= 700016) -+#if defined(_PR_PTHREADS) -+#define _PR_HAVE_GETPROTO_R -+#define _PR_HAVE_5_ARG_GETPROTO_R -+#define _PR_HAVE_GETHOST_R -+#define _PR_HAVE_GETHOST_R_INT -+#define _PR_HAVE_THREADSAFE_GETHOST -+#endif -+#endif -+ - #define USE_SETJMP - - #ifndef _PR_PTHREADS diff --git a/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk b/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index b1ea1eb209c0..000000000000 --- a/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include diff --git a/www/firefox-esr/files/patch-security-nss-lib-Makefile b/www/firefox-esr/files/patch-security-nss-lib-Makefile deleted file mode 100644 index 51304f730c92..000000000000 --- a/www/firefox-esr/files/patch-security-nss-lib-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif diff --git a/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c b/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c deleted file mode 100644 index eb54e8414e99..000000000000 --- a/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c +++ /dev/null @@ -1,45 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 -@@ -733,6 +733,34 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include <sys/stddef.h> -+#include <sys/sysctl.h> -+ -+#include <machine/cpu.h> -+#include <machine/md_var.h> -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +814,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - diff --git a/www/firefox-esr/files/patch-toolkit-xre-nsEmbedFunctions.cpp b/www/firefox-esr/files/patch-toolkit-xre-nsEmbedFunctions.cpp new file mode 100644 index 000000000000..6c493d940fe7 --- /dev/null +++ b/www/firefox-esr/files/patch-toolkit-xre-nsEmbedFunctions.cpp @@ -0,0 +1,10 @@ +--- toolkit/xre/nsEmbedFunctions.cpp~ ++++ toolkit/xre/nsEmbedFunctions.cpp +@@ -36,6 +36,7 @@ + * ***** END LICENSE BLOCK ***** */ + + #if defined(MOZ_WIDGET_QT) ++#include <unistd.h> + #include "nsQAppInstance.h" + #endif + diff --git a/www/firefox-esr/files/patch-toolkit_mozapps_installer_packager_mk b/www/firefox-esr/files/patch-toolkit_mozapps_installer_packager_mk new file mode 100644 index 000000000000..75af88fbcb4a --- /dev/null +++ b/www/firefox-esr/files/patch-toolkit_mozapps_installer_packager_mk @@ -0,0 +1,13 @@ +$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.11 2012/06/11 15:29:56 landry Exp $ +install headers/idl/sdk libs only if xulrunner +--- toolkit/mozapps/installer/packager.mk.orig Fri Jun 1 14:04:20 2012 ++++ toolkit/mozapps/installer/packager.mk Tue Jun 5 07:55:51 2012 +@@ -886,7 +886,7 @@ endif + $(NSINSTALL) -D $(DESTDIR)$(bindir) + $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) + ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) +-ifdef INSTALL_SDK # Here comes the hard part ++ifeq ($(MOZ_APP_NAME),xulrunner) + $(NSINSTALL) -D $(DESTDIR)$(includedir) + (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(includedir) && tar -xf -) diff --git a/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp b/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp deleted file mode 100644 index ff6c86b0d482..000000000000 --- a/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- widget/src/qt/nsNativeThemeQt.cpp~ -+++ widget/src/qt/nsNativeThemeQt.cpp -@@ -25,7 +25,9 @@ - #include "nsThemeConstants.h" - #include "nsIServiceManager.h" - #include "nsIDOMHTMLInputElement.h" -+#ifdef __GLIBC__ - #include <malloc.h> -+#endif - - - #include "gfxASurface.h" diff --git a/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp b/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp deleted file mode 100644 index 603e9c53c76a..000000000000 --- a/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- widget/src/qt/nsSound.cpp~ -+++ widget/src/qt/nsSound.cpp -@@ -40,6 +40,7 @@ - #include <QSound> - - #include <string.h> -+#include <unistd.h> - - #include "nscore.h" - #include "plstr.h" diff --git a/www/firefox-esr/files/patch-widget-src-qt-nsWindow.cpp b/www/firefox-esr/files/patch-widget-src-qt-nsWindow.cpp deleted file mode 100644 index 7cf6a06ac0e6..000000000000 --- a/www/firefox-esr/files/patch-widget-src-qt-nsWindow.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- widget/src/qt/nsWindow.cpp~ -+++ widget/src/qt/nsWindow.cpp -@@ -43,6 +43,7 @@ using namespace QtMobility; - - #ifdef MOZ_X11 - #include <X11/Xlib.h> -+#include "mozilla/X11Util.h" - #endif //MOZ_X11 - - #include "nsXULAppAPI.h" diff --git a/www/firefox-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index 9a41bbfc4602..000000000000 --- a/www/firefox-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h b/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h deleted file mode 100644 index 0440ce0a263f..000000000000 --- a/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h +++ /dev/null @@ -1,20 +0,0 @@ ---- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800 -+++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800 -@@ -45,7 +45,7 @@ - - class xptiInterfaceEntry; - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; -@@ -62,7 +62,7 @@ - #undef STUB_ENTRY - #undef SENTINEL_ENTRY - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); diff --git a/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp b/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp index 80e832263a77..73db2c3a785e 100644 --- a/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp +++ b/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp @@ -4,7 +4,7 @@ nsresult nsThreadManager::Init() { -+#ifdef NS_TLS && (__FreeBSD_version < 802513 \ ++#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ + || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) + if (!gTLSThreadID) + gTLSThreadID = mozilla::threads::Generic; diff --git a/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in deleted file mode 100644 index 1934cc3aaa47..000000000000 --- a/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 -@@ -70,7 +70,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -341,7 +356,7 @@ - # - # Linux/PPC - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) -+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp - ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +365,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +350,7 @@ - # - # OpenBSD/SPARC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) -+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp - ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s - endif diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index a827d1f61d08..b279cc9c1c4c 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= firefox-i18n -PORTVERSION= 14.0.1 +PORTVERSION= 15.0 CATEGORIES= www MASTER_SITE_SUBDIR= firefox/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -18,7 +18,7 @@ COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USE_FIREFOX= 14 +USE_FIREFOX= 15 USE_XPI= firefox linux-firefox USE_SUBMAKE= yes diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo index 24a9fab8de29..efb2b2e8cb86 100644 --- a/www/firefox-i18n/distinfo +++ b/www/firefox-i18n/distinfo @@ -1,164 +1,164 @@ -SHA256 (xpi/firefox-i18n-14.0.1/af.xpi) = 39757a66b63d65fc514504864a7790bcda29a1a8a7f715deaabe7afa109fe084 -SIZE (xpi/firefox-i18n-14.0.1/af.xpi) = 259413 -SHA256 (xpi/firefox-i18n-14.0.1/ak.xpi) = 8197f32bf4ab22a3615bdca921b10b5bffd92470aa8de5ffce3265c421978acd -SIZE (xpi/firefox-i18n-14.0.1/ak.xpi) = 261503 -SHA256 (xpi/firefox-i18n-14.0.1/ar.xpi) = e1ec2c58874c47dc37bc481632e34bbdee65bf55697d04c290ec46a260f2aeb4 -SIZE (xpi/firefox-i18n-14.0.1/ar.xpi) = 287334 -SHA256 (xpi/firefox-i18n-14.0.1/ast.xpi) = 24af08c2dadce38d3f0c9d2f6f50ac7bf7c44934d9907025cad80f82578a9a7d -SIZE (xpi/firefox-i18n-14.0.1/ast.xpi) = 243464 -SHA256 (xpi/firefox-i18n-14.0.1/be.xpi) = ced3dfbedd95c856ea880128b9727c9b8e2afdee1ebebe1269ebc11fdb9d32a0 -SIZE (xpi/firefox-i18n-14.0.1/be.xpi) = 261313 -SHA256 (xpi/firefox-i18n-14.0.1/bg.xpi) = 490d8ca2d27ef7a66169cd590be8802c18fe4f3ccdf2ec8c87a501addd6bba64 -SIZE (xpi/firefox-i18n-14.0.1/bg.xpi) = 300087 -SHA256 (xpi/firefox-i18n-14.0.1/bn-BD.xpi) = 0bd4cbab374b7f2ecdb8d15bacf77198bffb602acf617810aa93f925235db044 -SIZE (xpi/firefox-i18n-14.0.1/bn-BD.xpi) = 310085 -SHA256 (xpi/firefox-i18n-14.0.1/bn-IN.xpi) = 6b0a0d8f81ece0b9bcdc8e65eb2ee1d6d2569b4f5aa34900d323ebcda8939200 -SIZE (xpi/firefox-i18n-14.0.1/bn-IN.xpi) = 340501 -SHA256 (xpi/firefox-i18n-14.0.1/br.xpi) = a02ac264265b1c3b0bae6c4e8936de224c6286841bdb99e5ff346c59c97b9c90 -SIZE (xpi/firefox-i18n-14.0.1/br.xpi) = 269020 -SHA256 (xpi/firefox-i18n-14.0.1/bs.xpi) = 1c2a70f56db9ae927fd61d5cc22dae74a56eaac37224a3c09e0b64449099d4a1 -SIZE (xpi/firefox-i18n-14.0.1/bs.xpi) = 266194 -SHA256 (xpi/firefox-i18n-14.0.1/ca.xpi) = 8b173e56128aec56c5cd426d785f750c69bb74d2f35975754bc8653519013f22 -SIZE (xpi/firefox-i18n-14.0.1/ca.xpi) = 270258 -SHA256 (xpi/firefox-i18n-14.0.1/cs.xpi) = 53fca43dc68d000ed5647a1c4fc9de6b42bd984fd5ad941e75b5ae350469ecfb -SIZE (xpi/firefox-i18n-14.0.1/cs.xpi) = 270877 -SHA256 (xpi/firefox-i18n-14.0.1/cy.xpi) = 4646aeffd436c54e276bc13d742f425c2663baa90f9419b5db5acc7772e57274 -SIZE (xpi/firefox-i18n-14.0.1/cy.xpi) = 263051 -SHA256 (xpi/firefox-i18n-14.0.1/da.xpi) = 792cacd75426c5b262a8dfe741abd8949251d1abe4ba10f47a47b5c1f5922c5e -SIZE (xpi/firefox-i18n-14.0.1/da.xpi) = 260705 -SHA256 (xpi/firefox-i18n-14.0.1/de.xpi) = 57687914da67322473b2f25044b2354fb9efdc3d18c05621860745502a83fd45 -SIZE (xpi/firefox-i18n-14.0.1/de.xpi) = 270402 -SHA256 (xpi/firefox-i18n-14.0.1/el.xpi) = 5aba4b20078b971c6b70fe690ce126cc4720774e47aa1520e33854a0d75a0f0c -SIZE (xpi/firefox-i18n-14.0.1/el.xpi) = 285353 -SHA256 (xpi/firefox-i18n-14.0.1/en-GB.xpi) = 00cc3ffaf79019bffd84edf0904224c13eee0e603883d2d89d9ed223fb022da5 -SIZE (xpi/firefox-i18n-14.0.1/en-GB.xpi) = 251669 -SHA256 (xpi/firefox-i18n-14.0.1/en-US.xpi) = 7e0b62323a0ce970e7d72ac02ce509cc9c4ed17e4f7b412f40ff7c3bd65c559a -SIZE (xpi/firefox-i18n-14.0.1/en-US.xpi) = 251413 -SHA256 (xpi/firefox-i18n-14.0.1/en-ZA.xpi) = 442ea35bca8b8947c608906ce929855114adb09dfd2f9543493db720cf27781d -SIZE (xpi/firefox-i18n-14.0.1/en-ZA.xpi) = 251350 -SHA256 (xpi/firefox-i18n-14.0.1/eo.xpi) = fe248abe7a0772ac1528b50bc8299659310180de9b7b9b2c5f7dc60785579e8c -SIZE (xpi/firefox-i18n-14.0.1/eo.xpi) = 261867 -SHA256 (xpi/firefox-i18n-14.0.1/es-AR.xpi) = 071400a9313ab09c0dacccb519639f69f11fa0eacc1de9d47564ca84738251db -SIZE (xpi/firefox-i18n-14.0.1/es-AR.xpi) = 265959 -SHA256 (xpi/firefox-i18n-14.0.1/es-CL.xpi) = efe982c0159a4acebadefa4f66ae6417a6e872d5f360eb15af5d59a57ff5b34a -SIZE (xpi/firefox-i18n-14.0.1/es-CL.xpi) = 268868 -SHA256 (xpi/firefox-i18n-14.0.1/es-ES.xpi) = 24b65d1ca314b0d9b6ebdb5f68716df2cf461a872fd3756f5649d7fb5aab1fb1 -SIZE (xpi/firefox-i18n-14.0.1/es-ES.xpi) = 226575 -SHA256 (xpi/firefox-i18n-14.0.1/es-MX.xpi) = fe65d83fd7f7f97295f5167b7cfff61970eb83274a680d2a57bdeac2ab2f4d55 -SIZE (xpi/firefox-i18n-14.0.1/es-MX.xpi) = 227528 -SHA256 (xpi/firefox-i18n-14.0.1/et.xpi) = c4442cab7762800a80d1f85a3c0506e29643cb98dce0029a875d7902bb1b437a -SIZE (xpi/firefox-i18n-14.0.1/et.xpi) = 263591 -SHA256 (xpi/firefox-i18n-14.0.1/eu.xpi) = 9ab2c79210b5cad0609cde23b98165f7c85ad4aea36c08489185c0146b033c61 -SIZE (xpi/firefox-i18n-14.0.1/eu.xpi) = 262215 -SHA256 (xpi/firefox-i18n-14.0.1/fa.xpi) = 6f2844368bcbd3c0add255de9afde1346a38227924e74e5065db72aa2ff58678 -SIZE (xpi/firefox-i18n-14.0.1/fa.xpi) = 294603 -SHA256 (xpi/firefox-i18n-14.0.1/fi.xpi) = b276b074da20eea7bb9479d4e671360d7f4bbac6d005a0a547761cb620f538b4 -SIZE (xpi/firefox-i18n-14.0.1/fi.xpi) = 265435 -SHA256 (xpi/firefox-i18n-14.0.1/fr.xpi) = b4de02130d9955a7e323783f710d2b805f4ca8b26b30c04e65bb92c540fc72a2 -SIZE (xpi/firefox-i18n-14.0.1/fr.xpi) = 271891 -SHA256 (xpi/firefox-i18n-14.0.1/fy-NL.xpi) = be3a6b126906a6be5356fee3b9107c0af8898b444545994a3478bd0367b6082e -SIZE (xpi/firefox-i18n-14.0.1/fy-NL.xpi) = 268069 -SHA256 (xpi/firefox-i18n-14.0.1/ga-IE.xpi) = ab649e639849e1b1864d0c93208ce5ef2113edc1cc7285a4b287e44d03936ca4 -SIZE (xpi/firefox-i18n-14.0.1/ga-IE.xpi) = 274043 -SHA256 (xpi/firefox-i18n-14.0.1/gl.xpi) = 83f82fe04471961afd6f5987653d5ad2abf2141c9860deef17823dc535b7cadd -SIZE (xpi/firefox-i18n-14.0.1/gl.xpi) = 264817 -SHA256 (xpi/firefox-i18n-14.0.1/gu-IN.xpi) = e01d4ae5b9061818340df795a203634486d189e2cee18e4c2e1806dee5cd1b96 -SIZE (xpi/firefox-i18n-14.0.1/gu-IN.xpi) = 295498 -SHA256 (xpi/firefox-i18n-14.0.1/he.xpi) = aa27a3c301be484538722934548bee7823da54aed03d432bb61f75980fa8cf0c -SIZE (xpi/firefox-i18n-14.0.1/he.xpi) = 288043 -SHA256 (xpi/firefox-i18n-14.0.1/hi-IN.xpi) = 77bb6a54d429cd240c2f61548080afdcaf932c882a593fca3c7d6a6cc24e68e1 -SIZE (xpi/firefox-i18n-14.0.1/hi-IN.xpi) = 299426 -SHA256 (xpi/firefox-i18n-14.0.1/hr.xpi) = 52468d99f8389ae70e50891882b8b5aee4b9ce7814e710f5efa7b6d02b8654b3 -SIZE (xpi/firefox-i18n-14.0.1/hr.xpi) = 265784 -SHA256 (xpi/firefox-i18n-14.0.1/hu.xpi) = b0d7d4ec5fc4995beeb76ea6c26187be8c19c91b69fce54b4e1e92eb526a8fe7 -SIZE (xpi/firefox-i18n-14.0.1/hu.xpi) = 276309 -SHA256 (xpi/firefox-i18n-14.0.1/hy-AM.xpi) = a3b264308ee26653ca2954261dde79de2d583281592a9b97ff2535742c296912 -SIZE (xpi/firefox-i18n-14.0.1/hy-AM.xpi) = 480919 -SHA256 (xpi/firefox-i18n-14.0.1/id.xpi) = b63484568eea38df55b117102f5d1381cc4d4d96fee3c1eae8efda32c3396070 -SIZE (xpi/firefox-i18n-14.0.1/id.xpi) = 256819 -SHA256 (xpi/firefox-i18n-14.0.1/is.xpi) = 34275a703286bd8ac88701545866f1694a54f6d42c125653b0454f26d2b7c15f -SIZE (xpi/firefox-i18n-14.0.1/is.xpi) = 264898 -SHA256 (xpi/firefox-i18n-14.0.1/it.xpi) = 069525d9faec1e4a7f2de11aa778b43da9ba03f8c2297df9a4c05e9af152777c -SIZE (xpi/firefox-i18n-14.0.1/it.xpi) = 223702 -SHA256 (xpi/firefox-i18n-14.0.1/ja.xpi) = ca92ea45be9acbea17f36f1ef592f3ced5833fcf51aaac9e6ff1b2c3e5806348 -SIZE (xpi/firefox-i18n-14.0.1/ja.xpi) = 298353 -SHA256 (xpi/firefox-i18n-14.0.1/kk.xpi) = 42ba7f28202855fb04f205ca195667a2c98ac82f57974c040eeb65481e71f927 -SIZE (xpi/firefox-i18n-14.0.1/kk.xpi) = 304324 -SHA256 (xpi/firefox-i18n-14.0.1/kn.xpi) = bf131e45dd35accf733c55137ce9427c4df26625bf083fad3170c98530d80639 -SIZE (xpi/firefox-i18n-14.0.1/kn.xpi) = 324259 -SHA256 (xpi/firefox-i18n-14.0.1/ko.xpi) = 4ee3057c599c7abd7e834b738bafd47fe596bebbc9d4ab971256e82c9505fac0 -SIZE (xpi/firefox-i18n-14.0.1/ko.xpi) = 248839 -SHA256 (xpi/firefox-i18n-14.0.1/ku.xpi) = a4f7a5dbd70d0582adf34b3b6526c46b8f278d4075eb9f38ae403d7c4fff463d -SIZE (xpi/firefox-i18n-14.0.1/ku.xpi) = 276032 -SHA256 (xpi/firefox-i18n-14.0.1/lg.xpi) = 65b9483c3ffc8e120b7abd5692afffeeb90c0816589928765791cea59ca5c9bb -SIZE (xpi/firefox-i18n-14.0.1/lg.xpi) = 268852 -SHA256 (xpi/firefox-i18n-14.0.1/lt.xpi) = 589301e3179cdbf0d4c22740b3331fbbcf6fe8d739fde1d2e6af2d00374cc676 -SIZE (xpi/firefox-i18n-14.0.1/lt.xpi) = 334663 -SHA256 (xpi/firefox-i18n-14.0.1/lv.xpi) = bd5fe411916e36b8ca64f60f48f9a70d924d4801847e58edd028e14619bde0cd -SIZE (xpi/firefox-i18n-14.0.1/lv.xpi) = 264507 -SHA256 (xpi/firefox-i18n-14.0.1/mai.xpi) = 5b77dc00606aec08d9c3196872240c4c623bbe07da79d4f26123db6297d7f5df -SIZE (xpi/firefox-i18n-14.0.1/mai.xpi) = 299208 -SHA256 (xpi/firefox-i18n-14.0.1/mk.xpi) = 11cee652dd65d2689b2e1e688a878a2433cf7d8dac77e0d7ce8a980aa9d01aa8 -SIZE (xpi/firefox-i18n-14.0.1/mk.xpi) = 294779 -SHA256 (xpi/firefox-i18n-14.0.1/ml.xpi) = 6de125f40b89b92ee3b79a4ab98869726257c300dd2d333b6e4119b6d4cf753c -SIZE (xpi/firefox-i18n-14.0.1/ml.xpi) = 328299 -SHA256 (xpi/firefox-i18n-14.0.1/mr.xpi) = 285fa087b4b78bfe1c6204a45cea4f0716e13f4c80c8d2ecbaee54c1cdb2469a -SIZE (xpi/firefox-i18n-14.0.1/mr.xpi) = 305733 -SHA256 (xpi/firefox-i18n-14.0.1/nb-NO.xpi) = f19b4642a7a3d8fbc4e76c5b2c7942b95d69579f96e0999f17aad44c2e53050d -SIZE (xpi/firefox-i18n-14.0.1/nb-NO.xpi) = 263019 -SHA256 (xpi/firefox-i18n-14.0.1/nl.xpi) = 2227133e1d80fdc0ee2b8251d457d270e6fe27ad10d42a5be6aec3aa46b81f87 -SIZE (xpi/firefox-i18n-14.0.1/nl.xpi) = 264262 -SHA256 (xpi/firefox-i18n-14.0.1/nn-NO.xpi) = 7c384a2bbb238059890e57a6619821994b6ef6e1dff469ab77fb2ea28fa862fb -SIZE (xpi/firefox-i18n-14.0.1/nn-NO.xpi) = 263895 -SHA256 (xpi/firefox-i18n-14.0.1/nso.xpi) = 85c20d678eec03e054b1de5c436c8e43027001fdbe8d1a898842f44d6146183f -SIZE (xpi/firefox-i18n-14.0.1/nso.xpi) = 267693 -SHA256 (xpi/firefox-i18n-14.0.1/or.xpi) = b7bcd9537c13e8b7eae5d2d0f48e9a51c2e11934e5853ebbc5aec4babd9a7fce -SIZE (xpi/firefox-i18n-14.0.1/or.xpi) = 304397 -SHA256 (xpi/firefox-i18n-14.0.1/pa-IN.xpi) = 049096a59531307453bca995e931f5e4730eee85eb41d7b81ec6f4ce94bf60af -SIZE (xpi/firefox-i18n-14.0.1/pa-IN.xpi) = 300304 -SHA256 (xpi/firefox-i18n-14.0.1/pl.xpi) = 56d011893a07ad8547b6a629f961f390540a13c5e6e951a3b30e25eaf5b2828a -SIZE (xpi/firefox-i18n-14.0.1/pl.xpi) = 273932 -SHA256 (xpi/firefox-i18n-14.0.1/pt-BR.xpi) = d8b655ac608e414f247f1c92754b2ae35d0301de173a1f4a68d12c47dea793c6 -SIZE (xpi/firefox-i18n-14.0.1/pt-BR.xpi) = 268743 -SHA256 (xpi/firefox-i18n-14.0.1/pt-PT.xpi) = eacffbdb6dd182e9c1e054fd00c79f34501d59a18636d7d7bd36721e06b763e5 -SIZE (xpi/firefox-i18n-14.0.1/pt-PT.xpi) = 268211 -SHA256 (xpi/firefox-i18n-14.0.1/rm.xpi) = 7e1de9bd8670196af292f6bd226ff386f3606a75d194b0a43b139ab78da0a216 -SIZE (xpi/firefox-i18n-14.0.1/rm.xpi) = 266424 -SHA256 (xpi/firefox-i18n-14.0.1/ro.xpi) = 570c9da5f1d6164160981739983c6191f43974706398e102dfa29437e84cd253 -SIZE (xpi/firefox-i18n-14.0.1/ro.xpi) = 286802 -SHA256 (xpi/firefox-i18n-14.0.1/ru.xpi) = 5acbabc95c047b4586599fe9eb35e7eeb141290e617d233f4fcf45aa0b2be0e5 -SIZE (xpi/firefox-i18n-14.0.1/ru.xpi) = 267746 -SHA256 (xpi/firefox-i18n-14.0.1/si.xpi) = b1a0f75c549a5ec4339bdf70eb6bcb279c3213c0883fc231c9f2b273634c4e2f -SIZE (xpi/firefox-i18n-14.0.1/si.xpi) = 295362 -SHA256 (xpi/firefox-i18n-14.0.1/sk.xpi) = bd042442cf549ca10518339a2a725ed09302fd3fd79ea22806247ad170d5013f -SIZE (xpi/firefox-i18n-14.0.1/sk.xpi) = 277244 -SHA256 (xpi/firefox-i18n-14.0.1/sl.xpi) = 57ed25bbf7961caa0d3629b4cbe740769d0a337223bb1af1070f4b00e99bd9a5 -SIZE (xpi/firefox-i18n-14.0.1/sl.xpi) = 262677 -SHA256 (xpi/firefox-i18n-14.0.1/son.xpi) = e4c94ab3bb6f1a97f52b4425b368e9a9274824c5848a50ad717126ed68e1fd38 -SIZE (xpi/firefox-i18n-14.0.1/son.xpi) = 261296 -SHA256 (xpi/firefox-i18n-14.0.1/sq.xpi) = 7cab74153790518d7ef58935e4dba0394375a54996003331aa2b2acfda468704 -SIZE (xpi/firefox-i18n-14.0.1/sq.xpi) = 248980 -SHA256 (xpi/firefox-i18n-14.0.1/sr.xpi) = fcb65105e6b8e874806d415413238cbb2dd5d2712c94a379e7967d908891b9a5 -SIZE (xpi/firefox-i18n-14.0.1/sr.xpi) = 306504 -SHA256 (xpi/firefox-i18n-14.0.1/sv-SE.xpi) = 15ee86bea584fcd6db47e17614aba49dcf0b223c4a425dac4fccd5fd85650566 -SIZE (xpi/firefox-i18n-14.0.1/sv-SE.xpi) = 300674 -SHA256 (xpi/firefox-i18n-14.0.1/ta-LK.xpi) = a9aaa55e4490d3168617777472ddd49393dd25eed53cf617dd38ef496e78620d -SIZE (xpi/firefox-i18n-14.0.1/ta-LK.xpi) = 312531 -SHA256 (xpi/firefox-i18n-14.0.1/ta.xpi) = 3a28b3b8ac44e5cf0e205f7e59bd589fd02ac36a36d37dcbb5de297ac47a8748 -SIZE (xpi/firefox-i18n-14.0.1/ta.xpi) = 295689 -SHA256 (xpi/firefox-i18n-14.0.1/te.xpi) = a3225ea584a1f9c634ffeca20da518016e2fc2ce76c8672280e598ec768987e9 -SIZE (xpi/firefox-i18n-14.0.1/te.xpi) = 312341 -SHA256 (xpi/firefox-i18n-14.0.1/th.xpi) = d4e1df9b118f9fc1a4dfbc16929314f3206f517eba4ba6179d270aa74a2516cc -SIZE (xpi/firefox-i18n-14.0.1/th.xpi) = 295253 -SHA256 (xpi/firefox-i18n-14.0.1/tr.xpi) = 121a6413e2209b6b5efb6adfcd2160b050bd131e87656d11097ddb177fc9d5d2 -SIZE (xpi/firefox-i18n-14.0.1/tr.xpi) = 272367 -SHA256 (xpi/firefox-i18n-14.0.1/uk.xpi) = f68eb75409300892f2d311929702ef9d23e7e203feb08aeb23d6c0d84d9ca4af -SIZE (xpi/firefox-i18n-14.0.1/uk.xpi) = 300791 -SHA256 (xpi/firefox-i18n-14.0.1/vi.xpi) = b65ac68e4712af7f75852b79e37204b577d8ca3128592f0862ae2c9b8fb22ea3 -SIZE (xpi/firefox-i18n-14.0.1/vi.xpi) = 284581 -SHA256 (xpi/firefox-i18n-14.0.1/zh-CN.xpi) = 4d924b9efe324c58b65ed301faaabeb5a223cc58c24292e04395288be2a7f5a1 -SIZE (xpi/firefox-i18n-14.0.1/zh-CN.xpi) = 279886 -SHA256 (xpi/firefox-i18n-14.0.1/zh-TW.xpi) = b518709a1fa973bdccf643e24d76e32b7db6a1f492e4c583ff3ce51f3dc235b2 -SIZE (xpi/firefox-i18n-14.0.1/zh-TW.xpi) = 280804 -SHA256 (xpi/firefox-i18n-14.0.1/zu.xpi) = 4fa27fe75f4e2c8e15f670d21af6d24778a0fa8deda1e96ad132abb5a816ede5 -SIZE (xpi/firefox-i18n-14.0.1/zu.xpi) = 268032 +SHA256 (xpi/firefox-i18n-15.0/af.xpi) = f652460b46fff68cd30838f0cb74238ed8f5030c800cad9583b679300baceaff +SIZE (xpi/firefox-i18n-15.0/af.xpi) = 268863 +SHA256 (xpi/firefox-i18n-15.0/ak.xpi) = 9ce143f0898729fdc59e93a48933c5214b07c757260c7d5aa59203220cbacb77 +SIZE (xpi/firefox-i18n-15.0/ak.xpi) = 271019 +SHA256 (xpi/firefox-i18n-15.0/ar.xpi) = 12bd8823d685addefd89717b27c8c764755f90b63e9a349aa603874fd047aa2e +SIZE (xpi/firefox-i18n-15.0/ar.xpi) = 298350 +SHA256 (xpi/firefox-i18n-15.0/ast.xpi) = 3ad8dc0d1759ba552a21a558b2aeab1dc5cd0a36a1fe5eb92a0903ccf1c74895 +SIZE (xpi/firefox-i18n-15.0/ast.xpi) = 248048 +SHA256 (xpi/firefox-i18n-15.0/be.xpi) = 847b04a2dd75175a973a8652073825a11a15cef99800bb6f61d1607eaedec0ff +SIZE (xpi/firefox-i18n-15.0/be.xpi) = 271387 +SHA256 (xpi/firefox-i18n-15.0/bg.xpi) = 76ce8f9da1900639e6dff04657e303051ba62471a23b47ee7cd171ae5e95ee14 +SIZE (xpi/firefox-i18n-15.0/bg.xpi) = 312374 +SHA256 (xpi/firefox-i18n-15.0/bn-BD.xpi) = 2ad67707b0c9142e24af31ec0acc499dd20dabd04be785254f07e0f4d71458ec +SIZE (xpi/firefox-i18n-15.0/bn-BD.xpi) = 320571 +SHA256 (xpi/firefox-i18n-15.0/bn-IN.xpi) = fac3ee43a5bc5626a6e007145ebf297bdb8f6145d0a3dc52789c31f9772cbb51 +SIZE (xpi/firefox-i18n-15.0/bn-IN.xpi) = 350006 +SHA256 (xpi/firefox-i18n-15.0/br.xpi) = 07b9b3a48729fa17eac03be23966e926ed053ddd39448f05401f829480df37d1 +SIZE (xpi/firefox-i18n-15.0/br.xpi) = 278805 +SHA256 (xpi/firefox-i18n-15.0/bs.xpi) = eb41f19008a33691453cf7a06624939fd1b6298bbec07442bde5166b0bafec5e +SIZE (xpi/firefox-i18n-15.0/bs.xpi) = 274155 +SHA256 (xpi/firefox-i18n-15.0/ca.xpi) = 5f75ac8d4892a6ab163ac4b48ae1879ceee649f022af8e56ea7b80783402e404 +SIZE (xpi/firefox-i18n-15.0/ca.xpi) = 279475 +SHA256 (xpi/firefox-i18n-15.0/cs.xpi) = b3f286af68a015f3e7a03fff6427a343f4a180f419fcd9fb954cac0f8ac4427a +SIZE (xpi/firefox-i18n-15.0/cs.xpi) = 279346 +SHA256 (xpi/firefox-i18n-15.0/cy.xpi) = 07c232dd8e9adec929eae71b40456686d8019a3c06885e5dc34f32ebef79a3d7 +SIZE (xpi/firefox-i18n-15.0/cy.xpi) = 272154 +SHA256 (xpi/firefox-i18n-15.0/da.xpi) = 118ac7adfc78ca577ae11061b57bd9b11046a8032e0088e74452f5b18c163fd5 +SIZE (xpi/firefox-i18n-15.0/da.xpi) = 269301 +SHA256 (xpi/firefox-i18n-15.0/de.xpi) = 5b6dfaf2a7d05058b998368af9b98af31db99e4f5add674a8be178047dd11730 +SIZE (xpi/firefox-i18n-15.0/de.xpi) = 263532 +SHA256 (xpi/firefox-i18n-15.0/el.xpi) = 32adb07d6c21c5838426c387c5368df94728d574405e31c3fc9ebaf5687613d2 +SIZE (xpi/firefox-i18n-15.0/el.xpi) = 293558 +SHA256 (xpi/firefox-i18n-15.0/en-GB.xpi) = f5928a0970583c1a2275f4fa8b8ef05f8535ec758131fb65ed83bcc881c41b39 +SIZE (xpi/firefox-i18n-15.0/en-GB.xpi) = 260757 +SHA256 (xpi/firefox-i18n-15.0/en-US.xpi) = 8bbcd41e3cba30bc893f54d179aa029c1f896570428a5b0ba1327c85699d9c2a +SIZE (xpi/firefox-i18n-15.0/en-US.xpi) = 260389 +SHA256 (xpi/firefox-i18n-15.0/en-ZA.xpi) = 4977df2c679495a5790584e0f80598196c838517a1ecbd27ee5aca3373262212 +SIZE (xpi/firefox-i18n-15.0/en-ZA.xpi) = 260075 +SHA256 (xpi/firefox-i18n-15.0/eo.xpi) = d1d25cb7a5692a60c84ddaefc898478455b6f8d6002f3da3e1d3d42e4a8b616e +SIZE (xpi/firefox-i18n-15.0/eo.xpi) = 271982 +SHA256 (xpi/firefox-i18n-15.0/es-AR.xpi) = f9ebfe1beea8bd3a92dc3716d8a576ff16f6bcaca08f6e2cd8534a47766208c5 +SIZE (xpi/firefox-i18n-15.0/es-AR.xpi) = 279497 +SHA256 (xpi/firefox-i18n-15.0/es-CL.xpi) = 29d82deff1f55d022c1562205a455a6d121d03af17ece8ed4c963b077d527993 +SIZE (xpi/firefox-i18n-15.0/es-CL.xpi) = 277437 +SHA256 (xpi/firefox-i18n-15.0/es-ES.xpi) = d7a422adb57f77902cfa55e0c20950485132fa4edc81739103a16193488ce2cf +SIZE (xpi/firefox-i18n-15.0/es-ES.xpi) = 234446 +SHA256 (xpi/firefox-i18n-15.0/es-MX.xpi) = 3e05023317db994928fbc1ba7e1e480b8a97749d82e6dd7858126cef289cd55d +SIZE (xpi/firefox-i18n-15.0/es-MX.xpi) = 232425 +SHA256 (xpi/firefox-i18n-15.0/et.xpi) = 6e2c92d76d3ea2393ee3033130346680385c2a4a87a1a4bf6a8b88c356e2598e +SIZE (xpi/firefox-i18n-15.0/et.xpi) = 272453 +SHA256 (xpi/firefox-i18n-15.0/eu.xpi) = 24c14b8ce944341d05de68bfca908eb910ef11acdacb31b95173283b3d1bfc26 +SIZE (xpi/firefox-i18n-15.0/eu.xpi) = 270788 +SHA256 (xpi/firefox-i18n-15.0/fa.xpi) = 1a749c2e27d12147516db9762f90f0f4bbf047a99b57757ff2081775c2c69dbd +SIZE (xpi/firefox-i18n-15.0/fa.xpi) = 304776 +SHA256 (xpi/firefox-i18n-15.0/fi.xpi) = 14d4d2428ee176bfd3fb1a627d92b2e1d9dded64c0623fa0f88d4f6edca2c389 +SIZE (xpi/firefox-i18n-15.0/fi.xpi) = 275690 +SHA256 (xpi/firefox-i18n-15.0/fr.xpi) = d0bb872b694f997086382c6560b7544017b1ec88cfc17b82712a582a024941eb +SIZE (xpi/firefox-i18n-15.0/fr.xpi) = 273755 +SHA256 (xpi/firefox-i18n-15.0/fy-NL.xpi) = b3361d44941a2af8d8c8c2568a073a46cd68611308774b6cb0bdff25f75ce276 +SIZE (xpi/firefox-i18n-15.0/fy-NL.xpi) = 275749 +SHA256 (xpi/firefox-i18n-15.0/ga-IE.xpi) = 0071504387a1cdb674b6fcfadea242c235e7766f1ace655cf149850b49c21ef5 +SIZE (xpi/firefox-i18n-15.0/ga-IE.xpi) = 284178 +SHA256 (xpi/firefox-i18n-15.0/gl.xpi) = e705b005c254f402edf5d78cd79218a7ef50cddbcee4c19fc1cb2267bc082429 +SIZE (xpi/firefox-i18n-15.0/gl.xpi) = 272638 +SHA256 (xpi/firefox-i18n-15.0/gu-IN.xpi) = 4698cb094012203be33401882a3b0be00333d7e3a249776430d437e324e90cd6 +SIZE (xpi/firefox-i18n-15.0/gu-IN.xpi) = 302332 +SHA256 (xpi/firefox-i18n-15.0/he.xpi) = 8b2f077b75a151dfe1e4e18243e902f45f7274710f42a86635a504aea252267e +SIZE (xpi/firefox-i18n-15.0/he.xpi) = 287912 +SHA256 (xpi/firefox-i18n-15.0/hi-IN.xpi) = 9be991de32d97ccf1a1bdfe5de593a227843a45947c2327c2700593b4d955dab +SIZE (xpi/firefox-i18n-15.0/hi-IN.xpi) = 316191 +SHA256 (xpi/firefox-i18n-15.0/hr.xpi) = 731b18fab3ee56a80c67de25fcc5b1c158106fa701f1ae8557bdfc2f23e2818d +SIZE (xpi/firefox-i18n-15.0/hr.xpi) = 274796 +SHA256 (xpi/firefox-i18n-15.0/hu.xpi) = 5a07af7337e0cc39d603ff13491526e5dae703ed994cf80e894692dbe4572b16 +SIZE (xpi/firefox-i18n-15.0/hu.xpi) = 288899 +SHA256 (xpi/firefox-i18n-15.0/hy-AM.xpi) = 69444dccdddd15b4d13e8406e328b0bcd6a1f324591a21533f65d2e93edc7076 +SIZE (xpi/firefox-i18n-15.0/hy-AM.xpi) = 315709 +SHA256 (xpi/firefox-i18n-15.0/id.xpi) = f6149f31e0da844138cd0b442ac80ae2c25080280857727707633721d5a5a8c3 +SIZE (xpi/firefox-i18n-15.0/id.xpi) = 264725 +SHA256 (xpi/firefox-i18n-15.0/is.xpi) = a268e1677b805495dd17dc0f4a379a528f053899a8e1ae6752f176f4502d4fb3 +SIZE (xpi/firefox-i18n-15.0/is.xpi) = 274360 +SHA256 (xpi/firefox-i18n-15.0/it.xpi) = 423ff0e1b179fa784f5f6c021afcd288fb1967e80afb237edb46f4b83476c03d +SIZE (xpi/firefox-i18n-15.0/it.xpi) = 230878 +SHA256 (xpi/firefox-i18n-15.0/ja.xpi) = 706a9c2c0e7ad3210d5a67aca045a92b96d68a17c49a5be32fc1b78712cf16d6 +SIZE (xpi/firefox-i18n-15.0/ja.xpi) = 307017 +SHA256 (xpi/firefox-i18n-15.0/kk.xpi) = a6bfa40df8cadd1189ebed54c13513d22c3b436145f1327ab41f06c8277abb70 +SIZE (xpi/firefox-i18n-15.0/kk.xpi) = 314270 +SHA256 (xpi/firefox-i18n-15.0/kn.xpi) = 63e78103ad637ddef173d289a10866780a389f3c8bdeb4059c25998ae02acf27 +SIZE (xpi/firefox-i18n-15.0/kn.xpi) = 334104 +SHA256 (xpi/firefox-i18n-15.0/ko.xpi) = 38788f1564c82d77dc4062751da786be378cc1bca5f001b8620f93a48b274f22 +SIZE (xpi/firefox-i18n-15.0/ko.xpi) = 257655 +SHA256 (xpi/firefox-i18n-15.0/ku.xpi) = 2acc089512b9dedb8d1590eba19c41b65464b50baac65efa48ae8cb3bddf8915 +SIZE (xpi/firefox-i18n-15.0/ku.xpi) = 285701 +SHA256 (xpi/firefox-i18n-15.0/lg.xpi) = 9d215be0b7008af9648127e80ccee8cd7e26c29a688ae69b54df2d5d14275329 +SIZE (xpi/firefox-i18n-15.0/lg.xpi) = 278168 +SHA256 (xpi/firefox-i18n-15.0/lt.xpi) = d90d89925002a5a903c79d807033b915628be9cc761a85d1419c3e298559ef50 +SIZE (xpi/firefox-i18n-15.0/lt.xpi) = 337513 +SHA256 (xpi/firefox-i18n-15.0/lv.xpi) = 34c75aad84fc41fe8629857e551cce92281d9e3f54774fe89bc42e6e49f401eb +SIZE (xpi/firefox-i18n-15.0/lv.xpi) = 272061 +SHA256 (xpi/firefox-i18n-15.0/mai.xpi) = 142ed2f6fbb7be5d3e0022b7a6bfb19fa520855bb03e4dbf6efbe1666b1bfb7c +SIZE (xpi/firefox-i18n-15.0/mai.xpi) = 314156 +SHA256 (xpi/firefox-i18n-15.0/mk.xpi) = 61d78e89cc95a64e5da914d8e7135208e548551dd546fba675ffabe167099b35 +SIZE (xpi/firefox-i18n-15.0/mk.xpi) = 303390 +SHA256 (xpi/firefox-i18n-15.0/ml.xpi) = 5e5b32d5eada414dc38d063a1ef9ce4e5f03c5d5964112a8e18df06f2050141b +SIZE (xpi/firefox-i18n-15.0/ml.xpi) = 345461 +SHA256 (xpi/firefox-i18n-15.0/mr.xpi) = 1a7a0639e57a493b68705c88f4d6718acd744d0b2a6bc5e9c5c71bb8d3bb3cdf +SIZE (xpi/firefox-i18n-15.0/mr.xpi) = 313721 +SHA256 (xpi/firefox-i18n-15.0/nb-NO.xpi) = fe1ae00e0d6e26fce2100037c5c0b44f91fc5d2299cf5194544ebdc519127704 +SIZE (xpi/firefox-i18n-15.0/nb-NO.xpi) = 272400 +SHA256 (xpi/firefox-i18n-15.0/nl.xpi) = 5eb1e697ee5b4d36c897f14b11ef9610ed556cc0a2a08a201230165bc871c97c +SIZE (xpi/firefox-i18n-15.0/nl.xpi) = 275340 +SHA256 (xpi/firefox-i18n-15.0/nn-NO.xpi) = 06e2c38e37cba58a984d09a5bb8d6931dddec327cccfd40aaa7c640f372590a1 +SIZE (xpi/firefox-i18n-15.0/nn-NO.xpi) = 272502 +SHA256 (xpi/firefox-i18n-15.0/nso.xpi) = bf01a4f974806d4be469fe30e688a1f9d2808b0a6b36eded9a73cd18d56ec521 +SIZE (xpi/firefox-i18n-15.0/nso.xpi) = 275794 +SHA256 (xpi/firefox-i18n-15.0/or.xpi) = bc727af88c8733291e248ac3b0aba3758f38a3cf281dcfd86798293de582d387 +SIZE (xpi/firefox-i18n-15.0/or.xpi) = 311896 +SHA256 (xpi/firefox-i18n-15.0/pa-IN.xpi) = 720f76de172ab43617e0c454b6d793228a029a024277a0463ccff30be208fae6 +SIZE (xpi/firefox-i18n-15.0/pa-IN.xpi) = 305967 +SHA256 (xpi/firefox-i18n-15.0/pl.xpi) = 9b95af8da8c79c7c6ae334ef219643a2b572be8808b6c7e5c9ffed3e69d4d634 +SIZE (xpi/firefox-i18n-15.0/pl.xpi) = 282657 +SHA256 (xpi/firefox-i18n-15.0/pt-BR.xpi) = 6272ea3f8f23fd9a1a0a0e9439a1948bfcb98c756048558ff557f3fe67333fca +SIZE (xpi/firefox-i18n-15.0/pt-BR.xpi) = 276744 +SHA256 (xpi/firefox-i18n-15.0/pt-PT.xpi) = 462ca33db37cf77afede97afc2d0d065dbed208964ba6aeed639ccf1dd1cba12 +SIZE (xpi/firefox-i18n-15.0/pt-PT.xpi) = 276975 +SHA256 (xpi/firefox-i18n-15.0/rm.xpi) = a829e2a58f081ac947c62ea86d3f3cad3058dd2154c4b292c157c01a4239ec1b +SIZE (xpi/firefox-i18n-15.0/rm.xpi) = 274235 +SHA256 (xpi/firefox-i18n-15.0/ro.xpi) = 274202fc3350e1e40b431ba6a5ee3d8888ade5b6ab7de6fc6d6bd3bb36db93b4 +SIZE (xpi/firefox-i18n-15.0/ro.xpi) = 295295 +SHA256 (xpi/firefox-i18n-15.0/ru.xpi) = e16ab330c45f477952f9ab33098d655448441614c4c08323743d11970085f84f +SIZE (xpi/firefox-i18n-15.0/ru.xpi) = 275714 +SHA256 (xpi/firefox-i18n-15.0/si.xpi) = e6c78f69f7a8f1c9d2e22996f5de748055941dd9c76e075deac9c99bf2715d3e +SIZE (xpi/firefox-i18n-15.0/si.xpi) = 304018 +SHA256 (xpi/firefox-i18n-15.0/sk.xpi) = b5ea6a315397e6ee78f04f194600c4797321f99924667320f091f322538f1a7d +SIZE (xpi/firefox-i18n-15.0/sk.xpi) = 289319 +SHA256 (xpi/firefox-i18n-15.0/sl.xpi) = bb5a4b36e1b8dba9302576d97d46625b62ce2f6a809ddd5fcbdb7f23c97c3fd3 +SIZE (xpi/firefox-i18n-15.0/sl.xpi) = 272803 +SHA256 (xpi/firefox-i18n-15.0/son.xpi) = fc4a54f48dc0cfe3da1a2b6cb6162862a2a39cbf25538a2b00bfe9cf9dcd9294 +SIZE (xpi/firefox-i18n-15.0/son.xpi) = 270399 +SHA256 (xpi/firefox-i18n-15.0/sq.xpi) = 66b7f93c5d86a45019512d9337a4e6266a921514e4c27b41d22eaba6ab09d096 +SIZE (xpi/firefox-i18n-15.0/sq.xpi) = 257659 +SHA256 (xpi/firefox-i18n-15.0/sr.xpi) = 3ed94bd243bcb80b9bfada7c0482f24d0317b3bd5aaed78ba36abad89fe32b1c +SIZE (xpi/firefox-i18n-15.0/sr.xpi) = 314228 +SHA256 (xpi/firefox-i18n-15.0/sv-SE.xpi) = 68f04c0f72f09ee07061fc66f568cfa633dc50d226375dcc613dc94358645e39 +SIZE (xpi/firefox-i18n-15.0/sv-SE.xpi) = 276161 +SHA256 (xpi/firefox-i18n-15.0/ta-LK.xpi) = 4b2ea175c21fe803dba076dd1321d35ac4d0c9eef5f2f2bd4a28a01b03e2ddcc +SIZE (xpi/firefox-i18n-15.0/ta-LK.xpi) = 323324 +SHA256 (xpi/firefox-i18n-15.0/ta.xpi) = 2f72f4fee2f2318150d8092540ef3e0c47e7a2385522cd231006952ede5e4a41 +SIZE (xpi/firefox-i18n-15.0/ta.xpi) = 306300 +SHA256 (xpi/firefox-i18n-15.0/te.xpi) = e7b877324a23ac540e532d0cb498694c43fe2293e3f92228822c73b90650cfce +SIZE (xpi/firefox-i18n-15.0/te.xpi) = 321389 +SHA256 (xpi/firefox-i18n-15.0/th.xpi) = fc4b46304e9914089eb4a9fd1404c561c50309bbb90e21101f385070fd5583d4 +SIZE (xpi/firefox-i18n-15.0/th.xpi) = 303853 +SHA256 (xpi/firefox-i18n-15.0/tr.xpi) = d5631e2984553fe083723f4150afd717d1ac5f04d9eb0b3ffbb0ccc3a3d2c0d8 +SIZE (xpi/firefox-i18n-15.0/tr.xpi) = 281933 +SHA256 (xpi/firefox-i18n-15.0/uk.xpi) = 7307bb5d1821532162a5cb653e7a1a35f8de19743095605d055d793a98b4873a +SIZE (xpi/firefox-i18n-15.0/uk.xpi) = 311424 +SHA256 (xpi/firefox-i18n-15.0/vi.xpi) = 558176761a2875ce32ce402ebb27d334de7ed8ce6d0c574ccf9c5e19dc4193de +SIZE (xpi/firefox-i18n-15.0/vi.xpi) = 294951 +SHA256 (xpi/firefox-i18n-15.0/zh-CN.xpi) = 60e89d4f62d49e24e4657d3a9c506ee7ce47bdce2eca2cfe5e6189f826f13249 +SIZE (xpi/firefox-i18n-15.0/zh-CN.xpi) = 290961 +SHA256 (xpi/firefox-i18n-15.0/zh-TW.xpi) = a0eb597407065ffd8b9b58d2573dc8f42fa681cbb30341333ced416c49fb753e +SIZE (xpi/firefox-i18n-15.0/zh-TW.xpi) = 291946 +SHA256 (xpi/firefox-i18n-15.0/zu.xpi) = 22541e44eca9cf2c5fa258b8a76d9cbcb9c6f0c032e13414e946af3fbf7925ba +SIZE (xpi/firefox-i18n-15.0/zu.xpi) = 277289 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index c4ef6e472c82..77044218c0c3 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -6,8 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 14.0.1 -PORTREVISION= 1 +DISTVERSION= 15.0 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -19,13 +18,13 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ nss>=3.13.2:${PORTSDIR}/security/nss \ - sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -CONFLICTS_BUILD= spidermonkey-* - USE_AUTOTOOLS= autoconf213:env +USE_PYTHON_BUILD=yes USE_GECKO= gecko CONFLICTS= firefox-10.* MOZ_PKGCONFIG_FILES= # empty @@ -38,7 +37,6 @@ USE_QT4= # empty QT_NONSTANDARD= yes ALL_TARGET= default GNU_CONFIGURE= yes -OBJDIR_BUILD= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl @@ -78,8 +76,8 @@ USE_DISPLAY= yes MOZ_OPTIONS+= ${CONFIGURE_TARGET} MAKEFILE= ${WRKSRC}/client.mk ALL_TARGET= profiledbuild -MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \ - @MOZ_OBJDIR@/_profile/pgo/profileserver.py"' +MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \ + @MOZ_OBJDIR@/_profile/pgo/profileserver.py" .endif .if ${ARCH} == amd64 || ${ARCH} == i386 diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options index 0b4b15843a3a..93b811fc1ffd 100644 --- a/www/firefox/Makefile.options +++ b/www/firefox/Makefile.options @@ -16,4 +16,5 @@ GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk GNOMEUI_DESC?= libgnomeui support module LIGHTNING_DESC?= Calendar extension LOGGING_DESC?= Additional log messages +PGO_DESC?= Profile-Guided Optimization # move to bsd.options.desc.mk LIBPROXY_DESC?= Proxy support via libproxy diff --git a/www/firefox/Makefile.webplugins b/www/firefox/Makefile.webplugins index 25e748fc1e66..b135db5fb03e 100644 --- a/www/firefox/Makefile.webplugins +++ b/www/firefox/Makefile.webplugins @@ -14,10 +14,10 @@ # Documentation and examples: # # Makefile.webplugins will create symlinks automatically for each supported -# applications that supports the webplugins framework. Also, it will remove +# application that supports the webplugins framework. Also, it will remove # these symlinks when the plug-in port is uninstalled. # -# USE_WEBPLUGINS - Specify a list of application(s) that this plug-in +# USE_WEBPLUGINS - Specify a list of applications that this plug-in # port supports. For each of these applications, a # symlink will be created in # lib/browser_plugins/symlinks. See @@ -26,13 +26,13 @@ # Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all # applications) # -# WEBPLUGINS_NAME - If your port installs file(s) in ${WEBPLUGINS_DIR}, +# WEBPLUGINS_NAME - If your port installs files in ${WEBPLUGINS_DIR}, # then you can tweak WEBPLUGINS_NAME to change the # name of the directory # (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). # Default: WEBPLUGINS_NAME=${PKGBASE} # -# WEBPLUGINS_FILES - The plug-in file(s) that are going to be linked +# WEBPLUGINS_FILES - The plug-in files that are going to be linked # in lib/browser_plugins/symlinks/*/. It cannot # be empty or the port will set IGNORE. # @@ -40,9 +40,9 @@ # found. Each plug-in file in WEBPLUGINS_FILES # must be found in WEBPLUGINS_DIR. If your port # does not install in WEBPLUGINS_DIR, but in its own -# path. You will need to specify that here or +# path, you will need to specify that here or # symlinks will be created to non-existent files. -# Default: WEBPLUGINS_DIR?=${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} +# Default: WEBPLUGINS_DIR=${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME} # # # The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any @@ -53,8 +53,8 @@ # USE_WEBPLUGINS=linux (Supports linux-*) # USE_WEBPLUGINS=opera webkit-gtk2 # -# Example to add in Makefile and pkg-plist if the plug-in file(s) install in -# WEBPLUGINS_DIR, and if your port does this manually: +# Example to add in Makefile and pkg-plist if the plug-in files are installled +# to WEBPLUGINS_DIR, and if your port does this manually: # # Makefile: # ------------------------------------------------------ @@ -104,7 +104,7 @@ # ------------------------------------------------------ # [...] # USE_WEBPLUGINS=gecko* -# WEBPLUGINS_DIR=#{PREFIX}/lib/application +# WEBPLUGINS_DIR=${PREFIX}/lib/application # WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi # # .include <bsd.port.pre.mk> @@ -155,7 +155,7 @@ USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} .if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ ${WEBPLUGINS_FILES} == "" -IGNORE= cannot install: the WEBPLUGINS_FILES is empty, please add plugins file in it and see in www/firefox/Makefile.webplugins for document +IGNORE= can't be installed: WEBPLUGINS_FILES is empty. Please, add plug-in files to it and check www/firefox/Makefile.webplugins for documentation .endif .for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} @@ -178,28 +178,28 @@ WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*op WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} -WEBPLUGINS_LIBDIR= ${PREFIX}/lib/browser_plugins +WEBPLUGINS_LIBDIR= ${LOCALBASE}/lib/browser_plugins WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks -WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} +WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME} PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" _LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} _Q= 2>/dev/null || true -_WLD= ${WEBPLUGINS_LIBDIR:S,^${PREFIX},%D,} -_WLF= ${WEBPLUGINS_LINKFARMS:S,${PREFIX},%D,} -_WSD= ${WEBPLUGINS_SLDIR:S,^${PREFIX},%D,} +_WLD= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE},%D,} +_WLF= ${WEBPLUGINS_LINKFARMS:S,${LOCALBASE},%D,} +_WSD= ${WEBPLUGINS_SLDIR:S,^${LOCALBASE},%D,} webplugins-post-install: @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: The \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ + ${ECHO_CMD} "ERROR: \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \ ${ECHO_CMD}; \ else \ for _f in ${WEBPLUGINS_FILES}; do \ if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: The \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ + ${ECHO_CMD} "ERROR: \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \ ${ECHO_CMD}; \ fi; \ done; \ @@ -210,6 +210,10 @@ webplugins-post-install: ${LN} -sf $${_l} $${_d}/ ${_Q}; \ done; \ done; \ + if [ "${PREFIX}" != "${LOCALBASE}" ]; then \ + ${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST}; \ + fi; \ + ${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}; \ for _d in ${_WLF}; do \ ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ for _l in ${_LNWF}; do \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 9e1f7e5fd62a..4394e144128a 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-14.0.1.source.tar.bz2) = c21988f0207b678376c3d96f647aadf6d694e836f0b5c933ec15d93b75ea89aa -SIZE (firefox-14.0.1.source.tar.bz2) = 82478218 +SHA256 (firefox-15.0.source.tar.bz2) = 5416f0d6ab139846343deb86f604352d06a487ed142920613a2d2d3dd96bc789 +SIZE (firefox-15.0.source.tar.bz2) = 83713360 diff --git a/www/firefox/files/extra-bug780531 b/www/firefox/files/extra-bug780531 new file mode 100644 index 000000000000..54843c752c81 --- /dev/null +++ b/www/firefox/files/extra-bug780531 @@ -0,0 +1,34 @@ +--- configure.in~ ++++ configure.in +@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then + MOZ_SYDNEYAUDIO=1 + MOZ_CUBEB=1 + MOZ_MEDIA=1 +- case "$target_cpu" in +- arm*) ++ case "$target" in ++ arm-*-linux*) + MOZ_TREMOR=1 + ;; ++ *-freebsd*) ++ MOZ_TREMOR=1 ++ ;; + *) + MOZ_VORBIS=1 + ;; +@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV + MOZ_SYDNEYAUDIO=1 + MOZ_CUBEB=1 + MOZ_MEDIA=1 +- case "$target_cpu" in +- arm*) ++ case "$target" in ++ arm-*-linux*) + MOZ_TREMOR=1 + ;; ++ *-freebsd*) ++ MOZ_TREMOR=1 ++ ;; + *) + MOZ_VORBIS=1 + ;; diff --git a/www/firefox/files/patch-alsapulse b/www/firefox/files/patch-alsapulse index 263d11a61d36..9ca7c05af946 100644 --- a/www/firefox/files/patch-alsapulse +++ b/www/firefox/files/patch-alsapulse @@ -1,46 +1,46 @@ ---- config/autoconf.mk.in~ +diff --git config/autoconf.mk.in config/autoconf.mk.in +index 44c0b06..748511b 100644 +--- config/autoconf.mk.in +++ config/autoconf.mk.in -@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF +@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ +MOZ_ALSA = @MOZ_ALSA@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ -+ + +MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@ +MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ +MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ - ++ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ ---- configure.in~ + GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ +diff --git configure.in configure.in +index 5980b76..11f5f77 100644 +--- configure.in +++ configure.in -@@ -5758,17 +5775,47 @@ dnl ==================================== +@@ -5600,13 +5600,45 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(alsa, -+[ --enable-alsa Enable Alsa support], ++[ --enable-alsa Enable Alsa support (default on Linux)], +MOZ_ALSA=1, +MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) + dnl If using sydneyaudio with Linux, ensure that the alsa library is available --if test -n "$MOZ_SYDNEYAUDIO"; then -+if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then - case "$target_os" in - linux*) -+ MOZ_ALSA=1 -+ ;; -+ esac +-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then ++ MOZ_ALSA=1 +fi + +if test -n "$MOZ_ALSA"; then - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , [echo "$MOZ_ALSA_PKG_ERRORS" AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) -- ;; -- esac fi +AC_SUBST(MOZ_ALSA) @@ -55,6 +55,7 @@ +MOZ_PULSEAUDIO=) + +if test -n "$MOZ_PULSEAUDIO"; then ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , + [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" + AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) @@ -65,9 +66,55 @@ +AC_SUBST(MOZ_PULSEAUDIO) + dnl ======================================================== - dnl Permissions System + dnl = Enable GStreamer dnl ======================================================== ---- media/libsydneyaudio/src/Makefile.in~ +diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in +index 5ab4dd8..c8df26f 100644 +--- media/libcubeb/src/Makefile.in ++++ media/libcubeb/src/Makefile.in +@@ -24,10 +24,6 @@ endif + + ifeq ($(OS_TARGET),Android) + # No Android implementation of libcubeb yet. +-else ifeq ($(OS_TARGET),Linux) +-CSRCS = \ +- cubeb_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_TARGET),Darwin) +@@ -42,4 +38,16 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ cubeb_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ cubeb_pulse.c \ ++ $(NULL) ++endif ++ + include $(topsrcdir)/config/rules.mk +diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c +index 599aea2..41fd5af 100644 +--- media/libcubeb/src/cubeb_alsa.c ++++ media/libcubeb/src/cubeb_alsa.c +@@ -6,6 +6,6 @@ + #undef NDEBUG + #define _BSD_SOURCE +-#define _POSIX_SOURCE ++#define _XOPEN_SOURCE 500 + #include <pthread.h> + #include <sys/time.h> + #include <assert.h> +diff --git media/libsydneyaudio/src/Makefile.in media/libsydneyaudio/src/Makefile.in +index 8dda8ce..b19641d 100644 +--- media/libsydneyaudio/src/Makefile.in +++ media/libsydneyaudio/src/Makefile.in @@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) CSRCS = \ @@ -99,20 +146,23 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += winmm.lib endif ---- toolkit/library/Makefile.in~ +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 43384e9..e46a6e3 100644 +--- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -375,10 +375,12 @@ endif +@@ -379,10 +379,13 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) -ifdef MOZ_SYDNEYAUDIO -ifeq ($(OS_ARCH),Linux) ++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) +ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) endif -+ +ifdef MOZ_PULSEAUDIO +EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) ++endif endif ifdef HAVE_CLOCK_MONOTONIC diff --git a/www/firefox/files/patch-bug722975 b/www/firefox/files/patch-bug722975 new file mode 100644 index 000000000000..46a3381b9375 --- /dev/null +++ b/www/firefox/files/patch-bug722975 @@ -0,0 +1,61 @@ +# HG changeset patch +# Parent 9d3c9b863c697634e434b687d456bb82fa794ecf +# User Uli Schlachter <psychon@znc.in> +Bug 722975 - --enable-system-cairo build is broken after Bug 715658 fixed + + +diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp +--- gfx/thebes/gfxPlatform.cpp ++++ gfx/thebes/gfxPlatform.cpp +@@ -484,21 +484,19 @@ gfxPlatform::CreateDrawTargetForSurface( + + cairo_user_data_key_t kSourceSurface; + + void SourceBufferDestroy(void *srcBuffer) + { + static_cast<SourceSurface*>(srcBuffer)->Release(); + } + +-void SourceSnapshotDetached(cairo_surface_t *nullSurf) ++void SourceSnapshotDetached(void *nullSurf) + { +- gfxImageSurface* origSurf = +- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); +- ++ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf); + origSurf->SetData(&kSourceSurface, NULL, NULL); + } + + RefPtr<SourceSurface> + gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) + { + void *userData = aSurface->GetData(&kSourceSurface); + +@@ -588,24 +586,19 @@ gfxPlatform::GetSourceSurfaceForSurface( + } + + srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(), + imgSurface->Stride(), + size, format); + + } + +- cairo_surface_t *nullSurf = +- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); +- cairo_surface_set_user_data(nullSurf, +- &kSourceSurface, +- imgSurface, +- NULL); +- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); +- cairo_surface_destroy(nullSurf); ++ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", ++ (const unsigned char *) "data", 4, ++ SourceSnapshotDetached, imgSurface.get()); + } + + srcBuffer->AddRef(); + aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy); + + return srcBuffer; + } + diff --git a/www/firefox/files/patch-bug723860 b/www/firefox/files/patch-bug723860 new file mode 100644 index 000000000000..ee7b355912fe --- /dev/null +++ b/www/firefox/files/patch-bug723860 @@ -0,0 +1,54 @@ +commit 4e07587 +Author: Matthew Gregan <kinetik@flim.org> +Date: Wed Jun 6 17:58:07 2012 +1200 + + Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized. r=doublec +--- + content/media/gstreamer/nsGStreamerReader.cpp | 4 ++++ + content/media/ogg/nsOggReader.cpp | 3 +-- + content/media/wave/nsWaveReader.cpp | 3 +++ + 3 files changed, 8 insertions(+), 2 deletions(-) + +diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp +index 164fb2e..06a09b5 100644 +--- content/media/gstreamer/nsGStreamerReader.cpp ++++ content/media/gstreamer/nsGStreamerReader.cpp +@@ -505,6 +505,10 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, + nsresult nsGStreamerReader::GetBuffered(nsTimeRanges* aBuffered, + PRInt64 aStartTime) + { ++ if (!mInfo.mHasVideo && !mInfo.mHasAudio) { ++ return NS_OK; ++ } ++ + GstFormat format = GST_FORMAT_TIME; + MediaResource* resource = mDecoder->GetResource(); + gint64 resourceLength = resource->GetLength(); +diff --git content/media/ogg/nsOggReader.cpp content/media/ogg/nsOggReader.cpp +index c6ff008..8d40e2c 100644 +--- content/media/ogg/nsOggReader.cpp ++++ content/media/ogg/nsOggReader.cpp +@@ -1532,8 +1532,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) + { + // HasAudio and HasVideo are not used here as they take a lock and cause + // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change +- // after metadata is read and GetBuffered isn't called before metadata is +- // read. ++ // after metadata is read. + if (!mInfo.mHasVideo && !mInfo.mHasAudio) { + // No need to search through the file if there are no audio or video tracks + return NS_OK; +diff --git content/media/wave/nsWaveReader.cpp content/media/wave/nsWaveReader.cpp +index 7242eb5..60fc1e1 100644 +--- content/media/wave/nsWaveReader.cpp ++++ content/media/wave/nsWaveReader.cpp +@@ -239,6 +239,9 @@ static double RoundToUsecs(double aSeconds) { + + nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) + { ++ if (!mInfo.mHasAudio) { ++ return NS_OK; ++ } + PRInt64 startOffset = mDecoder->GetResource()->GetNextCachedData(mWavePCMOffset); + while (startOffset >= 0) { + PRInt64 endOffset = mDecoder->GetResource()->GetCachedDataEnd(startOffset); diff --git a/www/firefox/files/patch-bug753046 b/www/firefox/files/patch-bug753046 index d2d1a12efcc0..f50e21ff7fc3 100644 --- a/www/firefox/files/patch-bug753046 +++ b/www/firefox/files/patch-bug753046 @@ -4,15 +4,14 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/06 12:34:09 r --- dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.cpp -@@ -33,6 +33,8 @@ - #include "nsPluginsDir.h" - #include "nsXULAppAPI.h" +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#include <unistd.h> -+ - #ifdef MOZ_X11 - # include "mozilla/X11Util.h" - #endif + #ifdef MOZ_WIDGET_QT ++#include <unistd.h> // for _exit() + #include <QtCore/QTimer> + #include "nsQAppInstance.h" + #include "NestedLoopTimer.h" @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -65,7 +64,7 @@ $NetBSD: patch-ipc_chromium_Makefile.in,v 1.1 2012/03/06 12:34:09 ryoon Exp $ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -218,21 +217,23 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:1 #include <errno.h> #include <fcntl.h> -@@ -17,8 +17,13 @@ +@@ -17,9 +17,16 @@ #include <unistd.h> #if MOZ_HAVE_EXECINFO_H #include <execinfo.h> --#include <sys/sysctl.h> ++#endif ++ ++#if defined(OS_MACOSX) || defined(OS_BSD) + #include <sys/sysctl.h> #endif + +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include <sys/user.h> -+#elif defined(OS_FREEBSD) -+#include <sys/proc.h> +#endif -+#include <sys/sysctl.h> - ++ #include "base/basictypes.h" #include "base/eintr_wrapper.h" + #include "base/logging.h" @@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u return false; } @@ -242,7 +243,7 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:1 // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -250,6 +251,8 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:1 + being_debugged = (info.kp_flags & P_TRACED) != 0; +#elif defined(OS_FREEBSD) + being_debugged = (info.ki_flag & P_TRACED) != 0; ++#elif defined(OS_OPENBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif @@ -397,105 +400,19 @@ index 9a34492..62b280c 100644 #else typedef DirReaderFallback DirReaderPosix; #endif -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include <sys/stat.h> - #elif defined(OS_POSIX) - #include <sys/types.h> --#include <fts.h> - #include <sys/stat.h> -+#include <fts.h> - #endif +diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc +index 171e44f..0c6dfcc 100644 +--- ipc/chromium/src/base/file_util_linux.cc ++++ ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } - #include <stdio.h> -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,80 @@ -+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include <fcntl.h> -+#include <unistd.h> -+ -+#include <string> -+#include <vector> -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector<char> buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -505,7 +422,7 @@ $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34 // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef OS_LINUX ++#ifndef HAVE_STAT64 #define stat64 stat #endif @@ -531,27 +448,19 @@ $NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.1 2012/03/06 12:34:09 pump_ = new base::MessagePumpForUI(); #endif // OS_LINUX } else if (type_ == TYPE_IO) { -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $ - ---- ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include <linux/stat.h> - #endif -+#include <sys/stat.h> /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE + #elif defined(OS_POSIX) + #include <pthread.h> + typedef pthread_t PlatformThreadHandle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) #include <unistd.h> typedef pid_t PlatformThreadId; -+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include <mach/mach.h> @@ -560,7 +469,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 --- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,18 @@ +@@ -9,16 +9,30 @@ #if defined(OS_MACOSX) #include <mach/mach.h> @@ -568,22 +477,37 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 +#include <lwp.h> #elif defined(OS_LINUX) #include <sys/syscall.h> - #include <unistd.h> -+#elif defined(OS_DRAGONFLY) -+#include <unistd.h> +-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) + #include <sys/prctl.h> +-#elif !defined(__NetBSD__) +-#include <pthread_np.h> +#elif defined(OS_FREEBSD) ++#include <sys/param.h> ++#if __FreeBSD_version > 802500 ++#include <sys/thr.h> ++#else +_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); // XXX #include <sys/thr.h> ++extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") -+#include <pthread_np.h> ++#endif + #endif ++ ++#if !defined(OS_MACOSX) + #include <unistd.h> #endif ++#if defined(OS_BSD) && !defined(OS_NETBSD) ++#include <pthread_np.h> ++#endif ++ #if defined(OS_MACOSX) -@@ -38,7 +45,19 @@ + namespace base { + void InitThreading(); +@@ -38,9 +45,20 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); --#elif defined (__OpenBSD__) +-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#elif defined(OS_NETBSD) + return _lwp_self(); +#elif defined(OS_DRAGONFLY) @@ -597,9 +521,25 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 + return lwpid; +# endif +#elif defined(OS_OPENBSD) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); +- // TODO(BSD): find a better thread ID +- return (intptr_t)(pthread_self()); ++ return (intptr_t) (pthread_self()); #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif +@@ -102,9 +102,9 @@ void PlatformThread::SetName(const char* name) { + // Note that glibc also has a 'pthread_setname_np' api, but it may not be + // available everywhere and it's only benefit over using prctl directly is + // that it can set the name of threads other than the current thread. +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) ++#if defined(OS_BSD) && !defined(OS_NETBSD) + pthread_set_name_np(pthread_self(), name); +-#elif defined(__NetBSD__) ++#elif defined(OS_NETBSD) +- pthread_setname_np(pthread_self(), "%s", name); ++ pthread_setname_np(pthread_self(), "%s", (void *)name); + #else + prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0); $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -641,7 +581,7 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,326 @@ +@@ -0,0 +1,318 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -650,36 +590,20 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 + +#include "base/process_util.h" + -+#include <ctype.h> -+#include <fcntl.h> -+#include <unistd.h> -+#include <string> -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ -+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") -+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") -+#else -+#define PRE_SYS_INCLUDE -+#define POST_SYS_INCLUDE -+#endif -+PRE_SYS_INCLUDE -+#include <kvm.h> -+POST_SYS_INCLUDE ++#include <sys/param.h> +#include <sys/sysctl.h> -+#include <sys/types.h> +#include <sys/wait.h> -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include <sys/user.h> -+POST_SYS_INCLUDE -+#define HAVE_POSIX_SPAWN 1 -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include <sys/user.h> -+POST_SYS_INCLUDE +#endif + ++#include <ctype.h> ++#include <fcntl.h> ++#include <kvm.h> ++#include <unistd.h> ++ ++#include <string> ++ +#include "base/debug_util.h" +#include "base/eintr_wrapper.h" +#include "base/file_util.h" @@ -687,17 +611,21 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 600000000 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 +#endif ++ ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif +#endif + +#ifdef HAVE_POSIX_SPAWN -+PRE_SYS_INCLUDE +#include <spawn.h> -+POST_SYS_INCLUDE +extern "C" char **environ __dso_public; +#endif + @@ -938,7 +866,11 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue; @@ -1110,24 +1042,30 @@ $NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.4 2012/04/01 15:18:45 --- ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -27,9 +33,16 @@ #error Please add support for your platform in build/build_config.h #endif ++// For access to standard BSD features, use OS_BSD instead of a ++// more specific macro. ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) ++#define OS_BSD 1 ++#endif ++ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) @@ -1169,7 +1107,7 @@ $NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.1 2012/0 #endif -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) ++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) // There size_t is a synonym for |unsigned long| ... template <> struct ParamTraits<size_t> { @@ -1178,7 +1116,7 @@ $NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.1 2012/0 #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) ++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| template <> struct ParamTraits<int64> { @@ -1200,7 +1138,7 @@ $NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.1 2012/03/06 }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#elif defined(OS_MACOSX) || defined(OS_BSD) typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; @@ -1255,16 +1193,31 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/03/15 08:30:06 ryoo newEnvVars, #endif false, &process, arch); +diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h +index f37998d..b05dc7b 100644 +--- ipc/glue/SharedMemorySysV.h ++++ ipc/glue/SharedMemorySysV.h +@@ -8,7 +8,7 @@ + #ifndef mozilla_ipc_SharedMemorySysV_h + #define mozilla_ipc_SharedMemorySysV_h + +-#if defined(OS_LINUX) && !defined(ANDROID) ++#if (defined(OS_LINUX) && !defined(ANDROID)) || defined(OS_BSD) + + // SysV shared memory isn't available on Windows, but we define the + // following macro so that #ifdefs are clearer (compared to #ifdef $NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $ --- toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000 +++ toolkit/library/Makefile.in -@@ -534,6 +538,10 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle +@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle endif endif +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) ++# keep `environ' unresolved, see bug 14426 for binutils ++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols +endif + ifeq ($(OS_ARCH),WINNT) diff --git a/www/firefox/files/patch-bug759459 b/www/firefox/files/patch-bug759459 new file mode 100644 index 000000000000..efd253baff13 --- /dev/null +++ b/www/firefox/files/patch-bug759459 @@ -0,0 +1,24 @@ +commit 4d0c5b9 +Author: Marco Perez <bugmail@millibyte.net> +Date: Sat Jun 9 12:24:56 2012 -0400 + + Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence +--- + js/src/gc/Memory.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp +index 815e90b..10c1a91 100644 +--- js/src/gc/Memory.cpp ++++ js/src/gc/Memory.cpp +@@ -292,9 +292,9 @@ GetPageFaultCount() + #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN) + + #include <sys/mman.h> +-#include <unistd.h> + #include <sys/time.h> + #include <sys/resource.h> ++#include <unistd.h> + + void + InitMemorySubsystem() diff --git a/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp b/www/firefox/files/patch-bug760899 index 274a5026d6d0..460c1393bdbc 100644 --- a/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp +++ b/www/firefox/files/patch-bug760899 @@ -1,25 +1,3 @@ -commit f0a73aa -Author: Paul Adenot <paul@paul.cx> -Date: Thu Jun 21 20:44:39 2012 -0400 - - Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik ---- - content/media/gstreamer/nsGStreamerReader.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 06a09b5..c48f92e 100644 ---- content/media/gstreamer/nsGStreamerReader.cpp -+++ content/media/gstreamer/nsGStreamerReader.cpp -@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) - * stream but that are otherwise decodeable. - */ - guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO, -- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO}; -+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)}; - guint default_flags, current_flags; - g_object_get(mPlayBin, "flags", &default_flags, NULL); - commit 667daed Author: Stephen Moehle <stephen.moehle@gmail.com> Date: Tue Jun 5 11:32:36 2012 +1200 diff --git a/www/firefox/files/patch-bug761030 b/www/firefox/files/patch-bug761030 new file mode 100644 index 000000000000..5a0829e6c2f0 --- /dev/null +++ b/www/firefox/files/patch-bug761030 @@ -0,0 +1,25 @@ +commit 8bc9e15 +Author: Stephen Moehle <stephen.moehle@gmail.com> +Date: Tue Jun 5 11:31:13 2012 +1200 + + Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik + + --HG-- + extra : rebase_source : 5e884550f9870bd2fda247d50bebd472e8368588 +--- + content/media/gstreamer/nsGStreamerReader.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp +index 17374a3..6a50e09 100644 +--- content/media/gstreamer/nsGStreamerReader.cpp ++++ content/media/gstreamer/nsGStreamerReader.cpp +@@ -452,6 +452,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, + i, height); + b.mPlanes[i].mWidth = gst_video_format_get_component_width(format, + i, width); ++ b.mPlanes[i].mOffset = 0; ++ b.mPlanes[i].mSkip = 0; + } + + bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, diff --git a/www/firefox/files/patch-bug761077 b/www/firefox/files/patch-bug761077 new file mode 100644 index 000000000000..922fa55131e8 --- /dev/null +++ b/www/firefox/files/patch-bug761077 @@ -0,0 +1,88 @@ +diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl +index b8a87a5..918c4cf 100644 +--- xpcom/reflect/xptcall/public/genstubs.pl ++++ xpcom/reflect/xptcall/public/genstubs.pl +@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n"; + print OUTFILE "* 1 is AddRef\n"; + print OUTFILE "* 2 is Release\n"; + print OUTFILE "*/\n"; +-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n"; ++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n"; + for($i = 0; $i < $entry_count; $i++) { + print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n"; + } +diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc +index eb66761..807db26 100644 +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); +diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in +index ae6ed66..2783957 100644 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in +@@ -70,7 +70,7 @@ endif + endif + endif + # IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -269,7 +269,7 @@ endif + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) ++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp + ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -278,7 +278,7 @@ endif + # + # Linux/PPC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) ++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp + ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -350,7 +350,7 @@ endif + # + # OpenBSD/SPARC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif +diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h +index d903ced..e4ec832 100644 +--- xpcom/reflect/xptcall/src/xptcprivate.h ++++ xpcom/reflect/xptcall/src/xptcprivate.h +@@ -14,7 +14,7 @@ + + class xptiInterfaceEntry; + +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; + #else + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; +@@ -31,7 +31,7 @@ public: + #undef STUB_ENTRY + #undef SENTINEL_ENTRY + +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); + #else + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); diff --git a/www/firefox/files/patch-bug761419 b/www/firefox/files/patch-bug761419 new file mode 100644 index 000000000000..222e3053d489 --- /dev/null +++ b/www/firefox/files/patch-bug761419 @@ -0,0 +1,22 @@ +commit f0a73aa +Author: Paul Adenot <paul@paul.cx> +Date: Thu Jun 21 20:44:39 2012 -0400 + + Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik +--- + content/media/gstreamer/nsGStreamerReader.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp +index 06a09b5..c48f92e 100644 +--- content/media/gstreamer/nsGStreamerReader.cpp ++++ content/media/gstreamer/nsGStreamerReader.cpp +@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) + * stream but that are otherwise decodeable. + */ + guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO, +- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO}; ++ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)}; + guint default_flags, current_flags; + g_object_get(mPlayBin, "flags", &default_flags, NULL); + diff --git a/www/firefox/files/patch-bug775257 b/www/firefox/files/patch-bug775257 new file mode 100644 index 000000000000..7a6dbb9d86ed --- /dev/null +++ b/www/firefox/files/patch-bug775257 @@ -0,0 +1,27 @@ +commit 8fc8b74 +Author: Oleg Romashin <oleg.romashin@nokia.com> +Date: Wed Jul 18 22:46:11 2012 -0400 + + Bug 775257 - Gstreamer backend on Meego N9 produce extra noise in audio playback.r=giles +--- + content/media/gstreamer/nsGStreamerReader.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp +index c48f92e..0fb801a 100644 +--- content/media/gstreamer/nsGStreamerReader.cpp ++++ content/media/gstreamer/nsGStreamerReader.cpp +@@ -130,8 +130,13 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor) + gst_object_unref(sinkpad); + + mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! " ++#ifndef MOZ_TREMOR + "appsink name=audiosink sync=true caps=audio/x-raw-float," + "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL); ++#else ++ "appsink name=audiosink sync=true caps=audio/x-raw-int," ++ "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL); ++#endif + mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink), + "audiosink")); + gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks, diff --git a/www/firefox/files/patch-bug777696 b/www/firefox/files/patch-bug777696 new file mode 100644 index 000000000000..364608926d5a --- /dev/null +++ b/www/firefox/files/patch-bug777696 @@ -0,0 +1,32 @@ +commit 0c0d1a8 +Author: Landry Breuil <landry@openbsd.org> +Date: Mon Jul 30 17:57:15 2012 +0200 + + Bug 777696: Fix gstreamer backend on big endian architectures. r=doublec +--- + content/media/gstreamer/nsGStreamerReader.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp +index 0fb801a..4a69196 100644 +--- content/media/gstreamer/nsGStreamerReader.cpp ++++ content/media/gstreamer/nsGStreamerReader.cpp +@@ -132,10 +132,18 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor) + mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! " + #ifdef MOZ_TREMOR + "appsink name=audiosink sync=true caps=audio/x-raw-float," ++#ifdef IS_LITTLE_ENDIAN + "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL); + #else ++ "channels={1,2},rate=44100,width=32,endianness=4321", TRUE, NULL); ++#endif ++#else + "appsink name=audiosink sync=true caps=audio/x-raw-int," ++#ifdef IS_LITTLE_ENDIAN + "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL); ++#else ++ "channels={1,2},rate=48000,width=16,endianness=4321", TRUE, NULL); ++#endif + #endif + mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink), + "audiosink")); diff --git a/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp b/www/firefox/files/patch-bug778056 index e03a02bfc3f1..e03a02bfc3f1 100644 --- a/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp +++ b/www/firefox/files/patch-bug778056 diff --git a/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp b/www/firefox/files/patch-bug778078 index 57bae60dc967..232b32509a33 100644 --- a/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp +++ b/www/firefox/files/patch-bug778078 @@ -5,7 +5,7 @@ #if defined(MOZ_WIDGET_GTK2) -#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) // Disable the slice allocator, since jemalloc already uses similar layout // algorithms, and using a sub-allocator tends to increase fragmentation. // This must be done before g_thread_init() is called. diff --git a/www/firefox/files/patch-bug779847 b/www/firefox/files/patch-bug779847 new file mode 100644 index 000000000000..f431c4a8d3c5 --- /dev/null +++ b/www/firefox/files/patch-bug779847 @@ -0,0 +1,28 @@ +--- gfx/ycbcr/Makefile.in ++++ gfx/ycbcr/Makefile.in +@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \ + $(NULL) + endif + else +-ifeq ($(OS_ARCH),Linux) +-CPPSRCS += yuv_row_posix.cpp \ +- $(NULL) +-else +-ifeq ($(OS_ARCH),SunOS) +-CPPSRCS += yuv_row_posix.cpp \ +- $(NULL) +-else +-ifeq ($(OS_ARCH),Darwin) ++ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH))) + CPPSRCS += yuv_row_posix.cpp \ + $(NULL) + else + CPPSRCS += yuv_row_other.cpp \ + $(NULL) +-endif # Darwin +-endif # SunOS +-endif # linux ++endif # posix + endif # windows + + ifeq (arm,$(findstring arm,$(OS_TEST))) diff --git a/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp b/www/firefox/files/patch-bug781457 index e0ce1ad9c498..8a790ccf84a9 100644 --- a/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp +++ b/www/firefox/files/patch-bug781457 @@ -1,14 +1,5 @@ --- xpcom/base/nsStackWalk.cpp.orig 2012-05-29 00:57:31.000000000 +0200 +++ xpcom/base/nsStackWalk.cpp 2012-06-03 12:33:40.000000000 +0200 -@@ -57,7 +57,7 @@ - }; - static CriticalAddress gCriticalAddress; - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__) - #include <dlfcn.h> - #endif - @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb #elif defined(HAVE__UNWIND_BACKTRACE) diff --git a/www/firefox/files/patch-content__base__public__nsContentUtils.h b/www/firefox/files/patch-bug781474 index 8239b2e8b8fd..8239b2e8b8fd 100644 --- a/www/firefox/files/patch-content__base__public__nsContentUtils.h +++ b/www/firefox/files/patch-bug781474 diff --git a/www/firefox/files/patch-bug783463 b/www/firefox/files/patch-bug783463 new file mode 100644 index 000000000000..0409fd29f662 --- /dev/null +++ b/www/firefox/files/patch-bug783463 @@ -0,0 +1,34 @@ +--- gfx/skia/Makefile.in~ ++++ gfx/skia/Makefile.in +@@ -339,10 +339,9 @@ CPPSRCS += \ + SkMMapStream.cpp \ + SkOSFile.cpp \ + $(NULL) +-ifeq (Linux,$(OS_TARGET)) ++ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET)))) + CPPSRCS += \ + SkFontHost_linux.cpp \ +- SkFontHost_tables.cpp \ + SkTime_Unix.cpp \ + $(NULL) + endif +--- widget/qt/nsNativeThemeQt.cpp~ ++++ widget/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,6 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" +-#include <malloc.h> + + + #include "gfxASurface.h" +--- widget/qt/nsSound.cpp~ ++++ widget/qt/nsSound.cpp +@@ -40,6 +40,7 @@ + #include <QSound> + + #include <string.h> ++#include <unistd.h> + + #include "nscore.h" + #include "plstr.h" diff --git a/www/firefox/files/patch-bug784741 b/www/firefox/files/patch-bug784741 new file mode 100644 index 000000000000..83de74061eb5 --- /dev/null +++ b/www/firefox/files/patch-bug784741 @@ -0,0 +1,43 @@ +diff --git js/src/Makefile.in js/src/Makefile.in +index 8eb385f..01bd8e3 100644 +--- js/src/Makefile.in ++++ js/src/Makefile.in +@@ -323,6 +323,7 @@ endif + + ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) + ENABLE_YARR_JIT = 1 ++DEFINES += -DENABLE_YARR_JIT=1 + + VPATH += $(srcdir)/assembler/assembler \ + $(srcdir)/methodjit \ +diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h +index 6570f2d..0c84896 100644 +--- js/src/assembler/wtf/Platform.h ++++ js/src/assembler/wtf/Platform.h +@@ -1102,9 +1102,7 @@ + #if WTF_PLATFORM_CHROMIUM + #define ENABLE_YARR_JIT 0 + +-#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT) +-#define ENABLE_YARR_JIT 1 +- ++#elif ENABLE_YARR_JIT + /* Setting this flag compares JIT results with interpreter results. */ + #define ENABLE_YARR_JIT_DEBUG 0 + #endif +diff --git js/src/configure.in js/src/configure.in +index c142eb7..34f98b9 100644 +--- js/src/configure.in ++++ js/src/configure.in +@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug, + (using compiler flags DBG)], + [ if test "$enableval" != "no"; then + MOZ_DEBUG=1 +- ENABLE_METHODJIT_SPEW=1 ++ if test "$ENABLE_METHODJIT"; then ++ # needs MethodJIT or YarrJIT ++ ENABLE_METHODJIT_SPEW=1 ++ fi + if test -n "$enableval" -a "$enableval" != "yes"; then + MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` + _MOZ_DEBUG_FLAGS_SET=1 diff --git a/www/firefox/files/patch-bug784776 b/www/firefox/files/patch-bug784776 new file mode 100644 index 000000000000..417043931ee2 --- /dev/null +++ b/www/firefox/files/patch-bug784776 @@ -0,0 +1,50 @@ +--- content/media/MediaEngineDefault.cpp~ ++++ content/media/MediaEngineDefault.cpp +@@ -232,12 +232,12 @@ nsresult + MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID) + { + if (mState != kAllocated) { +- return NULL; ++ return 0; + } + + mTimer = do_CreateInstance(NS_TIMER_CONTRACTID); + if (!mTimer) { +- return NULL; ++ return 0; + } + + mSource = aStream; +--- gfx/layers/opengl/ImageLayerOGL.cpp~ ++++ gfx/layers/opengl/ImageLayerOGL.cpp +@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources() + { + if (mSharedHandle) { + gl()->ReleaseSharedHandle(mShareType, mSharedHandle); +- mSharedHandle = NULL; ++ mSharedHandle = 0; + } + + mYUVTexture[0].Release(); +--- intl/locale/src/unix/nsDateTimeFormatUnix.cpp~ ++++ intl/locale/src/unix/nsDateTimeFormatUnix.cpp +@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr + struct tm *tmc; + int i; + +- tt = time((time_t)NULL); ++ tt = time(NULL); + tmc = localtime(&tt); + + tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM +--- ipc/glue/CrossProcessMutex_unimplemented.cpp~ ++++ ipc/glue/CrossProcessMutex_unimplemented.cpp +@@ -40,7 +40,7 @@ CrossProcessMutexHandle + CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle) + { + NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!"); +- return NULL; ++ return 0; + } + + } diff --git a/www/firefox/files/patch-bug785638 b/www/firefox/files/patch-bug785638 new file mode 100644 index 000000000000..0cf60e4eb1fe --- /dev/null +++ b/www/firefox/files/patch-bug785638 @@ -0,0 +1,168 @@ +diff --git configure.in configure.in +index cef992b..3bd39ca 100644 +--- configure.in ++++ configure.in +@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then + + dnl See if we have assembly on this platform. + case "$OS_ARCH:$CPU_ARCH" in +- Linux:x86) +- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" +- VPX_X86_ASM=1 +- ;; +- Linux:x86_64) +- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" +- VPX_X86_ASM=1 +- ;; +- SunOS:x86) +- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" +- VPX_X86_ASM=1 +- ;; +- SunOS:x86_64) +- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" +- VPX_X86_ASM=1 +- ;; + Darwin:x86) + VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 +@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then + VPX_ASM_SUFFIX="$ASM_SUFFIX" + VPX_ARM_ASM=1 + fi ++ ;; ++ *:x86) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" ++ VPX_X86_ASM=1 ++ fi ++ ;; ++ *:x86_64) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" ++ VPX_X86_ASM=1 ++ fi ++ ;; + esac + + if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then +@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + + dnl Do we support libjpeg-turbo on this platform? + case "$OS_ARCH:$OS_TEST" in +- Linux:x86|Linux:i?86) +- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" +- LIBJPEG_TURBO_X86_ASM=1 +- ;; +- Linux:x86_64) +- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" +- LIBJPEG_TURBO_X64_ASM=1 +- ;; +- SunOS:i?86) +- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" +- LIBJPEG_TURBO_X86_ASM=1 +- ;; +- SunOS:x86_64) +- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" +- LIBJPEG_TURBO_X64_ASM=1 +- ;; + Darwin:i?86) + LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO" + LIBJPEG_TURBO_X86_ASM=1 +@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon" + LIBJPEG_TURBO_ARM_ASM=1 + ;; ++ *:x86|*:i?86) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ fi ++ ;; ++ *:x86_64) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ fi ++ ;; + esac + + fi +diff --git media/libvpx/update.sh media/libvpx/update.sh +index 79e0fb1..51956af 100755 +--- media/libvpx/update.sh ++++ media/libvpx/update.sh +@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h + # Should be same for all platforms... + cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h + +-# Config files for x86-linux-gcc and Solaris x86 ++# Config files for x86-linux-gcc and other x86 elf platforms + cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c + cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm + cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h + +-# Config files for x86_64-linux-gcc and Solaris x86_64 ++# Config files for x86_64-linux-gcc and other x86_64 elf platforms + cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c + cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm + cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h +diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h +index 55433f3..36e1780 100644 +--- media/libvpx/vpx_config.h ++++ media/libvpx/vpx_config.h +@@ -16,20 +16,12 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.h" + +-#elif defined(__linux__) && defined(__i386__) +-/* 32 bit Linux. */ ++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) ++/* 32 bit ELF platforms. */ + #include "vpx_config_x86-linux-gcc.h" + +-#elif defined(__linux__) && defined(__x86_64__) +-/* 64 bit Linux. */ +-#include "vpx_config_x86_64-linux-gcc.h" +- +-#elif defined(__sun) && defined(__i386) +-/* 32 bit Solaris. */ +-#include "vpx_config_x86-linux-gcc.h" +- +-#elif defined(__sun) && defined(__x86_64) +-/* 64 bit Solaris. */ ++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) ++/* 64 bit ELF platforms. */ + #include "vpx_config_x86_64-linux-gcc.h" + + #else +diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c +index eedd515..c8b5375 100644 +--- media/libvpx/vpx_config_c.c ++++ media/libvpx/vpx_config_c.c +@@ -15,22 +15,14 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.c" + +-#elif defined(__linux__) && defined(__i386__) +-/* 32 bit Linux. */ ++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) ++/* 32 bit ELF platforms. */ + #include "vpx_config_x86-linux-gcc.c" + +-#elif defined(__linux__) && defined(__x86_64__) +-/* 64 bit Linux. */ ++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) ++/* 64 bit ELF platforms. */ + #include "vpx_config_x86_64-linux-gcc.c" + +-#elif defined(__sun) && defined(__i386) +-/* 32 bit Solaris. */ +-#include "vpx_config_x86-linux-gcc.h" +- +-#elif defined(__sun) && defined(__x86_64) +-/* 64 bit Solaris. */ +-#include "vpx_config_x86_64-linux-gcc.h" +- + #else + #error VPX_X86_ASM is defined, but assembly not supported on this platform! + #endif diff --git a/www/firefox/files/patch-config_autoconf.mk.in b/www/firefox/files/patch-config_autoconf.mk.in index 0c6127366c69..877c48294fc6 100644 --- a/www/firefox/files/patch-config_autoconf.mk.in +++ b/www/firefox/files/patch-config_autoconf.mk.in @@ -19,12 +19,3 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ diff --git a/www/firefox/files/patch-config_config.mk b/www/firefox/files/patch-config_config.mk deleted file mode 100644 index c01a1463e5d4..000000000000 --- a/www/firefox/files/patch-config_config.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 -+++ config/config.mk 2009-08-09 20:50:05.000000000 +0200 -@@ -506,6 +506,7 @@ - -I$(srcdir) \ - -I. \ - -I$(DIST)/include -I$(DIST)/include/nsprpub \ -+ -I$(LOCALBASE)/include \ - $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ - $(OS_INCLUDES) \ - $(NULL) diff --git a/www/firefox/files/patch-config_mkdepend_Makefile.in b/www/firefox/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index 59df0d99a4df..000000000000 --- a/www/firefox/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100 -+++ config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100 -@@ -71,7 +71,8 @@ - - include $(topsrcdir)/config/rules.mk - --HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I$(LOCALBASE)/include -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox/files/patch-configure.in b/www/firefox/files/patch-configure.in index 733d3116c1d1..b4cb270ad9c3 100644 --- a/www/firefox/files/patch-configure.in +++ b/www/firefox/files/patch-configure.in @@ -23,33 +23,3 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -5903,6 +5903,14 @@ - VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" - VPX_X86_ASM=1 - ;; -+ FreeBSD:i386) -+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -+ VPX_X86_ASM=1 -+ ;; -+ FreeBSD:x86_64) -+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -+ VPX_X86_ASM=1 -+ ;; - SunOS:x86) - VPX_ASFLAGS="-f elf32 -rnasm -pnasm" - VPX_X86_ASM=1 -@@ -6297,6 +6305,14 @@ - LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" - LIBJPEG_TURBO_X64_ASM=1 - ;; -+ FreeBSD:i386) -+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -+ LIBJPEG_TURBO_X86_ASM=1 -+ ;; -+ FreeBSD:x86_64) -+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -+ LIBJPEG_TURBO_X64_ASM=1 -+ ;; - SunOS:i?86) - LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" - LIBJPEG_TURBO_X86_ASM=1 diff --git a/www/firefox/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp b/www/firefox/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp deleted file mode 100644 index 1dfabdbe21bd..000000000000 --- a/www/firefox/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- dom/plugins/ipc/PluginMessageUtils.cpp~ -+++ dom/plugins/ipc/PluginMessageUtils.cpp -@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const - i += with.length(); - } - -- return munged; -+ return munged.c_str(); - } - #endif - diff --git a/www/firefox/files/patch-gfx-thebes-gfxPlatform.cpp b/www/firefox/files/patch-gfx-thebes-gfxPlatform.cpp deleted file mode 100644 index 13ff30263c1b..000000000000 --- a/www/firefox/files/patch-gfx-thebes-gfxPlatform.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000 -+++ gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000 -@@ -446,6 +446,7 @@ - static_cast<SourceSurface*>(srcBuffer)->Release(); - } - -+#ifdef MOZ_TREE_CAIRO - void SourceSnapshotDetached(cairo_surface_t *nullSurf) - { - gfxImageSurface* origSurf = -@@ -453,6 +454,7 @@ - - origSurf->SetData(&kSourceSurface, NULL, NULL); - } -+#endif - - RefPtr<SourceSurface> - gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) -@@ -522,6 +524,7 @@ - imgSurface->Stride(), - format); - -+ #ifdef MOZ_TREE_CAIRO - cairo_surface_t *nullSurf = - cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); - cairo_surface_set_user_data(nullSurf, -@@ -530,6 +533,7 @@ - NULL); - cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); - cairo_surface_destroy(nullSurf); -+ #endif - } - - srcBuffer->AddRef(); diff --git a/www/firefox/files/patch-gfx-ycbcr-Makefile.in b/www/firefox/files/patch-gfx-ycbcr-Makefile.in deleted file mode 100644 index bf6c28297222..000000000000 --- a/www/firefox/files/patch-gfx-ycbcr-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- gfx/ycbcr/Makefile.in~ -+++ gfx/ycbcr/Makefile.in -@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) - else -+ifeq ($(OS_ARCH),FreeBSD) -+CPPSRCS += yuv_row_posix.cpp \ -+ $(NULL) -+else - ifeq ($(OS_ARCH),SunOS) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) -@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \ - $(NULL) - endif # Darwin - endif # SunOS -+endif # FreeBSD - endif # linux - endif # windows -
\ No newline at end of file diff --git a/www/firefox/files/patch-js-src-Makefile.in b/www/firefox/files/patch-js-src-Makefile.in deleted file mode 100644 index 69d3cf78e927..000000000000 --- a/www/firefox/files/patch-js-src-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 -+++ js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -737,7 +740,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),Linux) - EXTRA_LIBS += -ldl diff --git a/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in b/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in deleted file mode 100644 index 460b5d7850b0..000000000000 --- a/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- js/src/config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100 -+++ js/src/config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100 -@@ -71,7 +71,8 @@ - - include $(topsrcdir)/config/rules.mk - --HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I$(LOCALBASE)/include -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox/files/patch-js-src-config_config.mk b/www/firefox/files/patch-js-src-config_config.mk deleted file mode 100644 index 58873f3b1e9c..000000000000 --- a/www/firefox/files/patch-js-src-config_config.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 -+++ js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200 -@@ -506,6 +506,7 @@ - -I$(srcdir) \ - -I. \ - -I$(DIST)/include -I$(DIST)/include/nsprpub \ -+ -I$(LOCALBASE)/include \ - $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ - $(OS_INCLUDES) \ - $(NULL) diff --git a/www/firefox/files/patch-js-src-jscpucfg.h b/www/firefox/files/patch-js-src-jscpucfg.h deleted file mode 100644 index 85fe261572cf..000000000000 --- a/www/firefox/files/patch-js-src-jscpucfg.h +++ /dev/null @@ -1,22 +0,0 @@ ---- js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100 -+++ js/src/jscpucfg.h 2012-01-18 17:38:59.522462164 +0100 -@@ -77,6 +77,19 @@ - #define IS_BIG_ENDIAN 1 - #endif - -+#elif defined(__FreeBSD__) -+#include <sys/endian.h> -+ -+#if defined(BYTE_ORDER) -+#if BYTE_ORDER == LITTLE_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#elif BYTE_ORDER == BIG_ENDIAN -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#endif -+#endif -+ - #elif defined(JS_HAVE_ENDIAN_H) - #include <endian.h> - diff --git a/www/firefox/files/patch-layout_generic_Makefile.in b/www/firefox/files/patch-layout_generic_Makefile.in deleted file mode 100644 index b48d4e13f8ce..000000000000 --- a/www/firefox/files/patch-layout_generic_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- layout/generic/Makefile.in~ -+++ layout/generic/Makefile.in -@@ -154,9 +154,10 @@ LOCAL_INCLUDES += \ - -I$(srcdir)/../../dom/base \ - -I$(srcdir)/../../dom/plugins/base \ - -I$(srcdir)/../svg/base/src \ -- $(MOZ_CAIRO_CFLAGS) \ - $(NULL) - -+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) -+ - ifdef MOZ_ENABLE_GTK2 - CXXFLAGS += $(MOZ_GTK2_CFLAGS) - endif diff --git a/www/firefox/files/patch-media-libvpx-vpx_config.c b/www/firefox/files/patch-media-libvpx-vpx_config.c deleted file mode 100644 index 1cc3dab5b8bb..000000000000 --- a/www/firefox/files/patch-media-libvpx-vpx_config.c +++ /dev/null @@ -1,16 +0,0 @@ ---- media/libvpx/vpx_config_c.c~ -+++ media/libvpx/vpx_config_c.c -@@ -12,11 +12,11 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.c" - --#elif defined(__linux__) && defined(__i386__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) - /* 32 bit Linux. */ - #include "vpx_config_x86-linux-gcc.c" - --#elif defined(__linux__) && defined(__x86_64__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) - /* 64 bit Linux. */ - #include "vpx_config_x86_64-linux-gcc.c" - diff --git a/www/firefox/files/patch-media-libvpx-vpx_config.h b/www/firefox/files/patch-media-libvpx-vpx_config.h deleted file mode 100644 index d813ca8c608b..000000000000 --- a/www/firefox/files/patch-media-libvpx-vpx_config.h +++ /dev/null @@ -1,16 +0,0 @@ ---- media/libvpx/vpx_config.h~ -+++ media/libvpx/vpx_config.h -@@ -12,11 +12,11 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.h" - --#elif defined(__linux__) && defined(__i386__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) - /* 32 bit Linux. */ - #include "vpx_config_x86-linux-gcc.h" - --#elif defined(__linux__) && defined(__x86_64__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) - /* 64 bit Linux. */ - #include "vpx_config_x86_64-linux-gcc.h" - diff --git a/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.cfg b/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.cfg deleted file mode 100644 index 2236b6f5788c..000000000000 --- a/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.cfg +++ /dev/null @@ -1,100 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.cfg.orig 2010-12-23 17:34:06.000000000 +0100 -+++ nsprpub/pr/include/md/_freebsd.cfg 2010-12-23 17:34:44.000000000 +0100 -@@ -283,6 +283,97 @@ - #define PR_ALIGN_OF_POINTER 8 - #define PR_ALIGN_OF_WORD 8 - -+#elif defined(__powerpc64__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__powerpc__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" diff --git a/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h b/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h deleted file mode 100644 index f6d36d5c5e64..000000000000 --- a/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h +++ /dev/null @@ -1,30 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100 -+++ nsprpub/pr/include/md/_freebsd.h 2010-12-23 17:34:46.000000000 +0100 -@@ -57,6 +57,10 @@ - #define _PR_SI_ARCHITECTURE "ia64" - #elif defined(__amd64__) - #define _PR_SI_ARCHITECTURE "amd64" -+#elif defined(__powerpc64__) -+#define _PR_SI_ARCHITECTURE "powerpc64" -+#elif defined(__powerpc__) -+#define _PR_SI_ARCHITECTURE "powerpc" - #else - #error "Unknown CPU architecture" - #endif -@@ -106,6 +110,16 @@ - #define _PR_IPV6_V6ONLY_PROBE - #endif - -+#if (__FreeBSD_version >= 700016) -+#if defined(_PR_PTHREADS) -+#define _PR_HAVE_GETPROTO_R -+#define _PR_HAVE_5_ARG_GETPROTO_R -+#define _PR_HAVE_GETHOST_R -+#define _PR_HAVE_GETHOST_R_INT -+#define _PR_HAVE_THREADSAFE_GETHOST -+#endif -+#endif -+ - #define USE_SETJMP - - #ifndef _PR_PTHREADS diff --git a/www/firefox/files/patch-security-coreconf-FreeBSD.mk b/www/firefox/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index b1ea1eb209c0..000000000000 --- a/www/firefox/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include diff --git a/www/firefox/files/patch-security-nss-lib-Makefile b/www/firefox/files/patch-security-nss-lib-Makefile deleted file mode 100644 index 51304f730c92..000000000000 --- a/www/firefox/files/patch-security-nss-lib-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif diff --git a/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c b/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c deleted file mode 100644 index eb54e8414e99..000000000000 --- a/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c +++ /dev/null @@ -1,45 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 -@@ -733,6 +733,34 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include <sys/stddef.h> -+#include <sys/sysctl.h> -+ -+#include <machine/cpu.h> -+#include <machine/md_var.h> -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +814,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - diff --git a/www/firefox/files/patch-toolkit_mozapps_installer_packager_mk b/www/firefox/files/patch-toolkit_mozapps_installer_packager_mk new file mode 100644 index 000000000000..75af88fbcb4a --- /dev/null +++ b/www/firefox/files/patch-toolkit_mozapps_installer_packager_mk @@ -0,0 +1,13 @@ +$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.11 2012/06/11 15:29:56 landry Exp $ +install headers/idl/sdk libs only if xulrunner +--- toolkit/mozapps/installer/packager.mk.orig Fri Jun 1 14:04:20 2012 ++++ toolkit/mozapps/installer/packager.mk Tue Jun 5 07:55:51 2012 +@@ -886,7 +886,7 @@ endif + $(NSINSTALL) -D $(DESTDIR)$(bindir) + $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) + ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) +-ifdef INSTALL_SDK # Here comes the hard part ++ifeq ($(MOZ_APP_NAME),xulrunner) + $(NSINSTALL) -D $(DESTDIR)$(includedir) + (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(includedir) && tar -xf -) diff --git a/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp b/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp deleted file mode 100644 index c6915519e8ab..000000000000 --- a/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- widget/qt/nsNativeThemeQt.cpp~ -+++ widget/qt/nsNativeThemeQt.cpp -@@ -25,7 +25,9 @@ - #include "nsThemeConstants.h" - #include "nsIServiceManager.h" - #include "nsIDOMHTMLInputElement.h" -+#ifdef __GLIBC__ - #include <malloc.h> -+#endif - - - #include "gfxASurface.h" diff --git a/www/firefox/files/patch-widget-qt-nsSound.cpp b/www/firefox/files/patch-widget-qt-nsSound.cpp deleted file mode 100644 index 445dca03d3b1..000000000000 --- a/www/firefox/files/patch-widget-qt-nsSound.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- widget/qt/nsSound.cpp~ -+++ widget/qt/nsSound.cpp -@@ -40,6 +40,7 @@ - #include <QSound> - - #include <string.h> -+#include <unistd.h> - - #include "nscore.h" - #include "plstr.h" diff --git a/www/firefox/files/patch-widget-qt-nsWindow.cpp b/www/firefox/files/patch-widget-qt-nsWindow.cpp deleted file mode 100644 index ba15e5c2a895..000000000000 --- a/www/firefox/files/patch-widget-qt-nsWindow.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- widget/qt/nsWindow.cpp~ -+++ widget/qt/nsWindow.cpp -@@ -43,6 +43,7 @@ using namespace QtMobility; - - #ifdef MOZ_X11 - #include <X11/Xlib.h> -+#include "mozilla/X11Util.h" - #endif //MOZ_X11 - - #include "nsXULAppAPI.h" diff --git a/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index 9a41bbfc4602..000000000000 --- a/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/firefox/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h b/www/firefox/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h deleted file mode 100644 index 0440ce0a263f..000000000000 --- a/www/firefox/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h +++ /dev/null @@ -1,20 +0,0 @@ ---- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800 -+++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800 -@@ -45,7 +45,7 @@ - - class xptiInterfaceEntry; - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; -@@ -62,7 +62,7 @@ - #undef STUB_ENTRY - #undef SENTINEL_ENTRY - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); diff --git a/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp b/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp index 80e832263a77..af9e0ad7ba15 100644 --- a/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp +++ b/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp @@ -1,14 +1,14 @@ --- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -89,6 +89,11 @@ +@@ -57,6 +57,11 @@ nsresult nsThreadManager::Init() { -+#ifdef NS_TLS && (__FreeBSD_version < 802513 \ ++#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ + || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) + if (!gTLSThreadID) + gTLSThreadID = mozilla::threads::Generic; +#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; + mThreadsByPRThread.Init(); + if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) diff --git a/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in deleted file mode 100644 index 1934cc3aaa47..000000000000 --- a/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 -@@ -70,7 +70,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -341,7 +356,7 @@ - # - # Linux/PPC - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) -+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp - ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +365,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +350,7 @@ - # - # OpenBSD/SPARC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) -+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp - ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s - endif diff --git a/www/kompozer/Makefile b/www/kompozer/Makefile index 1a7b73e74094..92f14d3e3ec4 100644 --- a/www/kompozer/Makefile +++ b/www/kompozer/Makefile @@ -32,7 +32,6 @@ MOZ_OPTIONS= ${CONFIGURE_TARGET} \ --enable-xinerama \ --disable-xprint \ --enable-application=composer -PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux DESKTOP_ENTRIES="Kompozer" "${COMMENT}" \ "${PREFIX}/lib/kompozer/icons/mozicon50.xpm" "${PORTNAME}" \ diff --git a/www/kompozer/files/patch-config_autoconf.mk.in b/www/kompozer/files/patch-config_autoconf.mk.in index 23830f6f9696..bc346e56f0fe 100644 --- a/www/kompozer/files/patch-config_autoconf.mk.in +++ b/www/kompozer/files/patch-config_autoconf.mk.in @@ -17,12 +17,3 @@ mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) mrelibdir = $(mredir)/lib -@@ -251,7 +251,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ diff --git a/www/kompozer/files/patch-js-src-Makefile.in b/www/kompozer/files/patch-js-src-Makefile.in deleted file mode 100644 index e1f5b3c89f0a..000000000000 --- a/www/kompozer/files/patch-js-src-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2009-05-02 18:40:20.000000000 +0200 -+++ js/src/Makefile.in 2009-09-02 12:20:39.000000000 +0200 -@@ -260,7 +260,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --LDFLAGS += -pthread -+LDFLAGS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 diff --git a/www/libxul/Makefile b/www/libxul/Makefile index bd5ceb2d22fe..5996f7fc619a 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -33,13 +33,15 @@ MAKE_ENV= SKIP_GRE_REGISTRATION=1 mozappdir=${PREFIX}/lib/${MOZILLA} LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} USE_LDCONFIG= ${PREFIX}/lib/${MOZILLA} -PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig -MOZ_OPTIONS?= --disable-ipc +MOZ_OPTIONS?= --enable-application=xulrunner \ + --disable-ipc MOZ_EXTENSIONS= default,cookie,permissions USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner USE_MOZILLA= -event -ffi -vpx MOZ_CHROME= jar +MOZILLA_PLIST_DIRS= bin include lib share/idl +PLIST_DIRSTRY= share/idl MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-gtkmozembed-embedding \ mozilla-gtkmozembed mozilla-js mozilla-plugin diff --git a/www/libxul/files/patch-bug761077 b/www/libxul/files/patch-bug761077 new file mode 100644 index 000000000000..fb12c5b15021 --- /dev/null +++ b/www/libxul/files/patch-bug761077 @@ -0,0 +1,110 @@ +diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl +index b8a87a5..918c4cf 100644 +--- xpcom/reflect/xptcall/public/genstubs.pl ++++ xpcom/reflect/xptcall/public/genstubs.pl +@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n"; + print OUTFILE "* 1 is AddRef\n"; + print OUTFILE "* 2 is Release\n"; + print OUTFILE "*/\n"; +-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n"; ++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n"; + for($i = 0; $i < $entry_count; $i++) { + print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n"; + } +diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc +index eb66761..807db26 100644 +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); +diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in +index ae6ed66..2783957 100644 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in +@@ -85,7 +85,7 @@ + # New code for Linux, et. al., with gcc + # Migrate other platforms here after testing + # +-ifneq (,$(filter Linux GNU_%,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH))) + # Linux/x86-64 + ifeq (x86_64,$(OS_TEST)) + CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp +@@ -70,7 +70,7 @@ endif + endif + endif + # IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64 + CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp + endif + # +-# FreeBSD/amd64 +-# +-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64) +-CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp +-endif +-# + # BeOS/Intel (uses the same unixish_x86 code) + # + ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) +@@ -341,7 +356,7 @@ + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) ++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp + ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -350,7 +365,7 @@ + # + # Linux/PPC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) ++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp + ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -350,7 +350,7 @@ endif + # + # OpenBSD/SPARC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif +diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h +index d903ced..e4ec832 100644 +--- xpcom/reflect/xptcall/src/xptcprivate.h ++++ xpcom/reflect/xptcall/src/xptcprivate.h +@@ -14,7 +14,7 @@ + + class xptiInterfaceEntry; + +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; + #else + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; +@@ -31,7 +31,7 @@ public: + #undef STUB_ENTRY + #undef SENTINEL_ENTRY + +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); + #else + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); diff --git a/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp b/www/libxul/files/patch-bug778078 index 4e9a34873720..c3d42c391a98 100644 --- a/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp +++ b/www/libxul/files/patch-bug778078 @@ -5,7 +5,7 @@ #endif #if defined(MOZ_WIDGET_GTK2) -#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) // Disable the slice allocator, since jemalloc already uses similar layout // algorithms, and using a sub-allocator tends to increase fragmentation. // This must be done before g_thread_init() is called. diff --git a/www/libxul/files/patch-bug781457 b/www/libxul/files/patch-bug781457 new file mode 100644 index 000000000000..8a790ccf84a9 --- /dev/null +++ b/www/libxul/files/patch-bug781457 @@ -0,0 +1,10 @@ +--- xpcom/base/nsStackWalk.cpp.orig 2012-05-29 00:57:31.000000000 +0200 ++++ xpcom/base/nsStackWalk.cpp 2012-06-03 12:33:40.000000000 +0200 +@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb + + #elif defined(HAVE__UNWIND_BACKTRACE) + ++#define _GNU_SOURCE + // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 + #include <unwind.h> + diff --git a/www/libxul/files/patch-config-mkdepend-imakemdep.h b/www/libxul/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e664475d..000000000000 --- a/www/libxul/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/libxul/files/patch-config_mkdepend_Makefile.in b/www/libxul/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index 8da7e48ab0df..000000000000 --- a/www/libxul/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 -@@ -73,6 +73,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/libxul/files/patch-config_rules.mk b/www/libxul/files/patch-config_rules.mk deleted file mode 100644 index 8ab35f5a8326..000000000000 --- a/www/libxul/files/patch-config_rules.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- config/rules.mk.orig Thu Sep 14 14:07:03 2006 -+++ config/rules.mk Wed Oct 18 11:00:09 2006 -@@ -442,9 +442,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic --endif -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - - ifeq ($(OS_ARCH),NetBSD) diff --git a/www/libxul/files/patch-js-src-Makefile.in b/www/libxul/files/patch-js-src-Makefile.in deleted file mode 100644 index 751596240adf..000000000000 --- a/www/libxul/files/patch-js-src-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2009-05-11 15:21:19.000000000 +0200 -+++ js/src/Makefile.in 2009-05-11 15:21:34.000000000 +0200 -@@ -427,7 +427,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 diff --git a/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in b/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in deleted file mode 100644 index 871f914f1b86..000000000000 --- a/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/config/mkdepend/Makefile.in.orig 2009-08-15 17:45:39.000000000 +0200 -+++ js/src/config/mkdepend/Makefile.in 2009-08-15 17:46:08.000000000 +0200 -@@ -72,7 +72,7 @@ - - include $(topsrcdir)/config/rules.mk - --HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/libxul/files/patch-layout_generic_Makefile.in b/www/libxul/files/patch-layout_generic_Makefile.in deleted file mode 100644 index e39242751a1f..000000000000 --- a/www/libxul/files/patch-layout_generic_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- layout/generic/Makefile.in.orig 2009-08-07 00:49:41.000000000 +0200 -+++ layout/generic/Makefile.in 2009-08-09 20:54:53.000000000 +0200 -@@ -187,9 +187,10 @@ - -I$(srcdir)/../../content/base/src \ - -I$(srcdir)/../../content/html/content/src \ - -I$(srcdir)/../../dom/base \ -- $(MOZ_CAIRO_CFLAGS) \ - $(NULL) - -+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) -+ - ifdef MOZ_ENABLE_GTK2 - CXXFLAGS += $(MOZ_GTK2_CFLAGS) - endif diff --git a/www/libxul/files/patch-security-nss-lib-Makefile b/www/libxul/files/patch-security-nss-lib-Makefile deleted file mode 100644 index 51304f730c92..000000000000 --- a/www/libxul/files/patch-security-nss-lib-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif diff --git a/www/libxul/files/patch-security_coreconf_FreeBSD.mk b/www/libxul/files/patch-security_coreconf_FreeBSD.mk deleted file mode 100644 index 7aa6a8a0fbe1..000000000000 --- a/www/libxul/files/patch-security_coreconf_FreeBSD.mk +++ /dev/null @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include diff --git a/www/libxul/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c b/www/libxul/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c deleted file mode 100644 index b579fc5b4995..000000000000 --- a/www/libxul/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c +++ /dev/null @@ -1,44 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 18:44:42.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 18:46:41.000000000 +0100 -@@ -733,6 +733,33 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include <sys/stddef.h> -+#include <sys/sysctl.h> -+ -+#include <machine/cpu.h> -+#include <machine/md_var.h> -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +813,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - diff --git a/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp b/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp index 76a5dc8b9f7c..3485b1509ad1 100644 --- a/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp +++ b/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp @@ -9,11 +9,3 @@ #include <dlfcn.h> #endif -@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb - - #elif defined(HAVE__UNWIND_BACKTRACE) - -+#define _GNU_SOURCE - // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 - #include <unwind.h> - diff --git a/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc deleted file mode 100644 index ebe5474ca275..000000000000 --- a/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in deleted file mode 100644 index 21314a4eec66..000000000000 --- a/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in +++ /dev/null @@ -1,60 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 -@@ -85,7 +85,7 @@ - # New code for Linux, et. al., with gcc - # Migrate other platforms here after testing - # --ifneq (,$(filter Linux GNU_%,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH))) - # Linux/x86-64 - ifeq (x86_64,$(OS_TEST)) - CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp -@@ -70,7 +70,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64 - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif - # --# FreeBSD/amd64 --# --ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64) --CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp --endif --# - # BeOS/Intel (uses the same unixish_x86 code) - # - ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -341,7 +356,7 @@ - # - # Linux/PPC - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) -+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp - ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +365,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +350,7 @@ - # - # OpenBSD/SPARC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) -+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp - ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s - endif diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile index 2b52f3b9ff8e..145971ae36ce 100644 --- a/www/linux-firefox/Makefile +++ b/www/linux-firefox/Makefile @@ -6,7 +6,7 @@ # PORTNAME= firefox -PORTVERSION= 10.0.6 +PORTVERSION= 10.0.7 PORTEPOCH= 1 CATEGORIES= www MASTER_SITE_SUBDIR?= firefox/releases/${PORTVERSION}esr/linux-i686/en-US diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo index 9792a60a2e71..748be6da7f14 100644 --- a/www/linux-firefox/distinfo +++ b/www/linux-firefox/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-10.0.6esr.tar.bz2) = d2a3fb68bcdb3f0a19885b194f1372a8c3720e5a6019327d41dc8554c805c1cd -SIZE (firefox-10.0.6esr.tar.bz2) = 17298232 +SHA256 (firefox-10.0.7esr.tar.bz2) = 86d7b4eacead16e34cd58631c84a15d67dcdf8ef457ed6a140e2abe76fe703a8 +SIZE (firefox-10.0.7esr.tar.bz2) = 17303135 diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile index 1ed27456f377..d4f29ec5f169 100644 --- a/www/linux-seamonkey/Makefile +++ b/www/linux-seamonkey/Makefile @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -PORTVERSION= 2.11 +PORTVERSION= 2.12 CATEGORIES= www MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common index ad33afead170..2ac530414cee 100644 --- a/www/linux-seamonkey/Makefile.common +++ b/www/linux-seamonkey/Makefile.common @@ -53,9 +53,7 @@ do-install: @${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${PREFIX}/share/applications/ @${CP} -pR ${WRKSRC}/ ${FDIR}/ @${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/ - @${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/${APP_NAME}-run - @${ECHO_CMD} 'exec ${FDIR}/${BIN_NAME} "$$@"' >> ${WRKDIR}/${APP_NAME}-run - @${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}-run ${PREFIX}/bin/${APP_NAME} + @${LN} -sf ${FDIR}/${BIN_NAME} ${PREFIX}/bin/${APP_NAME} @${CP} -R ${LOCALBASE}/lib/npapi/symlinks/${APP_NAME}/ \ ${FDIR}/plugins/ ${_Q} @${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \ diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo index 13f1efe09993..de0c2dd6f305 100644 --- a/www/linux-seamonkey/distinfo +++ b/www/linux-seamonkey/distinfo @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.11.tar.bz2) = a00c9c4d01a1ad74bc5828cbc96cfc349076ad78e0b218ec0ba871e80ff5c405 -SIZE (seamonkey-2.11.tar.bz2) = 23241380 +SHA256 (seamonkey-2.12.tar.bz2) = 52854628b4324ca27f2b5f5f5a1794ae4559eea03dfc000350973a0bc96c071f +SIZE (seamonkey-2.12.tar.bz2) = 22987660 diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist index 197ed7f4ce13..f6f4e51af465 100644 --- a/www/linux-seamonkey/pkg-plist +++ b/www/linux-seamonkey/pkg-plist @@ -119,6 +119,7 @@ lib/%%APP_NAME%%/searchplugins/wikipedia.xml lib/%%APP_NAME%%/searchplugins/yahoo.xml lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini +lib/%%APP_NAME%%/update-settings.ini @exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile index b5ea0b0a658b..2a61af0db623 100644 --- a/www/seamonkey-i18n/Makefile +++ b/www/seamonkey-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= seamonkey-i18n -PORTVERSION= 2.11 +PORTVERSION= 2.12 CATEGORIES= www MASTER_SITE_SUBDIR= seamonkey/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= @@ -22,7 +22,7 @@ PLIST?= ${WRKDIR}/plist PLISTD?= ${WRKDIR}/plist_dirs PLISTF?= ${WRKDIR}/plist_files -USE_SEAMONKEY= 11 +USE_SEAMONKEY= 12 USE_XPI= seamonkey linux-seamonkey USE_SUBMAKE= yes diff --git a/www/seamonkey-i18n/distinfo b/www/seamonkey-i18n/distinfo index 982a76ad61a1..cee0f97e5dff 100644 --- a/www/seamonkey-i18n/distinfo +++ b/www/seamonkey-i18n/distinfo @@ -1,44 +1,44 @@ -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.ca.langpack.xpi) = d5b4dc442fe46b0c487979640956699f56f4de0b9d9243f9343fb6a17d4727d3 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.ca.langpack.xpi) = 819469 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.cs.langpack.xpi) = 3524d6b0d951b1dfd6bd3ba055319e613f92e6170d12b61e41cb4e9be4b762c7 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.cs.langpack.xpi) = 824922 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.de.langpack.xpi) = 6c1c191801c6d916d6323dcb183e638f63851640ecf05dac83a5ee587677de81 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.de.langpack.xpi) = 865755 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.en-GB.langpack.xpi) = bcd1efb2d86aae06843640aae0d4cd75512bb312e03dccbae7dc33d0e8c4cc25 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.en-GB.langpack.xpi) = 795528 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.en-US.langpack.xpi) = fc00a92a0f854d834b07610f6e9c05696e077dfc689b2e27f333d484e01432e5 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.en-US.langpack.xpi) = 795006 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.es-AR.langpack.xpi) = d3a87e633096c022dfa93e21c180fc67131a66c4e626bae141a8e11e303dfdb0 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.es-AR.langpack.xpi) = 865195 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.es-ES.langpack.xpi) = c82e644a7d22a2f776ba2a4585e2267f9d73239944561335f96913d1a815b73c -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.es-ES.langpack.xpi) = 795253 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.fi.langpack.xpi) = 5b1d4d11460a0141c78ab2238c3218ec165d3daf826a1b267b26091638acd3a6 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.fi.langpack.xpi) = 815315 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.fr.langpack.xpi) = a2d11a653cd9da1f7be2fb1a997881793a9ae480b39c362f726aae5c9ad2994c -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.fr.langpack.xpi) = 820894 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.hu.langpack.xpi) = 9c97f1e9141408e9ac80f8733b7495c0fac41c6c59e5e8597a8897e4b334c74e -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.hu.langpack.xpi) = 840751 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.it.langpack.xpi) = 751ce8d2d844b8839ee9fc5fccf501f48c2bb0e82814de584ea132fb57f67f14 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.it.langpack.xpi) = 743800 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.ja-JP-mac.langpack.xpi) = deaf96d00898dec4744fac0882d8f57f1a783e1cee27473028e51e354ccbe73c -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.ja-JP-mac.langpack.xpi) = 897029 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.ja.langpack.xpi) = 775d2b967451128eb24bd02a61a4eea4f2a3241fcccb29cc9cb44bbe5831454d -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.ja.langpack.xpi) = 872431 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.lt.langpack.xpi) = 4c6ddd5b4344b76ca0101e7dbfa7ce939cfe0da1f3f69e391198d80153565a87 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.lt.langpack.xpi) = 929356 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.nb-NO.langpack.xpi) = 6ede9126b0c5ac08c707109bc88c90e89db787d4236da2a6dabf49cb8858c124 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.nb-NO.langpack.xpi) = 814347 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.nl.langpack.xpi) = ed5e3c4c41b7d073fb8f48eaba6dc6999026e4957cd0e2ecfb60654c60ec1bf2 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.nl.langpack.xpi) = 811697 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.pl.langpack.xpi) = 09e38a6f253ed705b45f7606141b6e443775bc107173dc5c5a31bcdbfde3abcb -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.pl.langpack.xpi) = 835858 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.pt-PT.langpack.xpi) = 772000b298e05550e4af99a1bf9e2b8ba892f6f2282654c4b7c45fc45e41b462 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.pt-PT.langpack.xpi) = 850701 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.ru.langpack.xpi) = 9fa36ae44ca1432b1a0ed62c3a7da0ad0d5fe1322bdd780ecddc730462ad16e0 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.ru.langpack.xpi) = 897998 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.sk.langpack.xpi) = c91cd45bc3c6062fcef464d0c2fe90a0012e8d240a3e50bac3f66707ef5d73f3 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.sk.langpack.xpi) = 849951 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.sv-SE.langpack.xpi) = 72621e1821e00b66fab0083f83dc41573f66df31e499bd1129f316f8d37ca75a -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.sv-SE.langpack.xpi) = 876916 -SHA256 (xpi/seamonkey-i18n-2.11/seamonkey-2.11.tr.langpack.xpi) = 81f13cf11cb9549f44ba006f4beb7b833771affd2f4272d2304fd837ced860d3 -SIZE (xpi/seamonkey-i18n-2.11/seamonkey-2.11.tr.langpack.xpi) = 817050 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.ca.langpack.xpi) = adfd5acc1940dd010b16057429d0cd47fe34318e346943419bdf0853b2dc99c0 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.ca.langpack.xpi) = 758726 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.cs.langpack.xpi) = c8a3539a521c60de412cfbcc2258c931f2c2159bd7858fcf28a34462ad95aa26 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.cs.langpack.xpi) = 824461 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.de.langpack.xpi) = 14ee1e74c4de0f254ab8faf161160742671f1c248223191bc58e50ec5d3475d6 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.de.langpack.xpi) = 799407 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.en-GB.langpack.xpi) = 6bec0c224f3f828fde4e0dfde3aa4e1c9368d3192ead7d9d1bfe97542d52e3cd +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.en-GB.langpack.xpi) = 794976 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.en-US.langpack.xpi) = 0d86b0b87d566ace31251bcf6b61a264b181b815a839ab17e54d74bf4e5d58c1 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.en-US.langpack.xpi) = 739904 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.es-AR.langpack.xpi) = 3f71227794835166fb9c1d6c36f56c3d1af3d9b019e3c92efb544ea6049b92c5 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.es-AR.langpack.xpi) = 840165 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.es-ES.langpack.xpi) = 774f383a14472604026fc059b39753e6cebfe7587927fb773420be418b2ba711 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.es-ES.langpack.xpi) = 787253 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.fi.langpack.xpi) = ea43305b9a9eb4ff70b1bf69249c5e4e9ab7cb2fed3ff85554a081e12e2805a9 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.fi.langpack.xpi) = 817772 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.fr.langpack.xpi) = 2766b0f8204e1272f75a4793d81e00aaee2b919fcbe51917bb7df86d7e77f880 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.fr.langpack.xpi) = 816962 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.hu.langpack.xpi) = fbfc098882b3d287237ce981c194f087fea0349bff98e622df9dc586d7c59241 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.hu.langpack.xpi) = 801909 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.it.langpack.xpi) = a901ce807aee4ff449fd13610772502ede4fea888dad9118644123a2f83a6e4e +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.it.langpack.xpi) = 736599 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.ja-JP-mac.langpack.xpi) = 9b33548e72b04c8f194158fa1d314d8073ae8b0e30399086ef71e59cb76cb555 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.ja-JP-mac.langpack.xpi) = 899213 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.ja.langpack.xpi) = f1efcf41f28e5e17913ce569a9903c2f9c4ba43b76eaea8c4c105ff68b49a9d3 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.ja.langpack.xpi) = 874587 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.lt.langpack.xpi) = 8d6180cb5987c067105f856816398fa503ee9140d0919cd288951cbf480e23d7 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.lt.langpack.xpi) = 930503 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.nb-NO.langpack.xpi) = b68b928594d613186354f0ba8ba414189642c52dcb127ec15bed0f68cfa1b2c3 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.nb-NO.langpack.xpi) = 813440 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.nl.langpack.xpi) = 86c2438fd2549a3a7f3cefd4970b28dc446e422c55b719f5456388430b8e6b83 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.nl.langpack.xpi) = 812797 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.pl.langpack.xpi) = 0e7f9b7c0195ed24efa57b188cc5910dce39aa3e18ee11657a36b9352d4cb5e7 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.pl.langpack.xpi) = 821808 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.pt-PT.langpack.xpi) = 753b65e9d35de89db2d3089b66d2226a7e43869ab1fe67f4a394090d650bd6a8 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.pt-PT.langpack.xpi) = 851396 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.ru.langpack.xpi) = 8ee97aa10da018b02e6ffda041c4ebb33d33453101d97a9982f48b9c8c766a82 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.ru.langpack.xpi) = 864618 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.sk.langpack.xpi) = 31840992b98aaf0f426f8980c40a26d88481b282ecf8f02482f3fd95bb57cb1c +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.sk.langpack.xpi) = 797602 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.sv-SE.langpack.xpi) = 7b9ef9198ac9f9059948e500ed56d3420d24599ed5cea40c43327cc24206b7d6 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.sv-SE.langpack.xpi) = 839343 +SHA256 (xpi/seamonkey-i18n-2.12/seamonkey-2.12.tr.langpack.xpi) = 40cb87452a0f9e698f47044edf8b32b5e746c0d1cbf18f033ad904b6d4c773b4 +SIZE (xpi/seamonkey-i18n-2.12/seamonkey-2.12.tr.langpack.xpi) = 818972 diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 6729760fb7a6..46e0b98e3f25 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.11 +DISTVERSION= 2.12 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -17,11 +17,12 @@ COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ nss>=3.13.2:${PORTSDIR}/security/nss \ - sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip USE_AUTOTOOLS= autoconf213:env -CONFLICTS_BUILD= spidermonkey-1.[0-7]* +USE_PYTHON_BUILD=yes USE_BZIP2= yes USE_GMAKE= yes USE_GECKO= gecko @@ -30,7 +31,6 @@ USE_QT4= # empty QT_NONSTANDARD= yes WANT_PERL= yes GNU_CONFIGURE= yes -OBJDIR_BUILD= yes ALL_TARGET= default USE_GL= gl MAKE_JOBS_SAFE= yes @@ -41,7 +41,6 @@ MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ --enable-application=suite USE_MOZILLA= # empty -MOZILLA_PLIST_DIRS= bin lib MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 @@ -96,10 +95,6 @@ MOZ_OPTIONS+= --disable-composer BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif -.if !empty(CXX:M*clang++*) -CFLAGS+= -Wno-return-type-c-linkage -.endif - .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar @@ -117,14 +112,6 @@ post-patch: ${WRKSRC}/suite/app/nsSuiteApp.cpp @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/mozilla/modules/libpref/src/init/all.js - @${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \ - ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ - ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp - @${REINPLACE_CMD} -e 's|libgnomeui-2.so.0|libgnomeui-2.so|' \ - ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ - ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp - @${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \ - ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 5f96bcae4d63..43650a67d14b 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.11.source.tar.bz2) = 6771ee2abb068825748e6ebcaae4e789e4c64db9b220afaf42dc13934b52c4d9 -SIZE (seamonkey-2.11.source.tar.bz2) = 105846143 +SHA256 (seamonkey-2.12.source.tar.bz2) = 04f4d938a77bd651201497a768908ca75c95d44fda8adbc11f40a967f7a9605a +SIZE (seamonkey-2.12.source.tar.bz2) = 106854466 diff --git a/www/seamonkey/files/extra-bug780531 b/www/seamonkey/files/extra-bug780531 new file mode 100644 index 000000000000..a63bcaed35fa --- /dev/null +++ b/www/seamonkey/files/extra-bug780531 @@ -0,0 +1,34 @@ +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then + MOZ_SYDNEYAUDIO=1 + MOZ_CUBEB=1 + MOZ_MEDIA=1 +- case "$target_cpu" in +- arm*) ++ case "$target" in ++ arm-*-linux*) + MOZ_TREMOR=1 + ;; ++ *-freebsd*) ++ MOZ_TREMOR=1 ++ ;; + *) + MOZ_VORBIS=1 + ;; +@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV + MOZ_SYDNEYAUDIO=1 + MOZ_CUBEB=1 + MOZ_MEDIA=1 +- case "$target_cpu" in +- arm*) ++ case "$target" in ++ arm-*-linux*) + MOZ_TREMOR=1 + ;; ++ *-freebsd*) ++ MOZ_TREMOR=1 ++ ;; + *) + MOZ_VORBIS=1 + ;; diff --git a/www/seamonkey/files/mozconfig-generic.in b/www/seamonkey/files/mozconfig-generic.in deleted file mode 100644 index 9af187e48d2f..000000000000 --- a/www/seamonkey/files/mozconfig-generic.in +++ /dev/null @@ -1,8 +0,0 @@ -ac_add_options --prefix=@FAKEDIR@ -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -export PERL="@PERL@" diff --git a/www/seamonkey/files/patch-alsapulse b/www/seamonkey/files/patch-alsapulse index 7851f7348511..f3e94050d63d 100644 --- a/www/seamonkey/files/patch-alsapulse +++ b/www/seamonkey/files/patch-alsapulse @@ -1,46 +1,46 @@ ---- mozilla/config/autoconf.mk.in~ +diff --git mozilla/config/autoconf.mk.in mozilla/config/autoconf.mk.in +index 44c0b06..748511b 100644 +--- mozilla/config/autoconf.mk.in +++ mozilla/config/autoconf.mk.in -@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF +@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ +MOZ_ALSA = @MOZ_ALSA@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ -+ + +MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@ +MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ +MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ - ++ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ ---- mozilla/configure.in~ + GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ +diff --git mozilla/configure.in mozilla/configure.in +index 5980b76..11f5f77 100644 +--- mozilla/configure.in +++ mozilla/configure.in -@@ -5758,17 +5775,47 @@ dnl ==================================== +@@ -5600,13 +5600,45 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(alsa, -+[ --enable-alsa Enable Alsa support], ++[ --enable-alsa Enable Alsa support (default on Linux)], +MOZ_ALSA=1, +MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) + dnl If using sydneyaudio with Linux, ensure that the alsa library is available --if test -n "$MOZ_SYDNEYAUDIO"; then -+if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then - case "$target_os" in - linux*) -+ MOZ_ALSA=1 -+ ;; -+ esac +-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then ++ MOZ_ALSA=1 +fi + +if test -n "$MOZ_ALSA"; then - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , [echo "$MOZ_ALSA_PKG_ERRORS" AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) -- ;; -- esac fi +AC_SUBST(MOZ_ALSA) @@ -55,6 +55,7 @@ +MOZ_PULSEAUDIO=) + +if test -n "$MOZ_PULSEAUDIO"; then ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , + [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" + AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) @@ -65,9 +66,55 @@ +AC_SUBST(MOZ_PULSEAUDIO) + dnl ======================================================== - dnl Permissions System + dnl = Enable GStreamer dnl ======================================================== ---- mozilla/media/libsydneyaudio/src/Makefile.in~ +diff --git mozilla/media/libcubeb/src/Makefile.in mozilla/media/libcubeb/src/Makefile.in +index 5ab4dd8..c8df26f 100644 +--- mozilla/media/libcubeb/src/Makefile.in ++++ mozilla/media/libcubeb/src/Makefile.in +@@ -24,10 +24,6 @@ endif + + ifeq ($(OS_TARGET),Android) + # No Android implementation of libcubeb yet. +-else ifeq ($(OS_TARGET),Linux) +-CSRCS = \ +- cubeb_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_TARGET),Darwin) +@@ -42,4 +38,16 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ cubeb_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ cubeb_pulse.c \ ++ $(NULL) ++endif ++ + include $(topsrcdir)/config/rules.mk +diff --git mozilla/media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c +index 599aea2..41fd5af 100644 +--- mozilla/media/libcubeb/src/cubeb_alsa.c ++++ mozilla/media/libcubeb/src/cubeb_alsa.c +@@ -6,6 +6,6 @@ + #undef NDEBUG + #define _BSD_SOURCE +-#define _POSIX_SOURCE ++#define _XOPEN_SOURCE 500 + #include <pthread.h> + #include <sys/time.h> + #include <assert.h> +diff --git mozilla/media/libsydneyaudio/src/Makefile.in mozilla/media/libsydneyaudio/src/Makefile.in +index 8dda8ce..b19641d 100644 +--- mozilla/media/libsydneyaudio/src/Makefile.in +++ mozilla/media/libsydneyaudio/src/Makefile.in @@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) CSRCS = \ @@ -99,20 +146,23 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += winmm.lib endif ---- mozilla/toolkit/library/Makefile.in~ +diff --git mozilla/toolkit/library/Makefile.in mozilla/toolkit/library/Makefile.in +index 43384e9..e46a6e3 100644 +--- mozilla/toolkit/library/Makefile.in +++ mozilla/toolkit/library/Makefile.in -@@ -375,10 +375,12 @@ endif +@@ -379,10 +379,13 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) -ifdef MOZ_SYDNEYAUDIO -ifeq ($(OS_ARCH),Linux) ++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) +ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) endif -+ +ifdef MOZ_PULSEAUDIO +EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) ++endif endif ifdef HAVE_CLOCK_MONOTONIC diff --git a/www/seamonkey/files/patch-bug722975 b/www/seamonkey/files/patch-bug722975 new file mode 100644 index 000000000000..51bc5a4380ef --- /dev/null +++ b/www/seamonkey/files/patch-bug722975 @@ -0,0 +1,61 @@ +# HG changeset patch +# Parent 9d3c9b863c697634e434b687d456bb82fa794ecf +# User Uli Schlachter <psychon@znc.in> +Bug 722975 - --enable-system-cairo build is broken after Bug 715658 fixed + + +diff --git a/mozilla/gfx/thebes/gfxPlatform.cpp b/mozilla/gfx/thebes/gfxPlatform.cpp +--- mozilla/gfx/thebes/gfxPlatform.cpp ++++ mozilla/gfx/thebes/gfxPlatform.cpp +@@ -484,21 +484,19 @@ gfxPlatform::CreateDrawTargetForSurface( + + cairo_user_data_key_t kSourceSurface; + + void SourceBufferDestroy(void *srcBuffer) + { + static_cast<SourceSurface*>(srcBuffer)->Release(); + } + +-void SourceSnapshotDetached(cairo_surface_t *nullSurf) ++void SourceSnapshotDetached(void *nullSurf) + { +- gfxImageSurface* origSurf = +- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); +- ++ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf); + origSurf->SetData(&kSourceSurface, NULL, NULL); + } + + RefPtr<SourceSurface> + gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) + { + void *userData = aSurface->GetData(&kSourceSurface); + +@@ -588,24 +586,19 @@ gfxPlatform::GetSourceSurfaceForSurface( + } + + srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(), + imgSurface->Stride(), + size, format); + + } + +- cairo_surface_t *nullSurf = +- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); +- cairo_surface_set_user_data(nullSurf, +- &kSourceSurface, +- imgSurface, +- NULL); +- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); +- cairo_surface_destroy(nullSurf); ++ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", ++ (const unsigned char *) "data", 4, ++ SourceSnapshotDetached, imgSurface.get()); + } + + srcBuffer->AddRef(); + aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy); + + return srcBuffer; + } + diff --git a/www/seamonkey/files/patch-bug723860 b/www/seamonkey/files/patch-bug723860 new file mode 100644 index 000000000000..d76dbfe6d20c --- /dev/null +++ b/www/seamonkey/files/patch-bug723860 @@ -0,0 +1,54 @@ +commit 4e07587 +Author: Matthew Gregan <kinetik@flim.org> +Date: Wed Jun 6 17:58:07 2012 +1200 + + Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized. r=doublec +--- + content/media/gstreamer/nsGStreamerReader.cpp | 4 ++++ + content/media/ogg/nsOggReader.cpp | 3 +-- + content/media/wave/nsWaveReader.cpp | 3 +++ + 3 files changed, 8 insertions(+), 2 deletions(-) + +diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp +index 164fb2e..06a09b5 100644 +--- mozilla/content/media/gstreamer/nsGStreamerReader.cpp ++++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp +@@ -505,6 +505,10 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, + nsresult nsGStreamerReader::GetBuffered(nsTimeRanges* aBuffered, + PRInt64 aStartTime) + { ++ if (!mInfo.mHasVideo && !mInfo.mHasAudio) { ++ return NS_OK; ++ } ++ + GstFormat format = GST_FORMAT_TIME; + MediaResource* resource = mDecoder->GetResource(); + gint64 resourceLength = resource->GetLength(); +diff --git mozilla/content/media/ogg/nsOggReader.cpp mozilla/content/media/ogg/nsOggReader.cpp +index c6ff008..8d40e2c 100644 +--- mozilla/content/media/ogg/nsOggReader.cpp ++++ mozilla/content/media/ogg/nsOggReader.cpp +@@ -1532,8 +1532,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) + { + // HasAudio and HasVideo are not used here as they take a lock and cause + // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change +- // after metadata is read and GetBuffered isn't called before metadata is +- // read. ++ // after metadata is read. + if (!mInfo.mHasVideo && !mInfo.mHasAudio) { + // No need to search through the file if there are no audio or video tracks + return NS_OK; +diff --git mozilla/content/media/wave/nsWaveReader.cpp mozilla/content/media/wave/nsWaveReader.cpp +index 7242eb5..60fc1e1 100644 +--- mozilla/content/media/wave/nsWaveReader.cpp ++++ mozilla/content/media/wave/nsWaveReader.cpp +@@ -239,6 +239,9 @@ static double RoundToUsecs(double aSeconds) { + + nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) + { ++ if (!mInfo.mHasAudio) { ++ return NS_OK; ++ } + PRInt64 startOffset = mDecoder->GetResource()->GetNextCachedData(mWavePCMOffset); + while (startOffset >= 0) { + PRInt64 endOffset = mDecoder->GetResource()->GetCachedDataEnd(startOffset); diff --git a/www/seamonkey/files/patch-bug753046 b/www/seamonkey/files/patch-bug753046 index 16b3d832490c..8d1ccbf2b748 100644 --- a/www/seamonkey/files/patch-bug753046 +++ b/www/seamonkey/files/patch-bug753046 @@ -4,15 +4,14 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/06 12:34:09 r --- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp -@@ -33,6 +33,8 @@ - #include "nsPluginsDir.h" - #include "nsXULAppAPI.h" +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#include <unistd.h> -+ - #ifdef MOZ_X11 - # include "mozilla/X11Util.h" - #endif + #ifdef MOZ_WIDGET_QT ++#include <unistd.h> // for _exit() + #include <QtCore/QTimer> + #include "nsQAppInstance.h" + #include "NestedLoopTimer.h" @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -65,7 +64,7 @@ $NetBSD: patch-ipc_chromium_Makefile.in,v 1.1 2012/03/06 12:34:09 ryoon Exp $ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -218,21 +217,23 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:1 #include <errno.h> #include <fcntl.h> -@@ -17,8 +17,13 @@ +@@ -17,9 +17,16 @@ #include <unistd.h> #if MOZ_HAVE_EXECINFO_H #include <execinfo.h> --#include <sys/sysctl.h> ++#endif ++ ++#if defined(OS_MACOSX) || defined(OS_BSD) + #include <sys/sysctl.h> #endif + +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include <sys/user.h> -+#elif defined(OS_FREEBSD) -+#include <sys/proc.h> +#endif -+#include <sys/sysctl.h> - ++ #include "base/basictypes.h" #include "base/eintr_wrapper.h" + #include "base/logging.h" @@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u return false; } @@ -242,7 +243,7 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:1 // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -250,6 +251,8 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:1 + being_debugged = (info.kp_flags & P_TRACED) != 0; +#elif defined(OS_FREEBSD) + being_debugged = (info.ki_flag & P_TRACED) != 0; ++#elif defined(OS_OPENBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif @@ -397,105 +400,19 @@ index 9a34492..62b280c 100644 #else typedef DirReaderFallback DirReaderPosix; #endif -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include <sys/stat.h> - #elif defined(OS_POSIX) - #include <sys/types.h> --#include <fts.h> - #include <sys/stat.h> -+#include <fts.h> - #endif +diff --git mozilla/ipc/chromium/src/base/file_util_linux.cc mozilla/ipc/chromium/src/base/file_util_linux.cc +index 171e44f..0c6dfcc 100644 +--- mozilla/ipc/chromium/src/base/file_util_linux.cc ++++ mozilla/ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } - #include <stdio.h> -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,80 @@ -+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include <fcntl.h> -+#include <unistd.h> -+ -+#include <string> -+#include <vector> -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector<char> buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -505,7 +422,7 @@ $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34 // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef OS_LINUX ++#ifndef HAVE_STAT64 #define stat64 stat #endif @@ -531,27 +448,19 @@ $NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.1 2012/03/06 12:34:09 pump_ = new base::MessagePumpForUI(); #endif // OS_LINUX } else if (type_ == TYPE_IO) { -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $ - ---- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include <linux/stat.h> - #endif -+#include <sys/stat.h> /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE + #elif defined(OS_POSIX) + #include <pthread.h> + typedef pthread_t PlatformThreadHandle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) #include <unistd.h> typedef pid_t PlatformThreadId; -+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include <mach/mach.h> @@ -560,7 +469,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 --- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,18 @@ +@@ -9,16 +9,30 @@ #if defined(OS_MACOSX) #include <mach/mach.h> @@ -568,22 +477,37 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 +#include <lwp.h> #elif defined(OS_LINUX) #include <sys/syscall.h> - #include <unistd.h> -+#elif defined(OS_DRAGONFLY) -+#include <unistd.h> +-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) + #include <sys/prctl.h> +-#elif !defined(__NetBSD__) +-#include <pthread_np.h> +#elif defined(OS_FREEBSD) ++#include <sys/param.h> ++#if __FreeBSD_version > 802500 ++#include <sys/thr.h> ++#else +_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); // XXX #include <sys/thr.h> ++extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") -+#include <pthread_np.h> ++#endif + #endif ++ ++#if !defined(OS_MACOSX) + #include <unistd.h> #endif ++#if defined(OS_BSD) && !defined(OS_NETBSD) ++#include <pthread_np.h> ++#endif ++ #if defined(OS_MACOSX) -@@ -38,7 +45,19 @@ + namespace base { + void InitThreading(); +@@ -38,9 +45,20 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); --#elif defined (__OpenBSD__) +-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#elif defined(OS_NETBSD) + return _lwp_self(); +#elif defined(OS_DRAGONFLY) @@ -597,9 +521,25 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 + return lwpid; +# endif +#elif defined(OS_OPENBSD) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); +- // TODO(BSD): find a better thread ID +- return (intptr_t)(pthread_self()); ++ return (intptr_t) (pthread_self()); #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif +@@ -102,9 +102,9 @@ void PlatformThread::SetName(const char* name) { + // Note that glibc also has a 'pthread_setname_np' api, but it may not be + // available everywhere and it's only benefit over using prctl directly is + // that it can set the name of threads other than the current thread. +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) ++#if defined(OS_BSD) && !defined(OS_NETBSD) + pthread_set_name_np(pthread_self(), name); +-#elif defined(__NetBSD__) ++#elif defined(OS_NETBSD) +- pthread_setname_np(pthread_self(), "%s", name); ++ pthread_setname_np(pthread_self(), "%s", (void *)name); + #else + prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0); $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -641,7 +581,7 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,326 @@ +@@ -0,0 +1,318 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -650,36 +590,20 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 + +#include "base/process_util.h" + -+#include <ctype.h> -+#include <fcntl.h> -+#include <unistd.h> -+#include <string> -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ -+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") -+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") -+#else -+#define PRE_SYS_INCLUDE -+#define POST_SYS_INCLUDE -+#endif -+PRE_SYS_INCLUDE -+#include <kvm.h> -+POST_SYS_INCLUDE ++#include <sys/param.h> +#include <sys/sysctl.h> -+#include <sys/types.h> +#include <sys/wait.h> -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include <sys/user.h> -+POST_SYS_INCLUDE -+#define HAVE_POSIX_SPAWN 1 -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include <sys/user.h> -+POST_SYS_INCLUDE +#endif + ++#include <ctype.h> ++#include <fcntl.h> ++#include <kvm.h> ++#include <unistd.h> ++ ++#include <string> ++ +#include "base/debug_util.h" +#include "base/eintr_wrapper.h" +#include "base/file_util.h" @@ -687,17 +611,21 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 600000000 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 +#endif ++ ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif +#endif + +#ifdef HAVE_POSIX_SPAWN -+PRE_SYS_INCLUDE +#include <spawn.h> -+POST_SYS_INCLUDE +extern "C" char **environ __dso_public; +#endif + @@ -938,7 +866,11 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:1 +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue; @@ -1110,24 +1042,30 @@ $NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.4 2012/04/01 15:18:45 --- mozilla/ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -27,9 +33,16 @@ #error Please add support for your platform in build/build_config.h #endif ++// For access to standard BSD features, use OS_BSD instead of a ++// more specific macro. ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) ++#define OS_BSD 1 ++#endif ++ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) @@ -1169,7 +1107,7 @@ $NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.1 2012/0 #endif -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) ++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) // There size_t is a synonym for |unsigned long| ... template <> struct ParamTraits<size_t> { @@ -1178,7 +1116,7 @@ $NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.1 2012/0 #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) ++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| template <> struct ParamTraits<int64> { @@ -1200,7 +1138,7 @@ $NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.1 2012/03/06 }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#elif defined(OS_MACOSX) || defined(OS_BSD) typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; @@ -1255,16 +1193,31 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/03/15 08:30:06 ryoo newEnvVars, #endif false, &process, arch); +diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h +index f37998d..b05dc7b 100644 +--- mozilla/ipc/glue/SharedMemorySysV.h ++++ mozilla/ipc/glue/SharedMemorySysV.h +@@ -8,7 +8,7 @@ + #ifndef mozilla_ipc_SharedMemorySysV_h + #define mozilla_ipc_SharedMemorySysV_h + +-#if defined(OS_LINUX) && !defined(ANDROID) ++#if (defined(OS_LINUX) && !defined(ANDROID)) || defined(OS_BSD) + + // SysV shared memory isn't available on Windows, but we define the + // following macro so that #ifdefs are clearer (compared to #ifdef $NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $ --- mozilla/toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000 +++ mozilla/toolkit/library/Makefile.in -@@ -534,6 +538,10 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle +@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle endif endif +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) ++# keep `environ' unresolved, see bug 14426 for binutils ++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols +endif + ifeq ($(OS_ARCH),WINNT) diff --git a/www/seamonkey/files/patch-bug759459 b/www/seamonkey/files/patch-bug759459 new file mode 100644 index 000000000000..5434a759b353 --- /dev/null +++ b/www/seamonkey/files/patch-bug759459 @@ -0,0 +1,24 @@ +commit 4d0c5b9 +Author: Marco Perez <bugmail@millibyte.net> +Date: Sat Jun 9 12:24:56 2012 -0400 + + Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence +--- + js/src/gc/Memory.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp +index 815e90b..10c1a91 100644 +--- mozilla/js/src/gc/Memory.cpp ++++ mozilla/js/src/gc/Memory.cpp +@@ -292,9 +292,9 @@ GetPageFaultCount() + #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN) + + #include <sys/mman.h> +-#include <unistd.h> + #include <sys/time.h> + #include <sys/resource.h> ++#include <unistd.h> + + void + InitMemorySubsystem() diff --git a/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp b/www/seamonkey/files/patch-bug760899 index fe7e4c54e1e7..c81b855e7fc2 100644 --- a/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp +++ b/www/seamonkey/files/patch-bug760899 @@ -1,25 +1,3 @@ -commit f0a73aa -Author: Paul Adenot <paul@paul.cx> -Date: Thu Jun 21 20:44:39 2012 -0400 - - Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik ---- - content/media/gstreamer/nsGStreamerReader.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 06a09b5..c48f92e 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) - * stream but that are otherwise decodeable. - */ - guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO, -- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO}; -+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)}; - guint default_flags, current_flags; - g_object_get(mPlayBin, "flags", &default_flags, NULL); - commit 667daed Author: Stephen Moehle <stephen.moehle@gmail.com> Date: Tue Jun 5 11:32:36 2012 +1200 diff --git a/www/seamonkey/files/patch-bug761030 b/www/seamonkey/files/patch-bug761030 new file mode 100644 index 000000000000..d6b96cc697f3 --- /dev/null +++ b/www/seamonkey/files/patch-bug761030 @@ -0,0 +1,25 @@ +commit 8bc9e15 +Author: Stephen Moehle <stephen.moehle@gmail.com> +Date: Tue Jun 5 11:31:13 2012 +1200 + + Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik + + --HG-- + extra : rebase_source : 5e884550f9870bd2fda247d50bebd472e8368588 +--- + content/media/gstreamer/nsGStreamerReader.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp +index 17374a3..6a50e09 100644 +--- mozilla/content/media/gstreamer/nsGStreamerReader.cpp ++++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp +@@ -452,6 +452,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, + i, height); + b.mPlanes[i].mWidth = gst_video_format_get_component_width(format, + i, width); ++ b.mPlanes[i].mOffset = 0; ++ b.mPlanes[i].mSkip = 0; + } + + bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, diff --git a/www/seamonkey/files/patch-bug761077 b/www/seamonkey/files/patch-bug761077 new file mode 100644 index 000000000000..3c8040ed6754 --- /dev/null +++ b/www/seamonkey/files/patch-bug761077 @@ -0,0 +1,88 @@ +diff --git mozilla/xpcom/reflect/xptcall/public/genstubs.pl mozilla/xpcom/reflect/xptcall/public/genstubs.pl +index b8a87a5..918c4cf 100644 +--- mozilla/xpcom/reflect/xptcall/public/genstubs.pl ++++ mozilla/xpcom/reflect/xptcall/public/genstubs.pl +@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n"; + print OUTFILE "* 1 is AddRef\n"; + print OUTFILE "* 2 is Release\n"; + print OUTFILE "*/\n"; +-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n"; ++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n"; + for($i = 0; $i < $entry_count; $i++) { + print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n"; + } +diff --git mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc +index eb66761..807db26 100644 +--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc ++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); +diff --git mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in +index ae6ed66..2783957 100644 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in +@@ -70,7 +70,7 @@ endif + endif + endif + # IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -269,7 +269,7 @@ endif + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) ++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp + ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -278,7 +278,7 @@ endif + # + # Linux/PPC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) ++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp + ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -350,7 +350,7 @@ endif + # + # OpenBSD/SPARC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif +diff --git mozilla/xpcom/reflect/xptcall/src/xptcprivate.h mozilla/xpcom/reflect/xptcall/src/xptcprivate.h +index d903ced..e4ec832 100644 +--- mozilla/xpcom/reflect/xptcall/src/xptcprivate.h ++++ mozilla/xpcom/reflect/xptcall/src/xptcprivate.h +@@ -14,7 +14,7 @@ + + class xptiInterfaceEntry; + +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; + #else + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; +@@ -31,7 +31,7 @@ public: + #undef STUB_ENTRY + #undef SENTINEL_ENTRY + +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); + #else + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); diff --git a/www/seamonkey/files/patch-bug761419 b/www/seamonkey/files/patch-bug761419 new file mode 100644 index 000000000000..0c8c3d1d155a --- /dev/null +++ b/www/seamonkey/files/patch-bug761419 @@ -0,0 +1,22 @@ +commit f0a73aa +Author: Paul Adenot <paul@paul.cx> +Date: Thu Jun 21 20:44:39 2012 -0400 + + Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik +--- + content/media/gstreamer/nsGStreamerReader.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp +index 06a09b5..c48f92e 100644 +--- mozilla/content/media/gstreamer/nsGStreamerReader.cpp ++++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp +@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) + * stream but that are otherwise decodeable. + */ + guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO, +- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO}; ++ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)}; + guint default_flags, current_flags; + g_object_get(mPlayBin, "flags", &default_flags, NULL); + diff --git a/www/seamonkey/files/patch-bug775257 b/www/seamonkey/files/patch-bug775257 new file mode 100644 index 000000000000..904fec24a5a5 --- /dev/null +++ b/www/seamonkey/files/patch-bug775257 @@ -0,0 +1,27 @@ +commit 8fc8b74 +Author: Oleg Romashin <oleg.romashin@nokia.com> +Date: Wed Jul 18 22:46:11 2012 -0400 + + Bug 775257 - Gstreamer backend on Meego N9 produce extra noise in audio playback.r=giles +--- + content/media/gstreamer/nsGStreamerReader.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp +index c48f92e..0fb801a 100644 +--- mozilla/content/media/gstreamer/nsGStreamerReader.cpp ++++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp +@@ -130,8 +130,13 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor) + gst_object_unref(sinkpad); + + mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! " ++#ifndef MOZ_TREMOR + "appsink name=audiosink sync=true caps=audio/x-raw-float," + "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL); ++#else ++ "appsink name=audiosink sync=true caps=audio/x-raw-int," ++ "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL); ++#endif + mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink), + "audiosink")); + gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks, diff --git a/www/seamonkey/files/patch-bug777696 b/www/seamonkey/files/patch-bug777696 new file mode 100644 index 000000000000..4ac884a1452c --- /dev/null +++ b/www/seamonkey/files/patch-bug777696 @@ -0,0 +1,32 @@ +commit 0c0d1a8 +Author: Landry Breuil <landry@openbsd.org> +Date: Mon Jul 30 17:57:15 2012 +0200 + + Bug 777696: Fix gstreamer backend on big endian architectures. r=doublec +--- + content/media/gstreamer/nsGStreamerReader.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp +index 0fb801a..4a69196 100644 +--- mozilla/content/media/gstreamer/nsGStreamerReader.cpp ++++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp +@@ -132,10 +132,18 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor) + mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! " + #ifdef MOZ_TREMOR + "appsink name=audiosink sync=true caps=audio/x-raw-float," ++#ifdef IS_LITTLE_ENDIAN + "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL); + #else ++ "channels={1,2},rate=44100,width=32,endianness=4321", TRUE, NULL); ++#endif ++#else + "appsink name=audiosink sync=true caps=audio/x-raw-int," ++#ifdef IS_LITTLE_ENDIAN + "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL); ++#else ++ "channels={1,2},rate=48000,width=16,endianness=4321", TRUE, NULL); ++#endif + #endif + mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink), + "audiosink")); diff --git a/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp b/www/seamonkey/files/patch-bug778056 index 72eba848047d..72eba848047d 100644 --- a/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp +++ b/www/seamonkey/files/patch-bug778056 diff --git a/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp b/www/seamonkey/files/patch-bug778078 index 78cb22fd4702..fc29c1ca5ecb 100644 --- a/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp +++ b/www/seamonkey/files/patch-bug778078 @@ -5,7 +5,7 @@ #if defined(MOZ_WIDGET_GTK2) -#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) // Disable the slice allocator, since jemalloc already uses similar layout // algorithms, and using a sub-allocator tends to increase fragmentation. // This must be done before g_thread_init() is called. diff --git a/www/seamonkey/files/patch-bug779847 b/www/seamonkey/files/patch-bug779847 new file mode 100644 index 000000000000..ed30d515af31 --- /dev/null +++ b/www/seamonkey/files/patch-bug779847 @@ -0,0 +1,28 @@ +--- mozilla/gfx/ycbcr/Makefile.in ++++ mozilla/gfx/ycbcr/Makefile.in +@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \ + $(NULL) + endif + else +-ifeq ($(OS_ARCH),Linux) +-CPPSRCS += yuv_row_posix.cpp \ +- $(NULL) +-else +-ifeq ($(OS_ARCH),SunOS) +-CPPSRCS += yuv_row_posix.cpp \ +- $(NULL) +-else +-ifeq ($(OS_ARCH),Darwin) ++ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH))) + CPPSRCS += yuv_row_posix.cpp \ + $(NULL) + else + CPPSRCS += yuv_row_other.cpp \ + $(NULL) +-endif # Darwin +-endif # SunOS +-endif # linux ++endif # posix + endif # windows + + ifeq (arm,$(findstring arm,$(OS_TEST))) diff --git a/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp b/www/seamonkey/files/patch-bug781457 index f7331270ab8a..f7331270ab8a 100644 --- a/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp +++ b/www/seamonkey/files/patch-bug781457 diff --git a/www/seamonkey/files/patch-mozilla__content__base__public__nsContentUtils.h b/www/seamonkey/files/patch-bug781474 index 358d40c1f988..358d40c1f988 100644 --- a/www/seamonkey/files/patch-mozilla__content__base__public__nsContentUtils.h +++ b/www/seamonkey/files/patch-bug781474 diff --git a/www/seamonkey/files/patch-bug783463 b/www/seamonkey/files/patch-bug783463 new file mode 100644 index 000000000000..192eb5b99f73 --- /dev/null +++ b/www/seamonkey/files/patch-bug783463 @@ -0,0 +1,34 @@ +--- mozilla/gfx/skia/Makefile.in~ ++++ mozilla/gfx/skia/Makefile.in +@@ -339,10 +339,9 @@ CPPSRCS += \ + SkMMapStream.cpp \ + SkOSFile.cpp \ + $(NULL) +-ifeq (Linux,$(OS_TARGET)) ++ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET)))) + CPPSRCS += \ + SkFontHost_linux.cpp \ +- SkFontHost_tables.cpp \ + SkTime_Unix.cpp \ + $(NULL) + endif +--- mozilla/widget/qt/nsNativeThemeQt.cpp~ ++++ mozilla/widget/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,6 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" +-#include <malloc.h> + + + #include "gfxASurface.h" +--- mozilla/widget/qt/nsSound.cpp~ ++++ mozilla/widget/qt/nsSound.cpp +@@ -40,6 +40,7 @@ + #include <QSound> + + #include <string.h> ++#include <unistd.h> + + #include "nscore.h" + #include "plstr.h" diff --git a/www/seamonkey/files/patch-bug784741 b/www/seamonkey/files/patch-bug784741 new file mode 100644 index 000000000000..0b0611afa312 --- /dev/null +++ b/www/seamonkey/files/patch-bug784741 @@ -0,0 +1,43 @@ +diff --git js/src/Makefile.in js/src/Makefile.in +index 8eb385f..01bd8e3 100644 +--- mozilla/js/src/Makefile.in ++++ mozilla/js/src/Makefile.in +@@ -323,6 +323,7 @@ endif + + ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) + ENABLE_YARR_JIT = 1 ++DEFINES += -DENABLE_YARR_JIT=1 + + VPATH += $(srcdir)/assembler/assembler \ + $(srcdir)/methodjit \ +diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h +index 6570f2d..0c84896 100644 +--- mozilla/js/src/assembler/wtf/Platform.h ++++ mozilla/js/src/assembler/wtf/Platform.h +@@ -1102,9 +1102,7 @@ + #if WTF_PLATFORM_CHROMIUM + #define ENABLE_YARR_JIT 0 + +-#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT) +-#define ENABLE_YARR_JIT 1 +- ++#elif ENABLE_YARR_JIT + /* Setting this flag compares JIT results with interpreter results. */ + #define ENABLE_YARR_JIT_DEBUG 0 + #endif +diff --git js/src/configure.in js/src/configure.in +index c142eb7..34f98b9 100644 +--- mozilla/js/src/configure.in ++++ mozilla/js/src/configure.in +@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug, + (using compiler flags DBG)], + [ if test "$enableval" != "no"; then + MOZ_DEBUG=1 +- ENABLE_METHODJIT_SPEW=1 ++ if test "$ENABLE_METHODJIT"; then ++ # needs MethodJIT or YarrJIT ++ ENABLE_METHODJIT_SPEW=1 ++ fi + if test -n "$enableval" -a "$enableval" != "yes"; then + MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` + _MOZ_DEBUG_FLAGS_SET=1 diff --git a/www/seamonkey/files/patch-bug784776 b/www/seamonkey/files/patch-bug784776 new file mode 100644 index 000000000000..fbc597902017 --- /dev/null +++ b/www/seamonkey/files/patch-bug784776 @@ -0,0 +1,50 @@ +--- mozilla/content/media/MediaEngineDefault.cpp~ ++++ mozilla/content/media/MediaEngineDefault.cpp +@@ -232,12 +232,12 @@ nsresult + MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID) + { + if (mState != kAllocated) { +- return NULL; ++ return 0; + } + + mTimer = do_CreateInstance(NS_TIMER_CONTRACTID); + if (!mTimer) { +- return NULL; ++ return 0; + } + + mSource = aStream; +--- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~ ++++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp +@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources() + { + if (mSharedHandle) { + gl()->ReleaseSharedHandle(mShareType, mSharedHandle); +- mSharedHandle = NULL; ++ mSharedHandle = 0; + } + + mYUVTexture[0].Release(); +--- mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp~ ++++ mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp +@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr + struct tm *tmc; + int i; + +- tt = time((time_t)NULL); ++ tt = time(NULL); + tmc = localtime(&tt); + + tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM +--- mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp~ ++++ mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp +@@ -40,7 +40,7 @@ CrossProcessMutexHandle + CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle) + { + NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!"); +- return NULL; ++ return 0; + } + + } diff --git a/www/seamonkey/files/patch-bug785638 b/www/seamonkey/files/patch-bug785638 new file mode 100644 index 000000000000..2ce1cd35a78a --- /dev/null +++ b/www/seamonkey/files/patch-bug785638 @@ -0,0 +1,168 @@ +diff --git configure.in configure.in +index cef992b..3bd39ca 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then + + dnl See if we have assembly on this platform. + case "$OS_ARCH:$CPU_ARCH" in +- Linux:x86) +- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" +- VPX_X86_ASM=1 +- ;; +- Linux:x86_64) +- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" +- VPX_X86_ASM=1 +- ;; +- SunOS:x86) +- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" +- VPX_X86_ASM=1 +- ;; +- SunOS:x86_64) +- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" +- VPX_X86_ASM=1 +- ;; + Darwin:x86) + VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 +@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then + VPX_ASM_SUFFIX="$ASM_SUFFIX" + VPX_ARM_ASM=1 + fi ++ ;; ++ *:x86) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" ++ VPX_X86_ASM=1 ++ fi ++ ;; ++ *:x86_64) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" ++ VPX_X86_ASM=1 ++ fi ++ ;; + esac + + if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then +@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + + dnl Do we support libjpeg-turbo on this platform? + case "$OS_ARCH:$OS_TEST" in +- Linux:x86|Linux:i?86) +- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" +- LIBJPEG_TURBO_X86_ASM=1 +- ;; +- Linux:x86_64) +- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" +- LIBJPEG_TURBO_X64_ASM=1 +- ;; +- SunOS:i?86) +- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" +- LIBJPEG_TURBO_X86_ASM=1 +- ;; +- SunOS:x86_64) +- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" +- LIBJPEG_TURBO_X64_ASM=1 +- ;; + Darwin:i?86) + LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO" + LIBJPEG_TURBO_X86_ASM=1 +@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon" + LIBJPEG_TURBO_ARM_ASM=1 + ;; ++ *:x86|*:i?86) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ fi ++ ;; ++ *:x86_64) ++ if $CC -E -dM -</dev/null | grep -q __ELF__; then ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ fi ++ ;; + esac + + fi +diff --git media/libvpx/update.sh media/libvpx/update.sh +index 79e0fb1..51956af 100755 +--- mozilla/media/libvpx/update.sh ++++ mozilla/media/libvpx/update.sh +@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h + # Should be same for all platforms... + cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h + +-# Config files for x86-linux-gcc and Solaris x86 ++# Config files for x86-linux-gcc and other x86 elf platforms + cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c + cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm + cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h + +-# Config files for x86_64-linux-gcc and Solaris x86_64 ++# Config files for x86_64-linux-gcc and other x86_64 elf platforms + cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c + cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm + cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h +diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h +index 55433f3..36e1780 100644 +--- mozilla/media/libvpx/vpx_config.h ++++ mozilla/media/libvpx/vpx_config.h +@@ -16,20 +16,12 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.h" + +-#elif defined(__linux__) && defined(__i386__) +-/* 32 bit Linux. */ ++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) ++/* 32 bit ELF platforms. */ + #include "vpx_config_x86-linux-gcc.h" + +-#elif defined(__linux__) && defined(__x86_64__) +-/* 64 bit Linux. */ +-#include "vpx_config_x86_64-linux-gcc.h" +- +-#elif defined(__sun) && defined(__i386) +-/* 32 bit Solaris. */ +-#include "vpx_config_x86-linux-gcc.h" +- +-#elif defined(__sun) && defined(__x86_64) +-/* 64 bit Solaris. */ ++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) ++/* 64 bit ELF platforms. */ + #include "vpx_config_x86_64-linux-gcc.h" + + #else +diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c +index eedd515..c8b5375 100644 +--- mozilla/media/libvpx/vpx_config_c.c ++++ mozilla/media/libvpx/vpx_config_c.c +@@ -15,22 +15,14 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.c" + +-#elif defined(__linux__) && defined(__i386__) +-/* 32 bit Linux. */ ++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) ++/* 32 bit ELF platforms. */ + #include "vpx_config_x86-linux-gcc.c" + +-#elif defined(__linux__) && defined(__x86_64__) +-/* 64 bit Linux. */ ++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) ++/* 64 bit ELF platforms. */ + #include "vpx_config_x86_64-linux-gcc.c" + +-#elif defined(__sun) && defined(__i386) +-/* 32 bit Solaris. */ +-#include "vpx_config_x86-linux-gcc.h" +- +-#elif defined(__sun) && defined(__x86_64) +-/* 64 bit Solaris. */ +-#include "vpx_config_x86_64-linux-gcc.h" +- + #else + #error VPX_X86_ASM is defined, but assembly not supported on this platform! + #endif diff --git a/www/seamonkey/files/patch-config-rules.mk b/www/seamonkey/files/patch-config-rules.mk deleted file mode 100644 index 8ab35f5a8326..000000000000 --- a/www/seamonkey/files/patch-config-rules.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- config/rules.mk.orig Thu Sep 14 14:07:03 2006 -+++ config/rules.mk Wed Oct 18 11:00:09 2006 -@@ -442,9 +442,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic --endif -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - - ifeq ($(OS_ARCH),NetBSD) diff --git a/www/seamonkey/files/patch-configure.in b/www/seamonkey/files/patch-configure.in new file mode 100644 index 000000000000..c03ce706001e --- /dev/null +++ b/www/seamonkey/files/patch-configure.in @@ -0,0 +1,49 @@ +--- configure.in.orig 2012-07-14 00:40:08.000000000 +0200 ++++ configure.in 2012-08-18 18:16:06.000000000 +0200 +@@ -3101,6 +3118,8 @@ + + AC_SUBST(VISIBILITY_FLAGS) + ++MOZ_COMPILER_OPTS ++ + dnl Checks for header files. + dnl ======================================================== + AC_HEADER_DIRENT +@@ -4067,29 +4086,29 @@ + + AC_CACHE_CHECK(for __attribute__((always_inline)), + ac_cv_attribute_always_inline, +- [AC_TRY_COMPILE([], +- [inline void f(void) __attribute__((always_inline));], ++ [AC_TRY_COMPILE([inline void f(void) __attribute__((always_inline));], ++ [], + ac_cv_attribute_always_inline=yes, + ac_cv_attribute_always_inline=no)]) + + AC_CACHE_CHECK(for __attribute__((malloc)), + ac_cv_attribute_malloc, +- [AC_TRY_COMPILE([], +- [void* f(int) __attribute__((malloc));], ++ [AC_TRY_COMPILE([void* f(int) __attribute__((malloc));], ++ [], + ac_cv_attribute_malloc=yes, + ac_cv_attribute_malloc=no)]) + + AC_CACHE_CHECK(for __attribute__((warn_unused_result)), + ac_cv_attribute_warn_unused, +- [AC_TRY_COMPILE([], +- [int f(void) __attribute__((warn_unused_result));], ++ [AC_TRY_COMPILE([int f(void) __attribute__((warn_unused_result));], ++ [], + ac_cv_attribute_warn_unused=yes, + ac_cv_attribute_warn_unused=no)]) + + AC_CACHE_CHECK(for __attribute__((noreturn)), + ac_cv_attribute_noreturn, +- [AC_TRY_COMPILE([], +- [void f(void) __attribute__((noreturn));], ++ [AC_TRY_COMPILE([void f(void) __attribute__((noreturn));], ++ [], + ac_cv_attribute_noreturn=yes, + ac_cv_attribute_noreturn=no)]) + diff --git a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in index 7ca660b34206..98aa2319501a 100644 --- a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in +++ b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in @@ -1,14 +1,5 @@ --- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200 +++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2009-09-10 17:37:28.000000000 +0200 -@@ -42,7 +42,7 @@ - NSPR_LIBS = @NSPR_LIBS@ - NSPR_CFLAGS = @NSPR_CFLAGS@ - NSS_LIBS = @NSS_LIBS@ --NSS_CFLAGS = @NSS_CFLAGS@ -+NSS_CFLAGS = @NSS_CFLAGS@ -I/usr/local/include/nss/nss - - include $(MOD_DEPTH)/config/autoconf.mk - include $(topsrcdir)/build.mk @@ -180,6 +180,10 @@ CUSTOM_LIBS=1 endif diff --git a/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in b/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in deleted file mode 100644 index 566b95240799..000000000000 --- a/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/config/autoconf.mk.in.orig 2009-09-17 19:09:10.000000000 +0200 -+++ mozilla/config/autoconf.mk.in 2009-09-17 19:09:26.000000000 +0200 -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ diff --git a/www/seamonkey/files/patch-mozilla-config-mkdepend-Makefile.in b/www/seamonkey/files/patch-mozilla-config-mkdepend-Makefile.in deleted file mode 100644 index 64d685b847ed..000000000000 --- a/www/seamonkey/files/patch-mozilla-config-mkdepend-Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- mozilla/config/mkdepend/Makefile.in.orig 2009-09-11 19:30:23.000000000 +0200 -+++ mozilla/config/mkdepend/Makefile.in 2009-09-11 19:29:53.000000000 +0200 -@@ -73,6 +73,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/seamonkey/files/patch-mozilla-config-mkdepend-imakemdep.h b/www/seamonkey/files/patch-mozilla-config-mkdepend-imakemdep.h deleted file mode 100644 index 6df7089f91d3..000000000000 --- a/www/seamonkey/files/patch-mozilla-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- mozilla/config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ mozilla/config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/seamonkey/files/patch-mozilla-configure.in b/www/seamonkey/files/patch-mozilla-configure.in index ce91593e1ed6..d084ef86926d 100644 --- a/www/seamonkey/files/patch-mozilla-configure.in +++ b/www/seamonkey/files/patch-mozilla-configure.in @@ -23,33 +23,3 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -5903,6 +5903,14 @@ - VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" - VPX_X86_ASM=1 - ;; -+ FreeBSD:i386) -+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -+ VPX_X86_ASM=1 -+ ;; -+ FreeBSD:x86_64) -+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -+ VPX_X86_ASM=1 -+ ;; - SunOS:x86) - VPX_ASFLAGS="-f elf32 -rnasm -pnasm" - VPX_X86_ASM=1 -@@ -6297,6 +6305,14 @@ - LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" - LIBJPEG_TURBO_X64_ASM=1 - ;; -+ FreeBSD:i386) -+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -+ LIBJPEG_TURBO_X86_ASM=1 -+ ;; -+ FreeBSD:x86_64) -+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -+ LIBJPEG_TURBO_X64_ASM=1 -+ ;; - SunOS:i?86) - LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" - LIBJPEG_TURBO_X86_ASM=1 diff --git a/www/seamonkey/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp b/www/seamonkey/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp deleted file mode 100644 index f088ed439b95..000000000000 --- a/www/seamonkey/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~ -+++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp -@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const - i += with.length(); - } - -- return munged; -+ return munged.c_str(); - } - #endif - diff --git a/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp b/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp deleted file mode 100644 index e7dc51335465..000000000000 --- a/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- mozilla/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000 -+++ mozilla/gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000 -@@ -446,6 +446,7 @@ - static_cast<SourceSurface*>(srcBuffer)->Release(); - } - -+#ifdef MOZ_TREE_CAIRO - void SourceSnapshotDetached(cairo_surface_t *nullSurf) - { - gfxImageSurface* origSurf = -@@ -453,6 +454,7 @@ - - origSurf->SetData(&kSourceSurface, NULL, NULL); - } -+#endif - - RefPtr<SourceSurface> - gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) -@@ -522,6 +524,7 @@ - imgSurface->Stride(), - format); - -+ #ifdef MOZ_TREE_CAIRO - cairo_surface_t *nullSurf = - cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); - cairo_surface_set_user_data(nullSurf, -@@ -530,6 +533,7 @@ - NULL); - cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); - cairo_surface_destroy(nullSurf); -+ #endif - } - - srcBuffer->AddRef(); diff --git a/www/seamonkey/files/patch-mozilla-gfx-ycbcr-Makefile.in b/www/seamonkey/files/patch-mozilla-gfx-ycbcr-Makefile.in deleted file mode 100644 index 041689a51995..000000000000 --- a/www/seamonkey/files/patch-mozilla-gfx-ycbcr-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- mozilla/gfx/ycbcr/Makefile.in~ -+++ mozilla/gfx/ycbcr/Makefile.in -@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) - else -+ifeq ($(OS_ARCH),FreeBSD) -+CPPSRCS += yuv_row_posix.cpp \ -+ $(NULL) -+else - ifeq ($(OS_ARCH),SunOS) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) -@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \ - $(NULL) - endif # Darwin - endif # SunOS -+endif # FreeBSD - endif # linux - endif # windows -
\ No newline at end of file diff --git a/www/seamonkey/files/patch-mozilla-gfx-ycbcr-chromium_types.h b/www/seamonkey/files/patch-mozilla-gfx-ycbcr-chromium_types.h deleted file mode 100644 index aa584b0710fc..000000000000 --- a/www/seamonkey/files/patch-mozilla-gfx-ycbcr-chromium_types.h +++ /dev/null @@ -1,13 +0,0 @@ ---- mozilla/gfx/ycbcr/chromium_types.h.orig 2010-07-12 11:52:39.000000000 +0200 -+++ mozilla/gfx/ycbcr/chromium_types.h 2010-07-12 11:53:21.000000000 +0200 -@@ -72,6 +72,10 @@ - #define ARCH_CPU_SPARC_FAMILY 1 - #define ARCH_CPU_SPARC 1 - #define ARCH_CPU_64_BITS 1 -+#elif defined(__sparc64__) -+#define ARCH_CPU_SPARC_FAMILY 1 -+#define ARCH_CPU_SPARC 1 -+#define ARCH_CPU_64_BITS 1 - #else - #error Please add support for your architecture in chromium_types.h - #endif diff --git a/www/seamonkey/files/patch-mozilla-js-src-Makefile.in b/www/seamonkey/files/patch-mozilla-js-src-Makefile.in deleted file mode 100644 index 2aa54ce69c5e..000000000000 --- a/www/seamonkey/files/patch-mozilla-js-src-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 -+++ mozilla/js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -737,7 +740,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),Linux) - EXTRA_LIBS += -ldl diff --git a/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in b/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in deleted file mode 100644 index 0c1889122eeb..000000000000 --- a/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/js/src/config/mkdepend/Makefile.in.orig 2009-09-14 13:17:15.000000000 +0200 -+++ mozilla/js/src/config/mkdepend/Makefile.in 2009-09-14 13:17:34.000000000 +0200 -@@ -72,7 +72,7 @@ - - include $(topsrcdir)/config/rules.mk - --HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/seamonkey/files/patch-mozilla-js-src-jscpucfg.h b/www/seamonkey/files/patch-mozilla-js-src-jscpucfg.h deleted file mode 100644 index e2c1239896d5..000000000000 --- a/www/seamonkey/files/patch-mozilla-js-src-jscpucfg.h +++ /dev/null @@ -1,22 +0,0 @@ ---- mozilla/js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100 -+++ mozilla/js/src/jscpucfg.h 2012-01-18 17:38:59.522462164 +0100 -@@ -77,6 +77,19 @@ - #define IS_BIG_ENDIAN 1 - #endif - -+#elif defined(__FreeBSD__) -+#include <sys/endian.h> -+ -+#if defined(BYTE_ORDER) -+#if BYTE_ORDER == LITTLE_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#elif BYTE_ORDER == BIG_ENDIAN -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#endif -+#endif -+ - #elif defined(JS_HAVE_ENDIAN_H) - #include <endian.h> - diff --git a/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c b/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c deleted file mode 100644 index 3d0283312aa2..000000000000 --- a/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c +++ /dev/null @@ -1,16 +0,0 @@ ---- mozilla/media/libvpx/vpx_config_c.c~ -+++ mozilla/media/libvpx/vpx_config_c.c -@@ -12,11 +12,11 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.c" - --#elif defined(__linux__) && defined(__i386__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) - /* 32 bit Linux. */ - #include "vpx_config_x86-linux-gcc.c" - --#elif defined(__linux__) && defined(__x86_64__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) - /* 64 bit Linux. */ - #include "vpx_config_x86_64-linux-gcc.c" - diff --git a/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h b/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h deleted file mode 100644 index 3c12576bab54..000000000000 --- a/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h +++ /dev/null @@ -1,16 +0,0 @@ ---- mozilla/media/libvpx/vpx_config.h~ -+++ mozilla/media/libvpx/vpx_config.h -@@ -12,11 +12,11 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.h" - --#elif defined(__linux__) && defined(__i386__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) - /* 32 bit Linux. */ - #include "vpx_config_x86-linux-gcc.h" - --#elif defined(__linux__) && defined(__x86_64__) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) - /* 64 bit Linux. */ - #include "vpx_config_x86_64-linux-gcc.h" - diff --git a/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk b/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk deleted file mode 100644 index 6827aa77052a..000000000000 --- a/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,46 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include diff --git a/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile b/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile deleted file mode 100644 index 195e44014456..000000000000 --- a/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif diff --git a/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp b/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp deleted file mode 100644 index 7305a04e1c33..000000000000 --- a/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- mozilla/widget/qt/nsNativeThemeQt.cpp~ -+++ mozilla/widget/qt/nsNativeThemeQt.cpp -@@ -25,7 +25,9 @@ - #include "nsThemeConstants.h" - #include "nsIServiceManager.h" - #include "nsIDOMHTMLInputElement.h" -+#ifdef __GLIBC__ - #include <malloc.h> -+#endif - - - #include "gfxASurface.h" diff --git a/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp b/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp deleted file mode 100644 index 601b917a3347..000000000000 --- a/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- mozilla/widget/qt/nsSound.cpp~ -+++ mozilla/widget/qt/nsSound.cpp -@@ -40,6 +40,7 @@ - #include <QSound> - - #include <string.h> -+#include <unistd.h> - - #include "nscore.h" - #include "plstr.h" diff --git a/www/seamonkey/files/patch-mozilla-widget-qt-nsWindow.cpp b/www/seamonkey/files/patch-mozilla-widget-qt-nsWindow.cpp deleted file mode 100644 index 30a42b431da5..000000000000 --- a/www/seamonkey/files/patch-mozilla-widget-qt-nsWindow.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- mozilla/widget/qt/nsWindow.cpp~ -+++ mozilla/widget/qt/nsWindow.cpp -@@ -43,6 +43,7 @@ using namespace QtMobility; - - #ifdef MOZ_X11 - #include <X11/Xlib.h> -+#include "mozilla/X11Util.h" - #endif //MOZ_X11 - - #include "nsXULAppAPI.h" diff --git a/www/seamonkey/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp b/www/seamonkey/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp deleted file mode 100644 index fe6f025c996c..000000000000 --- a/www/seamonkey/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- mozilla/xpcom/io/nsNativeCharsetUtils.cpp.orig 2011-06-16 15:45:54.000000000 +0200 -+++ mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2011-06-16 15:46:49.000000000 +0200 -@@ -96,11 +96,11 @@ - // iconv for all platforms where nltypes.h and nllanginfo.h are present - // along with iconv. - // --#if defined(HAVE_ICONV) && defined(HAVE_NL_TYPES_H) && defined(HAVE_LANGINFO_CODESET) --#define USE_ICONV 1 --#else -+//#if defined(HAVE_ICONV) && defined(HAVE_NL_TYPES_H) && defined(HAVE_LANGINFO_CODESET) -+//#define USE_ICONV 1 -+//#else - #define USE_STDCONV 1 --#endif -+//#endif - - static void - isolatin1_to_utf16(const char **input, PRUint32 *inputLeft, PRUnichar **output, PRUint32 *outputLeft) diff --git a/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index 1997e6c2d19d..000000000000 --- a/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 252912459191..000000000000 --- a/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 -@@ -70,7 +70,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -341,7 +356,7 @@ - # - # Linux/PPC - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) -+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp - ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +365,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +350,7 @@ - # - # OpenBSD/SPARC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) -+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp - ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s - endif diff --git a/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp b/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp index ff88de2ba2df..3cb45f175317 100644 --- a/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp +++ b/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp @@ -1,14 +1,14 @@ --- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -89,6 +89,11 @@ +@@ -57,6 +57,11 @@ nsresult nsThreadManager::Init() { -+#ifdef NS_TLS && (__FreeBSD_version < 802513 \ ++#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ + || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) + if (!gTLSThreadID) + gTLSThreadID = mozilla::threads::Generic; +#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; + mThreadsByPRThread.Init(); + if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) diff --git a/www/seamonkey/files/patch-mozilla_toolkit_mozapps_installer_packager_mk b/www/seamonkey/files/patch-mozilla_toolkit_mozapps_installer_packager_mk new file mode 100644 index 000000000000..9a2a4ea99070 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla_toolkit_mozapps_installer_packager_mk @@ -0,0 +1,13 @@ +$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.11 2012/06/11 15:29:56 landry Exp $ +install headers/idl/sdk libs only if xulrunner +--- mozilla/toolkit/mozapps/installer/packager.mk.orig Fri Jun 1 14:04:20 2012 ++++ mozilla/toolkit/mozapps/installer/packager.mk Tue Jun 5 07:55:51 2012 +@@ -886,7 +886,7 @@ endif + $(NSINSTALL) -D $(DESTDIR)$(bindir) + $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) + ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) +-ifdef INSTALL_SDK # Here comes the hard part ++ifeq ($(MOZ_APP_NAME),xulrunner) + $(NSINSTALL) -D $(DESTDIR)$(includedir) + (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(includedir) && tar -xf -) |