commit: 8304fbc08ddbc34b5ac944ae091787d92e7786c1 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Apr 30 13:43:25 2014 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Apr 30 13:43:25 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=8304fbc0
seamonkey: added compile fix with USE="system-cairo" --- www-client/seamonkey/Manifest | 26 -- www-client/seamonkey/files/pixman-supplement.patch | 32 ++ www-client/seamonkey/seamonkey-2.26_beta2.ebuild | 376 --------------------- www-client/seamonkey/seamonkey-2.26_pre1.ebuild | 26 +- 4 files changed, 47 insertions(+), 413 deletions(-) diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index 33a1ba4..7b612f7 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -1,32 +1,6 @@ DIST enigmail-1.6.1_pre20140112.tar.xz 916028 SHA256 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149 SHA512 e05d9fcb2dd333cdca487d59a31bf045a568762e6a961267209bb4b5c8b6a0fc5ef8096b970302bc7bac9bc7f963d4a2d3c1d68326c4c18c7e93eb63308b0675 WHIRLPOOL 7a5d6366737fe239b00bcc8d805e6904fd5f9bd9724adbc0ab0f7752ec6f1b8d0bc961c250f8d51366265d685a1c66a3efcb86a23ebbde36152588bac97f576f DIST firefox-28.0-patches-0.1.tar.xz 4888 SHA256 2b33e263a645f0b8c5656ac3d2ad9ce9571e85642c6d5a24ea9549967181e727 SHA512 ce15b0cda105dc6606787c1b24d8f97a068cf87f970f59a181cb520791326ea2f78d5694234cb9f0baf1e5c057233263608ca65e3ebccb60bc0d3f20a4ee7303 WHIRLPOOL c442b127c29ad1cc1f03419bfbba86a5d93ad0e26561ce72199bc58ecd483463dd40788275a1e0169711a90b4bfc17a8a90b1faf2ae749fce9415eb870b4a286 DIST seamonkey-2.23-patches-01.tar.xz 824 SHA256 8779254ea0632c52090a70f7b0943bce0787e37b1a2e683cf49a3238d705af75 SHA512 03420b11e98c728aa001e755585e8ce1f9123160cb69042e4bbfed46a5cbaf1c567938e0c4d18f72d58c55bd780ada467733677f924c6bc6ab9e070c89b9c472 WHIRLPOOL 729e52bd1a2da0d830a1e5602fa980981648ef74123540b316ef97720798021fdb2efaa505cc59b9a629575656cbf469ec160403d395938375c55e570730d056 -DIST seamonkey-2.26_beta2-be.xpi 818751 SHA256 9d28956f65d373b2295edafc7f740ca74bb08811fec9c0ac389eb7c37cbc0c8c SHA512 a79ee99fd8d71b659b844e9b9e31e3a0efb30e0d995015e20dba8ac2e7dfecb6241ef58b1c6573907075b34623844960aba2321e4d8c20f17352c6e37d7345ad WHIRLPOOL 7baaca532e37a5a6d92e1277d95c51849c57394903d38f9e387f9ecb70ec16f4b1c398964dc9c581fc75f99aecd7b3331b32dea8df307fe828789d7cc9cb265d -DIST seamonkey-2.26_beta2-ca.xpi 816735 SHA256 e8085a568e034b9238284b41c2c7a9a07fdee1e01a17b59c52a474591293c380 SHA512 c45cdd1f19751bd780da239bdc56eec85378720dee1756f7d76d4a11720d49a7df790e621605ebe8da3f357df3b9776f74c1bd1d85b22bda0a41b8503db1cd32 WHIRLPOOL a18455282964601fbffe27c7b8028c5c588bbe9b8ce9cc3a2ce6dc76def0ec895eb6171a8e4cfffdc8baf983d053a614d915d6f3ac58de403d63be0ab6c9da2d -DIST seamonkey-2.26_beta2-cs.xpi 814944 SHA256 e8fe6fafd0837402114406f239fedd5fe607854a11de1e09c9829e3ae5f4da93 SHA512 e919488ad5269ed2fc12f62e1451e7ac574fd67f929852d4f888527eb11108564fab639813e0da8780ee63d9826f43b830279cfcfbd2512634a7733be0154373 WHIRLPOOL eb82aaafaa21bf8054e8881e19bac65baeaa01439a55a8d3d616598a804afc996ef7825b8669cf2fd0343961c3e06a6783ca9675994d85bc6aa391b3a0ac973e -DIST seamonkey-2.26_beta2-de.xpi 822042 SHA256 71ad72a3ef1f23cfa895537d946d48462d5c30a7c8f818850a4abc0d2dc7c513 SHA512 16231ff693fb7d9d6a89d14eaa1266d982bec7f785071b06b21a7cecda31ba1f1ef083abff28676f32138d103e8b4f3374fcf4f98b52461804bbbd042c687e37 WHIRLPOOL 891d3a769c4b4eb2212543b7097b674e61a49af3c25f375fe0f71bad969ccc5eadc6b4597dff1dbd3bfe0c0b3951dfe6be2f0b7272938ab14499d2750829ad0a -DIST seamonkey-2.26_beta2-en-GB.xpi 785829 SHA256 813fb0453a5f5d57d2232748597829e8351108e29c66313c2878ec01730ade4b SHA512 99ee6e037ce40e655e198cc249e1e895696e78154c01ca785fdb0d573438457d4763b93332cdcbcf53589d8c97355e4ef03c889323a19fda5eb5269f775cfe42 WHIRLPOOL d48b1487599626cdc9471ec6015a169f97140ee36a70eeaade16ad71dc3b193916bab9c91d66556c1281238f9d088d592578641a3d5d2c953297c0c9562e347e -DIST seamonkey-2.26_beta2-es-AR.xpi 837475 SHA256 c73b98255b6031ee18faa467e5ecb7ba3e5f3f25f1d0ad38af2d1a41b92ea2b2 SHA512 75af5b491afae0ef3e9663696d795f6089b2e0f54b0d6b2493973e154bbc8c101371dfed9437b4650ff78d909516dcd52a09fc7155ce48b4438f7642c993c2ec WHIRLPOOL 8096b2efd9cb9300d8f0ec0a841d4ac8e5d1621b794de445795d3b2b26492077664e0525068cd8487372b5869e96effa550cc7a99a4e6f0783fc9ddebde0dcd0 -DIST seamonkey-2.26_beta2-es-ES.xpi 814002 SHA256 c5ac2a462fa7f70adc4ce4220bdd25dd09efb3485473dcfc2bdd69cd0279ac98 SHA512 4e21200b8760bbe8ce9cf0b698cef0e5ce360ed9966854d244785e89ab18f538fe8d206b9c0a8f7dab2b5e28a8452bc0724e67a8dbc1b5f2583f97951be5990b WHIRLPOOL d2a5bba800519be4877dd97b3ff4ce4550761791827046e55930d1f29c4c4e531a151aa0dbaff19c438ce2f1406f89d28ff2924acf8df7881ffe2196fdd33b51 -DIST seamonkey-2.26_beta2-fi.xpi 784387 SHA256 14db9ca6d228b5a2836c08a00b14df77316bd2ae5c7364db07a267b591075040 SHA512 4c10eed9c6b44ff22c0f5c73998a2f7af5975c03034fc858eb0d85050479b4dbbd4fdc1b1cb2d6893a63a80cc62c12f2b21f715845080e292fbda251e150f46b WHIRLPOOL a3c819c9be7fb369145f1eb91c834f420dca06368a6c3d5c58dd4a874ddd103e16c337932d75b850b476b0eb99cb79467f503d6971b50adc5daab32f9fc4a582 -DIST seamonkey-2.26_beta2-fr.xpi 795188 SHA256 d55a40f8cd27bd122f37fb03a6c1e3d656de3724b3c4ff9d68a485c11f1281b8 SHA512 2ea8befeadc4ee96362e5631a7170afad969e1dcb9477285e9033fa99c3494058db66f0d119061c121e3786a5e70f5c1bac692c9d4beb1ef570ae7c340d046ba WHIRLPOOL fb548eb9ca3aff68ab54a8cbfc9713887d58ac9d91342097a93a96e74a19fc0e14653d0261e119665be395e691d8961e1a886fb8c0cb498e32396c41800e7806 -DIST seamonkey-2.26_beta2-gl.xpi 794258 SHA256 1b4c9f349af8f08e2a189a24caf894f90831cf501c919eab309dc435cbd00ef0 SHA512 8a9dad31d8e8c3431a2f38671c3535afbef2355fc7cd23a8941c49c9c57fd297864e437a786910c97841c6526d6f80051a0f5d48b8996f43aa133bf8b072401e WHIRLPOOL 393424b5d20eafd9ac9ff2478883b49b783104aa6af6f826943ecf4d728809ac753ca36ef5ba2a1fe3942de870aa2edf34d167e9fc528059a99e9d9aa27ced8c -DIST seamonkey-2.26_beta2-hu.xpi 828526 SHA256 e6f53c2031f67cb3b7eef784279b7ac6dde94c658b5d7beb48a7dce4a52f32e0 SHA512 3d957845b552062ce648f01f8b1423912ba22b2e013a30f72fd25d8034f797e0492efeac94d4f5ceb383046e055dee747f01fb03ad6f14d35ab7cbea64f8371b WHIRLPOOL f78e80b6a9b18b2aaeb4841af7f595424680c862f6117281ddc733c8b9011ec29f74452e9cf081091f1b8c276deb285581707e2bd7b4208ccce90967099b22ef -DIST seamonkey-2.26_beta2-it.xpi 728566 SHA256 7827ee1ccbb5c5415b2f2959c310c0314564ec2850f9892d5253e8ab92a9f798 SHA512 68482c92d680c664313fee8b82e5bccb1b31d0006bc1a6a47cd7c4c36b3fdd64a036c35bd610c351348816d6a496ea82512d9ed279f94b5c6a6876437e9478d2 WHIRLPOOL d9b433b3011e163a98428e2d733e149d7f0d8c7c8fa07327d2113f294169eb9f6820c859a6f645a3605a7c38d4312914f1aa78c0d55f92bfef88b7a4afed4f30 -DIST seamonkey-2.26_beta2-ja.xpi 867575 SHA256 f13ac504b68dfcc2e52fb2665d90106097bf24ba36d5f6102baf4c53d5cada1f SHA512 fa17f8c881b6f218f0ec31ca68e34cc9368b2b5b1910de63ff5c081ebfd124a5d882f9806ff1b1e80ee89080472ac57787ef4cb38de6304f87b380e13ab3b224 WHIRLPOOL 621d64eefbd484735f82b2b8a8be53c618019913decaf2308511f02e2bb2744d54d801578de4a0248f73fe590cbd6ac17d2c41bedee192a6efed881ca5fd46f5 -DIST seamonkey-2.26_beta2-lt.xpi 832068 SHA256 e3a283b8fcacb3cf732511090761ae69d74d3566f2a742940f0dca219ffcd7c2 SHA512 aed5b9c65a0dc5dc6f5cbbdc59279f39c84da6be447b95fe3d1eecdc1516fc4a5402e6e586c0cc829da78309e879a6bd2d9ee4783e64e7c5ef58dc3612a88fea WHIRLPOOL fb203b856ca2e16b287aed11f650c4465311b326ae5d2f96dd5e16477691fd01fd97d8bd1f4883d2b4a913325c4d8d3679bb92eef38a38b9158b5bf18802dc7c -DIST seamonkey-2.26_beta2-nb-NO.xpi 808006 SHA256 3af348e5c7706eefdc51a19bd58148a6182e7b04d1a969038e9ce02756e6d505 SHA512 3ca1fea74aa2f186128895185a830904fc3e0ec18864b27872d4b94d72ce1d849852f0882f1c61ec814f7f6a36c2cac562b6be766c2d8ac340c86f1158c189a0 WHIRLPOOL eeadd74238bbda09cf7e09abb45fa3d20aacd00b336702cbd568b48a8820438fcc1af7d12d796a2c0585ca3298b2540e09aa36bc3116e6ba98384449b9f7b954 -DIST seamonkey-2.26_beta2-nl.xpi 781831 SHA256 cb361520867a29473c2bb91f04d139154977fe2d2de40f53f4078501eb5fdc48 SHA512 2ba247a202a07302a37096f5263b2bbab7d4c146bf6f39b5f226bcddea962e036908a459c2c73fe7cbf48578042ca3dc1bd24869bc31f1a4675bdeea3733be42 WHIRLPOOL a2845a4c9ba74088cbfea03d3667cb855db50bb8168f10b358856bfab32fc87e035acbc044ba8402a1ee6c028abcdcdfe83c8c6d19f78c0196a5a53df13f38f0 -DIST seamonkey-2.26_beta2-pl.xpi 855815 SHA256 b1bcf0f0139fafe7c8c42e1e7e14db62fe818ea84054167131794e6491117036 SHA512 fa86b507c8a8c91ad2d33c5533a80ab8d57a181c245db0272c5096650f7c4fc70ebfa50860afeff22a1363ed340a34b5b7a292194892331f3f88c99ed5824a08 WHIRLPOOL 4c856788199216331d825e440c008bfac863b3fd021127ae55df6d9a15369bb439dabab5040bb33cd4f2438e62f6dc7910cf82796deb58c8c9db028cc53b8db8 -DIST seamonkey-2.26_beta2-pt-PT.xpi 817865 SHA256 66a6d9a462ee1f8f69456633cb23546d1d83a021375d8f07e94a87da02033048 SHA512 2fa672aa0e7b04cee82f10c6d836a31eb9c6f4d6f535a92548d2b7f76fbf9f6c165ef0fab083359c869629172be83995a05a1a633c1c88d203e9d8aa2199b17f WHIRLPOOL 5bcaf348f328cd0e794837fb4c3b88ad9c3ba34b7cb8bafcc2b559a580394d0d7560a1ee3878ecc634a23304d73ab1f706f5049f912c0285033aa4d203a1a0bd -DIST seamonkey-2.26_beta2-ru.xpi 885692 SHA256 f60ce2da06840f99ffa1747cafd0503ae7d9ca63996bd98b9e7d46d6313ee2a0 SHA512 83e5295289f5da848d1e4ead6d3e453a372b6381809ae57c464cc5173a409b288f2f44f4e5d45c828b4a907b2711a0ce6de58a8abdb23a623a9cdfd0e712dfea WHIRLPOOL 3abad9640aed83424f10c05eafeb1953efd0657e832437447e9a3d9b6444166f7ae476581fa289258226b97583c94b0f283d414933da13307ec1224696e3928c -DIST seamonkey-2.26_beta2-sk.xpi 841872 SHA256 91142cca58ed917c2262b74f82c1bd58710cd2a1db6e408e2a490075a6d7dae9 SHA512 fb754fc9d0a57a9533a4e9c791e47d75549af63192b049dcf3f4bcc702e2c353ced519208a56d88ab3a8a692e9a392ddbf18ba77e2cfcdc6be7ae0da26948b37 WHIRLPOOL ca64d639292ba0d2a3cd93aaa87ba4a71136458d5e3fbb4b0e7708e72166843f03207885335e4ecf56dd6aa4c0690ab0be898c3f75650207dfbffd479f66e88f -DIST seamonkey-2.26_beta2-sv-SE.xpi 809829 SHA256 4c9c87145118924940c990c98ecbfd3ef2bf72e0f584610c020c157b37a04bcc SHA512 48385838e156b06ca944d7ce51bb74fc6941d231333b1ff3d4ead91d7dff39cdb2005bc0b243c1f4727d3845a113cc58501e2526bc5ea1c1255da704bcdc51fb WHIRLPOOL c9226116b91386b577218777c114af2d716c4d343820b6f1c8ef1f8e437ea225e844e8ca30d8f12bd83c20c1fcd9f803eaeaa44ead5913fff5c7e4c56f7aa1c6 -DIST seamonkey-2.26_beta2-tr.xpi 791385 SHA256 3a8fb233be1d6804abd352e0dcc7c8df3287af34c4bb31fe8b68bc1ff27f8796 SHA512 ad4da2dadd0441e793f653304c1f769435752dfcfcbfe857360e23b71de7f1c39d8f7727047a75a85a19b43c698a36fae88128ff7cdf037bd30abb4a9d886778 WHIRLPOOL 54f2380ad2af543d850816b074e7a3588c77444f563d5c728363aad998de7ecf73e6dda2f69e7af88f0971f4132818d7ddb736b216356fc926237bac6c17f26e -DIST seamonkey-2.26_beta2-uk.xpi 853567 SHA256 6b48f28cbee5b4de9c7cab82297c9766081fec1c7956c1a01ae3df363f143621 SHA512 b8f7a0c1239b47c87aceda4323b48b8c5e7151b8c0db4d0564f3c77db8300fed4d7ca200e955bd14029812babd12d5cbdc01b1d07d9e908c3acdb3d15c565fb4 WHIRLPOOL f52752d71f0e87938581f9016417a2b7b7ab9c1598ce0b3b29975391a1b557282da3e5636bf1bd9bcffb9a1f80884a5326b2b0f430ed0824d72201384284f179 -DIST seamonkey-2.26_beta2-zh-CN.xpi 818845 SHA256 175f8a683b2a8f43b9d25349f47d9864c688845903c54448051d002b19b4a184 SHA512 881448b889de038b5e0a58bcd42fe278163771c24aa1d91e68591a6837b2a62648904640e0e1889800b6f4d46aa20940f95520e33af7b0adde5a7c5f49a86c9a WHIRLPOOL a1a8736edab2ad54e0918d1e37cf7c61a1a9eb28438b4c648a1bec419fdbe30a43c84e2e6cf276189ccfd28a9899c6d6121d9686138025f16a422328580b1a93 -DIST seamonkey-2.26_beta2-zh-TW.xpi 843200 SHA256 12ef404e9dbd483d6fea73dea419bb9df0a8a733444514fc1327ab6226d31d0f SHA512 a167eaf8000c106dc960e836b49efabc391ac5c9bf74c0ff161cd19781fc500b56dbdce38b719384288775c7bd528ebad3afa821e6c84c5ed560015a899dc5ea WHIRLPOOL b6c9c9ab1c0de3f6eaf13da81edcb1a555c061f04b17dc6267da31c3c4b8e3e0fd545b0bfc29d8f26ace0ebe79e8dd0a738af38b05c37084ee0130d186e80641 -DIST seamonkey-2.26_beta2.source.tar.bz2 165584886 SHA256 a2ff06e29a66c4f3c010ad953d5663436a1175affab15f2e2a53d5d44bd16841 SHA512 b312826a31984aa616081b9bc461605fae311eadd1aaaca08336b6f149695ed7eeb701d4edd7eebae368c5823917768d333d93faebbbc4b8dc691bfa181e5aaa WHIRLPOOL a84376974c325c65389b721cabc0ee64e083a1305acb52f14032b12a8c86b52ddb2393e2ab034eef821e8734a567979d52b32102b0990aeeffbacd5dd2d3f962 DIST seamonkey-2.26_pre1-be.xpi 818751 SHA256 bba364903e2cd080a83b4c7b06317ce547fce0463e46cb1ff5241dcd3b0341f7 SHA512 c80819046b7fe6645738bdb4849a068e8e35698a5c530b63d29195b4ec2876956892711367e570c9464546bf8617ec1103195efabbc8949d32517bafde013622 WHIRLPOOL 50ab8395519f815d1ff214a32726bd1e46327d0cd95290ac7a1ed3897eb0f70f3b019807b4cf88d91905a853e911ced42f93267af26cd5b2546db7b68b18e173 DIST seamonkey-2.26_pre1-ca.xpi 816735 SHA256 8885d0412bd420b77a831bc28aae685d0962ef840ddb16e380cd07a2f2ef176c SHA512 b6aef44fbf848a8240c28659c2d379d94f6053166424b9c46466e41a9df96a7917f9bc6deccb5d64d2c0362fedacdd3ce7be0704ab3e0c76c4cf45b3e1f30ff9 WHIRLPOOL 21b15cb74521f21489f47652fb660138d2796e0cf6da58c2e7122914a331131653737b9cff9b7503087c712ea71feaee5c35c5b82cfe626346adaebff1e1e094 DIST seamonkey-2.26_pre1-cs.xpi 814944 SHA256 cc77420a27f8e0757bcbdd6f8df2be361883ae1c5840e63f63a1386e43bc498c SHA512 91dc46661d494762895ec66c76e804a22dad3854f8e1439807636721b0052790b4ef14aca360b0ec742fe5d10eb71c181e9707af62c335328a10d07d79e828da WHIRLPOOL 50ea7fd10ba9c12193e3d11400007e8a68297043979e7f8a5464b63d3e26289cf21345ac6eccc20d14da6884d8a46ca13d33415e48fc0c3b335858d912a75e76 diff --git a/www-client/seamonkey/files/pixman-supplement.patch b/www-client/seamonkey/files/pixman-supplement.patch new file mode 100644 index 0000000..776fcc1 --- /dev/null +++ b/www-client/seamonkey/files/pixman-supplement.patch @@ -0,0 +1,32 @@ + +# HG changeset patch +# User Jan Beich <[email protected]> +# 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/seamonkey-2.26_beta2.ebuild b/www-client/seamonkey/seamonkey-2.26_beta2.ebuild deleted file mode 100644 index d91f6db..0000000 --- a/www-client/seamonkey/seamonkey-2.26_beta2.ebuild +++ /dev/null @@ -1,376 +0,0 @@ -# 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.25.ebuild,v 1.5 2014/04/11 06:44:03 polynomial-c Exp $ - -EAPI=5 -WANT_AUTOCONF="2.1" - -# This list can be updated with scripts/get_langs.sh from the mozilla overlay -MOZ_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 uk zh-CN zh-TW) - -MOZ_PV="${PV/_pre*}" -MOZ_PV="${MOZ_PV/_alpha/a}" -MOZ_PV="${MOZ_PV/_beta/b}" -MOZ_PV="${MOZ_PV/_rc/rc}" -MOZ_P="${P}" -MY_MOZ_P="${PN}-${MOZ_PV}" - -if [[ ${PV} == *_pre* ]] ; then - MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"; - MOZ_LANGPACK_PREFIX="linux-i686/xpi/" - # And the langpack stuff stays at eclass defaults -else - MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MOZ_PV}"; - MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}." - MOZ_LANGPACK_SUFFIX=".langpack.xpi" -fi - -inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas - -PATCHFF="firefox-28.0-patches-0.1" -PATCH="${PN}-2.23-patches-01" -EMVER="1.6.1_pre20140112" - -DESCRIPTION="Seamonkey Web Browser" -HOMEPAGE="http://www.seamonkey-project.org"; - -if [[ ${PV} == *_pre* ]] ; then - # pre-releases. No need for arch teams to change KEYWORDS here. - - KEYWORDS="" -else - # This is where arch teams should change the KEYWORDS. - - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -fi - -SLOT="0" -LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming selinux system-cairo system-icu system-jpeg system-sqlite test" - -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/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz - crypt? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}.tar.xz )" - #crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz ) - -ASM_DEPEND=">=dev-lang/yasm-1.1" - -# Mesa 7.10 needed for WebGL + bugfixes -RDEPEND=">=dev-libs/nss-3.16 - >=dev-libs/nspr-4.10.4 - >=dev-libs/glib-2.26:2 - >=media-libs/mesa-7.10 - >=media-libs/libpng-1.6.7[apng] - >=x11-libs/pango-1.14.0 - >=x11-libs/gtk+-2.14:2 - virtual/libffi - gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) - system-cairo? ( >=x11-libs/cairo-1.12[X] ) - system-icu? ( >=dev-libs/icu-51.1 ) - system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) - system-sqlite? ( >=dev-db/sqlite-3.8.1:3[secure-delete,debug=] ) - >=media-libs/libvpx-1.3.0 - crypt? ( >=app-crypt/gnupg-1.4 ) - kernel_linux? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) - selinux? ( sec-policy/selinux-mozilla )" - -DEPEND="${RDEPEND} - !elibc_glibc? ( dev-libs/libexecinfo ) - >=sys-devel/binutils-2.16.1 - virtual/pkgconfig - amd64? ( ${ASM_DEPEND} - virtual/opengl ) - x86? ( ${ASM_DEPEND} - virtual/opengl )" - -if [[ ${PV} == *beta* ]] ; then - S="${WORKDIR}/comm-beta" -else - S="${WORKDIR}/comm-release" -fi - -pkg_setup() { - if [[ ${PV} == *_pre* ]] ; then - ewarn "You're using an unofficial release of ${PN}. Don't file any bug in" - ewarn "Gentoo's Bugtracker against this package in case it breaks for you." - ewarn "Those belong to upstream: https://bugzilla.mozilla.org"; - fi - - moz_pkgsetup -} - -pkg_pretend() { - # Ensure we have enough disk space to compile - if use debug || use test ; then - CHECKREQS_DISK_BUILD="8G" - else - CHECKREQS_DISK_BUILD="4G" - fi - check-reqs_pkg_setup -} - -src_unpack() { - unpack ${A} - - # Unpack language packs - mozlinguas_src_unpack -} - -src_prepare() { - # Apply our patches - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/seamonkey" - - # browser patches go here - pushd "${S}"/mozilla &>/dev/null || die - EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch - 8000_fix_system_icu.patch" \ - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/firefox" - popd &>/dev/null || die - # drop -Wl,--build-id from LDFLAGS, bug #465466 - - # Shell scripts sometimes contain DOS line endings; bug 391889 - grep -rlZ --include="*.sh" $'\r$' . | - while read -r -d $'\0' file ; do - einfo edos2unix "${file}" - edos2unix "${file}" - done - - if use crypt ; then - mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail - #pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die - - #popd &>/dev/null || die - fi - - # Allow user to apply any additional patches without modifing ebuild - epatch_user - - local ms="${S}/mozilla" - - # Enable gnomebreakpad - if use debug ; then - sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ - "${ms}"/build/unix/run-mozilla.sh || die "sed failed!" - fi - - # Ensure that are plugins dir is enabled as default - sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ - "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!" - sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \ - "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!" - - # Don't exit with error when some libs are missing which we have in - # system. - sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ - -i "${S}"/suite/installer/Makefile.in || die - # Don't error out when there's no files to be removed: - sed 's@\(xargs rm\)$@\1 -f@' \ - -i "${ms}"/toolkit/mozapps/installer/packager.mk || die - - eautoreconf - cd "${S}"/mozilla || die - eautoconf - cd js/src || die - eautoconf -} - -src_configure() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - MEXTENSIONS="default" - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - mozconfig_config - - # It doesn't compile on alpha without this LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - if use chatzilla ; then - MEXTENSIONS+=",irc" - else - MEXTENSIONS+=",-irc" - fi - if ! use roaming ; then - MEXTENSIONS+=",-sroaming" - fi - - # We must force enable jemalloc 3 threw .mozconfig - echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig - - mozconfig_annotate '' --enable-jemalloc - mozconfig_annotate '' --enable-replace-malloc - mozconfig_annotate '' --prefix="${EPREFIX}"/usr - mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" - mozconfig_annotate '' --disable-gconf - mozconfig_annotate '' --enable-jsd - mozconfig_annotate '' --enable-canvas - mozconfig_annotate '' --with-system-png - mozconfig_annotate '' --enable-system-ffi - mozconfig_annotate '' --disable-gold - - # Other sm-specific settings - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - - mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" - mozconfig_annotate '' --build="${CTARGET:-${CHOST}}" - mozconfig_annotate '' --enable-safe-browsing - - mozconfig_use_enable gstreamer - mozconfig_use_enable pulseaudio - mozconfig_use_enable system-cairo - mozconfig_use_enable system-sqlite - mozconfig_use_with system-jpeg - mozconfig_use_with system-icu - mozconfig_use_enable system-icu intl-api - # Feature is know to cause problems on hardened - mozconfig_use_enable jit ion - - # Use an objdir to keep things organized. - echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonk" \ - >> "${S}"/.mozconfig - - # Finalize and report settings - mozconfig_final - - if use crypt ; then - pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die - # econf fails here and would produce useless Makefiles anyway - ./configure || die - popd &>/dev/null || die - fi - - # Work around breakage in makeopts with --no-print-directory - MAKEOPTS="${MAKEOPTS/--no-print-directory/}" - - if [[ $(gcc-major-version) -lt 4 ]] ; then - append-cxxflags -fno-stack-protector - elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then - if use amd64 || use x86 ; then - append-flags -mno-avx - fi - fi -} - -src_compile() { - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ - emake -f client.mk - - # Only build enigmail extension if conditions are met. - if use crypt ; then - cd "${S}"/mailnews/extensions/enigmail || die - emake - emake xpi - fi -} - -src_install() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - DICTPATH="\"${EPREFIX}/usr/share/myspell\"" - - local emid obj_dir="seamonk" - cd "${S}/${obj_dir}" || die - - # Pax mark xpcshell for hardened support, only used for startupcache creation. - pax-mark m "${S}/${obj_dir}/mozilla/dist/bin/xpcshell" - - # Copy our preference before omnijar is created. - sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \ - "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ - || die - - # Set default path to search for dictionaries. - echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \ - >> "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ - || die - - if ! use libnotify ; then - echo 'pref("browser.download.manager.showAlertOnComplete", false);' \ - >> "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ - || die - fi - - echo 'pref("extensions.autoDisableScopes", 3);' >> \ - "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ - || die - - MOZ_MAKE_FLAGS="${MAKEOPTS}" \ - emake DESTDIR="${D}" install - cp "${FILESDIR}"/icon/${PN}.desktop "${T}" || die - - if use crypt ; then - local em_dir="${S}/mailnews/extensions/enigmail/build" - 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 - - popd &>/dev/null || die - fi - - sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \ - -i "${T}"/${PN}.desktop || die - sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \ - || die - - # Install language packs - mozlinguas_src_install - - # Add StartupNotify=true bug 290401 - if use startup-notification ; then - echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die - fi - - # Install icon and .desktop for menu entry - newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png - domenu "${T}"/${PN}.desktop - - # Required in order to use plugins and even run seamonkey on hardened. - pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container} - - if use minimal ; then - rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} - fi - - # Handle plugins dir through nsplugins.eclass - share_plugins_dir - - doman "${S}"/${obj_dir}/suite/app/${PN}.1 -} - -pkg_preinst() { - MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}" - - if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then - rm ${MOZILLA_FIVE_HOME}/plugins -rf - fi -} - -pkg_postinst() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - # Update mimedb for the new .desktop file - fdo-mime_desktop_database_update - - if use chatzilla ; then - elog "chatzilla is now an extension which can be en-/disabled and configured via" - elog "the Add-on manager." - fi -} diff --git a/www-client/seamonkey/seamonkey-2.26_pre1.ebuild b/www-client/seamonkey/seamonkey-2.26_pre1.ebuild index 00dda32..dcfa8d0 100644 --- a/www-client/seamonkey/seamonkey-2.26_pre1.ebuild +++ b/www-client/seamonkey/seamonkey-2.26_pre1.ebuild @@ -68,7 +68,7 @@ RDEPEND=">=dev-libs/nss-3.16 >=x11-libs/gtk+-2.14:2 virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) - system-cairo? ( >=x11-libs/cairo-1.12[X] ) + system-cairo? ( >=x11-libs/cairo-1.12[X] x11-libs/pixman ) system-icu? ( >=dev-libs/icu-51.1 ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( >=dev-db/sqlite-3.8.1:3[secure-delete,debug=] ) @@ -93,7 +93,7 @@ else S="${WORKDIR}/comm-release" fi -BUILD_OBJ_DIR="${S}/seamonk" +BUILD_OBJ_DIR="${WORKDIR}/seamonk" pkg_setup() { if [[ ${PV} == *_pre* ]] ; then @@ -128,6 +128,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}/seamonkey" + epatch "${FILESDIR}/pixman-supplement.patch" + # browser patches go here pushd "${S}"/mozilla &>/dev/null || die EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch @@ -268,9 +270,11 @@ src_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 -f client.mk + emake -f "${S}/client.mk" # Only build enigmail extension if conditions are met. if use crypt ; then @@ -284,30 +288,30 @@ src_install() { MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" DICTPATH="\"${EPREFIX}/usr/share/myspell\"" - local emid obj_dir="${BUILD_OBJ_DIR}" - cd "${obj_dir}" || die + local emid + cd "${BUILD_OBJ_DIR}" || die # Pax mark xpcshell for hardened support, only used for startupcache creation. - pax-mark m "${obj_dir}/mozilla/dist/bin/xpcshell" + pax-mark m "${BUILD_OBJ_DIR}/mozilla/dist/bin/xpcshell" # Copy our preference before omnijar is created. sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \ - "${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ + "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ || die # Set default path to search for dictionaries. echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \ - >> "${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ + >> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ || die if ! use libnotify ; then echo 'pref("browser.download.manager.showAlertOnComplete", false);' \ - >> "${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ + >> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ || die fi echo 'pref("extensions.autoDisableScopes", 3);' >> \ - "${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ + "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ || die MOZ_MAKE_FLAGS="${MAKEOPTS}" \ @@ -354,7 +358,7 @@ src_install() { # Handle plugins dir through nsplugins.eclass share_plugins_dir - doman "${S}"/${obj_dir}/suite/app/${PN}.1 + doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1" } pkg_preinst() {
