diff options
| author | Beat Gaetzi <beat@FreeBSD.org> | 2014-12-03 14:55:25 +0000 |
|---|---|---|
| committer | Beat Gaetzi <beat@FreeBSD.org> | 2014-12-03 14:55:25 +0000 |
| commit | 0ccec1792b8fba8fc60c7a879953c57f10fbfc9c (patch) | |
| tree | 1a32479f5df7c300e66e4b2c4ca0ed5c4bfe2463 /mail | |
| parent | - Update to 0.22 (diff) | |
- Update Thunderbird to 31.3.0
- Update gmp-api to 35.0
- Update openh264 to 1.2
- Update NSS to 3.17.3
- Update Firefox to 34.0.5
- Update Firefox ESR 31.3.0
- Update libxul to 31.3.0
- Improve CONFIGURE_TARGET handling
- Always build using client.mk
- Switch to clang by default on systems without libc++
(/stable/8 and /stable/9)
- Drop lang/python2 dependency, only lang/python27 is required
to build
- Use DuckDuckGo searchplugin from upstream (has suggestions
and purposes)
- Backport a few about:memory fixes
- Backport Web Notifications libnotify integration
- Add GTK3 option for www/firefox. Adwaita is a bit broken
since Gtk 3.14, see:
https://bugzilla.mozilla.org/show_bug.cgi?id=1073117
PR: 195559
Submitted by: Jan Beich
MFH: 2014Q4
Security: http://vuxml.org/freebsd/7ae61870-9dd2-4884-a2f2-f19bb5784d09.html
Notes
Notes:
svn path=/head/; revision=373830
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/linux-thunderbird/Makefile | 2 | ||||
| -rw-r--r-- | mail/linux-thunderbird/distinfo | 4 | ||||
| -rw-r--r-- | mail/thunderbird-i18n/Makefile | 2 | ||||
| -rw-r--r-- | mail/thunderbird-i18n/distinfo | 220 | ||||
| -rw-r--r-- | mail/thunderbird/Makefile | 34 | ||||
| -rw-r--r-- | mail/thunderbird/distinfo | 4 | ||||
| -rw-r--r-- | mail/thunderbird/files/patch-bug1076983 | 45 | ||||
| -rw-r--r-- | mail/thunderbird/files/patch-bug1082199 | 26 | ||||
| -rw-r--r-- | mail/thunderbird/files/patch-bug1103858 | 42 | ||||
| -rw-r--r-- | mail/thunderbird/files/patch-bug858919 | 391 |
10 files changed, 582 insertions, 188 deletions
diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile index 9e93133f6064..6c54f77e4ead 100644 --- a/mail/linux-thunderbird/Makefile +++ b/mail/linux-thunderbird/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 31.2.0 +DISTVERSION= 31.3.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo index cd6b5336f427..228f097cafa8 100644 --- a/mail/linux-thunderbird/distinfo +++ b/mail/linux-thunderbird/distinfo @@ -1,5 +1,5 @@ -SHA256 (thunderbird-31.2.0.tar.bz2) = 4c4da90f383d7b43e97e471656a6cfbbd44d1b80d57b8b2405497678aced46b5 -SIZE (thunderbird-31.2.0.tar.bz2) = 33559450 +SHA256 (thunderbird-31.3.0.tar.bz2) = fe6ade66ad90c811a5c3832bd9b0bb61f25835f43acdf150d9dda866fbe331dd +SIZE (thunderbird-31.3.0.tar.bz2) = 33397719 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index 11dd8bcc67ec..559417516d41 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 31.2.0 +PORTVERSION= 31.3.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo index 094926733cba..0561b88bd209 100644 --- a/mail/thunderbird-i18n/distinfo +++ b/mail/thunderbird-i18n/distinfo @@ -1,110 +1,110 @@ -SHA256 (xpi/thunderbird-i18n-31.2.0/ar.xpi) = de2222b5edbe334c323086d2f4742b3d89abf53ea9d04e7b145b56e06203490a -SIZE (xpi/thunderbird-i18n-31.2.0/ar.xpi) = 472812 -SHA256 (xpi/thunderbird-i18n-31.2.0/ast.xpi) = 5d8a3d7cf8a8777595d9427f9ef9fa50af9e42d3c02fb0eaf23bc98ee5fc673d -SIZE (xpi/thunderbird-i18n-31.2.0/ast.xpi) = 393049 -SHA256 (xpi/thunderbird-i18n-31.2.0/be.xpi) = f8228331079c95d98aff60c49039b41bc494c10074b19d92850d0abc88b94da2 -SIZE (xpi/thunderbird-i18n-31.2.0/be.xpi) = 427488 -SHA256 (xpi/thunderbird-i18n-31.2.0/bg.xpi) = 4c7ec26c111e810476f8308a2b65c1fd754c9a970eec04440a186cab9487dd5b -SIZE (xpi/thunderbird-i18n-31.2.0/bg.xpi) = 493734 -SHA256 (xpi/thunderbird-i18n-31.2.0/bn-BD.xpi) = 41cd06883895d4813f140aeb2c9592ded5c1971e035373a79ff9484dc731e8de -SIZE (xpi/thunderbird-i18n-31.2.0/bn-BD.xpi) = 555613 -SHA256 (xpi/thunderbird-i18n-31.2.0/br.xpi) = a4fbe64d4b4e2c4a0c92a1679459b774b6f19838203661c97bfdd4bd132e0918 -SIZE (xpi/thunderbird-i18n-31.2.0/br.xpi) = 441444 -SHA256 (xpi/thunderbird-i18n-31.2.0/ca.xpi) = ff37b69e48d8fe429a981bce805cf6470f21ccfb9718762aa49fbe16246e0e6a -SIZE (xpi/thunderbird-i18n-31.2.0/ca.xpi) = 441713 -SHA256 (xpi/thunderbird-i18n-31.2.0/cs.xpi) = 11c4d4d9aa51b4db454ea0aa3164d62ed17c6b108be18b28bf2eacf626546737 -SIZE (xpi/thunderbird-i18n-31.2.0/cs.xpi) = 444701 -SHA256 (xpi/thunderbird-i18n-31.2.0/da.xpi) = c11a949b9e20375542b72dfd631091db3ae29040cf32f15cf661c141b72d9503 -SIZE (xpi/thunderbird-i18n-31.2.0/da.xpi) = 422051 -SHA256 (xpi/thunderbird-i18n-31.2.0/de.xpi) = c5a529579a4884a9efd7dade99fda51fb17f1918e68439719c4d4cb9f303d908 -SIZE (xpi/thunderbird-i18n-31.2.0/de.xpi) = 424665 -SHA256 (xpi/thunderbird-i18n-31.2.0/el.xpi) = 3a60bd9b6d3806794ae7a45f5ed51ddaed0cc7d3d4eefb32e1a048e92e3bd617 -SIZE (xpi/thunderbird-i18n-31.2.0/el.xpi) = 484855 -SHA256 (xpi/thunderbird-i18n-31.2.0/en-GB.xpi) = 2d96c8962746fe12c42d6d161d0993c317344b6ce236689a33554f432832922b -SIZE (xpi/thunderbird-i18n-31.2.0/en-GB.xpi) = 412515 -SHA256 (xpi/thunderbird-i18n-31.2.0/en-US.xpi) = b3ce584db1780e96d42284945d5accde989ee747bbe5d56fa26df500a4f8655d -SIZE (xpi/thunderbird-i18n-31.2.0/en-US.xpi) = 413660 -SHA256 (xpi/thunderbird-i18n-31.2.0/es-AR.xpi) = 24b5ce7d75676056103ae24c589b19e707c94ad1e79dc5cb8d9aa85abeef40a2 -SIZE (xpi/thunderbird-i18n-31.2.0/es-AR.xpi) = 438531 -SHA256 (xpi/thunderbird-i18n-31.2.0/es-ES.xpi) = 2d879a455caac1fb21cf7f4cbedd0a685e8a13c4048d9182c0027ee7b947f398 -SIZE (xpi/thunderbird-i18n-31.2.0/es-ES.xpi) = 374979 -SHA256 (xpi/thunderbird-i18n-31.2.0/et.xpi) = 1f7a2196700782542290c7c28d0da7c6f9e958f8ff9c2e00318c4bfe4fa26f97 -SIZE (xpi/thunderbird-i18n-31.2.0/et.xpi) = 434364 -SHA256 (xpi/thunderbird-i18n-31.2.0/eu.xpi) = 006bc0dad91e8ed9d5b1b0b812171a147bc34fb5b8159f5b990a14b34e426941 -SIZE (xpi/thunderbird-i18n-31.2.0/eu.xpi) = 431448 -SHA256 (xpi/thunderbird-i18n-31.2.0/fi.xpi) = 0ee12f069f1ca5e36873b5ed7ddf42539358dbee321dd2c60c9d86c0b099ad87 -SIZE (xpi/thunderbird-i18n-31.2.0/fi.xpi) = 435632 -SHA256 (xpi/thunderbird-i18n-31.2.0/fr.xpi) = db6cc05b0c2ba94130cf065e4ee9c0440c5583bed557e46453a1cbc0df3c2cb4 -SIZE (xpi/thunderbird-i18n-31.2.0/fr.xpi) = 444144 -SHA256 (xpi/thunderbird-i18n-31.2.0/fy-NL.xpi) = 041ade3e98acdcb4ef5589aea49c9c8cd49730fd117d7fc0f45c4a24db9235d9 -SIZE (xpi/thunderbird-i18n-31.2.0/fy-NL.xpi) = 438545 -SHA256 (xpi/thunderbird-i18n-31.2.0/ga-IE.xpi) = f25ca1b71b9ab326a08a74492de3bf7ab276751e79ac3bba97e017b6d63b35a0 -SIZE (xpi/thunderbird-i18n-31.2.0/ga-IE.xpi) = 449362 -SHA256 (xpi/thunderbird-i18n-31.2.0/gd.xpi) = f520c4ffff9903ae8277f59c90e3d0a8f7c3dbdfcf08f7a09eed5e52be28ab75 -SIZE (xpi/thunderbird-i18n-31.2.0/gd.xpi) = 453171 -SHA256 (xpi/thunderbird-i18n-31.2.0/gl.xpi) = 49e151a0e9fb797534095177a36c8323f4b21af7c3b0cd119cddb5c8c3991a38 -SIZE (xpi/thunderbird-i18n-31.2.0/gl.xpi) = 446788 -SHA256 (xpi/thunderbird-i18n-31.2.0/he.xpi) = db3ec6a406074229b5d470147ed18c195d1c83ff002c9c6692e5a974fce68109 -SIZE (xpi/thunderbird-i18n-31.2.0/he.xpi) = 476111 -SHA256 (xpi/thunderbird-i18n-31.2.0/hr.xpi) = a79194cb6a188515b02591bb4d10aab2f0a4f51ad7d9de880e5f97b0d824b6bb -SIZE (xpi/thunderbird-i18n-31.2.0/hr.xpi) = 436980 -SHA256 (xpi/thunderbird-i18n-31.2.0/hu.xpi) = 57ee1d724aed1a7afc67fcc58905f74c2d5694602ccc54218266a608611e90b8 -SIZE (xpi/thunderbird-i18n-31.2.0/hu.xpi) = 454542 -SHA256 (xpi/thunderbird-i18n-31.2.0/hy-AM.xpi) = 2626af0ff4cd8023c599abb158a5f61e4e507112f1c7ccf470bef16896a3224c -SIZE (xpi/thunderbird-i18n-31.2.0/hy-AM.xpi) = 492765 -SHA256 (xpi/thunderbird-i18n-31.2.0/id.xpi) = a053c4935b4088c8fbb0850a73b4177ae854462f8ad37d130581879969fad498 -SIZE (xpi/thunderbird-i18n-31.2.0/id.xpi) = 475876 -SHA256 (xpi/thunderbird-i18n-31.2.0/is.xpi) = 63a39a88a75fabc271e09f8a8bed08388a1c3aa1fbb6b8a3e2946f7ba3ba008d -SIZE (xpi/thunderbird-i18n-31.2.0/is.xpi) = 437959 -SHA256 (xpi/thunderbird-i18n-31.2.0/it.xpi) = b7a9c9454d038bda5138bbf73c30af650d79aa5de017c3d4eefd039cbfa6ca27 -SIZE (xpi/thunderbird-i18n-31.2.0/it.xpi) = 368001 -SHA256 (xpi/thunderbird-i18n-31.2.0/ja.xpi) = 128c6413771d621a80840f26d9248f52ca6d16456e032f2f754058dca233eab3 -SIZE (xpi/thunderbird-i18n-31.2.0/ja.xpi) = 489267 -SHA256 (xpi/thunderbird-i18n-31.2.0/ko.xpi) = 949d6bbc2c35c4fa2751a4efdd21d253f60c30e7ff975fd4b5806d89d1737a3c -SIZE (xpi/thunderbird-i18n-31.2.0/ko.xpi) = 448920 -SHA256 (xpi/thunderbird-i18n-31.2.0/lt.xpi) = c6eb3433657dab7ebb01cbb86d0024aa49598a4fca61f500ed9e44c4e74fdc95 -SIZE (xpi/thunderbird-i18n-31.2.0/lt.xpi) = 456351 -SHA256 (xpi/thunderbird-i18n-31.2.0/nb-NO.xpi) = 2779fff656aaebaa852aa79c0685a801159a5d5b296bc239a871e0ca3b77558f -SIZE (xpi/thunderbird-i18n-31.2.0/nb-NO.xpi) = 430941 -SHA256 (xpi/thunderbird-i18n-31.2.0/nl.xpi) = 21da7b7403d3c3746ff560a541dc87fdce9537fd14bfaee3904e936c426d4400 -SIZE (xpi/thunderbird-i18n-31.2.0/nl.xpi) = 431888 -SHA256 (xpi/thunderbird-i18n-31.2.0/nn-NO.xpi) = c79700f36907cde8d2a5788b121a7d0118f8b2471c72eda8f6aaf41f6049293b -SIZE (xpi/thunderbird-i18n-31.2.0/nn-NO.xpi) = 433198 -SHA256 (xpi/thunderbird-i18n-31.2.0/pa-IN.xpi) = 899c8f1dc900280a44869bd5c4be649f30186c361b717a9e996d269c744fce7e -SIZE (xpi/thunderbird-i18n-31.2.0/pa-IN.xpi) = 525323 -SHA256 (xpi/thunderbird-i18n-31.2.0/pl.xpi) = 489f30d45340cc7fdfc3a84d7459f464404ad5abd4cc72d4091c1e1c167f2533 -SIZE (xpi/thunderbird-i18n-31.2.0/pl.xpi) = 410872 -SHA256 (xpi/thunderbird-i18n-31.2.0/pt-BR.xpi) = 2459b15a8277d9c636f7380201f9636a98f7be66e695567bb545af21bed3f581 -SIZE (xpi/thunderbird-i18n-31.2.0/pt-BR.xpi) = 450477 -SHA256 (xpi/thunderbird-i18n-31.2.0/pt-PT.xpi) = f44efe77338e3bac23eb4e266a22e7e21c977db0b1740e2e2bb8978cb2724d75 -SIZE (xpi/thunderbird-i18n-31.2.0/pt-PT.xpi) = 439604 -SHA256 (xpi/thunderbird-i18n-31.2.0/rm.xpi) = b0f7e929ebe3e1c88b304e7df9cc3f5fc185effe1666bf5bebaab5874d1706d7 -SIZE (xpi/thunderbird-i18n-31.2.0/rm.xpi) = 439185 -SHA256 (xpi/thunderbird-i18n-31.2.0/ro.xpi) = 4c60b7a9233ed19b79f38f2c1acdd3c3c421e83866986720d36bc2dd5852c5ab -SIZE (xpi/thunderbird-i18n-31.2.0/ro.xpi) = 479747 -SHA256 (xpi/thunderbird-i18n-31.2.0/ru.xpi) = 8098a2085dc282b70d5f2ec44a51676086d7e930c45056b8be8225529c0a93bd -SIZE (xpi/thunderbird-i18n-31.2.0/ru.xpi) = 436156 -SHA256 (xpi/thunderbird-i18n-31.2.0/si.xpi) = 07a599cddff30ebdb245b03cf7fb3f10fd7dab77c7d5f72043a348147d9561b1 -SIZE (xpi/thunderbird-i18n-31.2.0/si.xpi) = 528812 -SHA256 (xpi/thunderbird-i18n-31.2.0/sk.xpi) = c2a10018d3a697735368112b957f84bfb1033567a04897e744e1a4d25cb91e1b -SIZE (xpi/thunderbird-i18n-31.2.0/sk.xpi) = 452995 -SHA256 (xpi/thunderbird-i18n-31.2.0/sl.xpi) = 03391be8d12577f9e733e137818fdda4f4f28724ddbd4d9548e4ad26da94296a -SIZE (xpi/thunderbird-i18n-31.2.0/sl.xpi) = 433874 -SHA256 (xpi/thunderbird-i18n-31.2.0/sq.xpi) = be5ba55ce94531b3dc84056e0433f78d341fe3b4f8ba5c68f67795aca44c8490 -SIZE (xpi/thunderbird-i18n-31.2.0/sq.xpi) = 454694 -SHA256 (xpi/thunderbird-i18n-31.2.0/sr.xpi) = e8f23cffa3b76f867dd0209f1f65a2b55d3f80245dbba9946b0f1993c1759791 -SIZE (xpi/thunderbird-i18n-31.2.0/sr.xpi) = 537335 -SHA256 (xpi/thunderbird-i18n-31.2.0/sv-SE.xpi) = 1760e8023cb00f33111279f25b60604613b682385aa735c2286fdd3d909853e2 -SIZE (xpi/thunderbird-i18n-31.2.0/sv-SE.xpi) = 436105 -SHA256 (xpi/thunderbird-i18n-31.2.0/ta-LK.xpi) = 1fe61ab35f687cd2389296783b7896b191bcc3ce02f7229404e1adc46360fe0e -SIZE (xpi/thunderbird-i18n-31.2.0/ta-LK.xpi) = 553508 -SHA256 (xpi/thunderbird-i18n-31.2.0/tr.xpi) = a44cfd98890ab255a21b54991de71eca5f06a17e5cf825c01f8b7874ff2b2edd -SIZE (xpi/thunderbird-i18n-31.2.0/tr.xpi) = 457360 -SHA256 (xpi/thunderbird-i18n-31.2.0/uk.xpi) = 7942f621505ce2270dbac9aecded2be7457aedf8ae345ffa776dfa5f3e524cb6 -SIZE (xpi/thunderbird-i18n-31.2.0/uk.xpi) = 499656 -SHA256 (xpi/thunderbird-i18n-31.2.0/vi.xpi) = 132981f1bdcf48ffb630965052713425d93fed862d0a87e9878c2196f64fd684 -SIZE (xpi/thunderbird-i18n-31.2.0/vi.xpi) = 513835 -SHA256 (xpi/thunderbird-i18n-31.2.0/zh-CN.xpi) = d6382bf21c901de5301a2ce4f2aaba839ba4ea3171bb2b965fca6876703c79cf -SIZE (xpi/thunderbird-i18n-31.2.0/zh-CN.xpi) = 462668 -SHA256 (xpi/thunderbird-i18n-31.2.0/zh-TW.xpi) = 7704b9a4ed6f20c94b1390349614e18af643bf6d58b9cef38664afcc7048346f -SIZE (xpi/thunderbird-i18n-31.2.0/zh-TW.xpi) = 463408 +SHA256 (xpi/thunderbird-i18n-31.3.0/ar.xpi) = 961c958edcb33301c6459c12a2589333c6e993cdd93be4511ecaf9ea575f8bf3 +SIZE (xpi/thunderbird-i18n-31.3.0/ar.xpi) = 472812 +SHA256 (xpi/thunderbird-i18n-31.3.0/ast.xpi) = 1582a7be9ac87115d5866ca72559018b7ce93ef6ffc3accc6c347d38dbb22bc4 +SIZE (xpi/thunderbird-i18n-31.3.0/ast.xpi) = 393049 +SHA256 (xpi/thunderbird-i18n-31.3.0/be.xpi) = e2c9c3d0ab8ce123d388aabe8b075805c95f4733dca1ae9eff7464eb23aed083 +SIZE (xpi/thunderbird-i18n-31.3.0/be.xpi) = 427488 +SHA256 (xpi/thunderbird-i18n-31.3.0/bg.xpi) = 37ce4d7cc4012171b26d83a5d77f30838e9d5a4058b18c7796da3c78cf3fcec9 +SIZE (xpi/thunderbird-i18n-31.3.0/bg.xpi) = 493734 +SHA256 (xpi/thunderbird-i18n-31.3.0/bn-BD.xpi) = 0d8a5ae252428c229c0c949d59e206d2fc82382a7128425a0194af6459f29ab2 +SIZE (xpi/thunderbird-i18n-31.3.0/bn-BD.xpi) = 555613 +SHA256 (xpi/thunderbird-i18n-31.3.0/br.xpi) = b9ad663e315abe792fc034e46f7cc01d690249d5f600ad860f73929d521619de +SIZE (xpi/thunderbird-i18n-31.3.0/br.xpi) = 441444 +SHA256 (xpi/thunderbird-i18n-31.3.0/ca.xpi) = 396760bcb133041e1b52acba598941ff627bd6fd7c1632b129a545418755f845 +SIZE (xpi/thunderbird-i18n-31.3.0/ca.xpi) = 441713 +SHA256 (xpi/thunderbird-i18n-31.3.0/cs.xpi) = 8895b7c250f5f270c6e34e109b9e9b7b795d0a0855050af2c56adc89e2b9d1d1 +SIZE (xpi/thunderbird-i18n-31.3.0/cs.xpi) = 444701 +SHA256 (xpi/thunderbird-i18n-31.3.0/da.xpi) = e9a75204f486a49599d8570423365517d4df7c497150cee8d95574982a47885f +SIZE (xpi/thunderbird-i18n-31.3.0/da.xpi) = 422051 +SHA256 (xpi/thunderbird-i18n-31.3.0/de.xpi) = 5773e8a308e6b30974e9eb3fa40b5b11d9fa9ace480686f86a5654f72c84a373 +SIZE (xpi/thunderbird-i18n-31.3.0/de.xpi) = 424665 +SHA256 (xpi/thunderbird-i18n-31.3.0/el.xpi) = 68b5c38d0c58283acb5f2f6b574bcc2573a47e7371f66b1e6b4c6bac3e29cd52 +SIZE (xpi/thunderbird-i18n-31.3.0/el.xpi) = 484855 +SHA256 (xpi/thunderbird-i18n-31.3.0/en-GB.xpi) = cb9c5f83e7925181c75065a8eb2db466641219e02ffae9f38c9c5532a422d53c +SIZE (xpi/thunderbird-i18n-31.3.0/en-GB.xpi) = 412515 +SHA256 (xpi/thunderbird-i18n-31.3.0/en-US.xpi) = 87235667cfb9c91186f551f0113410fefca3eac6d42e42715423c6a1fc93964d +SIZE (xpi/thunderbird-i18n-31.3.0/en-US.xpi) = 413660 +SHA256 (xpi/thunderbird-i18n-31.3.0/es-AR.xpi) = 57d4d3385193bd1c3b9c479efbbc3b01c53981e1824a7373841fa13f53ac5de0 +SIZE (xpi/thunderbird-i18n-31.3.0/es-AR.xpi) = 438531 +SHA256 (xpi/thunderbird-i18n-31.3.0/es-ES.xpi) = 6d35a449cffec11afe297e8084e75ca073acaec6b12a187128eac45a7fa7abb4 +SIZE (xpi/thunderbird-i18n-31.3.0/es-ES.xpi) = 374979 +SHA256 (xpi/thunderbird-i18n-31.3.0/et.xpi) = 008116d438ce76722ed9b466aa4d822b5c073ca063b4b25539d8690c92e1cfff +SIZE (xpi/thunderbird-i18n-31.3.0/et.xpi) = 434364 +SHA256 (xpi/thunderbird-i18n-31.3.0/eu.xpi) = 666528eb407334a4e8a6b3b00b2ccc9f3586f81bcb7ac80374823b65f9ac6742 +SIZE (xpi/thunderbird-i18n-31.3.0/eu.xpi) = 431448 +SHA256 (xpi/thunderbird-i18n-31.3.0/fi.xpi) = bfdcbcaaba90a65b5aa37c4feb37d6026ff1cbe915924abfe4c150f0d9c55430 +SIZE (xpi/thunderbird-i18n-31.3.0/fi.xpi) = 435632 +SHA256 (xpi/thunderbird-i18n-31.3.0/fr.xpi) = e7896408afc9c68eef3194ad512929c4b61d60ab2287e1ef9464d1de29ed6f1f +SIZE (xpi/thunderbird-i18n-31.3.0/fr.xpi) = 444144 +SHA256 (xpi/thunderbird-i18n-31.3.0/fy-NL.xpi) = d3552a76b606e12e4f524458376deeff330194b332b17ccf8d853b5b77357d68 +SIZE (xpi/thunderbird-i18n-31.3.0/fy-NL.xpi) = 438545 +SHA256 (xpi/thunderbird-i18n-31.3.0/ga-IE.xpi) = 502302b8177fbd196fde6ad0ff65367c3a5940d944e593adc20072bbbe1dfda6 +SIZE (xpi/thunderbird-i18n-31.3.0/ga-IE.xpi) = 449362 +SHA256 (xpi/thunderbird-i18n-31.3.0/gd.xpi) = b052fdb7a37c5082844fd7a136d5db3eab616f096e11e0f56158554be52c1da9 +SIZE (xpi/thunderbird-i18n-31.3.0/gd.xpi) = 453171 +SHA256 (xpi/thunderbird-i18n-31.3.0/gl.xpi) = ceffb5e73f89001b46b82fde8f42aac548214148ce7bb480a1824a6cf452e781 +SIZE (xpi/thunderbird-i18n-31.3.0/gl.xpi) = 446788 +SHA256 (xpi/thunderbird-i18n-31.3.0/he.xpi) = 879efda7c448bff7b93757e0edbf983021f190dc8f1cccdf1d03141a39b1596d +SIZE (xpi/thunderbird-i18n-31.3.0/he.xpi) = 476111 +SHA256 (xpi/thunderbird-i18n-31.3.0/hr.xpi) = 4263d0bc96b51c93a2ac69e5b0707c755f592e656ab1a827bec0f823c2d58c4e +SIZE (xpi/thunderbird-i18n-31.3.0/hr.xpi) = 436980 +SHA256 (xpi/thunderbird-i18n-31.3.0/hu.xpi) = 237941d22d98607fcbc40a1abed257fdcc93cae8fea799e90de29895c936bbdf +SIZE (xpi/thunderbird-i18n-31.3.0/hu.xpi) = 454542 +SHA256 (xpi/thunderbird-i18n-31.3.0/hy-AM.xpi) = ca895d9350a24d3fed16c6743ced1526e6a2cf0dbf24cb3f740a841d5cf203a3 +SIZE (xpi/thunderbird-i18n-31.3.0/hy-AM.xpi) = 492765 +SHA256 (xpi/thunderbird-i18n-31.3.0/id.xpi) = 55257017268da8bc3ad47cf754d3e943a96c1d1e5966aa9b12e312991322e4b4 +SIZE (xpi/thunderbird-i18n-31.3.0/id.xpi) = 475876 +SHA256 (xpi/thunderbird-i18n-31.3.0/is.xpi) = 986bf8d578652c00ba1735f714cc52632044d655263c3a408c804729b874e373 +SIZE (xpi/thunderbird-i18n-31.3.0/is.xpi) = 437959 +SHA256 (xpi/thunderbird-i18n-31.3.0/it.xpi) = ee00ccf84f655d57ec7622f1b8b52f22d0fe7d1313115a09a2c5377285e286dc +SIZE (xpi/thunderbird-i18n-31.3.0/it.xpi) = 368001 +SHA256 (xpi/thunderbird-i18n-31.3.0/ja.xpi) = 6fb40bcc1a2a3d1c18c298a8c582a7940201baafa1d0c15d46cd819990c200b4 +SIZE (xpi/thunderbird-i18n-31.3.0/ja.xpi) = 489267 +SHA256 (xpi/thunderbird-i18n-31.3.0/ko.xpi) = 1af67a385b3d4dfeb99ba57851ed113b6d10e1eb48aadcd1d03510c8faef9aea +SIZE (xpi/thunderbird-i18n-31.3.0/ko.xpi) = 448920 +SHA256 (xpi/thunderbird-i18n-31.3.0/lt.xpi) = 3415f9915ecce765d0104f8f37c85346579e55e2edc4f75955e9acb4e4599755 +SIZE (xpi/thunderbird-i18n-31.3.0/lt.xpi) = 456351 +SHA256 (xpi/thunderbird-i18n-31.3.0/nb-NO.xpi) = 7c58e207a9e627ea7e74b5126df4f1495170602217b12ba83ba6cb454b5648e8 +SIZE (xpi/thunderbird-i18n-31.3.0/nb-NO.xpi) = 430941 +SHA256 (xpi/thunderbird-i18n-31.3.0/nl.xpi) = fb0934635ce55901c9c43382ab2214952b926e1d5ee2c966c44ab883ee5adcb3 +SIZE (xpi/thunderbird-i18n-31.3.0/nl.xpi) = 431888 +SHA256 (xpi/thunderbird-i18n-31.3.0/nn-NO.xpi) = e2c3077b6497c153f581b24b1ca1b4bec27687c4d328c477484357aec295f42a +SIZE (xpi/thunderbird-i18n-31.3.0/nn-NO.xpi) = 433198 +SHA256 (xpi/thunderbird-i18n-31.3.0/pa-IN.xpi) = 7dc4048eb5e9166a855e4c819380036354841173a77c2a68a1784c3bf31b9949 +SIZE (xpi/thunderbird-i18n-31.3.0/pa-IN.xpi) = 525323 +SHA256 (xpi/thunderbird-i18n-31.3.0/pl.xpi) = 90533d8a111ada96d263d6125baf273fe1410c22c272e7170274b0c11e98c45a +SIZE (xpi/thunderbird-i18n-31.3.0/pl.xpi) = 410872 +SHA256 (xpi/thunderbird-i18n-31.3.0/pt-BR.xpi) = 2e8a412d12a850e3f011533287245cf5a6a3a124e85ac0c651057605d12d2b12 +SIZE (xpi/thunderbird-i18n-31.3.0/pt-BR.xpi) = 450477 +SHA256 (xpi/thunderbird-i18n-31.3.0/pt-PT.xpi) = 0c70f96167c6d84dccf933af218f5eeae218c0f2cb991dd084481e0a2e7905f3 +SIZE (xpi/thunderbird-i18n-31.3.0/pt-PT.xpi) = 439604 +SHA256 (xpi/thunderbird-i18n-31.3.0/rm.xpi) = cec2dd8a3a4ac8c74e36b1faa2487a93f9550f35f2476c0f048d825c2088bc8c +SIZE (xpi/thunderbird-i18n-31.3.0/rm.xpi) = 439185 +SHA256 (xpi/thunderbird-i18n-31.3.0/ro.xpi) = 6aa936dfe30286ebfecfd19255017e1456ac43ae02a7cef033ca3f744fff366c +SIZE (xpi/thunderbird-i18n-31.3.0/ro.xpi) = 479747 +SHA256 (xpi/thunderbird-i18n-31.3.0/ru.xpi) = 6f1c9f2810d42a9167fe0b74139d5a0df7695db1fb720b6e0b776997e807284e +SIZE (xpi/thunderbird-i18n-31.3.0/ru.xpi) = 436156 +SHA256 (xpi/thunderbird-i18n-31.3.0/si.xpi) = 0583537d4cda5b5ba01bdf76004de491e18475c8f19d9d0d419be155abb0365d +SIZE (xpi/thunderbird-i18n-31.3.0/si.xpi) = 528812 +SHA256 (xpi/thunderbird-i18n-31.3.0/sk.xpi) = 6342d9f60ee5a7e378e31e0c46784bc68e2f021913e9286366f15093e9cd6246 +SIZE (xpi/thunderbird-i18n-31.3.0/sk.xpi) = 452995 +SHA256 (xpi/thunderbird-i18n-31.3.0/sl.xpi) = 8abad28471f5838d775d7b5c23ef01cd1443b265ba8a957f96653bebfc96309f +SIZE (xpi/thunderbird-i18n-31.3.0/sl.xpi) = 433874 +SHA256 (xpi/thunderbird-i18n-31.3.0/sq.xpi) = e695bfe8c3b397d82253c6e933b3bf4c60adbd4c184250d73f5f307ffe045df6 +SIZE (xpi/thunderbird-i18n-31.3.0/sq.xpi) = 454694 +SHA256 (xpi/thunderbird-i18n-31.3.0/sr.xpi) = 8a05e47be44411d349f56fc72f81b1b95106c92628a906aa9b5d43282e81b977 +SIZE (xpi/thunderbird-i18n-31.3.0/sr.xpi) = 537335 +SHA256 (xpi/thunderbird-i18n-31.3.0/sv-SE.xpi) = 1039ad1c9c8f038a079d64f688e3da7a708e7dd5854dbe8aaf49fb9589e93d50 +SIZE (xpi/thunderbird-i18n-31.3.0/sv-SE.xpi) = 436105 +SHA256 (xpi/thunderbird-i18n-31.3.0/ta-LK.xpi) = 0eb91f1a539dab98b005210c06f4db9f628cc3bba9e2dabc82451c6e4a5c29c6 +SIZE (xpi/thunderbird-i18n-31.3.0/ta-LK.xpi) = 553508 +SHA256 (xpi/thunderbird-i18n-31.3.0/tr.xpi) = 7353950261d2272cd79a7d81e1f1d144fd1060c8c179dcb13b1f89c2dbd7d71e +SIZE (xpi/thunderbird-i18n-31.3.0/tr.xpi) = 457360 +SHA256 (xpi/thunderbird-i18n-31.3.0/uk.xpi) = 59450065564a275731211b1372329c1e7719dafeb185999d36dededcc112c7f4 +SIZE (xpi/thunderbird-i18n-31.3.0/uk.xpi) = 499656 +SHA256 (xpi/thunderbird-i18n-31.3.0/vi.xpi) = c2a3399b1853884cdfb8ba64366210c48ec32b3f7ff03eaf0368b7cfe0b79f99 +SIZE (xpi/thunderbird-i18n-31.3.0/vi.xpi) = 513835 +SHA256 (xpi/thunderbird-i18n-31.3.0/zh-CN.xpi) = 77b77f0d9f537a302c2f7868a962ff4178480247dc6253ff107fa9595adbed8b +SIZE (xpi/thunderbird-i18n-31.3.0/zh-CN.xpi) = 462668 +SHA256 (xpi/thunderbird-i18n-31.3.0/zh-TW.xpi) = 884e3ada592a3c543b3b03d0d185e20a9bf86aa9a2e8809df9e9e5e7316a9d53 +SIZE (xpi/thunderbird-i18n-31.3.0/zh-TW.xpi) = 463408 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 92c5dc57d83d..f4b813e1f284 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 31.2.0 +DISTVERSION= 31.3.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/ + https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} @@ -32,17 +32,14 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l EM_VERSION= 1.7.2 -L_VERSION= 3.3.2 +L_VERSION= 3.3.3 SSP_UNSAFE= yes -OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko USE_MOZILLA= # empty -WANT_GNOME= yes USE_QT5= # empty QT_NONSTANDARD= yes -ALL_TARGET= default USE_GL= gl USES= dos2unix tar:bzip2 DOS2UNIX_FILES= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -63,11 +60,6 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS_DEFINE= ENIGMAIL LIGHTNING OPTIONS_DEFAULT=ENIGMAIL LIGHTNING -# non-client.mk objdir build broken after bug 846540 -.undef GNU_CONFIGURE -ALL_TARGET= build -MAKEFILE= ${WRKSRC}/client.mk - .include "${.CURDIR}/../../www/firefox/Makefile.options" OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/GSTREAMER//} @@ -79,21 +71,9 @@ MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi -# avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1> -# To be removed when 9.2R goes EOL. http://llvm.org/PR15840 -.if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION:M3[23]} -. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -BROKEN= Cannot build with OPTIMIZED_CFLAGS option due to \ - a ${CHOSEN_COMPILER_TYPE} bug: unset the option or \ - use FAVORITE_COMPILER=gcc in Makefile.local/make.conf -# apply workaround only for -O2 or greater -. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]} -. if ${MACHINE_CPU:Msse2} -CXXFLAGS+= -msse2 -. else -CXXFLAGS+= -O1 -. endif -. endif +.if ${PORTVERSION:R:R} < 33 +CONFIGURE_TARGET:=${CONFIGURE_TARGET:S/portbld/unknown/} +MOZ_OPTIONS:= ${MOZ_OPTIONS:S/${CONFIGURE_TARGET}//} .endif .if ${PORT_OPTIONS:MALSA} @@ -163,7 +143,7 @@ pre-configure: .if ${PORT_OPTIONS:MENIGMAIL} post-configure: cd ${WRKSRC}/mailnews/extensions/enigmail/ && \ - ${SETENV} ${MAKE_ENV} ./configure + ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure post-build: ${DO_MAKE_BUILD:S/${MAKEFILE}/Makefile/} all xpi \ diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 18cb22c174eb..08fa8fde9536 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,4 +1,4 @@ -SHA256 (thunderbird-31.2.0.source.tar.bz2) = 48130bbd9102303167aa832ea80970201777ee65b91fbab515332527850749b4 -SIZE (thunderbird-31.2.0.source.tar.bz2) = 171047372 +SHA256 (thunderbird-31.3.0.source.tar.bz2) = b742782965ce9c65b69c1dc470497ea456f11caeb8fda3ea593ee31ad496f556 +SIZE (thunderbird-31.3.0.source.tar.bz2) = 171213377 SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6 SIZE (enigmail-1.7.2.tar.gz) = 1420346 diff --git a/mail/thunderbird/files/patch-bug1076983 b/mail/thunderbird/files/patch-bug1076983 deleted file mode 100644 index ff764be7398f..000000000000 --- a/mail/thunderbird/files/patch-bug1076983 +++ /dev/null @@ -1,45 +0,0 @@ -commit e10ee74 -Author: Martin Thomson <martin.thomson@gmail.com> -Date: Tue Oct 14 17:17:35 2014 -0700 - - Bug 1076983 - Disabling SSL 3.0 with pref ---- - netwerk/base/public/security-prefs.js | 2 +- - security/manager/ssl/src/nsNSSComponent.cpp | 7 +++---- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git netwerk/base/public/security-prefs.js netwerk/base/public/security-prefs.js -index 352552e..c12731b 100644 ---- mozilla/netwerk/base/public/security-prefs.js -+++ mozilla/netwerk/base/public/security-prefs.js -@@ -2,7 +2,7 @@ - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - --pref("security.tls.version.min", 0); -+pref("security.tls.version.min", 1); - pref("security.tls.version.max", 3); - - pref("security.ssl.allow_unrestricted_renego_everywhere__temporarily_available_pref", false); -diff --git security/manager/ssl/src/nsNSSComponent.cpp security/manager/ssl/src/nsNSSComponent.cpp -index 8cab67b..772959d 100644 ---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp -+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp -@@ -829,14 +829,13 @@ void nsNSSComponent::setValidationOptions(bool isInitialSetting, - mDefaultCertVerifier = new SharedCertVerifier(odc, osc, ogc, pinningMode); - } - --// Enable the TLS versions given in the prefs, defaulting to SSL 3.0 (min --// version) and TLS 1.2 (max version) when the prefs aren't set or set to --// invalid values. -+// Enable the TLS versions given in the prefs, defaulting to TLS 1.0 (min) and -+// TLS 1.2 (max) when the prefs aren't set or set to invalid values. - nsresult - nsNSSComponent::setEnabledTLSVersions() - { - // keep these values in sync with security-prefs.js -- static const int32_t PSM_DEFAULT_MIN_TLS_VERSION = 0; -+ static const int32_t PSM_DEFAULT_MIN_TLS_VERSION = 1; - static const int32_t PSM_DEFAULT_MAX_TLS_VERSION = 3; - - int32_t minVersion = Preferences::GetInt("security.tls.version.min", diff --git a/mail/thunderbird/files/patch-bug1082199 b/mail/thunderbird/files/patch-bug1082199 new file mode 100644 index 000000000000..e24fe4726c2c --- /dev/null +++ b/mail/thunderbird/files/patch-bug1082199 @@ -0,0 +1,26 @@ +commit 258ec90 +Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com> +Date: Fri Oct 17 15:55:00 2014 +0200 + + Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 78bb13a..70265a7 100644 +--- mozilla/memory/build/mozjemalloc_compat.c ++++ mozilla/memory/build/mozjemalloc_compat.c +@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + size_t active, allocated, mapped, page, pdirty; + size_t lg_chunk; + ++ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in ++ // src/ctl.c ++ uint64_t epoch = 0; ++ size_t esz = sizeof(epoch); ++ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); ++ + CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); + CTL_GET("stats.active", active); diff --git a/mail/thunderbird/files/patch-bug1103858 b/mail/thunderbird/files/patch-bug1103858 new file mode 100644 index 000000000000..71ce13eb116e --- /dev/null +++ b/mail/thunderbird/files/patch-bug1103858 @@ -0,0 +1,42 @@ +diff --git configure.in configure.in +index b2b45e7..dcfdfb7 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -8346,7 +8346,7 @@ case "$OS_TARGET" in + NECKO_WIFI=1 + fi + ;; +- Darwin|FreeBSD|SunOS|WINNT) ++ Darwin|DragonFly|FreeBSD|SunOS|WINNT) + NECKO_WIFI=1 + ;; + Linux) +diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build +index d4de063..3949380 100644 +--- mozilla/netwerk/wifi/moz.build ++++ mozilla/netwerk/wifi/moz.build +@@ -35,7 +35,7 @@ if CONFIG['OS_ARCH'] == 'Darwin': + UNIFIED_SOURCES += [ + 'osx_corewlan.mm', + ] +-elif CONFIG['OS_ARCH'] == 'FreeBSD': ++elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'): + UNIFIED_SOURCES += [ + 'nsWifiScannerFreeBSD.cpp', + ] +diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp +index bdf171e..4185d69 100644 +--- mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp ++++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp +@@ -13,7 +13,11 @@ + #include <sys/socket.h> + #include <net/if.h> + #include <net/if_media.h> ++#ifdef __DragonFly__ ++#include <netproto/802_11/ieee80211_ioctl.h> ++#else + #include <net80211/ieee80211_ioctl.h> ++#endif + + #include <ifaddrs.h> + #include <string.h> diff --git a/mail/thunderbird/files/patch-bug858919 b/mail/thunderbird/files/patch-bug858919 new file mode 100644 index 000000000000..04dd48deee22 --- /dev/null +++ b/mail/thunderbird/files/patch-bug858919 @@ -0,0 +1,391 @@ +commit a33d4f7 +Author: Martin Stransky <stransky@redhat.com> +Date: Fri Nov 14 04:04:00 2014 +0100 + + Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt +--- + toolkit/components/alerts/nsAlertsService.cpp | 10 +-- + toolkit/system/gnome/moz.build | 2 + + toolkit/system/gnome/nsAlertsIconListener.cpp | 64 ++++++++++++------ + toolkit/system/gnome/nsAlertsIconListener.h | 89 ++++++++++++++++++++++++++ + toolkit/system/gnome/nsGnomeModule.cpp | 5 ++ + toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++ + toolkit/system/gnome/nsSystemAlertsService.h | 27 ++++++++ + 7 files changed, 226 insertions(+), 25 deletions(-) + +diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp +index 93f4536..f8b5e07 100644 +--- mozilla/toolkit/components/alerts/nsAlertsService.cpp ++++ mozilla/toolkit/components/alerts/nsAlertsService.cpp +@@ -100,9 +100,11 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl + nsCOMPtr<nsIAlertsService> sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); + nsresult rv; + if (sysAlerts) { +- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, +- aAlertCookie, aAlertListener, aAlertName, +- aBidi, aLang, IPC::Principal(aPrincipal)); ++ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener, aAlertName, ++ aBidi, aLang, IPC::Principal(aPrincipal)); ++ if (NS_SUCCEEDED(rv)) ++ return NS_OK; + } + + if (!ShouldShowAlert()) { +diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build +index c033f8b..9242209 100644 +--- mozilla/toolkit/system/gnome/moz.build ++++ mozilla/toolkit/system/gnome/moz.build +@@ -5,7 +5,9 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ ++ 'nsAlertsIconListener.cpp', + 'nsGnomeModule.cpp', ++ 'nsSystemAlertsService.cpp', + ] + + if CONFIG['MOZ_ENABLE_GCONF']: +diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp +index f39335e..55f4356 100644 +--- mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp ++++ mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp +@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure, + NS_RELEASE(alert); + } + ++static GdkPixbuf* ++GetPixbufFromImgRequest(imgIRequest* aRequest) ++{ ++ nsCOMPtr<imgIContainer> image; ++ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); ++ if (NS_FAILED(rv)) { ++ return nullptr; ++ } ++ ++ nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = ++ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); ++ ++ return imgToPixbuf->ConvertImageToPixbuf(image); ++} ++ + NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, + nsIObserver, nsISupportsWeakReference) + +@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe + nsresult + nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) + { ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); ++ + uint32_t imgStatus = imgIRequest::STATUS_ERROR; + nsresult rv = aRequest->GetImageStatus(&imgStatus); + NS_ENSURE_SUCCESS(rv, rv); + if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { + // We have an error getting the image. Display the notification with no icon. + ShowAlert(nullptr); +- } + +- if (mIconRequest) { ++ // Cancel any pending request + mIconRequest->Cancel(NS_BINDING_ABORTED); + mIconRequest = nullptr; + } ++ + return NS_OK; + } + + nsresult + nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) + { +- if (aRequest != mIconRequest) +- return NS_ERROR_FAILURE; ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); + + if (mLoadedFrame) + return NS_OK; // only use one frame + +- nsCOMPtr<imgIContainer> image; +- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); +- if (NS_FAILED(rv)) +- return rv; +- +- nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = +- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); +- +- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); +- if (!imagePixbuf) +- return NS_ERROR_FAILURE; ++ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); ++ if (!imagePixbuf) { ++ ShowAlert(nullptr); ++ } else { ++ ShowAlert(imagePixbuf); ++ g_object_unref(imagePixbuf); ++ } + +- ShowAlert(imagePixbuf); ++ mLoadedFrame = true; + +- g_object_unref(imagePixbuf); ++ // Cancel any pending request (multipart image loading/decoding for instance) ++ mIconRequest->Cancel(NS_BINDING_ABORTED); ++ mIconRequest = nullptr; + +- mLoadedFrame = true; + return NS_OK; + } + +@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf) + mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); + gboolean result = notify_notification_show(mNotification, nullptr); + ++ if (result && mAlertListener) ++ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); ++ + return result ? NS_OK : NS_ERROR_FAILURE; + } + +@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl) + if (!il) + return ShowAlert(nullptr); + +- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, +- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, +- nullptr, getter_AddRefs(mIconRequest)); ++ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, ++ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, ++ 0 /* use default */, getter_AddRefs(mIconRequest)); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ mIconRequest->StartDecoding(); ++ ++ return NS_OK; + } + + void +diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h +new file mode 100644 +index 0000000..ac96db9 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsAlertsIconListener.h +@@ -0,0 +1,89 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsAlertsIconListener_h__ ++#define nsAlertsIconListener_h__ ++ ++#include "nsCOMPtr.h" ++#include "imgINotificationObserver.h" ++#include "nsStringAPI.h" ++#include "nsIObserver.h" ++#include "nsWeakReference.h" ++ ++#include <gdk-pixbuf/gdk-pixbuf.h> ++ ++class imgIRequest; ++ ++struct NotifyNotification; ++ ++class nsAlertsIconListener : public imgINotificationObserver, ++ public nsIObserver, ++ public nsSupportsWeakReference ++{ ++public: ++ NS_DECL_ISUPPORTS ++ NS_DECL_IMGINOTIFICATIONOBSERVER ++ NS_DECL_NSIOBSERVER ++ ++ nsAlertsIconListener(); ++ ++ nsresult InitAlertAsync(const nsAString & aImageUrl, ++ const nsAString & aAlertTitle, ++ const nsAString & aAlertText, ++ bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener); ++ ++ void SendCallback(); ++ void SendClosed(); ++ ++protected: ++ virtual ~nsAlertsIconListener(); ++ ++ nsresult OnStopRequest(imgIRequest* aRequest); ++ nsresult OnStopFrame(imgIRequest* aRequest); ++ ++ /** ++ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols ++ * is that notify_notification_new takes three arguments in libnotify.so.4 and ++ * four in libnotify.so.1. ++ * Passing the fourth argument as NULL is binary compatible. ++ */ ++ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); ++ typedef bool (*notify_is_initted_t)(void); ++ typedef bool (*notify_init_t)(const char*); ++ typedef GList* (*notify_get_server_caps_t)(void); ++ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); ++ typedef bool (*notify_notification_show_t)(void*, char*); ++ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); ++ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); ++ ++ nsCOMPtr<imgIRequest> mIconRequest; ++ nsCString mAlertTitle; ++ nsCString mAlertText; ++ ++ nsCOMPtr<nsIObserver> mAlertListener; ++ nsString mAlertCookie; ++ ++ bool mLoadedFrame; ++ bool mAlertHasAction; ++ ++ static void* libNotifyHandle; ++ static bool libNotifyNotAvail; ++ static notify_is_initted_t notify_is_initted; ++ static notify_init_t notify_init; ++ static notify_get_server_caps_t notify_get_server_caps; ++ static notify_notification_new_t notify_notification_new; ++ static notify_notification_show_t notify_notification_show; ++ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; ++ static notify_notification_add_action_t notify_notification_add_action; ++ NotifyNotification* mNotification; ++ gulong mClosureHandler; ++ ++ nsresult StartRequest(const nsAString & aImageUrl); ++ nsresult ShowAlert(GdkPixbuf* aPixbuf); ++}; ++ ++#endif +diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp +index 5ccc8e5..f893893 100644 +--- mozilla/toolkit/system/gnome/nsGnomeModule.cpp ++++ mozilla/toolkit/system/gnome/nsGnomeModule.cpp +@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) + #endif ++#include "nsSystemAlertsService.h" ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) + + #ifdef MOZ_ENABLE_GCONF + NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); +@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); + #endif ++NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); + + static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + #ifdef MOZ_ENABLE_GCONF +@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, + { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, + #endif ++ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, + { nullptr } + }; + +@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { + { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, + { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, + #endif ++ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, + { nullptr } + }; + +diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp +new file mode 100644 +index 0000000..b91b402 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp +@@ -0,0 +1,53 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#include "nsXULAppAPI.h" ++#include "nsSystemAlertsService.h" ++#include "nsAlertsIconListener.h" ++#include "nsAutoPtr.h" ++ ++NS_IMPL_ADDREF(nsSystemAlertsService) ++NS_IMPL_RELEASE(nsSystemAlertsService) ++ ++NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) ++ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) ++ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) ++NS_INTERFACE_MAP_END_THREADSAFE ++ ++nsSystemAlertsService::nsSystemAlertsService() ++{ ++} ++ ++nsSystemAlertsService::~nsSystemAlertsService() ++{} ++ ++nsresult ++nsSystemAlertsService::Init() ++{ ++ return NS_OK; ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, ++ const nsAString & aAlertText, bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener, ++ const nsAString & aAlertName, ++ const nsAString & aBidi, ++ const nsAString & aLang, ++ nsIPrincipal * aPrincipal) ++{ ++ nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener(); ++ if (!alertListener) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener); ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, ++ nsIPrincipal* aPrincipal) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} +diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h +new file mode 100644 +index 0000000..b0bd625 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsSystemAlertsService.h +@@ -0,0 +1,27 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsSystemAlertsService_h__ ++#define nsSystemAlertsService_h__ ++ ++#include "nsIAlertsService.h" ++#include "nsCOMPtr.h" ++ ++class nsSystemAlertsService : public nsIAlertsService ++{ ++public: ++ NS_DECL_NSIALERTSSERVICE ++ NS_DECL_ISUPPORTS ++ ++ nsSystemAlertsService(); ++ ++ nsresult Init(); ++ ++protected: ++ virtual ~nsSystemAlertsService(); ++ ++}; ++ ++#endif /* nsSystemAlertsService_h__ */ |