Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, profiles/, www-client/seamonkey/, ...
Date: Sun, 04 Dec 2011 01:10:27
Message-Id: ad641f5471bbb71209e05baac6970430f8444453.polynomial-c@gentoo
1 commit: ad641f5471bbb71209e05baac6970430f8444453
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 4 01:09:42 2011 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 4 01:09:42 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=ad641f54
7
8 seamonkey: New beta release.
9
10 ---
11 profiles/package.mask | 2 +-
12 www-client/seamonkey/Manifest | 56 ++++++------
13 .../files/enigmail/enigmail-1.3.3-bug373733.patch | 20 ++++
14 .../seamonkey/files/seamonkey-2.6b1-bug682677.diff | 71 ++++++++++++++
15 ...2.5_beta4.ebuild => seamonkey-2.6_beta2.ebuild} | 99 ++++++++++----------
16 5 files changed, 171 insertions(+), 77 deletions(-)
17
18 diff --git a/profiles/package.mask b/profiles/package.mask
19 index 134b0d8..d48e838 100644
20 --- a/profiles/package.mask
21 +++ b/profiles/package.mask
22 @@ -6,5 +6,5 @@
23 #
24
25 # These are experimental use with caution!!
26 ->=www-client/seamonkey-2.5_beta1
27 +=www-client/seamonkey-2.6_beta*
28
29
30 diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
31 index cd00d73..0e3a485 100644
32 --- a/www-client/seamonkey/Manifest
33 +++ b/www-client/seamonkey/Manifest
34 @@ -1,32 +1,34 @@
35 AUX all-gentoo.js 712 RMD160 9c8352b0780ee3ac1e6f372dccb15975dfa09212 SHA1 5825d4485807fe53ddf8bbee70c7352f16c5ea45 SHA256 dfe92f212383bb79b3e2aebb03763c1ad179b3cbc90b22eb4b6aeddba98d100b
36 +AUX enigmail/enigmail-1.3.3-bug373733.patch 1168 RMD160 296a154bb79945a763f922149eb68667c4b51343 SHA1 52f5ec3cc1818eaa45a689200e4a84c7c599e377 SHA256 c8a61a29164e66a47c2d12ec96c3c31a6b3019f3fd3b961584642fdde228b379
37 AUX icon/seamonkey.desktop 288 RMD160 c9f56aed280a3ff68f0c40ae453fc24351daeea6 SHA1 87254c3cbfad672309e4b1fa408d08b74be31056 SHA256 524ae39ffc10b2a950aa344ae6c3f3d9b4a21009697edfd52ec47aa850d795d0
38 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
39 AUX seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch 3768 RMD160 48d6849a54d73054dde7f76e2e0aff4ebcd24926 SHA1 744f5d981e2219843ddba47341053ed74463ef11 SHA256 eed1c52b02b89d97328aa25b9c825d5b76d833bad87ce98f6fed5c32da91b5ac
40 +AUX seamonkey-2.6b1-bug682677.diff 2317 RMD160 b45155ae8a81ea8014b3844af50c223ca2b3756b SHA1 6914ce260d12318659bf1c4a83ca2e915d16d3c7 SHA256 f79675ebcc555c2e42f7c10e17dd79863968435c0d2bca064e40f315bfc19f88
41 DIST enigmail-1.3.3.tar.gz 1367995 RMD160 4c7ab726052b566f913612cfbdd767714486bf9c SHA1 a6d61b6dbdcfdb0dc4eaa8aac1b6277fed65c8c5 SHA256 7110d2f0eea8a9a7580ddc13ab56c262bbd33776ebdc34ab19ec90143f010be6
42 -DIST seamonkey-2.4.1-patches-01.tar.xz 15108 RMD160 cacdc06de2c3d76ff4ae85f8cc3e13a25d8f1ac5 SHA1 518d1df4bad0e28f1d3bdfcb7deb1b4c3cc960dc SHA256 8713bdad0f5523e32abd80292da4759c0664fb24f3ec56cc523d8b104e701306
43 -DIST seamonkey-2.5_beta4-be.xpi 795233 RMD160 1ccef5ea0eee9dd4234bc4dc3c187c69e388722d SHA1 9135fb90c9f3d12291a711a582db3d147ac17dbe SHA256 0beec11e97474981822c0b4f2e36921f8db800d4ad4ddea6876da30756984877
44 -DIST seamonkey-2.5_beta4-ca.xpi 813814 RMD160 531ba953ae5fa511358f7030be481d0d231b3576 SHA1 e359589bb3a9434f22bcc22953c183a4823af9ff SHA256 5b9d767cb95961d5c7cf4e2a69a1f20bb3ab2fc2483362a81f8729ee98b482e6
45 -DIST seamonkey-2.5_beta4-cs.xpi 819090 RMD160 dc07d055f56e519f312fa5cb969ccd4284a31ed5 SHA1 89b98acab14662da728e22fe6a03898a5ed065c4 SHA256 74dfb6ff94da82e2ef631703c25f16319dd84aa6ba4b3ed57224f6388bb6128d
46 -DIST seamonkey-2.5_beta4-de.xpi 859869 RMD160 062bad21f206d7e5e700b8dcd2a27566dd5957cb SHA1 17bbf950a8fd6ae8966d9ee5fd5596a1fbebfde8 SHA256 65c49587af591be118fbf44a6aebf93d818f8361e6cea95c2fbab87a0dbafffb
47 -DIST seamonkey-2.5_beta4-en-GB.xpi 789630 RMD160 ca8e08bad2abdbf2b572e8b4333a2b3bc1ae62fb SHA1 c558b0fb79c2a8cbe8e40a0f397e076fb2f717d9 SHA256 bde7ebb62e659911cc495716cd30a8ce658278588b2f69093e17318a9133e10c
48 -DIST seamonkey-2.5_beta4-en-US.xpi 789287 RMD160 918fa5ed589d34d5f1ff6563c1cacf347035beef SHA1 d3afc135e207525416378f990f66515cc4df9393 SHA256 d1a08709d580b6d56f8d4459af3180399f5ab2c331cfc27a96dc0f1a627f6399
49 -DIST seamonkey-2.5_beta4-es-AR.xpi 859119 RMD160 e8e75593cd06c67c16477d4ee4003231c094c770 SHA1 463388c40066e30395a2ead76c4d0a5254261b34 SHA256 1842ed3ed46591488cc921ca28bdb55c7849aa3dc87bd2a43fcb655f01088de8
50 -DIST seamonkey-2.5_beta4-es-ES.xpi 787408 RMD160 964101581fe93c2cee6513d4f9e3fc20635df51c SHA1 525c889ae19a0712009c993270414695b72cce88 SHA256 09ae7cbcba34d507286109f688b54b0782dabd2781581b6990d0eeb33a24d27f
51 -DIST seamonkey-2.5_beta4-fi.xpi 809364 RMD160 0119d54687d7509b792f242af7f5ab52cb61c314 SHA1 919e764bd5c58f538e0d9b87c3244e1edb76d003 SHA256 7b98f9e19d1a945b340d050dd37e0d6477ee5bdfc49ffef2edd7b9f558864a9b
52 -DIST seamonkey-2.5_beta4-fr.xpi 814852 RMD160 38f3c152b6cc05ef8ccecc8a475e732392fc799b SHA1 4522ea03cbdf48e805d3248f1505cf70c7e13057 SHA256 995133aeb091a81dd30b0b49e51f8c93ca778c2d3c5e2a2ef8184dbf0c233f69
53 -DIST seamonkey-2.5_beta4-gl.xpi 809259 RMD160 9b46f5ee144d1b707e2ef242ca9aa897948f0295 SHA1 891e389fdcb8beab7f5ce708685b20096467eb65 SHA256 6e4a9341532d4917df73291f0d8c628eb2468305d7948d80128849d1db336ca9
54 -DIST seamonkey-2.5_beta4-hu.xpi 830898 RMD160 b545b963e28bcc6330d239bb30ac952ee17e6072 SHA1 347cbad7bb31510c8b269f6d6064164a8a43cce3 SHA256 94c626ada163bf04d1f3b830e1eac5551a185026254f44acca1c9e439e696647
55 -DIST seamonkey-2.5_beta4-it.xpi 737810 RMD160 3decebf3d008011e3c19641d8bef727b9b60dcf7 SHA1 635243d4d50342b4495fbd3f5e200c9bc1048e26 SHA256 4af6b23f9ec9204634cd2cdc1f75d0e6e2e02db2b3778bcdb17356767d85e388
56 -DIST seamonkey-2.5_beta4-ja.xpi 864233 RMD160 cc807188009f2102cc0476f41e3cb23af522f4c4 SHA1 7b8ed468e218793474d0a11cd068a3f9a4eb53e7 SHA256 2769357425343740abc7a9caacd2f7c134167ec0de9c51bc3b06611d63587efe
57 -DIST seamonkey-2.5_beta4-lt.xpi 961779 RMD160 d0b8999698e52e7907aa99b96cb24fc324b36c64 SHA1 f7080af6880bd62c4ffa2e449a61aaf5871abe5c SHA256 2722ba4503f11fa54a8ddfa8081abafe0e9b943300621bbdc1146e018fb8babe
58 -DIST seamonkey-2.5_beta4-nb-NO.xpi 807765 RMD160 54c60825f4e85c255d0656e15fb81e075374ad9d SHA1 d680247ce5dfe938e42d1f27733c8fc816e474af SHA256 e8383031aced1be6d35e5946318fabe3a26d3830d9082f9d4e0d0139d2f03daa
59 -DIST seamonkey-2.5_beta4-nl.xpi 806319 RMD160 7c09fac0ce23d393f5bce1c69704e0ab6562dad4 SHA1 1f148aaa92a7901732a8a9fd3048ad04222123b7 SHA256 18f17bfb37fc2d26e3bc9a31b96d5ff9b78f70952e856983e136af2d2aab9d70
60 -DIST seamonkey-2.5_beta4-pl.xpi 828798 RMD160 46cd8b0f2395f536e9ebb38f0e3a727ad023233b SHA1 3f25ca3ce8deafd2bbe03777f9b4afd3c93f3a67 SHA256 12a612b035e9943edbb08a0ace757cc72222fec029b83a80ee17a32c6d4bc873
61 -DIST seamonkey-2.5_beta4-pt-PT.xpi 844864 RMD160 b90465d85aa81b95884f770f57a81a19cc5cf37f SHA1 3100046446e101b463d609b29abdd7335e97b82c SHA256 642e59c498cafe1688af791ba258e7c0e6e683c9f50529ac95bacc4048837014
62 -DIST seamonkey-2.5_beta4-ru.xpi 891481 RMD160 5b8776e739401d3f6f45fe9ae97920fe9cec78f0 SHA1 9a43d8d75dff84bea7894532e347a970d30359eb SHA256 adf77c057d3a55a7c2173657611825a29664a9111a20d86deeb6f061b15852ce
63 -DIST seamonkey-2.5_beta4-sk.xpi 842552 RMD160 390e4e97f0ffa4ad8bbd45525a7b989fdc5168f5 SHA1 53b88dc0a45797a0a230234cdc3c0327e50096d0 SHA256 ae4772ad07cc93671f2c52c90fe80641fd9dab7f92abfb0bf9420338126ac0a5
64 -DIST seamonkey-2.5_beta4-sv-SE.xpi 871535 RMD160 6a0a7eeee3a7054b7989f1ffa853d8d0d88cf29f SHA1 74b52569436cf0d7bac7111b4d78ffd317d9b206 SHA256 7e1cd38bdebfbf32ffabd421b48170e624058f416be29268eee05549709450fc
65 -DIST seamonkey-2.5_beta4-tr.xpi 807205 RMD160 541bac93d2a5310594f40e4bf28af68dc402d05e SHA1 07e4695723b2852c9463a95843bc93cf38d87f57 SHA256 0c0a655ea10bcf9b86d25d9b58c9a8cae7fdae191c02fb63359d8f2fc14b9902
66 -DIST seamonkey-2.5_beta4-zh-CN.xpi 837986 RMD160 6f45ba71684339b3c2de6db5413934e1ad56e687 SHA1 e63de8518475adf66b1b938a0cad7faca0879e21 SHA256 75952433c1268f3b0b8f363be774ed17f747b6dd7b7103df48c373343c2a0525
67 -DIST seamonkey-2.5_beta4.source.tar.bz2 89481907 RMD160 1ed9a59457b7bafe2aed2071908822b98225dddc SHA1 74b8b9a415b97e4e3242db516fa57ed8b9f43dfe SHA256 10031a49b84542641bc93b40c3e8c3a56dd3aee90db47b49880ec1d100302231
68 -EBUILD seamonkey-2.5_beta4.ebuild 10099 RMD160 d3ffeaf1ebb53a65f763cb57ca964f5177386ed3 SHA1 d3d7e30a455669e04be29aeb50e1fec30fa7eb96 SHA256 aa8952368cf901bd9b1e204043143d2e3b4bf94c4a56c03b0bd1bf6545cf77c8
69 +DIST seamonkey-2.5-patches-01.tar.xz 8576 RMD160 c0c69f031497211616e73b571968ce6892e1f718 SHA1 70fe20e3925286c91a1083495b404bea0d02bff0 SHA256 47f6e1f8a6aba1747bd67ffb7253c71c10734becf5047e0329f566f39bf9f33c
70 +DIST seamonkey-2.6_beta2-be.xpi 796444 RMD160 e63bf35f7961632a88b4cd6049357aeafea58b3e SHA1 13847c390c1cea8d121149af2c314017e018b535 SHA256 20b9f17090ca9eb07530163b2cdd62326246c28b4b3ad9a01d4db52c8e9e38ae
71 +DIST seamonkey-2.6_beta2-ca.xpi 814466 RMD160 8fcd5acf074da3381a38183fb2bfc13b70a13a23 SHA1 2cf0cd5b3641fd5765f80f9928660c7268a5574d SHA256 76583f6759d53edb4ef67328a2ecbc4a297112d1488684585774b4e73b6e73a3
72 +DIST seamonkey-2.6_beta2-cs.xpi 819661 RMD160 fa4505e26dc6fd74fd368337ae4f632fa483578f SHA1 9f3022ec40a78a9299bd094900d54a3e32dfdc00 SHA256 c8f090b1765ed9a15071adb948f2d74417b31fcd9655799eb66f7ebf7765d175
73 +DIST seamonkey-2.6_beta2-de.xpi 860353 RMD160 6757eb51cc69d37a0418f8f3536eb5f7ee6c22c9 SHA1 0147372e04e541c0027deabe74ea2292986df574 SHA256 d6dbb20394067d6d5aeb14c63a20c727bdfa30f1a97e31ca49f07e8c692ccf0b
74 +DIST seamonkey-2.6_beta2-en-GB.xpi 790667 RMD160 09411e7fd31bc560c3bba834b259570377653cb2 SHA1 190d9081d921d4ad668dcce321c9ed26eacbf32e SHA256 2e00e63712bbc152e9c31959580718adb3106fd7503855d71272ccc087a9f544
75 +DIST seamonkey-2.6_beta2-en-US.xpi 789695 RMD160 bc700f3378b0954ec278b0e2ce308a08e0470265 SHA1 dbcbf7fb4e7de07ed09b456a1aa2dcdb30976091 SHA256 905556dffdceb45d00a144991dae7b9373711bab2101878fcc09cd5e867b90d8
76 +DIST seamonkey-2.6_beta2-es-AR.xpi 859632 RMD160 02084894c51780407cdc5940aee6fe51e127202f SHA1 7319ac84af2efb78eff274e16cca356ac0c7a388 SHA256 7a9a58a80f2442d714a7051cca63e8ec0c5fe2abb4963083b6d1e66581bd376f
77 +DIST seamonkey-2.6_beta2-es-ES.xpi 788484 RMD160 d865961583fb410562f11fae35c999892e5b6190 SHA1 3176b5018ac390ae73d828ee7630acc67b4da128 SHA256 73a256fcf6dfccb99ed5bfc3b5c154d838a57054ef3896af4fd1d89ca914e49d
78 +DIST seamonkey-2.6_beta2-fi.xpi 809900 RMD160 f8a7d8c3e51b99efce3bd33782ebc84631fa55ad SHA1 1618529a33314d8d78a1c9ade76cc4b98b39da10 SHA256 38df8fb3e4def9975bfc363329aaf67cd5093e78286f757d1b245a5829af615c
79 +DIST seamonkey-2.6_beta2-fr.xpi 815676 RMD160 4029c02e7f890216e797ae562bdfed57ef9ec38e SHA1 b74bb4f37d1d78a695c077730dc414028b80b2ce SHA256 745da3a9d85f2842023d33d9ce412c753016917efedf1e9c81cce6d899d712bb
80 +DIST seamonkey-2.6_beta2-gl.xpi 809736 RMD160 fd3835054aa9fb97f3cb712a42e3eed0f1d607c6 SHA1 bdc89e64a04c976105ec28e7ea928c2319d99122 SHA256 aed835a165d0b8b405596db78ab4b7509aac727a5ac7ae5115ae5f688e254c0b
81 +DIST seamonkey-2.6_beta2-hu.xpi 832650 RMD160 a764f1240d930d1ad7a2ec43f666686475137a6b SHA1 028b184db2263edbacf939c869bc6674c4529bfd SHA256 20b3cf0d06bb60e12219e485f6ef9de69f7463272bb1f3ee7eb603e230e000c7
82 +DIST seamonkey-2.6_beta2-it.xpi 738878 RMD160 accdb2a07f65830a332829f68a53ac114a0a3166 SHA1 12f343d27424ce96239390665259e701f4440bca SHA256 d3c87fd961d4fbda29e39f94d21a84981b327018644f4994383953b8d74e808a
83 +DIST seamonkey-2.6_beta2-ja.xpi 864873 RMD160 92a3252ddd900bb2b3d990cb7721737e106ed116 SHA1 749e552f9e4f6813e6c900c1a04f987f03799c89 SHA256 d1e72c59e8201c37160d3ce882cb06c5c6afc77c97d1be2cd272bd30ef4e5a3b
84 +DIST seamonkey-2.6_beta2-lt.xpi 962667 RMD160 e4c5fa21625d22f97366b8cc77157b2d0a921c9d SHA1 78a30fc886e8623c7f4001a67c946641df2379e2 SHA256 f7e7e1ba8865241d7f6424d512ca80b951dbd2a3a1bdc63e3fc2718f8dd9b6dd
85 +DIST seamonkey-2.6_beta2-nb-NO.xpi 808226 RMD160 87fcca3d585a43879e52e8763fb57784e10fe455 SHA1 d69451c562ffd6b9b1d4772918397acaed704dc3 SHA256 5cdcfd72d4b6c632c573652f9b2fc4e7b44f9883f5062c2657612261ad65ce17
86 +DIST seamonkey-2.6_beta2-nl.xpi 806819 RMD160 639441fabfd61f13c2348be003e45f2b299003af SHA1 9a1f8c8c5cf368ba6580bf5ad1b2231656a529bb SHA256 5488dbc6a8afe826c32a60100572b284a87f955b2146dcda224da71b7005c307
87 +DIST seamonkey-2.6_beta2-pl.xpi 829357 RMD160 a7bdbad0bb33d2da4aeb1d9a7800573874d6d309 SHA1 35e82f6bbee4d68c0adb749dd3580dab229724f5 SHA256 b8f035905655404a18134db8f1931f619ff8edc921e961b984e29a856a0648e4
88 +DIST seamonkey-2.6_beta2-pt-PT.xpi 845392 RMD160 7ab92610f6b9eb90514b9666220763667b60ff6e SHA1 392120b79172c88223050d5bceb6b2421d8b6866 SHA256 90898ac7109c116c10df6de1607602fbe3bb72ecf96554c228a583a3d44a8884
89 +DIST seamonkey-2.6_beta2-ru.xpi 892794 RMD160 b8a6951f8a452f1911694c5c87ce321efa8950c7 SHA1 480dc8336529d4c5b6411ce6db603a6bf6237883 SHA256 c802a31aa172a14f2a130c19fbb612879e1f2dfe3206e74b76bfdce967dfc41a
90 +DIST seamonkey-2.6_beta2-sk.xpi 843098 RMD160 cb86858dc51b45c3b0c50b9bdd6824f9e4a92627 SHA1 cc88762455e8811f1a3158c177a81d6c1f2dd091 SHA256 c36301cdd6549bc6a7c57277965d969aa3f27901b8b0684745bf25e8a8c53bef
91 +DIST seamonkey-2.6_beta2-sv-SE.xpi 872017 RMD160 28ec5017fe686921ac7dffa7bef3d62e1463308d SHA1 1a8e4569e8ab07b9e52dda0c307c868d985ae7c2 SHA256 d56b9bf6aa21f9c2c19f46c1a656d79872a238089f8022f6ff1f352e06c2d3c2
92 +DIST seamonkey-2.6_beta2-tr.xpi 809260 RMD160 f0eea72384662d4495e949142e17b01d156e5ce8 SHA1 2fcf1726753095dd563f48c7b2550b16711c1aef SHA256 e460e33715f01c787a1649e05e758072176e8916055ca4e8522c2922c318eee2
93 +DIST seamonkey-2.6_beta2-zh-CN.xpi 838638 RMD160 75ecca74f98bf7ba224d5fafcd41927ba2970b8d SHA1 a7086c5930492fc5cd920b37c47f1006faa8d324 SHA256 df36bdf15a3e39a3b20194996adf873ad9e1fedb2d3bcc7fac98ff668a1f8a63
94 +DIST seamonkey-2.6_beta2.source.tar.bz2 96531073 RMD160 974a7a1dcc8f7f75da5246fe03d11d3a1f9d9f6e SHA1 3225aa07ae202e0cb1741c3f2c26760fda5625a1 SHA256 2c04f03e8076efdbbb5fa060f5e4fa8b15ee821879ac62dce9c6ba42c5a3bc11
95 +EBUILD seamonkey-2.6_beta2.ebuild 10138 RMD160 d05244c4f61179a970db8bfcd0dcb1987708cf92 SHA1 38c2efe880b2f873538ef75271b1b99db338cd5d SHA256 1250b743e5d4e2372061444c84e2a5865229e2d5d089e329211968e66bae8fb4
96
97 diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch b/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch
98 new file mode 100644
99 index 0000000..2b8d6d9
100 --- /dev/null
101 +++ b/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch
102 @@ -0,0 +1,20 @@
103 +--- a/mailnews/extensions/enigmail/package/enigmail.js 2011-09-19 10:46:49.000000000 -0500
104 ++++ b/mailnews/extensions/enigmail/package/enigmail.js 2011-11-11 06:30:21.000000000 -0600
105 +@@ -924,7 +924,7 @@
106 + Components.classes["@mozilla.org/file/directory_service;1"].
107 + getService(Components.interfaces.nsIProperties);
108 +
109 +- var extensionLoc = directoryService.get("ProfD", Components.interfaces.nsIFile);
110 ++ var extensionLoc = directoryService.get("CurProcD", Components.interfaces.nsIFile);
111 + extensionLoc.append("extensions");
112 + extensionLoc.append(ENIGMAIL_EXTENSION_ID);
113 + extensionLoc.append("wrappers");
114 +@@ -1460,7 +1460,7 @@
115 + Components.classes["@mozilla.org/file/directory_service;1"].
116 + getService(Components.interfaces.nsIProperties);
117 + var extensionLoc =
118 +- directoryService.get("ProfD", Components.interfaces.nsIFile);
119 ++ directoryService.get("CurProcD", Components.interfaces.nsIFile);
120 + extensionLoc.append("extensions");
121 + extensionLoc.append(ENIGMAIL_EXTENSION_ID);
122 + extensionLoc.append("wrappers");
123
124 diff --git a/www-client/seamonkey/files/seamonkey-2.6b1-bug682677.diff b/www-client/seamonkey/files/seamonkey-2.6b1-bug682677.diff
125 new file mode 100644
126 index 0000000..29f085b
127 --- /dev/null
128 +++ b/www-client/seamonkey/files/seamonkey-2.6b1-bug682677.diff
129 @@ -0,0 +1,71 @@
130 +Mozilla Bug 682677 - Eliminated direct access to mInfo->pixel_depth, which is not allowed in libpng15. We access pixel_depth via png_get_IHDR() instead; r=joedrew
131 +
132 +--- comm-beta/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp
133 ++++ comm-beta/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp
134 +@@ -380,18 +380,17 @@
135 + return;
136 + }
137 + mPos += aCount;
138 + aBuffer += aCount;
139 + aCount = 0;
140 +
141 + // Raymond Chen says that 32bpp only are valid PNG ICOs
142 + // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
143 +- if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() &&
144 +- static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) {
145 ++ if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) {
146 + PostDataError();
147 + }
148 + return;
149 + }
150 +
151 + // We've processed all of the icon dir entries and are within the
152 + // bitmap info size
153 + if (!mIsPNG && mCurrIcon == mNumIcons && mPos >= mImageOffset &&
154 +--- comm-beta/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h
155 ++++ comm-beta/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h
156 +@@ -69,28 +69,35 @@
157 + void CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset,
158 + PRInt32 width, PRInt32 height,
159 + gfxASurface::gfxImageFormat format);
160 + void SetAnimFrameInfo();
161 +
162 + void EndImageFrame();
163 +
164 + // Checks if the info header contains valid information
165 +- bool HasValidInfo() const
166 ++ // Check if PNG is valid ICO (32bpp RGBA)
167 ++ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
168 ++ bool IsValidICO() const
169 + {
170 +- return mInfo && mInfo->valid;
171 +- }
172 ++ png_uint_32
173 ++ png_width, // Unused
174 ++ png_height; // Unused
175 +
176 +- // Obtain the pixel depth if available or 0 otherwise
177 +- PRInt32 GetPixelDepth() const
178 +- {
179 +- if (!mInfo) {
180 +- return 0;
181 ++ int png_bit_depth,
182 ++ png_color_type;
183 ++
184 ++ if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth,
185 ++ &png_color_type, NULL, NULL, NULL)) {
186 ++
187 ++ return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
188 ++ png_bit_depth == 8);
189 ++ } else {
190 ++ return false;
191 + }
192 +- return mInfo->pixel_depth;
193 + }
194 +
195 + public:
196 + png_structp mPNG;
197 + png_infop mInfo;
198 + nsIntRect mFrameRect;
199 + PRUint8 *mCMSLine;
200 + PRUint8 *interlacebuf;
201
202 diff --git a/www-client/seamonkey/seamonkey-2.5_beta4.ebuild b/www-client/seamonkey/seamonkey-2.6_beta2.ebuild
203 similarity index 77%
204 rename from www-client/seamonkey/seamonkey-2.5_beta4.ebuild
205 rename to www-client/seamonkey/seamonkey-2.6_beta2.ebuild
206 index 912b4d9..991bd74 100644
207 --- a/www-client/seamonkey/seamonkey-2.5_beta4.ebuild
208 +++ b/www-client/seamonkey/seamonkey-2.6_beta2.ebuild
209 @@ -1,18 +1,15 @@
210 # Copyright 1999-2011 Gentoo Foundation
211 # Distributed under the terms of the GNU General Public License v2
212 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.4.1.ebuild,v 1.1 2011/09/30 21:33:19 polynomial-c Exp $
213 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.5.ebuild,v 1.2 2011/11/23 22:59:52 polynomial-c Exp $
214
215 EAPI="3"
216 WANT_AUTOCONF="2.1"
217
218 -inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python nsplugins
219 +inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python nsplugins
220
221 -PATCH="${PN}-2.4.1-patches-01"
222 +PATCH="${PN}-2.5-patches-01"
223 EMVER="1.3.3"
224
225 -LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
226 -NOSHORTLANGS="en-GB en-US es-AR"
227 -
228 MY_PV="${PV/_pre*}"
229 MY_PV="${MY_PV/_alpha/a}"
230 MY_PV="${MY_PV/_beta/b}"
231 @@ -32,7 +29,7 @@ if [[ ${PV} == *_pre* ]] ; then
232 LANGPACK_PREFIX=""
233 LANGPACK_SUFFIX=""
234 #KEYWORDS=""
235 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
236 + KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
237 #HAS_LANGS="false"
238 else
239 # This is where arch teams should change the KEYWORDS.
240 @@ -40,7 +37,7 @@ else
241 #REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
242 REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}"
243 LANG_URI="${REL_URI}/langpack"
244 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
245 + KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
246 [[ ${PV} == *alpha* ]] && HAS_LANGS="false"
247 fi
248
249 @@ -56,19 +53,22 @@ SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 -> ${P}.source.tar.bz2
250 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
251
252 if ${HAS_LANGS} ; then
253 - for X in ${LANGS} ; do
254 - if [ "${X}" != "en" ] ; then
255 - SRC_URI="${SRC_URI}
256 + LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt
257 + nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
258 +
259 + for X in "${LANGS[@]}" ; do
260 + # en is handled internally
261 + if [[ ${X} != en ]] ; then
262 + SRC_URI+="
263 linguas_${X/-/_}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
264 fi
265 - IUSE="${IUSE} linguas_${X/-/_}"
266 - # english is handled internally
267 - if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
268 - #if [ "${X}" != "en-US" ]; then
269 - SRC_URI="${SRC_URI}
270 - linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
271 - #fi
272 - IUSE="${IUSE} linguas_${X%%-*}"
273 + IUSE+=" linguas_${X/-/_}"
274 + # Install all the specific locale xpis if there's no generic locale xpi
275 + # Example: there's no pt.xpi, so install all pt-*.xpi
276 + if ! has ${X%%-*} "${LANGS[@]}"; then
277 + SRC_URI+="
278 + linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
279 + IUSE+=" linguas_${X%%-*}"
280 fi
281 done
282 fi
283 @@ -102,25 +102,31 @@ else
284 S="${WORKDIR}/comm-release"
285 fi
286
287 +# TODO: Move all the linguas crap to an eclass
288 linguas() {
289 - local LANG SLANG
290 - for LANG in ${LINGUAS}; do
291 - if has ${LANG} en en_US; then
292 - has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
293 + # Generate the list of language packs called "linguas"
294 + # This list is used to install the xpi language packs
295 + local LINGUA
296 + for LINGUA in ${LINGUAS}; do
297 + if has ${LINGUA} en ; then
298 + # For mozilla products, en and en_US are handled internally
299 continue
300 - elif has ${LANG} ${LANGS//-/_}; then
301 - has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
302 + # If this language is supported by ${P},
303 + elif has ${LINGUA} "${LANGS[@]//-/_}"; then
304 + # Add the language to linguas, if it isn't already there
305 + has ${LINGUA//_/-} "${linguas[@]}" || linguas+=(${LINGUA//_/-})
306 continue
307 - elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
308 - for X in ${LANGS}; do
309 - if [[ "${X}" == "${LANG}-"* ]] && \
310 - [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
311 - has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
312 + # For each short LINGUA that isn't in LANGS,
313 + # add *all* long LANGS to the linguas list
314 + elif ! has ${LINGUA%%-*} "${LANGS[@]}"; then
315 + for LANG in "${LANGS[@]}"; do
316 + if [[ ${LANG} == ${LINGUA}-* ]]; then
317 + has ${LANG} "${linguas[@]}" || linguas+=(${LANG})
318 continue 2
319 fi
320 done
321 fi
322 - ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
323 + ewarn "Sorry, but ${P} does not support the ${LINGUA} locale"
324 done
325 }
326
327 @@ -129,13 +135,10 @@ src_unpack() {
328
329 if ${HAS_LANGS} ; then
330 linguas
331 - for X in ${linguas}; do
332 + for X in "${linguas[@]}"; do
333 # FIXME: Add support for unpacking xpis to portage
334 - [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
335 + xpi_unpack "${P}-${X}.xpi"
336 done
337 - if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
338 - einfo "Selected language packs (first will be default): ${linguas}"
339 - fi
340 fi
341 }
342
343 @@ -163,17 +166,12 @@ src_prepare() {
344
345 # browser patches go here
346 pushd "${S}"/mozilla &>/dev/null || die
347 - EPATCH_EXCLUDE="5005_do_not_call_openunshareddatabse.patch
348 - 5006_use_system_libffi.patch
349 - 5006_initialize_ns_xp_come_library_file_from_ns.patch
350 - 5007_allow_to_pass_an_application_directory.patch
351 - 5008_always_load_gre_defaults_pref.patch
352 - 5009_provide_ns_app_pre_defaults_dir.patch
353 - 5011_build_fix_for_ENABLE_YARR_JIT-0.patch
354 - 5012_workaround_recent_arm_gnu_ld_bug.patch
355 - 5014_allow_to_build_yuv_convert_arm.patch
356 - 5017_enable_system_ffi.patch
357 - 5018_enable_system_ffi_part2.patch" \
358 + EPATCH_EXCLUDE="1000-config_rules_install_dist_files.patch
359 + 5000_arm-bug-644136.patch
360 + 5010_only_add_-DEANBLE_JIT-1_to_CXXFLAGS.patch
361 + 5013_dont_enable_YARR_JIT_on_mips.patch
362 + 5015_add_mips_hppa_ia64_s390_sparch_defines_in_ipc.patch
363 + 5016_allow_armv4t_in_nanojit.patch" \
364 EPATCH_SUFFIX="patch" \
365 EPATCH_FORCE="yes" \
366 epatch "${WORKDIR}/_mozilla"
367 @@ -186,13 +184,14 @@ src_prepare() {
368 epatch "${WORKDIR}/_mailnews"
369 popd &>/dev/null || die
370
371 - epatch "${FILESDIR}"/${PN}-2.3.1-scrollbar-mouse-interaction-improvement.patch
372 + epatch "${FILESDIR}"/${PN}-2.6b1-bug682677.diff
373
374 # Allow user to apply any additional patches without modifing ebuild
375 epatch_user
376
377 if use crypt ; then
378 mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
379 + epatch "${FILESDIR}"/enigmail/enigmail-1.3.3-bug373733.patch
380 cd "${S}"/mailnews/extensions/enigmail || die
381 ./makemake -r 2&>/dev/null
382 sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
383 @@ -241,6 +240,8 @@ src_configure() {
384 mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
385 mozconfig_annotate '' --enable-system-ffi
386
387 + mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
388 +
389 mozconfig_use_enable system-sqlite
390 mozconfig_use_enable methodjit
391
392 @@ -327,7 +328,7 @@ src_install() {
393 > "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
394 || die
395
396 - # Plugins dir
397 + # Handle plugins dir through nsplugins.eclass
398 share_plugins_dir
399
400 doman "${S}"/suite/app/${PN}.1 || die