* [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/, www-client/seamonkey/, eclass/
@ 2014-10-17 16:54 Ian Stakenvicius
0 siblings, 0 replies; 2+ messages in thread
From: Ian Stakenvicius @ 2014-10-17 16:54 UTC (permalink / raw
To: gentoo-commits
commit: 2fb4c43c7593575a6046a7b1abb686a6f2086949
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 16 20:34:25 2014 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Oct 17 16:54:15 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2fb4c43c
Seamonkey version bump to 2.30
comm-release for mozilla-33 does not build properly when MOZ_OBJDIR is set, without
running the configure phase twice -- it ignores .mozconfig the first time around;
this ebuild does that, as ugly as it is.
Also applied the jemalloc configure fix needed to fix bug 525522, to seamonkey.
Also in this commit is an explicit flag for system bzip2, and a drop of a redundant
--with-system-zlib from mozconfig-v5.33.eclass. An initial build test was failing
on the bundled bzip2, so this just avoids that.
---
eclass/mozconfig-v5.33.eclass | 4 +-
www-client/seamonkey/Manifest | 56 ++++++++++-----------
www-client/seamonkey/files/pixman-supplement.patch | 32 ------------
.../files/seamonkey-2.30-jemalloc-configure.patch | 29 +++++++++++
...nkey-2.30-pulseaudio_configure_switch_fix.patch | 20 ++++++++
...key-2.29_beta2.ebuild => seamonkey-2.30.ebuild} | 58 ++++++++++++++--------
6 files changed, 115 insertions(+), 84 deletions(-)
diff --git a/eclass/mozconfig-v5.33.eclass b/eclass/mozconfig-v5.33.eclass
index a031942..fb6c5d8 100644
--- a/eclass/mozconfig-v5.33.eclass
+++ b/eclass/mozconfig-v5.33.eclass
@@ -135,7 +135,8 @@ mozconfig_config() {
mozconfig_annotate 'system_libs' \
--with-system-zlib \
--enable-pango \
- --enable-svg
+ --enable-svg \
+ --with-system-bz2
mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
@@ -194,7 +195,6 @@ mozconfig_config() {
mozconfig_annotate '' --enable-system-ffi
mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
mozconfig_annotate '' --disable-gconf
- mozconfig_annotate 'Gentoo default' --with-system-zlib
# We must force-enable jemalloc 3 via .mozconfig
echo "export MOZ_JEMALLOC=1" >> "${S}"/.mozconfig || die
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 89ddd01..96f216f 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,29 +1,29 @@
-DIST enigmail-1.7.tar.gz 1414100 SHA256 cddbf35783194a4e994f9584ad5bee74750e25f690e81727ba9eccc4f814f161 SHA512 b9ca47c66669fbff381509cd880dc3f11b880eec80588c7c2d7d259350cf6313fd0867e3b0468f3d6a90c705a19989c16d93d75d2568caff9266d581acf64cbf WHIRLPOOL ea0f97ebf49b417a4d2435b41801a08c45cd7f2a9f8f0c6f32387417ce6a89fa787bb076564598c5d0033160eb7cef6a3cc8696c4a41e88841b5c7bbdf256a39
+DIST enigmail-1.7.2.tar.gz 1420346 SHA256 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6 SHA512 e121308127d25d658db804bcd49e37b609fe7a52c2b2f4b0e5cd5c90106157642e164b7f9e31ef419e89a60326af93ce007e6d04ecea714e4b933b01007fee10 WHIRLPOOL 8e226445556cbf31dc55c924f8d2367d4a497eff385fb31128be03dd0650d32251e37a99aba9806b1a019cc124b717f2e97a8341bd4e01dcc39be6580fe27a24
DIST firefox-31.0-patches-0.2.tar.xz 4636 SHA256 fdcd4e68093fb905af06cd89aad7042f8a4e695dea9c184351945fcb5872a062 SHA512 2fee84ac6027a1e1317470112df54fef411596a522bca756f82c525b13ba952015e71f2aa05a807fec04c3bd092e8cbebd0c2349e0dc4950b329a88811b00151 WHIRLPOOL 59dc5f3457dc2a0c0c83a0128063da00d127cee13487b112064368de7d98438b7ffeb1dfe362080eca6a82af4834f3e27c6bd887e51b5d59c728ae124b26114d
-DIST seamonkey-2.23-patches-01.tar.xz 824 SHA256 8779254ea0632c52090a70f7b0943bce0787e37b1a2e683cf49a3238d705af75 SHA512 03420b11e98c728aa001e755585e8ce1f9123160cb69042e4bbfed46a5cbaf1c567938e0c4d18f72d58c55bd780ada467733677f924c6bc6ab9e070c89b9c472 WHIRLPOOL 729e52bd1a2da0d830a1e5602fa980981648ef74123540b316ef97720798021fdb2efaa505cc59b9a629575656cbf469ec160403d395938375c55e570730d056
-DIST seamonkey-2.29_beta2-be.xpi 837342 SHA256 a7a0218e7679e87a010cd5ebe28f011a440714163dc84aacd045060f599f91cd SHA512 58edf36af8814c20d3bafcbe7b5c4d37a4be5c77a8b61b8a2a2e03287202784b49f3849f762179d36cdd86f8221632b423271c65495826a010854d1d7a55880b WHIRLPOOL 7c80406b2d49424efe065fb22e6b92a6e8fedf68d82cca42ac021d8d8004427b5128d9493d70ea42ab7012dacfcd5b4f9fad2b9cb6f23752628ff2de06a8eeb0
-DIST seamonkey-2.29_beta2-ca.xpi 830892 SHA256 38d950fe1b8a6f7907396d3358bc0d13b67c4cf37fd26fd8610dc8e53fc5f44e SHA512 8c8111ad84576d662065f3abd7098b2cde45c748fa0791e21253e8d94cdd14830fd5a183d4ba93aab430704167daa8457af436aebe5bac830faadf3287c7883c WHIRLPOOL f2b6fb72eb931e42e2fd5cb763f74219b12eb06ab02cea0ad88135214394719ef5e7cc43bd8f694f4c9bbee95607adfbbfa8d5b5eede31394a2d84b5be700fdf
-DIST seamonkey-2.29_beta2-cs.xpi 832267 SHA256 cd395172d193e3166f9fcf608b36b3f5109b643cf951506fcb3b150913057fc7 SHA512 ee5c0bcb6bf106f7b7cce60b560955a72567727daa5321612b687424df95d3848ccede72665afd3d75784c47cff044394b8efba5a60fddbbd7f755f28191b02b WHIRLPOOL 9c64dcc29499c1254e3b49f3626112aa284c5ff596bcdadc15d3fc27f1f17ee3e1ef4fbc1557ef28e59bf0a3e3d12948d87b28efa2298005c0b7f7726d9ffe54
-DIST seamonkey-2.29_beta2-de.xpi 837071 SHA256 f768d8a96828e268b4abd35484e0b29392c968c08cb5d280c9a013efbf457ba3 SHA512 6eecff53dfa552ab8f066c257cdec465f8436377089c44ead2e5a7b39e29848747d87497c1d290383dbe878793902aa497e32b4a9849438e0466a9f7c555483e WHIRLPOOL dae4798811bf63564ec676ad93aaff59c25d900f15f5dac53d33320aab3e3e9a7404f29be73e9c4a9867ee1792e0cd04f7771ab4d8d698e3630cf5a258820981
-DIST seamonkey-2.29_beta2-en-GB.xpi 800824 SHA256 89e63e1f7dba136625cabf25c17d746a9472dd33461ebefe58ac83e82306c17f SHA512 1db0bf32474f6be4882b5094a7e607de266a2adee3d4a9b0f5d11c91b0e3cd2c9edff7a4d40a43ee060b91829e38156acb805cc987a9605efc991d31bf605f16 WHIRLPOOL dd0a755384e3c9b7e2533655cc60bea654d5a7bbfa74358e1ae72a50dc0e964a2f9bf53e34c90f71caa65fd53b451522fb4ead540fa5b84365712eed752a4f29
-DIST seamonkey-2.29_beta2-es-AR.xpi 851548 SHA256 569ef13755f4ceec51a9050213b5c8366a0b6c4d1300afb9176cd40f4f425e5b SHA512 3fafb59f5079f0a15d8ed2bd908221abd3a43d0d99a0217a9d19301e6215afc9c13d8e84a25f02b4c8d60976b129d487ba2e9b6f970c463954cd2927f23fa05e WHIRLPOOL 120417780f719fc1072c378628d87bbfb25a59c815d4603c1a7a32264dadc8001fde7970ba7ed6bf567d504b9546f439fe1e93461ba6b7dfcad1fdb3b009ef7d
-DIST seamonkey-2.29_beta2-es-ES.xpi 827396 SHA256 6821842732b3c36203d64129f961c77bd12299b04305202edf83ff9488f90b44 SHA512 5e8fa7aebf354726b78d16b7a16225306af2cd47d7f92725b6238ed2af31f989bb4d213a6091a3cfebd6d1ff7f0e7f2318d9ca3a45408cdcd049254d80ed3fa2 WHIRLPOOL b72af5d7c9e2180ac5edb4be4f44675b510bfcdb00c8dd022c098b79080ae93b2aab881d548826fc71102d8ad3b5679a6c649c3d1916ab92628096548080a5a0
-DIST seamonkey-2.29_beta2-fi.xpi 798956 SHA256 c2b966791c253b5885a6201f5fce09e5fd34d8b36819dd55f91536eefdc99574 SHA512 cd6bfce1cc11b34072650635822e277f5d07c85d65e31ec3a504384372e77b59d20e0e8ecef6da99cf673c2a226e458d4f8c0c74b372e27b8478fc17662e5867 WHIRLPOOL 1ff4e6b784f398c7f4ab0ef6ee5d136b1fee84ae537afdb39624ae60e22b7f2b77a4e44e7e58a39aac121184dc3c7a0623e8d4614504eefdf957e0acc652cc6d
-DIST seamonkey-2.29_beta2-fr.xpi 809847 SHA256 c828a96d304f20377cb9a43259a8a6252194b6a383ed263a0b711173b11c121e SHA512 443deedb80129ab0ff6f7e5d771929ff5f82ddc952f11ec41a0b7182b5b725a8d85d07f0c3479fcecf72e69189a118f597024d0eacb908da760490c5575360fc WHIRLPOOL aa7094410ac3c2c83eec324cea7998a94b72a540ef698518ef527b070c14828c513bef49e8d89bb885ceb5cba48cc392a6748e610ea65a790a6559b987ecf1d2
-DIST seamonkey-2.29_beta2-gl.xpi 811260 SHA256 3d64965a28019b8d218a42f2200ec38f434437de10513715049e7314fd7db4ce SHA512 a8d1302d2fc9fb049da10b3dc76d66bc8644fb892f65d56d32fcbfc066297fcff957cc7182deae1c436d670f7181adaa5f796661e08ff34ff87d60b81d0fc557 WHIRLPOOL 8152b6bb38863f2b6b733bf27af91c708f6851e14c6d9d9c6a7e7b088436ba2fba8dd31bcc7eaf58afd199ab6361ecb622f8fcc8629d86852abf0310807eac46
-DIST seamonkey-2.29_beta2-hu.xpi 845863 SHA256 558cbc471330b468a2d4c65f15055a4546e6e54ac4ee489413771e651ef2f3e9 SHA512 794c61d36ed9e13c7cea9b1a450a0352281345c1865e8f0c7373ad91966eba9af66f11d6739c1babfae101a06d187657ee534eef5d05171a7bdacd879f244d49 WHIRLPOOL 4bc858ec49577e88b3872acf19d401ddef60491034bf2d62399b9119d3afbbcc493445ceaec846b59d30161dee8137cceec3aede4eb15cd33d605eb3afdcb80c
-DIST seamonkey-2.29_beta2-it.xpi 747522 SHA256 1a835f9b712c2e6c5d455f38c7193be6aa8abe8d7ba4dd79ed88039dfd57a253 SHA512 cc3d6dc031680fa5561ed2125273e9df10a0f21e317a0cbdff9f44ee4f19f5a8cace673c512034c7113056a197a0585420176e626961c06c83ef66d3f3fcb7e8 WHIRLPOOL 7d557e68f71dcc7f207a4822630313aeb549c7fce54427e2964cf67d3d59bf8248b020d522b894fd5f85690b8626e4bf3915cb5779e7ab1866d419e3322e1984
-DIST seamonkey-2.29_beta2-ja.xpi 882629 SHA256 9fd323ddf3bcafa2853887da3acfcf134951582ad19a3c8e7b0c4f84f0a2794a SHA512 acf09cacba21251a45876f1542bfdc138c6ad0e26ba61a2b410b099315a5ef0d981907f84abd534cc6c907969ab340603622ba13869810392425beaab7dfeb3f WHIRLPOOL 711b263a98e8b816163fbe411c7e4c3ba7d31e293cd3604b05bece2dc752e2aec381c514a1228b03922abd6a2658b2bbb0ffe8a529fffe413152280aee4984d0
-DIST seamonkey-2.29_beta2-lt.xpi 847471 SHA256 1efa10862d001f74637440efdfc9a927511de3c24cc80b1efe5beb17c0839544 SHA512 61c7310f239346afee5e80ab788c144d3b399238dc46c4cbe69545a3fbe33b1295e2fbb4ec2fbe4ef588b6aea00f02e5c750d6bd35e68db30ba66a5b8708f9b7 WHIRLPOOL 70ff16950e1a52dcd952863db8d30ac0274d09a6865a78410155784929be983978d57cd0f0217a376c22c2ef6b49b224037e52d053af6b531f69e53ef6878e54
-DIST seamonkey-2.29_beta2-nb-NO.xpi 820413 SHA256 d1a5a5183dae9f5173246decab4d61abbc9dbb95385f91061c8a00bf973d015a SHA512 f266ffdbbfda425f9a883a672c5aed134b192e4be021b16fc5ca71e670bbbf2404b2792fcf43a5ee350ce7856315b59fae480171c3cc4196e401063028b04e38 WHIRLPOOL 1bfef6fee1406bd2e6987fb4457841388865de9fd52a3c67e7bd54b7c2a528065d7ee091087c1bad489192d4c897972891f87a21a67ea8d8495771c933b8b02d
-DIST seamonkey-2.29_beta2-nl.xpi 795956 SHA256 23250119fb571f6bac17eaa2ce0c8a773e125218a1fe0a5739a2c07f054a227e SHA512 2898ad6c0ce3293fafc56897d4d54bfe0bed868d0acfd23cc40d7a4c90ba7182f759aee3c99ce4a8d9f093362d8c07aa8d71220d78d7825aea707362403fe6a6 WHIRLPOOL 278bcc3125a76a4ef2094386f1cb8b55c2d7879833e2685ea23670866e547600a9e694116ca90d077c7e9b493533f145e4130814a9eaf5a5318fffad5d717490
-DIST seamonkey-2.29_beta2-pl.xpi 868183 SHA256 49fc711ab4f0e4d25880b9120084962f2f1ce77deeb6038962ddfbf0f818d53f SHA512 e344fb17e7d08a21651181251d651c73419789716dbf0a76665a14e54cf6cbea0ae8c82709866fe771c27558ac7aaa4f239dac76d78ea39ea8850beb9871c16e WHIRLPOOL 019f2490c747696236ab90813ace87de2300fba5b93257d71bfc66ec39b090904189a0353e06a9952c05fd53dc50a85cdb7506994777501426ccb3c59b609525
-DIST seamonkey-2.29_beta2-pt-PT.xpi 835296 SHA256 818d66c01f8b0ce7a2dc312b683ba706c9959a8b7c72a390b47e6645cecd8e5d SHA512 25237c493bfe1d3e23ffbbb177f66819e5cbde41c4cb6b5755acb571db0861247be6478b9af457f5e8525254ce482a81e44a6a7a4d321a759f45e0edf3941f3a WHIRLPOOL e8712489bc25816c293917bf559a7688ea60ce1c615e35a737e9c5acf81eb5d0941c115352955c9bdc17dfb880576347b8514763c705f3991927d9d5e3a44225
-DIST seamonkey-2.29_beta2-ru.xpi 904348 SHA256 39c92e3c03a6c69964b10ca8a815087e8ed2bcf21bb9dbd2b6a7a8ed3e5f209a SHA512 1f75e48cc41063fd54ecde0d885195cca1cb8b4d3b645472353ccb5e2c9547d6d07fc9b01277fa59707707a88b2853b98c8b45836d48b6c93f8b08d37d27dc9c WHIRLPOOL 716ba4f3ad9ad5caf0e723616028ca87513554dfd3202ca46750a98d0fe9c3e583e4924677dceabba4a0b80e87f96eae0b38664440955b8e6d770064f3b35f7a
-DIST seamonkey-2.29_beta2-sk.xpi 859264 SHA256 d8c94f5ce1f62d94f80f44e4780037260f718544f576ef1d3be3c27f52826c7e SHA512 af6ee89d339491f6444d9d7ffc287374129f65bad476c3fb54b146c0320349059fd2c472dcf423a203aba382d54fbaac281236516a805503c1073f9f5091fc7b WHIRLPOOL e1442a2c703d8aba6334042c0c53a18723ebd45c036a754dec497d7a19ff2b50b48785c39c80158b0e7b2851ba60d47913f507f89b415bf68933787c2de4ab9e
-DIST seamonkey-2.29_beta2-sv-SE.xpi 824245 SHA256 a79308c4dbefee9e8a82b51e5e9bc3dcb5b72cf7a984b3bd4f2104a9beb50bbe SHA512 390d115530865716bcba8e9753550fe1d243625862429d26c98acb87b21297ff95cdd26460564244804e127970f5b630f8a6d3a6c72f80cd554cbe403c61a4af WHIRLPOOL 0784d4dc73dcf437dee8e6dc68cb113e3791b659d9687772b1626daf80dd7a217d95e18e410fde6c07319d7640d87721d81672501e16dc87886d8af5ac4c8c35
-DIST seamonkey-2.29_beta2-tr.xpi 808130 SHA256 0c03cfeb4b10199b4cd93c39695f699cc8080515f036117d9a7d38f2534d2c29 SHA512 09fcca405a46a607a5348bb147c28511a3f4d0cd3ab22745e31bb568f2ff54be21189f04ad8d26293d2d584c4f32149f3eb2a068f703bbd0bff868da6707dead WHIRLPOOL c2fc99be94a640435c659efb787abc18f3d13f39e3526cc158767070c29d4dbbc14a25cb0330c14a7fffa1918686dd83be81d89aa06b0afb70f4cfa96103167a
-DIST seamonkey-2.29_beta2-uk.xpi 870445 SHA256 bae08a32142b687dc817882931a32528242b1e7bbaaa1b5f36c1aba44376813a SHA512 fc379d7fcc0322d5e57b65be1b8705ac417a1cf4ba45b12aa6a698294cce6ff3fdfd6484060413716c7e49d113c1f99ca268452020e3cda8ec788757b98971e9 WHIRLPOOL 3924423588d48c0e5897d365aa6630d318f534a59ec5ad653701a9cfe0ed487000066139b307c994afbe7d57eda880736fe4cccf5581c7dba04bc32899e03dcb
-DIST seamonkey-2.29_beta2-zh-CN.xpi 833563 SHA256 ae8eb0e7d74153bd217fa3af1706b2ef7ce339b04912bd23f08c5cc82cee5594 SHA512 2299af10b5e14dfcc9349c090bb3ea6ada96ffe69b9961cfb5530c7f48bf77155220f19c81a38fd8484bdfdd12e61b7f2fc2fe5949b35560b5e44c0d20e1b38e WHIRLPOOL f8f339bbc69c66f691445b5eaec86c8ed9b982ab63fe8ef19bcc3d1bb8f80af8d04702d6081a41841233d3b8e629928e50f5fe94150c12ee9eb603fc387836c1
-DIST seamonkey-2.29_beta2-zh-TW.xpi 858130 SHA256 e75e1f0fb533ab9b38cc1aaccfc5ac542befc4024fe460f4f48a96b76edf8d9a SHA512 27f454f88219842b48a1b7020713b633514f4e9be840d28c062a1285389744f0cf496eb0cd893d74ce27402c64303383164894d510e0575d2bcb759fbc1df553 WHIRLPOOL 863bc1de7d4405d3c8b05b0dcf09a4070d1e747808fc8c205379e06fef638fdbfdc96e65ddba5043f97fc5d45775fb3adc0c6c529a036860b80fdf3b87c3da96
-DIST seamonkey-2.29_beta2.source.tar.bz2 173851863 SHA256 ec9412d514b1a3f4349f90f65d7975ceef261afabb05fa0c09fca3c98537acf7 SHA512 662b1cf7966adb67959b97b940cf613373732c288908e7025a4ae4c1bae3f173b40621be9a7a6f7c0dcaafe85195a89a9dba12204531363107f40d2032a7ee72 WHIRLPOOL 1c985fcd1406e7ab1078d44818edfdf3d3418605f68c667b8f12178678def607c4d3e73d318ef7da65045f29aaebec873e52b7e7a5abf4dc23eee3bc0d478017
+DIST seamonkey-2.30-be.xpi 841428 SHA256 942e41816717417241480048c5bdb3359050170d5d1373baac60637072125318 SHA512 2351668fe455f1434fdb4746e68981d788da961ac8e5a793560bf6814a3fcd11b362596a6bad9a1def8e3d9ea09c4ae9e30d6d926f2270c5da5d8fb1bce65689 WHIRLPOOL 501b99e452b70da0def42703f5c11218b402fdf56a7cdd7caacd323e46d55bae4108a7d669f62fdbc0b8efae0c3779bf9cf6601a171b33d13081609d41349101
+DIST seamonkey-2.30-ca.xpi 834809 SHA256 f1885b21616e0c0598b5209a64ab6c709b6a38e6c87d7e7dc46bbb5a080d220f SHA512 acc31e729e42a4c73a8ec9d72575edebaf9682b8f3e5b4b6c30984d787d1f71a4163a4184a83ab0e0b18787202248bef275345b5050f1e0be3ffa076c74c74bb WHIRLPOOL b927aa53f4282b0f08c609f9fb849e0b36a5226712ab829f5494993fa223d2339b3cc07cb6d99362717387cf029d0fe794171412a088fecba39a36d617d4593c
+DIST seamonkey-2.30-cs.xpi 836086 SHA256 1d27172ba95f2604b33e108c3d3121ea24c019c2a29cdc23905bc6a88558783e SHA512 89a03956cef6135e2db1b464fc9982ec6cd472b1069158e42b60c41fac3146284fdb1d59728f2b7145227226b2146bb8c3c30443800cce3f1f7505a468480ff8 WHIRLPOOL 787e5652c59e8829fc65b49e1d2f294db439550938ba3a1f722845726bcb73349ebf5c96c92c2f8e8c78996ba72627bb4c9e19e0befdc2cc9dc2f8411b1498f7
+DIST seamonkey-2.30-de.xpi 840719 SHA256 d0af448d7eb0994eb6bcb21e6fdeaede037b91fd74558743b2212629304ecb82 SHA512 aa0d974727d8c9018f98e64d3c5eb1efebde5049e89aa853df6ed45b1f94ebc807d19b52344c9c44db7c4eca52dcf3380535910809e41748085a1da4a950e7ad WHIRLPOOL ab87470573303b18fbe9bda087bef49d14dac3440a8f837369f997c8ecda77c012dd4ef531acd393b9ff6da106e82b78d6c074aba87754ebec3705b584ef711b
+DIST seamonkey-2.30-en-GB.xpi 805934 SHA256 54b6ddc03323c03e1ff7651941ac30d7723ff7a16efefc34c31f40a9418273d3 SHA512 6a8ed362063e9b384e56d219825849a03b07bafd829753ac2abb3eaef207b6154cfbfd5200358f1f611cfbaf79d45475c221122f659cdaa9c821cb3ae4afeb1b WHIRLPOOL b36587128f9f1a6768e5862b1a374ada28e87eb15fbbfb749424d58843e5ec6f762ef84c3c6f2590dc315e222ca89b50d1e2fce152a7d77cbb85a6e48ad23b97
+DIST seamonkey-2.30-es-AR.xpi 854761 SHA256 e2c138ef0a4a7fa0dc4cba91fea2e52c6f580bbe1bcbba1e929ef133ca1892e8 SHA512 17837906591a335d342c717cadf22dfa52c9c4a9739f217d7112d2edafd5920da7b7e4c3c40323b5c625cc277a09aa7717e67c1a92c461d4be3b0a0b4e6a3416 WHIRLPOOL 1ccf05a01d5677cc1eb792c9661960e9b4fa636d36a710f512a62a3b5871412d650cd896d6a3a45c1085515aa57ae2ad1d9503f03aad2cb41631ea063a25ebb9
+DIST seamonkey-2.30-es-ES.xpi 831828 SHA256 34e7b38ef23dcef4b6279a155aef5e33abd2d9f7f39c54970ccb4e86a0236e0d SHA512 8b1f2eeaaa1468ca31cdc6e2c59ebbacaa5ac22fa4c747bb37e81be9e01c3732a5962da2eebf2e54357f7a75b5af07efccdbaecbf0dacfb6402dbf89730558ee WHIRLPOOL 2b8d6b616fdac6d19c27961e03bb8d1a0eb46a69e02aa3134e34dfb9d9716dd389e968449c0dd3aecc101973eb3345984e7dd01834fa5a80fddad3e59812cca5
+DIST seamonkey-2.30-fi.xpi 802428 SHA256 f08ad7cb30ef288ee023fff77c1d9f7daf92e27f6b046aaacb39f5bc77d21f86 SHA512 4590fad0fd72ba4f533ff7eefb91dbf225d8febaa6963f586f2b8e55360fe365275fb0f1ddecc6ed14e2831b48735fbd9b2e0e2220b4e83147b883051a3d3792 WHIRLPOOL c32dc6fecbf5b6586dfafab3a46247ae65b92fd76c995f12186384dedd4678f7c0db8937b529b4ed49d3de2326f112a69b6735c268bcf164cc0fad22aee55cd0
+DIST seamonkey-2.30-fr.xpi 813379 SHA256 d4b8853961ff4040124b74657c052944e1fb34ce155a57b63802a36104c1b18a SHA512 925c7284895c06dee766df0c2ac192eed68b99cbdbc9c1b8bbcc314108ae84b364c4b4fe842559322bc641d01189a9c6e0fe0960d92cffc7c8108eec3158c763 WHIRLPOOL 44c62336a88f294c0aee3ff976915964f2ba02381c46eff5a920810cd2c623a43d804e534990e7f1c222f5335000ad06b9335dc3fdf977be53e7436076c8631f
+DIST seamonkey-2.30-gl.xpi 815086 SHA256 085312f4d6e0da8c6dc05ee976eb73c64f8db5deea94e93e51094af2c612daf9 SHA512 ae7bd3885fd85a69913beac5a86a06918d0bb5ea63aa151173d1d9c62411a355015b4bcbbd337bc5da80f1496edba7186d356303248206d2b4dd9d83073b9b35 WHIRLPOOL 83c8927a0d9e6ce1b5bdbb95ed633b355b5daef8c96eaa0c916db4aa89083836eccf82572392548da93d1c80afa2fce8cea0136231d41746c49ddb4fb59a33df
+DIST seamonkey-2.30-hu.xpi 846944 SHA256 d8e348427de7fc4a12b29eebb242d85f2a783155ee1980115a12ea18c20b3a76 SHA512 9b5a8b6b92072dc9bee7502a1346f13b32e31ad0df6c84bab6f387becf9d913e96d36dbd9290be175156adc90e1d0d1ebcf8f566287180027ea0cd352f7701b9 WHIRLPOOL cef87732321cfd3e9feb793cf2839172490920ae71ae3882be3d646453dc19b433cd38a82543063de1d386506c776ca8bb10cdb04ae5fef191b8c0d3c78ed262
+DIST seamonkey-2.30-it.xpi 744667 SHA256 7cfbf41c51267252e948c726d82c99f1dd08b41e0824c4b3aee3745139bf6aea SHA512 7cc7342d88570e48d2be110267b07ed3b9eb4b0048126e9bc68d6ec5e22fc398faecf18d3713e9f4056cb8978e1001ec9f2fa990d2e20e819f697956d394011e WHIRLPOOL 25e156d4d1ca4978ab4867af3c5e597b17b8a6e929190cae89c0450e3f1d3864b58495b459488bab803a60066aa28b7bae90a067dccc5311058790fdcea3b81d
+DIST seamonkey-2.30-ja.xpi 886414 SHA256 310b1915fddd645ef599c4ccd43a012d7ad5b6dcd8b9ee1ed55314dfe1b84d50 SHA512 6d3a0735992b9bdba9fb746782d3fe3984501a3ddb2c7f84ee5968b61975d648b96dd1be1d9c9c0780c8f50dda69984ea788d45553d7f8e2c69602a157e2bc79 WHIRLPOOL 2c57e2a86d014cec595c03e4a5080a589ba379362c232cec021244916d883a9a4131d699e0346013e5234a0a5130982c33d747c28e96d27cd2169acf189c3ce4
+DIST seamonkey-2.30-lt.xpi 852885 SHA256 cf3f171f9b322f463d4776118f91e9213efc47d9da311e9666b0134956c9f9d5 SHA512 c9546106504cb4d153c142f80fba4ba93692329118692178aeeb78a3e8cf39f069b7067fd88445e7b8ff415cbdd4384292a53c6fad1424e4a9928327df8476c5 WHIRLPOOL d08404a15dd400763184c005c29535be16b3f21a1944de3eb4ecfc228dc17f3725c9cbce8b0e534f8c2e5c68fb7d27fc5cbdf1825f9fbcc9e9bc36aae0450cc3
+DIST seamonkey-2.30-nb-NO.xpi 825465 SHA256 4174506d5b648bd3a32860d7f1a13f38acc8efd4add445654c39d148d8bd579a SHA512 1ec7fa36e2d95a4136d593f66047c767e000c19fa7303bceb5e98eeedaa7edbf8dec9ca39c13d2b3d8f4aedb92411e8567bcb8d8f4b05f00f8c304e57dfd2626 WHIRLPOOL f4d5ba0b851565390b03443d0398f9745fa6c571dd5a203b06cea6a953fde4ec515622b42c189d2ae274fca0736dbee50adafc67c01e7693c11cfc314c8ffbfa
+DIST seamonkey-2.30-nl.xpi 799416 SHA256 65d96aa66d3d5e7df067a24af45ac1642d402df0d83b3ad62566de8b1341ef52 SHA512 92948518c9beaf2294176b3a5abfa907e64e3e13c80c13682450268cfc49e0f3ba3153f6a98924f68f870ed85773142da02a6e1766b96807d1e72e84d129192e WHIRLPOOL 994daa04299cf8d8ee5c36f939aae737dd012f076653834c0be63bf97fd17092ffe9280c403b71eecb6202312c487f0e95270d5fb377cb2160744c13a1378cc8
+DIST seamonkey-2.30-patches-01.tar.xz 956 SHA256 e9ad4da92714136eafaeb3aee867d1e539e828a0f123faf02e374d24993d0ef2 SHA512 397efad12b9e3694f051cc5ab96e2bc03ecd44f5c788b487a0cc0dfc297a7001ba18adf1e3ed33c1e40ff48df34d05154e84a9720304570bfc770922b3b4cc47 WHIRLPOOL 7e732a1f686bfb214af843c95c6c3f66b9c8365d0a26fc8da2543891c9e2210da5e6855cd9edbb9a2d62767c0098cb68c8dde375143787b4b43cf9ff0ef871e5
+DIST seamonkey-2.30-pl.xpi 871070 SHA256 7c0ec1aee1224a271ed7f8bdb65cc661ac1896492c40a560c703e0bf41409f2c SHA512 089419cc2fcf99a8ce270c5411a36a29dd3a5eca084f37d6e21093ea600b2520a189c4b134fdbb69f79d4e10571eddbb6d42bede3c5f3bbd503d376a9119073d WHIRLPOOL f73a74962c229c09ffde3c097f588ca36129ecfaee5aef32b740737c3a377210273d2bcc9f30e13239eb9ba4c60f58cfc009e051687bce9c7941712d0aef7620
+DIST seamonkey-2.30-pt-PT.xpi 839078 SHA256 a199d31a141a793468315c4b8e2af945dad65300af3dc08ecf6e46cc8a268e94 SHA512 3f163b1609925f65dfca415bb84701f15bf34290c3722b8d6e86d08725caa7e48ed7a56f8607183958a8c5c93ed763f4566f95f74cafaef6d2ffff4147402d36 WHIRLPOOL 62cc037679f0b2e9dd5f2dfb859670357192d3a54be7280500fcd321ff971a153939cacc2cd5b0b7e797078e3e666ef8d6a0c67b229b2f334b8575b1f4db7609
+DIST seamonkey-2.30-ru.xpi 908478 SHA256 2de977bae6270ab0a81de79f83f1fbd193d0a34b5522ce58f08d7e0437267db1 SHA512 c57f879b362d197738ca08473e049702e719262131ed2d438ca811517919bb0d6be7f0660fc4f1e85c5ba04b8f4d07ed80f2d4e9944462a273bd43374b7bd759 WHIRLPOOL 332c1be74d4e6198822930182cd4413a95656716116b08e10257148f5c1ee65faeb72bda66f68379de6eafa1ecf2dd899ddebdc4e2cbced27dbfc42910b5fb0c
+DIST seamonkey-2.30-sk.xpi 863112 SHA256 3171795cb2b8d38cb2efd2a0c92cf9b9292cedae910630b76b82c49dc6965424 SHA512 57183c249f297e61f3277677ab8c83810052546814684501b78cf1988ed65d170dc614dd7f08cff17d6da741b7c775b775691da7644d19e2b180a2515d37089d WHIRLPOOL 39d32adabffee22a8696e33bd8518d5defe85ae214c354009ddc27a15817815418fa2dc1e2acac2433af38c05e02be789e1f4134717d428b6969f3df97d9882d
+DIST seamonkey-2.30-sv-SE.xpi 827757 SHA256 a8be050ec15e4c73ae2b91bcdbbd7d1b49f10606f3dcd8507ff3716c8ea738cb SHA512 d7e4cef5c978e773945092786fb0d36cc4ef39d080cae287577ee0092b3c9ab1a6d016a16b290e62fb92759cb161d965c8e703a1b3276b61169a6e3181f2ccc9 WHIRLPOOL 33de8734ed453847ead0f798fbc8dace63c77ccf0785aa536c99e0faa947b6a318c1b0c1e8a3405b44054c237e0db582206c3fcfc73d3ccde770059edd4f5db2
+DIST seamonkey-2.30-tr.xpi 811821 SHA256 e21d7da74395703daada431cf7cabc4dde2368aa6f3acff689a3ff95c3c986c7 SHA512 81c4e86612970454d7640945dc9444d87ea1baab3fdeb53a4a7406a444cd92f4bb7a1f9d9201250bfc1a0a7abda3a5373b791271419323f4e605a7808075f795 WHIRLPOOL 308088e27827b68198ba3a2f4f375e9390f6c5fdcc4b84129fc545dab34013c8224b631efce99584db7eb8d1ebb1b131b0ead668a8146c41d189866c8f29e7de
+DIST seamonkey-2.30-uk.xpi 874148 SHA256 cc18e2c32851c0672505c3afa93503b87c7f176ff10115f378c52499d9119113 SHA512 0c1d33ebf31aef567529680b6606075067c71006d09cb230df83abb77f72890917c3acda5e7dc0fb1ff1868116a75247fe8e39e635412eb3a85e40c7a3a30eca WHIRLPOOL 52e8bf646cd45e57f1a7542f5dcfda60bf63d128b295652d5980c8bf362512d021fffe7dd5fed66394a2b21ddd05fadf944d6dd7179f1dfb15ad8e358151fbca
+DIST seamonkey-2.30-zh-CN.xpi 837222 SHA256 e61da8c2d17b9afa0aad1d41910f00c785f618bb457cb9590176d4e5447cf6ad SHA512 bbe45bd081c1746f860b0caa14953034aef57135bb35a2292bdd186f4c6c7853ac07fd0a9a835de129081e40ffacce1da5e4ab2084695ead94fb15100ff4d132 WHIRLPOOL b76c7f8cd4f9edd9fb4af3d23eff24b9f48a48f1a8e4977364c6ece5959495b6b7525f1b8b7e037cbae9466536deb01de1a091825f62d564fe52f4adaef3735b
+DIST seamonkey-2.30-zh-TW.xpi 863385 SHA256 29993aeafcf649561008394400cad3e9cb053891af1f69709aff4d2ce5ca90c0 SHA512 c3a4522de0c11e6865df6636f5fbc6407a93ddfe43c3e40ca8f69f53ed60477382d18358f28b930d4487bca920349c759d2ee9c5413cb8286bdb1ba11281d205 WHIRLPOOL 96fab6120262a81fcc9a658030aa3df80c5d1b2e4046058c6ead83a791e299aedc61d8dd359ade21d74b8f44cd2aca974e7ab312a1bca9db427fb627340ca6e4
+DIST seamonkey-2.30.source.tar.bz2 178435927 SHA256 613eb08d80bf671b390869e9682810d7ae312a9858f6b69da76155f42ff1d516 SHA512 e5ae37b5f6668fe4a064e2e0afd90f168b1074164eb832705641e90837b286ea0e0a32f336fd3813cbc706735ca98ec459a6c33915879c3c3c63760ec910b6df WHIRLPOOL 1a742a49621d47df10491a427292478876e01fbd7af816d0fe58dae1beca24037d8d3d59803db989b7d383ac9030a1d06cc98f76632785370fb6c8220e1a8fa6
diff --git a/www-client/seamonkey/files/pixman-supplement.patch b/www-client/seamonkey/files/pixman-supplement.patch
deleted file mode 100644
index 776fcc1..0000000
--- a/www-client/seamonkey/files/pixman-supplement.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# HG changeset patch
-# User Jan Beich <jbeich@tormail.org>
-# Date 1397136910 14400
-# Node ID c27f7537bc1b10e9127d8f7252657b7b2bf00db3
-# Parent 80a530af380d1a54004c4d6492052bf6a241d578
-Bug 993467 - Follow-up to bug 941595 to unbreak --with-system-pixman after bug 845874. r=Standard8
-CLOSED TREE
-
-diff --git a/config/config.mk b/config/config.mk
---- a/config/config.mk
-+++ b/config/config.mk
-@@ -402,17 +402,17 @@ TAR_CREATE_FLAGS = -chf
- MY_CONFIG := $(DEPTH)/config/myconfig.mk
- MY_RULES := $(DEPTH)/config/myrules.mk
-
- #
- # Default command macros; can be overridden in <arch>.mk.
- #
- CCC = $(CXX)
-
--OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS)
-+OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
-
- INCLUDES = \
- $(LOCAL_INCLUDES) \
- -I$(srcdir) \
- -I. \
- -I$(DIST)/include -I$(DIST)/include/nsprpub \
- $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
- $(OS_INCLUDES) \
-
diff --git a/www-client/seamonkey/files/seamonkey-2.30-jemalloc-configure.patch b/www-client/seamonkey/files/seamonkey-2.30-jemalloc-configure.patch
new file mode 100644
index 0000000..437d1ad
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.30-jemalloc-configure.patch
@@ -0,0 +1,29 @@
+--- a/mozilla/memory/jemalloc/src/configure.ac 2014-10-11 05:06:41.000000000 -0400
++++ b/mozilla/memory/jemalloc/src/configure.ac 2014-10-16 13:41:10.809799170 -0400
+@@ -887,7 +887,7 @@
+ dnl Check whether the BSD/SUSv1 sbrk() exists. If not, disable DSS support.
+ AC_CHECK_FUNC([sbrk], [have_sbrk="1"], [have_sbrk="0"])
+ if test "x$have_sbrk" = "x1" ; then
+- if test "x$sbrk_deprecated" == "x1" ; then
++ if test "x$sbrk_deprecated" = "x1" ; then
+ AC_MSG_RESULT([Disabling dss allocation because sbrk is deprecated])
+ enable_dss="0"
+ else
+@@ -1180,7 +1180,7 @@
+ printf("%d\n", rv);
+ }
+ ], [je_cv_gcc_builtin_ffsl])
+-if test "x${je_cv_gcc_builtin_ffsl}" == "xyes" ; then
++if test "x${je_cv_gcc_builtin_ffsl}" = "xyes" ; then
+ AC_DEFINE([JEMALLOC_INTERNAL_FFSL], [__builtin_ffsl])
+ AC_DEFINE([JEMALLOC_INTERNAL_FFS], [__builtin_ffs])
+ else
+@@ -1194,7 +1194,7 @@
+ printf("%d\n", rv);
+ }
+ ], [je_cv_function_ffsl])
+- if test "x${je_cv_function_ffsl}" == "xyes" ; then
++ if test "x${je_cv_function_ffsl}" = "xyes" ; then
+ AC_DEFINE([JEMALLOC_INTERNAL_FFSL], [ffsl])
+ AC_DEFINE([JEMALLOC_INTERNAL_FFS], [ffs])
+ else
diff --git a/www-client/seamonkey/files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch b/www-client/seamonkey/files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch
new file mode 100644
index 0000000..d4fa603
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch
@@ -0,0 +1,20 @@
+--- comm-beta/mozilla/configure.in
++++ comm-beta/mozilla/configure.in
+@@ -5489,17 +5489,6 @@
+ dnl = Disable PulseAudio
+ dnl ========================================================
+
+-dnl If using Linux, ensure that the PA library is available
+-case "$OS_TARGET" in
+-WINNT|Darwin|Android|OpenBSD)
+- ;;
+-*)
+- if test -z "$MOZ_B2G"; then
+- MOZ_PULSEAUDIO=1
+- fi
+- ;;
+-esac
+-
+ MOZ_ARG_DISABLE_BOOL(pulseaudio,
+ [ --disable-pulseaudio Disable PulseAudio support],
+ MOZ_PULSEAUDIO=,
diff --git a/www-client/seamonkey/seamonkey-2.29_beta2.ebuild b/www-client/seamonkey/seamonkey-2.30.ebuild
similarity index 87%
rename from www-client/seamonkey/seamonkey-2.29_beta2.ebuild
rename to www-client/seamonkey/seamonkey-2.30.ebuild
index fd2a3b0..05771e8 100644
--- a/www-client/seamonkey/seamonkey-2.29_beta2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.30.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.26.1.ebuild,v 1.4 2014/07/05 11:23:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.29.1.ebuild,v 1.2 2014/10/05 18:08:51 polynomial-c Exp $
EAPI=5
WANT_AUTOCONF="2.1"
@@ -28,11 +28,11 @@ fi
MOZCONFIG_OPTIONAL_WIFI=1
MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v4.31 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v5.33 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
PATCHFF="firefox-31.0-patches-0.2"
-PATCH="${PN}-2.23-patches-01"
-EMVER="1.7"
+PATCH="${PN}-2.30-patches-01"
+EMVER="1.7.2"
DESCRIPTION="Seamonkey Web Browser"
HOMEPAGE="http://www.seamonkey-project.org"
@@ -53,14 +53,13 @@ IUSE="+chatzilla +crypt +ipc +mailclient minimal pulseaudio +roaming selinux tes
SRC_URI="${SRC_URI}
${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
- http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
- http://dev.gentoo.org/~axs/distfiles/${PATCHFF}.tar.xz
+ http://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
mailclient? ( crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz ) )"
ASM_DEPEND=">=dev-lang/yasm-1.1"
-RDEPEND=">=dev-libs/nss-3.16.2
+RDEPEND=">=dev-libs/nss-3.17.1
>=dev-libs/nspr-4.10.6
mailclient? ( crypt? ( || (
( >=app-crypt/gnupg-2.0
@@ -70,10 +69,11 @@ RDEPEND=">=dev-libs/nss-3.16.2
)
)
=app-crypt/gnupg-1.4* ) ) )
- selinux? ( sec-policy/selinux-mozilla )"
+ selinux? ( sec-policy/selinux-mozilla )
+ system-sqlite? ( >=dev-db/sqlite-3.8.5:3[secure-delete,debug=] )"
DEPEND="${RDEPEND}
- !elibc_glibc? ( !elibc_uclibc? ( dev-libs/libexecinfo ) )
+ !elibc_glibc? ( !elibc_uclibc? ( dev-libs/libexecinfo ) )
mailclient? ( crypt? ( dev-lang/perl ) )
amd64? ( ${ASM_DEPEND}
virtual/opengl )
@@ -121,6 +121,9 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/seamonkey"
+ epatch "${FILESDIR}"/${PN}-2.30-pulseaudio_configure_switch_fix.patch
+ epatch "${FILESDIR}"/${P}-jemalloc-configure.patch
+
# browser patches go here
pushd "${S}"/mozilla &>/dev/null || die
EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch
@@ -168,6 +171,8 @@ src_prepare() {
eautoconf
cd "${S}"/mozilla/js/src || die
eautoconf
+ cd "${S}"/mozilla/memory/jemalloc/src || die
+ WANT_AUTOCONF= eautoconf
}
src_configure() {
@@ -213,12 +218,17 @@ src_configure() {
# Other sm-specific settings
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
mozconfig_annotate '' --enable-safe-browsing
+
mozconfig_use_enable mailclient mailnews
# Use an objdir to keep things organized.
echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" \
>> "${S}"/.mozconfig
+ # Add a TOPSRCDIR too just in case
+ echo "mk_add_options TOPSRCDIR=${S}" \
+ >> "${S}"/.mozconfig
# Finalize and report settings
mozconfig_final
@@ -229,6 +239,7 @@ src_configure() {
popd &>/dev/null || die
fi
+
# Work around breakage in makeopts with --no-print-directory
MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
@@ -239,21 +250,30 @@ src_configure() {
append-flags -mno-avx
fi
fi
+
+ mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
+ # run configure twice to get it to prepare the objdir and then actually set up properly
+ # apparently necessary due to build system b0rkage on mozilla-33
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+ emake V=1 -f "${S}"/client.mk configure
+
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+ emake V=1 -f "${S}"/client.mk configure
}
src_compile() {
- mkdir -p ${BUILD_OBJ_DIR} && cd ${BUILD_OBJ_DIR} || die
-
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
- emake V=1 -f "${S}/client.mk"
+ emake V=1 -f "${S}"/client.mk
# Only build enigmail extension if conditions are met.
if use crypt && use mailclient ; then
einfo "Building enigmail"
pushd "${WORKDIR}"/enigmail &>/dev/null || die
emake -j1
- emake -j1 xpi
+ emake xpi
popd &>/dev/null || die
fi
}
@@ -278,12 +298,6 @@ src_install() {
>> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
|| die
- #if ! use libnotify ; then
- # echo 'pref("browser.download.manager.showAlertOnComplete", false);' \
- # >> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
- # || die
- #fi
-
echo 'pref("extensions.autoDisableScopes", 3);' >> \
"${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
|| die
@@ -297,7 +311,7 @@ src_install() {
pushd "${T}" &>/dev/null || die
unzip "${em_dir}"/enigmail*.xpi install.rdf || die
emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
+ #'
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
unzip "${em_dir}"/enigmail*.xpi || die
@@ -334,11 +348,11 @@ src_install() {
# Handle plugins dir through nsplugins.eclass
share_plugins_dir
- doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1"
+ #doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1"
# revdep-rebuild entry
insinto /etc/revdep-rebuild
- echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/11${PN}
+ echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
doins "${T}"/11${PN}
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/, www-client/seamonkey/, eclass/
@ 2017-02-06 2:26 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2017-02-06 2:26 UTC (permalink / raw
To: gentoo-commits
commit: c8e13f0ddf2812355c107dd82262138b5e35c91d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 6 02:25:25 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 02:25:25 2017 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=c8e13f0d
seamonkey: Fix build with libevent-2.1
eclass/mozconfig-v6.49.eclass | 12 ++------
www-client/seamonkey/files/firefox-52-curve.patch | 34 ----------------------
.../files/seamonkey-2.46-configure_regexp.patch | 14 ---------
www-client/seamonkey/seamonkey-2.46-r1.ebuild | 6 ++--
4 files changed, 5 insertions(+), 61 deletions(-)
diff --git a/eclass/mozconfig-v6.49.eclass b/eclass/mozconfig-v6.49.eclass
index 7f9ed15..bc6e7d3 100644
--- a/eclass/mozconfig-v6.49.eclass
+++ b/eclass/mozconfig-v6.49.eclass
@@ -94,6 +94,7 @@ RDEPEND=">=app-text/hunspell-1.2:=
dev-libs/atk
dev-libs/expat
>=x11-libs/cairo-1.10[X]
+ >=x11-libs/gtk+-2.18:2
x11-libs/gdk-pixbuf
>=x11-libs/pango-1.22.0
>=media-libs/libpng-1.6.21:0=[apng]
@@ -120,7 +121,7 @@ RDEPEND=">=app-text/hunspell-1.2:=
system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 )
system-icu? ( >=dev-libs/icu-56.1:= )
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
- system-libevent? ( =dev-libs/libevent-2.0*:0= )
+ system-libevent? ( >=dev-libs/libevent-2.0:0= )
system-sqlite? ( >=dev-db/sqlite-3.13.0:3[secure-delete,debug=] )
system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 )
@@ -134,8 +135,7 @@ if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
IUSE+=" gtk3"
fi
RDEPEND+="
- gtk3? ( >=x11-libs/gtk+-3.4.0:3 )
- !gtk3? ( >=x11-libs/gtk+-2.18:2 )"
+ gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
IUSE+=" +gtk2"
@@ -143,11 +143,7 @@ elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
IUSE+=" gtk2"
fi
RDEPEND+="
- gtk2? ( >=x11-libs/gtk+-2.18:2 )
!gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
-else
- RDEPEND+="
- >=x11-libs/gtk+-2.18:2"
fi
if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
inherit qmake-utils
@@ -239,8 +235,6 @@ mozconfig_config() {
fi
fi
- # Enable position independent executables
- mozconfig_annotate 'enabled by Gentoo' --enable-pie
mozconfig_use_enable debug
mozconfig_use_enable debug tests
diff --git a/www-client/seamonkey/files/firefox-52-curve.patch b/www-client/seamonkey/files/firefox-52-curve.patch
deleted file mode 100644
index 508d580..0000000
--- a/www-client/seamonkey/files/firefox-52-curve.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Franziskus Kiefer <franziskuskiefer@gmail.com>
-# Date 1469717280 -7200
-# Thu Jul 28 16:48:00 2016 +0200
-# Node ID 95aa61f1e3562e526bf88179d9d078fd90ad1bda
-# Parent d42aacfe34af25e2f5110e2ca3d24a210eabeb33
-Update keybits in H2, r=mt
-
-MozReview-Commit-ID: 35oWoDMqe1Y
-
-diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
---- a/netwerk/protocol/http/Http2Session.cpp
-+++ b/netwerk/protocol/http/Http2Session.cpp
-@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile()
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
- }
-
- uint32_t keybits = ssl->GetKEAKeyBits();
- if (kea == ssl_kea_dh && keybits < 2048) {
- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
- this, keybits));
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
-- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
-- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
-+ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
-+ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
- this, keybits));
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
- }
-
- int16_t macAlgorithm = ssl->GetMACAlgorithmUsed();
- LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n",
- this, macAlgorithm));
- if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) {
diff --git a/www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch b/www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch
deleted file mode 100644
index 6928f84..0000000
--- a/www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/604696
-https://bugzilla.mozilla.org/show_bug.cgi?id=1329252
-
---- seamonkey-2.46/mozilla/build/autoconf/icu.m4
-+++ seamonkey-2.46/mozilla/build/autoconf/icu.m4
-@@ -70,7 +70,7 @@
- fi
- fi
-
-- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
-+ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
- if test x"$version" = x; then
- AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
- fi
diff --git a/www-client/seamonkey/seamonkey-2.46-r1.ebuild b/www-client/seamonkey/seamonkey-2.46-r1.ebuild
index 2876ebf..7630d0e 100644
--- a/www-client/seamonkey/seamonkey-2.46-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.46-r1.ebuild
@@ -61,8 +61,8 @@ MOZCONFIG_OPTIONAL_WIFI=1
MOZCONFIG_OPTIONAL_JIT="enabled"
inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.49 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas-v2
-PATCHFF="firefox-49.0-patches-03"
-PATCH="${PN}-2.46-patches-01"
+PATCHFF="firefox-49.0-patches-04"
+PATCH="${PN}-2.46-patches-02"
EMVER="1.9.6.1"
DESCRIPTION="Seamonkey Web Browser"
@@ -135,13 +135,11 @@ src_unpack() {
src_prepare() {
# Apply our patches
eapply "${WORKDIR}"/seamonkey
- eapply "${FILESDIR}"/${PN}-2.46-configure_regexp.patch
# browser patches go here
pushd "${S}"/mozilla &>/dev/null || die
rm -f "${WORKDIR}"/firefox/2000-firefox_gentoo_install_dirs.patch
eapply "${WORKDIR}"/firefox
- eapply "${FILESDIR}"/firefox-52-curve.patch
popd &>/dev/null || die
# Shell scripts sometimes contain DOS line endings; bug 391889
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-06 2:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-06 2:26 [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/, www-client/seamonkey/, eclass/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2014-10-17 16:54 Ian Stakenvicius
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox