Date: Sun, 22 Jun 2014 04:25:57 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1610 - in trunk: Mk Mk/Uses mail/thunderbird mail/thunderbird-i18n mail/thunderbird/files www/firefox www/firefox-i18n www/firefox-nightly www/firefox-nightly/files www/firefox/files www/linux-firefox www/seamonkey www/seamonkey/files Message-ID: <201406220425.s5M4Pv9V041251@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Jun 22 04:25:57 2014
New Revision: 1610
Log:
update
Added:
trunk/mail/thunderbird/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
trunk/mail/thunderbird/files/patch-bug1023028
- copied, changed from r1609, trunk/www/firefox-nightly/files/patch-bug1023028
trunk/mail/thunderbird/files/patch-bug1026828
- copied, changed from r1609, trunk/www/firefox-nightly/files/patch-bug1026828
trunk/mail/thunderbird/files/patch-bug847568
- copied, changed from r1609, trunk/mail/thunderbird/files/patch-z-bug847568
trunk/mail/thunderbird/files/patch-bug981348
trunk/mail/thunderbird/files/patch-z-bug517422
- copied, changed from r1609, trunk/mail/thunderbird/files/patch-zz-bug517422
trunk/www/firefox-nightly/files/patch-bug1028036
trunk/www/firefox-nightly/files/patch-bug1028049
trunk/www/seamonkey/files/patch-bug1023028
- copied, changed from r1609, trunk/www/firefox/files/patch-bug1023028
Deleted:
trunk/mail/thunderbird/files/patch-bug783463
trunk/mail/thunderbird/files/patch-bug803480
trunk/mail/thunderbird/files/patch-bug807492
trunk/mail/thunderbird/files/patch-bug810716
trunk/mail/thunderbird/files/patch-bug815219
trunk/mail/thunderbird/files/patch-bug851992
trunk/mail/thunderbird/files/patch-bug876156
trunk/mail/thunderbird/files/patch-bug878791
trunk/mail/thunderbird/files/patch-bug886181
trunk/mail/thunderbird/files/patch-bug889699
trunk/mail/thunderbird/files/patch-bug893397
trunk/mail/thunderbird/files/patch-bug910875
trunk/mail/thunderbird/files/patch-bug916216
trunk/mail/thunderbird/files/patch-bug916589
trunk/mail/thunderbird/files/patch-bug918177
trunk/mail/thunderbird/files/patch-bug938730
trunk/mail/thunderbird/files/patch-bug945046
trunk/mail/thunderbird/files/patch-bug946560
trunk/mail/thunderbird/files/patch-bug961816
trunk/mail/thunderbird/files/patch-bug975634
trunk/mail/thunderbird/files/patch-bug977457
trunk/mail/thunderbird/files/patch-bug985848
trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
trunk/mail/thunderbird/files/patch-z-bug1026828
trunk/mail/thunderbird/files/patch-z-bug847568
trunk/mail/thunderbird/files/patch-zz-bug517422
trunk/www/firefox-nightly/files/patch-bug1015547
trunk/www/firefox-nightly/files/patch-bug1023028
trunk/www/firefox-nightly/files/patch-bug1026828
trunk/www/firefox/files/patch-bug1023028
trunk/www/seamonkey/files/patch-bug893397
trunk/www/seamonkey/files/patch-bug916589
trunk/www/seamonkey/files/patch-bug975397
trunk/www/seamonkey/files/patch-bug993467
Modified:
trunk/Mk/Uses/gecko.mk
trunk/Mk/bsd.gecko.mk
trunk/mail/thunderbird-i18n/Makefile
trunk/mail/thunderbird-i18n/distinfo
trunk/mail/thunderbird/Makefile
trunk/mail/thunderbird/distinfo
trunk/mail/thunderbird/files/patch-bug1013675
trunk/mail/thunderbird/files/patch-bug1015547
trunk/mail/thunderbird/files/patch-bug779713
trunk/mail/thunderbird/files/patch-bug826985
trunk/mail/thunderbird/files/patch-bug961264
trunk/mail/thunderbird/files/patch-bug962345
trunk/mail/thunderbird/files/patch-clang34-disable-stdcall
trunk/mail/thunderbird/files/patch-config-baseconfig.mk
trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
trunk/www/firefox-i18n/Makefile
trunk/www/firefox-i18n/Makefile.lang
trunk/www/firefox-i18n/Makefile.option
trunk/www/firefox-i18n/distinfo
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
trunk/www/linux-firefox/Makefile
trunk/www/linux-firefox/distinfo
trunk/www/seamonkey/Makefile
trunk/www/seamonkey/distinfo
trunk/www/seamonkey/files/patch-bug826985
trunk/www/seamonkey/files/patch-bug847568
trunk/www/seamonkey/files/patch-z-bug517422
Modified: trunk/Mk/Uses/gecko.mk
==============================================================================
--- trunk/Mk/Uses/gecko.mk Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/Mk/Uses/gecko.mk Sun Jun 22 04:25:57 2014 (r1610)
@@ -67,8 +67,8 @@
.elif ${_GECKO_ARGS:Mthunderbird}
-_GECKO_DEFAULT_VERSION= 24
-_GECKO_VERSIONS= 24
+_GECKO_DEFAULT_VERSION= 31
+_GECKO_VERSIONS= 31
_GECKO_TYPE= thunderbird
.if exists(${LOCALBASE}/bin/thunderbird)
@@ -77,7 +77,7 @@
.endif
# Dependence lines for different Thunderbird versions
-24_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+31_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
.else
IGNORE= Unknown type of gecko dependency you may specify either libxul, firefox, seamonkey or thunderbird
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/Mk/bsd.gecko.mk Sun Jun 22 04:25:57 2014 (r1610)
@@ -277,7 +277,7 @@
USE_MOZILLA+= -cairo # ports/169343
USE_DISPLAY=yes # install
USE_GNOME+= pango
-. if ${MOZILLA_VER:R:R} >= 30
+. if ${MOZILLA_VER:R:R} >= 30 || ${MOZILLA} == "seamonkey"
USE_QT5+= qmake_build buildtools_build gui network quick printsupport
. else
USE_QT4+= qmake_build moc_build rcc_build gui network opengl
Modified: trunk/mail/thunderbird-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird-i18n/Makefile Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird-i18n/Makefile Sun Jun 22 04:25:57 2014 (r1610)
@@ -2,7 +2,7 @@
# $FreeBSD: head/mail/thunderbird-i18n/Makefile 356960 2014-06-07 23:46:45Z antoine $
PORTNAME= thunderbird-i18n
-PORTVERSION= 24.6.0
+PORTVERSION= 30.0b1
CATEGORIES= mail news net-im
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
PKGNAMEPREFIX=
Modified: trunk/mail/thunderbird-i18n/distinfo
==============================================================================
--- trunk/mail/thunderbird-i18n/distinfo Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird-i18n/distinfo Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,110 +1,110 @@
-SHA256 (xpi/thunderbird-i18n-24.6.0/ar.xpi) = 17c15dff54c4df3ed6b2e94e4214155584b27ec36532115fd7ff67dd1592f64d
-SIZE (xpi/thunderbird-i18n-24.6.0/ar.xpi) = 457862
-SHA256 (xpi/thunderbird-i18n-24.6.0/ast.xpi) = c7bbd66d3c1256675ffc97eaa4348f4a5fe7f3a4673563c1d68bed00bec56717
-SIZE (xpi/thunderbird-i18n-24.6.0/ast.xpi) = 373831
-SHA256 (xpi/thunderbird-i18n-24.6.0/be.xpi) = 6798c92d5f47ce38828d91e426a7cac9043d8f276b3ecddf4990cd17a26d60ef
-SIZE (xpi/thunderbird-i18n-24.6.0/be.xpi) = 416882
-SHA256 (xpi/thunderbird-i18n-24.6.0/bg.xpi) = 8aa99de4c0fbaef3e73f650adc8a481c30fc3f7e30e3e26d4499a5cab6e176e2
-SIZE (xpi/thunderbird-i18n-24.6.0/bg.xpi) = 485024
-SHA256 (xpi/thunderbird-i18n-24.6.0/bn-BD.xpi) = ae24e4f3aff29cac99ee72e9fc6f72711737a358fd5727031ffd3cd6803ab78a
-SIZE (xpi/thunderbird-i18n-24.6.0/bn-BD.xpi) = 537258
-SHA256 (xpi/thunderbird-i18n-24.6.0/br.xpi) = e9f722a70b98b036140f703dcb6860a8b953d4e811efa7081d19bd841f00d44f
-SIZE (xpi/thunderbird-i18n-24.6.0/br.xpi) = 427680
-SHA256 (xpi/thunderbird-i18n-24.6.0/ca.xpi) = a617d74e14e7890612ea2431e337dfad947eeeb53e9bb56628cf08aeda30fb9b
-SIZE (xpi/thunderbird-i18n-24.6.0/ca.xpi) = 429746
-SHA256 (xpi/thunderbird-i18n-24.6.0/cs.xpi) = e351d889e8fde0b6b0d13de8b94d71c71e8065473b8c2af449eaa83077182ad9
-SIZE (xpi/thunderbird-i18n-24.6.0/cs.xpi) = 431476
-SHA256 (xpi/thunderbird-i18n-24.6.0/da.xpi) = 87177c2c311c76062095e1a88aae002c1841bccb4cf3269d26a0cad14f908013
-SIZE (xpi/thunderbird-i18n-24.6.0/da.xpi) = 409627
-SHA256 (xpi/thunderbird-i18n-24.6.0/de.xpi) = 4bb7030276184e1d5a22bd3b8177301d1987a94acae5b023e156c1316fd3f906
-SIZE (xpi/thunderbird-i18n-24.6.0/de.xpi) = 408674
-SHA256 (xpi/thunderbird-i18n-24.6.0/el.xpi) = 47a477894c50a3a98f7cb4283f8115dfdec8b99c7d2005437f90cf27091b9e4b
-SIZE (xpi/thunderbird-i18n-24.6.0/el.xpi) = 464553
-SHA256 (xpi/thunderbird-i18n-24.6.0/en-GB.xpi) = b80143321e669ff4cbf9de1a74906165e2467126613755823b5d95b28247a498
-SIZE (xpi/thunderbird-i18n-24.6.0/en-GB.xpi) = 400962
-SHA256 (xpi/thunderbird-i18n-24.6.0/en-US.xpi) = 112518d5464763b12a642b8ad5f24d246e3ddc0dbe815cb879ac8f0d22e1b8a4
-SIZE (xpi/thunderbird-i18n-24.6.0/en-US.xpi) = 402144
-SHA256 (xpi/thunderbird-i18n-24.6.0/es-AR.xpi) = a77f1cc88721695bf122265d781da1f6e7e152adb28b5c8f1dcb4b53abec7e13
-SIZE (xpi/thunderbird-i18n-24.6.0/es-AR.xpi) = 425657
-SHA256 (xpi/thunderbird-i18n-24.6.0/es-ES.xpi) = e7228a9bc34a70f04fe4b6bb44cb193e8303ee985c20ac71951691faf8f303e5
-SIZE (xpi/thunderbird-i18n-24.6.0/es-ES.xpi) = 366308
-SHA256 (xpi/thunderbird-i18n-24.6.0/et.xpi) = dbe79156d159f99eaa4212f06a4892e8d57c2c638674b7eb48a9411dc33bd896
-SIZE (xpi/thunderbird-i18n-24.6.0/et.xpi) = 422893
-SHA256 (xpi/thunderbird-i18n-24.6.0/eu.xpi) = ef24864e5477b9546d7e16bdb551f8fea880b9a626cbf2e141fae6c19c82f31a
-SIZE (xpi/thunderbird-i18n-24.6.0/eu.xpi) = 418497
-SHA256 (xpi/thunderbird-i18n-24.6.0/fi.xpi) = 64e456b04f28c10bc588c0ac37a164240eeb6269975a8e2ebf82815182863009
-SIZE (xpi/thunderbird-i18n-24.6.0/fi.xpi) = 424265
-SHA256 (xpi/thunderbird-i18n-24.6.0/fr.xpi) = cb2a157da1d19b007441f361369198e065e83a413f538ee072fb5b5336cae507
-SIZE (xpi/thunderbird-i18n-24.6.0/fr.xpi) = 431289
-SHA256 (xpi/thunderbird-i18n-24.6.0/fy-NL.xpi) = 3332bf259d5b4ddacf240b7bf00dcbbb9a34db48f3b6f8075362ab4f4d498ea1
-SIZE (xpi/thunderbird-i18n-24.6.0/fy-NL.xpi) = 426098
-SHA256 (xpi/thunderbird-i18n-24.6.0/ga-IE.xpi) = 6c0f264ae94c77c3c6f1699f161c4c2ab52150361d332d133d18b3ca74ae396f
-SIZE (xpi/thunderbird-i18n-24.6.0/ga-IE.xpi) = 437114
-SHA256 (xpi/thunderbird-i18n-24.6.0/gd.xpi) = 11b63c83a6cd875d18e6de1372e6d22bd52ecf01da14cf2fbe8c4290e1b46ba1
-SIZE (xpi/thunderbird-i18n-24.6.0/gd.xpi) = 440092
-SHA256 (xpi/thunderbird-i18n-24.6.0/gl.xpi) = 8c7e91e354935d1b3ba9f9717e085edaebf8ef807ab297be1007c839fea83959
-SIZE (xpi/thunderbird-i18n-24.6.0/gl.xpi) = 427543
-SHA256 (xpi/thunderbird-i18n-24.6.0/he.xpi) = ac5e70e428c632a81b7df33704885b9d0cdea0d209783d901f6b6283faf1aa7f
-SIZE (xpi/thunderbird-i18n-24.6.0/he.xpi) = 457066
-SHA256 (xpi/thunderbird-i18n-24.6.0/hr.xpi) = 8a4218eb59f0bf0b06849835268b9f3ae0fcf109a12ef4d41036692434ab4816
-SIZE (xpi/thunderbird-i18n-24.6.0/hr.xpi) = 422387
-SHA256 (xpi/thunderbird-i18n-24.6.0/hu.xpi) = e57cd0837c359cdef58648408f6eecd1cbbc47b432478b22ccc13add88f5ea7b
-SIZE (xpi/thunderbird-i18n-24.6.0/hu.xpi) = 441512
-SHA256 (xpi/thunderbird-i18n-24.6.0/hy-AM.xpi) = 15ce69087c8b75c1d06581b9a42078179ed23f212cde57a6f443ff61062869f8
-SIZE (xpi/thunderbird-i18n-24.6.0/hy-AM.xpi) = 477923
-SHA256 (xpi/thunderbird-i18n-24.6.0/id.xpi) = b0d47c428e230e22a8763ed6d2c708a2d56f78e1ff028afb423b91eb14a7fe61
-SIZE (xpi/thunderbird-i18n-24.6.0/id.xpi) = 457499
-SHA256 (xpi/thunderbird-i18n-24.6.0/is.xpi) = a3b7ec605787122f75a07326d0bebcfa115d9f540d2d09dca61c85c7c8797a95
-SIZE (xpi/thunderbird-i18n-24.6.0/is.xpi) = 425710
-SHA256 (xpi/thunderbird-i18n-24.6.0/it.xpi) = cbc99bb400bc1942e824e4d8b3ff70c9a3543af4883f46ddbba7d2da3ca7fcc0
-SIZE (xpi/thunderbird-i18n-24.6.0/it.xpi) = 357933
-SHA256 (xpi/thunderbird-i18n-24.6.0/ja.xpi) = ef614d5909591bc82ce763780504759f834b4650d97385e6a6f08677a0e8fce9
-SIZE (xpi/thunderbird-i18n-24.6.0/ja.xpi) = 475559
-SHA256 (xpi/thunderbird-i18n-24.6.0/ko.xpi) = 8064614276a1486df269677f3d1f0b4118e30baf5596d2bc704aa1e3fd6d99da
-SIZE (xpi/thunderbird-i18n-24.6.0/ko.xpi) = 428071
-SHA256 (xpi/thunderbird-i18n-24.6.0/lt.xpi) = 902c0a385bea8d77b8ebddf04889e9d4fba6a19628aaee5f6d3dbd114145029f
-SIZE (xpi/thunderbird-i18n-24.6.0/lt.xpi) = 443260
-SHA256 (xpi/thunderbird-i18n-24.6.0/nb-NO.xpi) = acb35e8653c1f41f690e37d8d29d42ba09489fcd81e136928b0c555531a6f6a1
-SIZE (xpi/thunderbird-i18n-24.6.0/nb-NO.xpi) = 418922
-SHA256 (xpi/thunderbird-i18n-24.6.0/nl.xpi) = 291fc386c76ed01927344afe0611c80560f29504a398c7e96c52bdf915a537c8
-SIZE (xpi/thunderbird-i18n-24.6.0/nl.xpi) = 418764
-SHA256 (xpi/thunderbird-i18n-24.6.0/nn-NO.xpi) = 70843b8c43e3f707fe2a53f5401635f81e63a7055a038e984e1bfee25626c2f1
-SIZE (xpi/thunderbird-i18n-24.6.0/nn-NO.xpi) = 421134
-SHA256 (xpi/thunderbird-i18n-24.6.0/pa-IN.xpi) = 1f46cc15aaf9862b6a584fd458bbb84102d0005d1dd31ed14adb79d4a1c77827
-SIZE (xpi/thunderbird-i18n-24.6.0/pa-IN.xpi) = 508272
-SHA256 (xpi/thunderbird-i18n-24.6.0/pl.xpi) = 91d8e2eae75533431a47bdceb4984b7dc37a32c7d05b55347053b1c2388a4eff
-SIZE (xpi/thunderbird-i18n-24.6.0/pl.xpi) = 401753
-SHA256 (xpi/thunderbird-i18n-24.6.0/pt-BR.xpi) = ee0126f821648b3dfdf2c707828bba476ce9ec65ff3474090fae3c2b9569e4f2
-SIZE (xpi/thunderbird-i18n-24.6.0/pt-BR.xpi) = 430909
-SHA256 (xpi/thunderbird-i18n-24.6.0/pt-PT.xpi) = 3d45604b348cacbb733049c9b212dacebc47bcbd2b5bd69a42ce9342463fdd44
-SIZE (xpi/thunderbird-i18n-24.6.0/pt-PT.xpi) = 425026
-SHA256 (xpi/thunderbird-i18n-24.6.0/rm.xpi) = 10702682354f3caea6c68de79e706662cdc1f0bd2764f13342da8e759f70664a
-SIZE (xpi/thunderbird-i18n-24.6.0/rm.xpi) = 432384
-SHA256 (xpi/thunderbird-i18n-24.6.0/ro.xpi) = b25ae8ab37cc36ca8bfd7974bcaffff49d97dbaa8f825e17d7a3922585abb461
-SIZE (xpi/thunderbird-i18n-24.6.0/ro.xpi) = 497491
-SHA256 (xpi/thunderbird-i18n-24.6.0/ru.xpi) = b4c2ac97185d661e90ecd034117b5cd0cee08b90dc0cc2aa3ca4da4839016a36
-SIZE (xpi/thunderbird-i18n-24.6.0/ru.xpi) = 425098
-SHA256 (xpi/thunderbird-i18n-24.6.0/si.xpi) = 4d879737f492c61a1afe8345a2c21da5ece7808235c332d2ce2e56a024e64f64
-SIZE (xpi/thunderbird-i18n-24.6.0/si.xpi) = 511167
-SHA256 (xpi/thunderbird-i18n-24.6.0/sk.xpi) = a7ad8f81f289dd865e201ab96d11c43528b64ab4d6b1c6c68f3c43405afcf11d
-SIZE (xpi/thunderbird-i18n-24.6.0/sk.xpi) = 440106
-SHA256 (xpi/thunderbird-i18n-24.6.0/sl.xpi) = 19108bba085142f7752ee53bb411b952275ce481af9a1b07138e8ba492017884
-SIZE (xpi/thunderbird-i18n-24.6.0/sl.xpi) = 421706
-SHA256 (xpi/thunderbird-i18n-24.6.0/sq.xpi) = 84f26fc90cabc52d19bd4cb4adff60607f3e00acb717405917d5596535f4478e
-SIZE (xpi/thunderbird-i18n-24.6.0/sq.xpi) = 435215
-SHA256 (xpi/thunderbird-i18n-24.6.0/sr.xpi) = acafdbb54d034450c939bf1e440005f998a8fc870a59386b50311a6d36d4851a
-SIZE (xpi/thunderbird-i18n-24.6.0/sr.xpi) = 518890
-SHA256 (xpi/thunderbird-i18n-24.6.0/sv-SE.xpi) = 1b14e9eeef56ffb12b142c98549cf32590053c51125f9b14d5f1d92f52cdbaed
-SIZE (xpi/thunderbird-i18n-24.6.0/sv-SE.xpi) = 423816
-SHA256 (xpi/thunderbird-i18n-24.6.0/ta-LK.xpi) = 432b008f0752fdeccce411d5d506e9128b6a383295d75647fe1e1a7f7b90c5b0
-SIZE (xpi/thunderbird-i18n-24.6.0/ta-LK.xpi) = 534923
-SHA256 (xpi/thunderbird-i18n-24.6.0/tr.xpi) = 7174f4b8072aa3e13d26e5cf55a8439a47a68270740beca51c7d38c2fbd34a38
-SIZE (xpi/thunderbird-i18n-24.6.0/tr.xpi) = 438067
-SHA256 (xpi/thunderbird-i18n-24.6.0/uk.xpi) = ea8d2eafbc0e309feace44458c0d75297a5709301a2bbd073e78334c53bd5e5c
-SIZE (xpi/thunderbird-i18n-24.6.0/uk.xpi) = 480949
-SHA256 (xpi/thunderbird-i18n-24.6.0/vi.xpi) = d1578c8b452d4d1ce0219c7d95b4183f727b14a4d8484de02c6dfe04444e7d1d
-SIZE (xpi/thunderbird-i18n-24.6.0/vi.xpi) = 495559
-SHA256 (xpi/thunderbird-i18n-24.6.0/zh-CN.xpi) = f02300ee532bcc9c3d2a94c18636a112d757e49882c160149fa14bac07778bd3
-SIZE (xpi/thunderbird-i18n-24.6.0/zh-CN.xpi) = 449182
-SHA256 (xpi/thunderbird-i18n-24.6.0/zh-TW.xpi) = 3c7182d57ba762a78c96d4f15960ce87e72bd057eef906f0632d20cd724bd8b7
-SIZE (xpi/thunderbird-i18n-24.6.0/zh-TW.xpi) = 450001
+SHA256 (xpi/thunderbird-i18n-30.0b1/ar.xpi) = b1e1d614db65f55a34bbb106c16ed0a9ff27bf3fdf7f050139399ebdd866d0a0
+SIZE (xpi/thunderbird-i18n-30.0b1/ar.xpi) = 469895
+SHA256 (xpi/thunderbird-i18n-30.0b1/ast.xpi) = 41ab8c094c6de979f8aee24fc012a2276db9576b25944377c46fb09ceddc7702
+SIZE (xpi/thunderbird-i18n-30.0b1/ast.xpi) = 389510
+SHA256 (xpi/thunderbird-i18n-30.0b1/be.xpi) = f8b4730dca495823f8367a870f949bda869c6ddc29ebbf216f9cbeb5e76c8804
+SIZE (xpi/thunderbird-i18n-30.0b1/be.xpi) = 426154
+SHA256 (xpi/thunderbird-i18n-30.0b1/bg.xpi) = 03877cb0fd65e604eeb3997c490cbd81c578ce71720c3c90388740ddcf991f15
+SIZE (xpi/thunderbird-i18n-30.0b1/bg.xpi) = 501183
+SHA256 (xpi/thunderbird-i18n-30.0b1/bn-BD.xpi) = a2218c14757551c8d80b9fe0beb80caee794547804bcee808cc792e074d95d9e
+SIZE (xpi/thunderbird-i18n-30.0b1/bn-BD.xpi) = 552412
+SHA256 (xpi/thunderbird-i18n-30.0b1/br.xpi) = 24f480c4827b1029240edafd4abcc96f1cebe8e45d77bf880f76da895a41d37a
+SIZE (xpi/thunderbird-i18n-30.0b1/br.xpi) = 439838
+SHA256 (xpi/thunderbird-i18n-30.0b1/ca.xpi) = aef1a3aead63f1e50dd77c8e8438bf36230d804cd5f213dacb5ecd03597722c0
+SIZE (xpi/thunderbird-i18n-30.0b1/ca.xpi) = 440158
+SHA256 (xpi/thunderbird-i18n-30.0b1/cs.xpi) = 7c7de75d88fa2635ba1411e71ebab13f028327612c71ab7c16c5a0946d5065d0
+SIZE (xpi/thunderbird-i18n-30.0b1/cs.xpi) = 445468
+SHA256 (xpi/thunderbird-i18n-30.0b1/da.xpi) = dc632020e6ac1924788fee3251d948eecbeaa6f79c69e57339974b80d68310e9
+SIZE (xpi/thunderbird-i18n-30.0b1/da.xpi) = 420101
+SHA256 (xpi/thunderbird-i18n-30.0b1/de.xpi) = cd47a64722b0ed1a20445474caa1aea577c1f643d99017099b6c8b8acff04544
+SIZE (xpi/thunderbird-i18n-30.0b1/de.xpi) = 422136
+SHA256 (xpi/thunderbird-i18n-30.0b1/el.xpi) = 19483650b2c291504f4beff3b19e7343443deea79613218a58ba1688d78f5f59
+SIZE (xpi/thunderbird-i18n-30.0b1/el.xpi) = 481424
+SHA256 (xpi/thunderbird-i18n-30.0b1/en-GB.xpi) = 56e2f66829fd712a33ea1b682c2e8b1909db7415f1a0f4862c8f2f7bfd4f2184
+SIZE (xpi/thunderbird-i18n-30.0b1/en-GB.xpi) = 411030
+SHA256 (xpi/thunderbird-i18n-30.0b1/en-US.xpi) = b3644fcd6d3f511c0c297a74963a61bf67e4bd4117089c6e011e1d0e1ef8ef8e
+SIZE (xpi/thunderbird-i18n-30.0b1/en-US.xpi) = 412268
+SHA256 (xpi/thunderbird-i18n-30.0b1/es-AR.xpi) = 3b4926345fab339ade02a8da2f6570055ae146de8bf1cae947fd1da03b9855e1
+SIZE (xpi/thunderbird-i18n-30.0b1/es-AR.xpi) = 436558
+SHA256 (xpi/thunderbird-i18n-30.0b1/es-ES.xpi) = 9e5bf57051fe3d23a38b9ed64780cb4ecd4cfbe52b43d80dd0e956766c79ee9d
+SIZE (xpi/thunderbird-i18n-30.0b1/es-ES.xpi) = 373875
+SHA256 (xpi/thunderbird-i18n-30.0b1/et.xpi) = 90fee05d2e706f3b7be2bbb21f6d66040a4b0f87057e18129922fb6c86e5e330
+SIZE (xpi/thunderbird-i18n-30.0b1/et.xpi) = 432515
+SHA256 (xpi/thunderbird-i18n-30.0b1/eu.xpi) = 5afb4f82f349ca4b7170b41b9d417539b62f8264c267cbaf7bf148a20aac2765
+SIZE (xpi/thunderbird-i18n-30.0b1/eu.xpi) = 429813
+SHA256 (xpi/thunderbird-i18n-30.0b1/fi.xpi) = 0cbb7bd8c10cf4c3942fb2c2bfac34311ac05d67019a5f809ba581b2dc937ed7
+SIZE (xpi/thunderbird-i18n-30.0b1/fi.xpi) = 433900
+SHA256 (xpi/thunderbird-i18n-30.0b1/fr.xpi) = 33f2fdfa8e60bcf67e2156fcf4d03c9ac14a54f61552eed812662913cf5cff2a
+SIZE (xpi/thunderbird-i18n-30.0b1/fr.xpi) = 442419
+SHA256 (xpi/thunderbird-i18n-30.0b1/fy-NL.xpi) = eb7282116e3586582ca4887ddac5a915b4fa018812eb132a0e5e1567ea9bb596
+SIZE (xpi/thunderbird-i18n-30.0b1/fy-NL.xpi) = 436843
+SHA256 (xpi/thunderbird-i18n-30.0b1/ga-IE.xpi) = 6837f618e9b6c7ef329c696a1c5030d2276e52a66f2983fa965cade2cefe80de
+SIZE (xpi/thunderbird-i18n-30.0b1/ga-IE.xpi) = 453831
+SHA256 (xpi/thunderbird-i18n-30.0b1/gd.xpi) = d1c9d52ac7bac3158867ac23863fd6551f5f913ed6f98760e4ea5a31c694429a
+SIZE (xpi/thunderbird-i18n-30.0b1/gd.xpi) = 451364
+SHA256 (xpi/thunderbird-i18n-30.0b1/gl.xpi) = 4467b73ea828231e4739643e234aa84a14285141c42ab7bc19e70000267c881a
+SIZE (xpi/thunderbird-i18n-30.0b1/gl.xpi) = 443704
+SHA256 (xpi/thunderbird-i18n-30.0b1/he.xpi) = 08917380480988b98065fee858a25b15198d2d202d670f17497d155201e752d5
+SIZE (xpi/thunderbird-i18n-30.0b1/he.xpi) = 472888
+SHA256 (xpi/thunderbird-i18n-30.0b1/hr.xpi) = b76414ffb2cf11cd24f4f4af5c99ac7a5c462220120c91385b65365103b33dbd
+SIZE (xpi/thunderbird-i18n-30.0b1/hr.xpi) = 435328
+SHA256 (xpi/thunderbird-i18n-30.0b1/hu.xpi) = bb0f3d46e74f5397e88be41de014e904ef88b995d9ec7c004667a23264195f04
+SIZE (xpi/thunderbird-i18n-30.0b1/hu.xpi) = 452664
+SHA256 (xpi/thunderbird-i18n-30.0b1/hy-AM.xpi) = a7d691853a3af8037edb1106078b6ccd9876343af10d3008df1106fd650eab35
+SIZE (xpi/thunderbird-i18n-30.0b1/hy-AM.xpi) = 494762
+SHA256 (xpi/thunderbird-i18n-30.0b1/id.xpi) = 2832a6cf2b8d1b95dd2b341f29e099f509e3dedf972a647451f728ce07b9de99
+SIZE (xpi/thunderbird-i18n-30.0b1/id.xpi) = 472654
+SHA256 (xpi/thunderbird-i18n-30.0b1/is.xpi) = f7ee59b38be59c6209ac9c184e74bd6de249f277fe67a7a390a74ef46fee14e0
+SIZE (xpi/thunderbird-i18n-30.0b1/is.xpi) = 436391
+SHA256 (xpi/thunderbird-i18n-30.0b1/it.xpi) = f60d520cd838465bc7606f2b7c74b33aa26f6d5893017869feeaa00367107353
+SIZE (xpi/thunderbird-i18n-30.0b1/it.xpi) = 366812
+SHA256 (xpi/thunderbird-i18n-30.0b1/ja.xpi) = a1763c36a2dcd206ce8ef75b81bfbc699ebe15f2dcf5a8ee6642cce84e68d451
+SIZE (xpi/thunderbird-i18n-30.0b1/ja.xpi) = 487386
+SHA256 (xpi/thunderbird-i18n-30.0b1/ko.xpi) = 8479a521c74a27705a546c460e947bdc14b0f9ad261983ff6fc8b6ae93534f43
+SIZE (xpi/thunderbird-i18n-30.0b1/ko.xpi) = 442609
+SHA256 (xpi/thunderbird-i18n-30.0b1/lt.xpi) = f00871797b952e4eb7f98f094ab6490600c098c7f391d534334500e430055797
+SIZE (xpi/thunderbird-i18n-30.0b1/lt.xpi) = 455495
+SHA256 (xpi/thunderbird-i18n-30.0b1/nb-NO.xpi) = 877f6e73bffa5769f2c9d3c9d66d202f098faa96df76a04a7b33a3505ca49658
+SIZE (xpi/thunderbird-i18n-30.0b1/nb-NO.xpi) = 431915
+SHA256 (xpi/thunderbird-i18n-30.0b1/nl.xpi) = 2b2ea7dbc09a78674560acb9d7c25d65377e615882b2efeab89edabe06068292
+SIZE (xpi/thunderbird-i18n-30.0b1/nl.xpi) = 430383
+SHA256 (xpi/thunderbird-i18n-30.0b1/nn-NO.xpi) = 00266b0b1fd030ecd18e634d6740fb7596d0cd6fa53be292697326afe9b961e2
+SIZE (xpi/thunderbird-i18n-30.0b1/nn-NO.xpi) = 437863
+SHA256 (xpi/thunderbird-i18n-30.0b1/pa-IN.xpi) = 69bf632334a6bcf19a22b5247ac74c2fe430363b3ceb27a69ccd7f926428893a
+SIZE (xpi/thunderbird-i18n-30.0b1/pa-IN.xpi) = 522283
+SHA256 (xpi/thunderbird-i18n-30.0b1/pl.xpi) = b7c65465af405eb0bd37992f5be6be2087c0c690e3e99e078b16d03359255214
+SIZE (xpi/thunderbird-i18n-30.0b1/pl.xpi) = 409689
+SHA256 (xpi/thunderbird-i18n-30.0b1/pt-BR.xpi) = b60731d8aa56cf2c8556377a3bac07c5bec1bf9d7c61ef84d2eca78f79d73c2a
+SIZE (xpi/thunderbird-i18n-30.0b1/pt-BR.xpi) = 447386
+SHA256 (xpi/thunderbird-i18n-30.0b1/pt-PT.xpi) = 9cb3e0a2e792c20479bc823bc4233ff0c346110bbdde61e4faf6534fa2532cfb
+SIZE (xpi/thunderbird-i18n-30.0b1/pt-PT.xpi) = 436336
+SHA256 (xpi/thunderbird-i18n-30.0b1/rm.xpi) = c6d102e66d49735847bac6a6c4ccfc81bcb7a32a7d1a3d06b4403ba667dd1e76
+SIZE (xpi/thunderbird-i18n-30.0b1/rm.xpi) = 438298
+SHA256 (xpi/thunderbird-i18n-30.0b1/ro.xpi) = 77c37326c1c84999143dd6510948a4ff01552474265de90fd0616de73b4e526a
+SIZE (xpi/thunderbird-i18n-30.0b1/ro.xpi) = 477237
+SHA256 (xpi/thunderbird-i18n-30.0b1/ru.xpi) = 87faee48b186d6cfb270cbd0205965bc2eca4e0c10e34faf7ad5aa32bf9a2b58
+SIZE (xpi/thunderbird-i18n-30.0b1/ru.xpi) = 434678
+SHA256 (xpi/thunderbird-i18n-30.0b1/si.xpi) = 60b25167c403c3b0e98354069053cbbd340b4de5dffed5203e185a1f1b1989de
+SIZE (xpi/thunderbird-i18n-30.0b1/si.xpi) = 526022
+SHA256 (xpi/thunderbird-i18n-30.0b1/sk.xpi) = a84393fb9b7f9b23535769b5f8e90bc33d0c28a69abd05976ea5e6f7f9aa9509
+SIZE (xpi/thunderbird-i18n-30.0b1/sk.xpi) = 451336
+SHA256 (xpi/thunderbird-i18n-30.0b1/sl.xpi) = 282b2f5b6a04ca20cc4b526de50a66737beea13e7a63cb6ed4541459857197f5
+SIZE (xpi/thunderbird-i18n-30.0b1/sl.xpi) = 434795
+SHA256 (xpi/thunderbird-i18n-30.0b1/sq.xpi) = b6ae452418139ce06b252de870227647158f9c83c2a04d9d024ddc7138fa4157
+SIZE (xpi/thunderbird-i18n-30.0b1/sq.xpi) = 451620
+SHA256 (xpi/thunderbird-i18n-30.0b1/sr.xpi) = 1d2b9a1dfac6c295ee6761aaf94f0fc82f0eace5e70dccfa9e6a0b3fb0718d3b
+SIZE (xpi/thunderbird-i18n-30.0b1/sr.xpi) = 534083
+SHA256 (xpi/thunderbird-i18n-30.0b1/sv-SE.xpi) = f1e9a29b644dcabbfad99d5fc09b565837aaf3699483929d011c8aea2dac5bc7
+SIZE (xpi/thunderbird-i18n-30.0b1/sv-SE.xpi) = 440557
+SHA256 (xpi/thunderbird-i18n-30.0b1/ta-LK.xpi) = c9f64b203861d72e2af7e8ba0196192cb107f83e9a7760565a8e8b7aa1e7804d
+SIZE (xpi/thunderbird-i18n-30.0b1/ta-LK.xpi) = 550128
+SHA256 (xpi/thunderbird-i18n-30.0b1/tr.xpi) = 2270a568ccc2ea3f7a09ff04080063285ebf79ab7ffe00a7c008236b85ecf8ea
+SIZE (xpi/thunderbird-i18n-30.0b1/tr.xpi) = 454359
+SHA256 (xpi/thunderbird-i18n-30.0b1/uk.xpi) = 728494adebf46ab7cc80d400c04b4823304c27bec1a01d189f3dc434e64f1520
+SIZE (xpi/thunderbird-i18n-30.0b1/uk.xpi) = 497066
+SHA256 (xpi/thunderbird-i18n-30.0b1/vi.xpi) = 3ea6aae016d69a9fa649520f7e3688d64717c729a5afbb07bcb9dd7c485ae50d
+SIZE (xpi/thunderbird-i18n-30.0b1/vi.xpi) = 510612
+SHA256 (xpi/thunderbird-i18n-30.0b1/zh-CN.xpi) = 8a28baa1b8302cee2d8c6e1dee28723466002481a8f2f7e670c4e5fa39d84119
+SIZE (xpi/thunderbird-i18n-30.0b1/zh-CN.xpi) = 460978
+SHA256 (xpi/thunderbird-i18n-30.0b1/zh-TW.xpi) = 658695dc2f35884c3169fecdc2fc78ff3148843145838157bad9449e7a84397f
+SIZE (xpi/thunderbird-i18n-30.0b1/zh-TW.xpi) = 461728
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/Makefile Sun Jun 22 04:25:57 2014 (r1610)
@@ -2,43 +2,45 @@
# $FreeBSD: head/mail/thunderbird/Makefile 339634 2014-01-13 21:00:02Z rene $
PORTNAME= thunderbird
-DISTVERSION= 24.6.0
+DISTVERSION= 31.0b1
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}
MAINTAINER= gecko@FreeBSD.org
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
-BUILD_DEPENDS= nspr>=4.10.2:${PORTSDIR}/devel/nspr \
- nss>=3.15.4:${PORTSDIR}/security/nss \
- sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
- cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
- soundtouch>=1.7.0:${PORTSDIR}/audio/soundtouch \
- harfbuzz>=0.9.16:${PORTSDIR}/print/harfbuzz \
- graphite2>=1.2.3:${PORTSDIR}/graphics/graphite2 \
+BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \
+ nss>=3.16:${PORTSDIR}/security/nss \
+ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
+ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
+ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
+ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
+ sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
+# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \
+
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
-EM_VERSION= 1.6
-L_VERSION= 2.6.5
+EM_VERSION= 1.6.1_pre20140112
+L_VERSION= 3.3
SSP_UNSAFE= yes
USE_AUTOTOOLS= autoconf213:env
USE_PYTHON_BUILD=2
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
-USE_MOZILLA= # empty
+USE_MOZILLA= -cairo
WANT_GNOME= yes
-USE_QT4= # empty
+USE_QT5= # empty
QT_NONSTANDARD= yes
ALL_TARGET= default
USE_GL= gl
@@ -73,27 +75,50 @@
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-esr24
+WRKSRC= ${WRKDIR}/comm-beta
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>
+# http://svnweb.freebsd.org/changeset/base/255804
+.if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056
+. 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
+.endif
+
.if ${PORT_OPTIONS:MALSA}
BUILD_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
.endif
+.if ${PORT_OPTIONS:MGSTREAMER}
+BUILD_DEPENDS+= gstreamer1-libav>=1.2.4:${PORTSDIR}/multimedia/gstreamer1-libav
+.endif
+
.if ${PORT_OPTIONS:MENIGMAIL}
-MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail
+#MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail
+MASTER_SITES+= https://dev.gentoo.org/~polynomial-c/mozilla/:enigmail
DISTFILES+= ${EM_DISTFILE}:enigmail
RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
EM_DISTNAME= enigmail-${EM_VERSION}
-EM_DISTFILE= ${EM_DISTNAME}.tar.gz
-EM_XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-${OPSYS:tl}-${ARCH:S/amd64/x86_64/}.xpi
+EM_DISTFILE= ${EM_DISTNAME}.tar.xz
+EM_XPI_FILE= ${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}-${OPSYS:tl}-${ARCH:S/amd64/x86_64/:S/i386/x86/}-gcc3.xpi
EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5}
EM_ID= ${PORTNAME}@mozilla-enigmail.org
EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \
${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \
${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
.endif
.if ${PORT_OPTIONS:MLIGHTNING}
@@ -122,10 +147,11 @@
${WRKSRC}/mail/app/nsMailApp.cpp
.if ${PORT_OPTIONS:MENIGMAIL}
@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \
- ${WRKSRC}/mailnews/extensions/enigmail/makemake
+ ${WRKSRC}/mailnews/extensions/enigmail/util/fixlang.pl \
+ ${WRKSRC}/mailnews/extensions/enigmail/util/make-lang-xpi.pl
@${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \
-e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \
- ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in
+ ${WRKSRC}/mailnews/extensions/enigmail/Makefile
@${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \
-e '/em:maxVersion/s/pre//' \
${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf
@@ -137,11 +163,13 @@
(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
.if ${PORT_OPTIONS:MENIGMAIL}
+post-configure:
+ cd ${WRKSRC}/mailnews/extensions/enigmail/ && \
+ ${SETENV} ${MAKE_ENV} ./configure
+
post-build:
- cd ${WRKSRC}/mailnews/extensions/enigmail && \
- ./makemake -r -o ${MOZ_OBJDIR}
${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} all xpi \
- -C ${MOZ_OBJDIR}/mailnews/extensions/enigmail
+ -C ${WRKSRC}/mailnews/extensions/enigmail
.endif
port-pre-install:
Modified: trunk/mail/thunderbird/distinfo
==============================================================================
--- trunk/mail/thunderbird/distinfo Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/distinfo Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,2 +1,4 @@
-SHA256 (thunderbird-24.6.0.source.tar.bz2) = 14ece268a3a83f8658cb140884892ca662c08751614bf9b250931f7fdc5b25f0
-SIZE (thunderbird-24.6.0.source.tar.bz2) = 140368737
+SHA256 (thunderbird-31.0b1.source.tar.bz2) = 39385e202c66b288e110d674e7da6801ea22f919d07d85cf1d75f5301ba58cb3
+SIZE (thunderbird-31.0b1.source.tar.bz2) = 170609945
+SHA256 (enigmail-1.6.1_pre20140112.tar.xz) = 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149
+SIZE (enigmail-1.6.1_pre20140112.tar.xz) = 916028
Added: trunk/mail/thunderbird/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl Sun Jun 22 04:25:57 2014 (r1610)
@@ -0,0 +1,53 @@
+commit 49a1daf
+Author: Patrick Brunschwig <patrick@enigmail.net>
+Date: Tue Jan 28 18:10:54 2014 +0100
+
+ fixed detection of compiler type for better supporting cross-compilers
+---
+ config/getOsTarget.pl | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git config/getOsTarget.pl config/getOsTarget.pl
+index 91285cd..cf4a233 100755
+--- mailnews/extensions/enigmail/config/getOsTarget.pl
++++ mailnews/extensions/enigmail/config/getOsTarget.pl
+@@ -9,13 +9,15 @@
+ # -c : CPU and compiler type
+ # -o : OS type
+
++use File::Basename;
++
+ if ($#ARGV != 3) {
+ exit (1);
+ }
+
+ my $srcOs = $ARGV[1];
+ my $srcCpu = $ARGV[2];
+-my $srcComp = $ARGV[3];
++my $srcComp = basename($ARGV[3]);
+
+ my $targetOs = "";
+ my $targetCpu = "";
+@@ -95,10 +97,10 @@ else {
+ if ($targetOs eq "WINNT") {
+ $targetComp = "msvc";
+ }
+-if ($srcComp =~ /^gcc/) {
++elsif ($srcComp =~ /gcc/ || $srcComp =~ /clang/) {
+ $targetComp = "gcc3";
+ }
+-elsif ($srcComp =~ /^cc/) {
++elsif ($srcComp =~ /cc/) {
+ if ($targetOs eq "SunOS") {
+ $targetComp = "sunc";
+ }
+@@ -107,6 +109,9 @@ elsif ($srcComp =~ /cc/) {
+ elsif ($targetOs eq "AIX") {
+ $targetComp = "ibmc";
+ }
++ else {
++ $targetComp = "gcc3";
++ }
+ }
+ else {
+ $targetComp = $srcComp;
Modified: trunk/mail/thunderbird/files/patch-bug1013675
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug1013675 Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/files/patch-bug1013675 Sun Jun 22 04:25:57 2014 (r1610)
@@ -2,7 +2,7 @@
index 13a286f..293bd73 100644
--- mozilla/xpcom/base/nsDebugImpl.cpp
+++ mozilla/xpcom/base/nsDebugImpl.cpp
-@@ -45,13 +45,44 @@
+@@ -45,12 +45,43 @@
#endif
#endif
@@ -10,7 +10,6 @@
+#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
+ || defined(__NetBSD__) || defined(__OpenBSD__)
#include <stdbool.h>
- #include <sys/types.h>
#include <unistd.h>
+#include <sys/param.h>
#include <sys/sysctl.h>
Modified: trunk/mail/thunderbird/files/patch-bug1015547
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug1015547 Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/files/patch-bug1015547 Sun Jun 22 04:25:57 2014 (r1610)
@@ -2,11 +2,12 @@
index 7bed45f..053de17 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -3166,6 +3166,7 @@ AC_CHECK_FUNCS(random strerror lchown fc
- AC_CHECK_FUNCS(statvfs64 statvfs statfs64 statfs)
- AC_CHECK_FUNCS(flockfile getpagesize)
- AC_CHECK_FUNCS(localtime_r strtok_r)
-+AC_CHECK_FUNCS(arc4random arc4random_buf)
+@@ -2950,7 +2950,7 @@ dnl Checks for library functions.
+ dnl ========================================================
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MEMCMP
+-AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r)
++AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r arc4random arc4random_buf)
dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
Copied and modified: trunk/mail/thunderbird/files/patch-bug1023028 (from r1609, trunk/www/firefox-nightly/files/patch-bug1023028)
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug1023028 Sun Jun 22 04:24:32 2014 (r1609, copy source)
+++ trunk/mail/thunderbird/files/patch-bug1023028 Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,7 +1,7 @@
diff --git configure.in configure.in
index 41aebf5..c2dfac7 100644
---- configure.in
-+++ configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
@@ -1302,6 +1302,9 @@ dnl ========================================================
dnl GNU specific defaults
dnl ========================================================
Copied and modified: trunk/mail/thunderbird/files/patch-bug1026828 (from r1609, trunk/www/firefox-nightly/files/patch-bug1026828)
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug1026828 Sun Jun 22 04:24:32 2014 (r1609, copy source)
+++ trunk/mail/thunderbird/files/patch-bug1026828 Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,7 +1,7 @@
diff --git storage/src/moz.build storage/src/moz.build
index 4cd2551..5c40536 100644
---- storage/src/moz.build
-+++ storage/src/moz.build
+--- mozilla/storage/src/moz.build
++++ mozilla/storage/src/moz.build
@@ -50,11 +50,14 @@ FINAL_LIBRARY = 'storagecomps'
# (such as NSS) might trigger an initialization of sqlite and allocation
# of memory using the default allocator, prior to the storage service
Modified: trunk/mail/thunderbird/files/patch-bug779713
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug779713 Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/files/patch-bug779713 Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,8 +1,13 @@
-diff --git mfbt/Util.h mfbt/Util.h
-index e0843ca..353ec36 100644
---- mozilla/mfbt/Util.h
-+++ mozilla/mfbt/Util.h
-@@ -19,6 +19,13 @@
+--- mozilla/mfbt/Alignment.h
++++ mozilla/mfbt/Alignment.h
+@@ -9,11 +9,20 @@
+ #ifndef mozilla_Alignment_h
+ #define mozilla_Alignment_h
+
++#include "mozilla/Attributes.h"
++
+ #include <stddef.h>
+ #include <stdint.h>
namespace mozilla {
@@ -14,9 +19,9 @@
+#define MOZ_ALIGNOF(T) __alignof(T)
+#else
/*
- * This class, and the corresponding macro MOZ_ALIGNOF, figure out how many
+ * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
* bytes of alignment a given type needs.
-@@ -37,6 +44,7 @@ class AlignmentFinder
+@@ -32,6 +41,7 @@ public:
};
#define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
@@ -24,7 +29,7 @@
/*
* Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
-@@ -48,7 +56,10 @@ class AlignmentFinder
+@@ -43,7 +53,10 @@ public:
* will declare a two-character array |arr| aligned to 8 bytes.
*/
@@ -40,7 +45,7 @@
index d317766..ddb13da 100644
--- mozilla/mfbt/Attributes.h
+++ mozilla/mfbt/Attributes.h
-@@ -67,6 +67,9 @@
+@@ -54,6 +54,9 @@
# ifndef __has_extension
# define __has_extension __has_feature /* compatibility, for older versions of clang */
# endif
@@ -50,7 +55,7 @@
# if __has_extension(cxx_constexpr)
# define MOZ_HAVE_CXX11_CONSTEXPR
# endif
-@@ -85,6 +88,9 @@
+@@ -75,6 +78,9 @@
# endif
#elif defined(__GNUC__)
# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
@@ -60,13 +65,11 @@
# if MOZ_GCC_VERSION_AT_LEAST(4, 7, 0)
# define MOZ_HAVE_CXX11_OVERRIDE
# define MOZ_HAVE_CXX11_FINAL final
-@@ -102,6 +108,9 @@
- # define MOZ_HAVE_NEVER_INLINE __attribute__((noinline))
+@@ -96,6 +102,7 @@
# define MOZ_HAVE_NORETURN __attribute__((noreturn))
#elif defined(_MSC_VER)
-+# if _MSC_VER >= 1800
+ # if _MSC_VER >= 1800
+# define MOZ_HAVE_CXX11_ALIGNAS
-+# endif
+ # define MOZ_HAVE_CXX11_DELETE
+ # endif
# if _MSC_VER >= 1700
- # define MOZ_HAVE_CXX11_FINAL final
- # else
Deleted: trunk/mail/thunderbird/files/patch-bug783463
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug783463 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- mozilla/gfx/skia/moz.build~
-+++ mozilla/gfx/skia/moz.build
-@@ -188,10 +188,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
- 'SkMMapStream.cpp',
- 'SkOSFile.cpp',
- ]
-- if CONFIG['OS_TARGET'] == 'Linux':
-+ if CONFIG['MOZ_X11'] == 1 or CONFIG['OS_TARGET'] == 'Linux':
- CPP_SOURCES += [
- 'SkFontHost_linux.cpp',
-- 'SkFontHost_tables.cpp',
- 'SkThread_pthread.cpp',
- 'SkTime_Unix.cpp',
- ]
Deleted: trunk/mail/thunderbird/files/patch-bug803480
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug803480 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,102 +0,0 @@
-diff --git configure.in configure.in
-index a0575dc..be327fd 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -4306,7 +4306,6 @@ NS_PRINTING=1
- MOZ_PDF_PRINTING=
- MOZ_DISABLE_CRYPTOLEGACY=
- NSS_DISABLE_DBM=
--NECKO_WIFI=1
- NECKO_COOKIES=1
- NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource websocket wyciwyg device"
- USE_ARM_KUSER=
-@@ -4336,11 +4335,6 @@ case "${target}" in
- fi
-
- NSS_DISABLE_DBM=1
-- if test -z "$gonkdir"; then
-- NECKO_WIFI=
-- else
-- NECKO_WIFI=1
-- fi
- MOZ_THEME_FASTSTRIPE=1
- MOZ_TREE_FREETYPE=1
- MOZ_MEMORY=1
-@@ -8485,28 +8479,39 @@ done
- dnl
- dnl option to disable necko's wifi scanner
- dnl
-+
-+case "$OS_TARGET" in
-+ OS2)
-+ dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-+ ;;
-+ Android)
-+ if test -n "$gonkdir"; then
-+ NECKO_WIFI=1
-+ fi
-+ ;;
-+ Darwin|SunOS|WINNT)
-+ NECKO_WIFI=1
-+ ;;
-+ Linux)
-+ if test -z "$MOZ_ENABLE_DBUS"; then
-+ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
-+ fi
-+ NECKO_WIFI=1
-+ NECKO_WIFI_DBUS=1
-+ ;;
-+esac
-+
- MOZ_ARG_DISABLE_BOOL(necko-wifi,
- [ --disable-necko-wifi Disable necko wifi scanner],
- NECKO_WIFI=,
- NECKO_WIFI=1)
-
--if test "$OS_ARCH" = "OS2"; then
-- dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-- NECKO_WIFI=
--fi
--if test "$NECKO_WIFI" -a \
-- "$OS_ARCH" != "Linux" -a \
-- "$OS_ARCH" != "Darwin" -a \
-- "$OS_ARCH" != "SunOS" -a \
-- "$OS_ARCH" != "WINNT"; then
-- AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
--fi
--
- if test "$NECKO_WIFI"; then
- AC_DEFINE(NECKO_WIFI)
- _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
- fi
- AC_SUBST(NECKO_WIFI)
-+AC_SUBST(NECKO_WIFI_DBUS)
-
- dnl
- dnl option to disable cookies
-diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in
-index 26dbd79..4cbf912 100644
---- mozilla/netwerk/wifi/Makefile.in
-+++ mozilla/netwerk/wifi/Makefile.in
-@@ -20,7 +20,7 @@ ifeq ($(OS_ARCH),SunOS)
- OS_INCLUDES += $(GLIB_CFLAGS)
- endif
-
--ifdef MOZ_ENABLE_DBUS
-+ifdef NECKO_WIFI_DBUS
- OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
- endif
-
-diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build
-index 5e70211..07b01de 100644
---- mozilla/netwerk/wifi/moz.build
-+++ mozilla/netwerk/wifi/moz.build
-@@ -43,7 +43,7 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
- 'nsWifiScannerSolaris.cpp',
- ]
-
--if CONFIG['MOZ_ENABLE_DBUS']:
-+if CONFIG['NECKO_WIFI_DBUS']:
- CPP_SOURCES += [
- 'nsWifiScannerDBus.cpp',
- ]
Deleted: trunk/mail/thunderbird/files/patch-bug807492
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug807492 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,628 +0,0 @@
-JJdiff --git configure.in configure.in
-index c167461..8346c11 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -5246,17 +5246,17 @@ if test "$NS_PRINTING"; then
- AC_DEFINE(NS_PRINT_PREVIEW)
- fi
-
- dnl Turn off webrtc for OS's we don't handle yet, but allow
- dnl --enable-webrtc to override. Can disable for everything in
- dnl the master list above.
- if test -n "$MOZ_WEBRTC"; then
- case "$target" in
-- *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*)
-+ *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
- dnl Leave enabled
- ;;
- *)
- dnl default to disabled for all others
- MOZ_WEBRTC=
- ;;
- esac
- fi
-diff --git media/mtransport/objs.mk media/mtransport/objs.mk
-index f1fc85f..141e8ca 100644
---- mozilla/media/mtransport/objs.mk
-+++ mozilla/media/mtransport/objs.mk
-@@ -18,22 +18,26 @@ LOCAL_INCLUDES += \
- -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/util/libekr \
- -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/log \
- -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/registry \
- -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/stats \
- -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/plugin \
- -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/event \
- $(NULL)
-
--ifeq ($(OS_TARGET), Darwin)
-+ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
- LOCAL_INCLUDES += \
- -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include \
- -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \
- $(NULL)
-+ifeq ($(OS_TARGET), Darwin)
- DEFINES += -DDARWIN
-+else
-+DEFINES += -DBSD
-+endif
- endif
-
- ifeq ($(OS_TARGET), Linux)
- LOCAL_INCLUDES += \
- -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include \
- -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \
- $(NULL)
- DEFINES += -DLINUX
-diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in
-index c1d5bf4..2ecf2c7 100644
---- mozilla/media/mtransport/test/Makefile.in
-+++ mozilla/media/mtransport/test/Makefile.in
-@@ -73,22 +73,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1
- else
- #default_fallback; probably doesn't work
- DEFINES += -D__Userspace_os_$(OS_TARGET)=1
- endif
- endif
- endif
- endif
-
--ifeq ($(OS_TARGET), Darwin)
-+ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
- LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include
-+ifeq ($(OS_TARGET), Darwin)
- DEFINES += \
- -DGTEST_USE_OWN_TR1_TUPLE=1 \
- $(NULL)
- endif
-+endif
-
- ifeq ($(OS_TARGET), Linux)
- LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include
- endif
-
- ifeq ($(OS_TARGET), Android)
- LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/android/include
-
-diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
-index 0e1f8b4..9a4b995 100644
---- mozilla/media/mtransport/third_party/nICEr/nicer.gyp
-+++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp
-@@ -126,26 +126,36 @@
- 'R_DEFINED_UINT2=uint16_t',
- 'R_DEFINED_INT4=int32_t',
- 'R_DEFINED_UINT4=uint32_t',
- 'R_DEFINED_INT8=int64_t',
- 'R_DEFINED_UINT8=uint64_t',
- ],
-
- 'conditions' : [
-- ## Mac
-+ ## Mac and BSDs
- [ 'OS == "mac"', {
-+ 'defines' : [
-+ 'DARWIN',
-+ 'HAVE_XLOCALE',
-+ ],
-+ }],
-+ [ 'os_bsd == 1', {
-+ 'defines' : [
-+ 'BSD',
-+ ],
-+ }],
-+ [ 'OS == "mac" or os_bsd == 1', {
- 'cflags_mozilla': [
- '-Wall',
- '-Wno-parentheses',
- '-Wno-strict-prototypes',
- '-Wmissing-prototypes',
- ],
- 'defines' : [
-- 'DARWIN',
- 'HAVE_LIBM=1',
- 'HAVE_STRDUP=1',
- 'HAVE_STRLCPY=1',
- 'HAVE_SYS_TIME_H=1',
- 'HAVE_VFPRINTF=1',
- 'NEW_STDIO'
- 'RETSIGTYPE=void',
- 'TIME_WITH_SYS_TIME_H=1',
-diff --git media/mtransport/third_party/nICEr/src/stun/addrs.c media/mtransport/third_party/nICEr/src/stun/addrs.c
-index b0b66b2..04fea94 100644
---- mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c
-+++ mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c
-@@ -50,17 +50,19 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
- #else
- #include <syslog.h>
- /* Work around an Android NDK < r8c bug */
- #undef __unused
- #include <linux/sysctl.h>
- #endif
- #include <net/if.h>
- #ifndef LINUX
-+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
- #include <net/if_var.h>
-+#endif
- #include <net/if_dl.h>
- #include <net/if_types.h>
- #include <sys/sockio.h>
- #else
- #include <linux/if.h>
- #endif
- #include <net/route.h>
-
-@@ -75,17 +77,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
- #include <netdb.h>
- #endif /* UNIX */
-
- #include "stun.h"
- #include "addrs.h"
-
-
-
--#ifdef DARWIN
-+#if defined(BSD) || defined(DARWIN)
- /*
- * Copyright (c) 1983, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
-@@ -685,17 +687,17 @@ nr_stun_remove_duplicate_addrs(nr_transport_addr addrs[], int remove_loopback, i
- }
-
- int
- nr_stun_get_addrs(nr_transport_addr addrs[], int maxaddrs, int drop_loopback, int *count)
- {
- int _status=0;
- int i;
-
--#ifdef DARWIN
-+#if defined(BSD) || defined(DARWIN)
- _status = stun_get_mib_addrs(addrs, maxaddrs, count);
- #elif defined(WIN32)
- _status = stun_get_win32_addrs(addrs, maxaddrs, count);
- #elif defined(__sparc__)
- _status = stun_get_sparc_addrs(addrs, maxaddrs, count);
- #else
- _status = stun_get_siocgifconf_addrs(addrs, maxaddrs, count);
- #endif
-diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h
-index a3c51f9..eb65ac8 100644
---- mozilla/media/mtransport/third_party/nICEr/src/stun/stun.h
-+++ mozilla/media/mtransport/third_party/nICEr/src/stun/stun.h
-@@ -36,21 +36,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- #ifdef WIN32
- #include <winsock2.h>
- #else
- #include <sys/param.h>
- #include <sys/socket.h>
- #include <net/if.h>
- #ifndef LINUX
-+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
- #include <net/if_var.h>
-+#endif
- #include <net/if_dl.h>
- #include <net/if_types.h>
- #endif
-+#ifndef BSD
- #include <net/route.h>
-+#endif
- #include <netinet/in.h>
- #ifndef LINUX
- #include <netinet/in_var.h>
- #endif
- #include <arpa/inet.h>
- #include <netdb.h>
- #endif
- #include <time.h>
-diff --git media/mtransport/third_party/nICEr/src/util/mbslen.c media/mtransport/third_party/nICEr/src/util/mbslen.c
-index cc260b7..66af2d7 100644
---- mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c
-+++ mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c
-@@ -38,50 +38,58 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- #include <errno.h>
- #include <csi_platform.h>
-
- #include <assert.h>
- #include <locale.h>
- #include <stdlib.h>
- #include <wchar.h>
--#ifdef DARWIN
-+
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+# if __FreeBSD_version > 900505
-+# define HAVE_XLOCALE
-+# endif
-+#endif
-+
-+#ifdef HAVE_XLOCALE
- #include <xlocale.h>
--#endif /* DARWIN */
-+#endif /* HAVE_XLOCALE */
-
- #include "nr_api.h"
- #include "mbslen.h"
-
- /* get number of characters in a mult-byte character string */
- int
- mbslen(const char *s, size_t *ncharsp)
- {
--#ifdef DARWIN
-+#ifdef HAVE_XLOCALE
- static locale_t loc = 0;
- static int initialized = 0;
--#endif /* DARWIN */
-+#endif /* HAVE_XLOCALE */
- #ifdef WIN32
- char *my_locale=0;
- unsigned int i;
- #endif /* WIN32 */
- int _status;
- size_t nbytes;
- int nchars;
- mbstate_t mbs;
-
--#ifdef DARWIN
-+#ifdef HAVE_XLOCALE
- if (! initialized) {
- initialized = 1;
- loc = newlocale(LC_CTYPE_MASK, "UTF-8", LC_GLOBAL_LOCALE);
- }
-
- if (loc == 0) {
- /* unable to create the UTF-8 locale */
- assert(loc != 0); /* should never happen */
--#endif /* DARWIN */
-+#endif /* HAVE_XLOCALE */
-
- #ifdef WIN32
- if (!setlocale(LC_CTYPE, 0))
- ABORT(R_INTERNAL);
-
- if (!(my_locale = r_strdup(setlocale(LC_CTYPE, 0))))
- ABORT(R_NO_MEMORY);
-
-@@ -94,28 +102,28 @@ mbslen(const char *s, size_t *ncharsp)
- /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */
- /* null-checking setlocale is required because Android */
- char *locale = setlocale(LC_CTYPE, 0);
- /* some systems use "utf8" instead of "UTF-8" like Fedora 17 */
- if (!locale || (!strcasestr(locale, "UTF-8") && !strcasestr(locale, "UTF8")))
- ABORT(R_NOT_FOUND);
- #endif
-
--#ifdef DARWIN
-+#ifdef HAVE_XLOCALE
- }
--#endif /* DARWIN */
-+#endif /* HAVE_XLOCALE */
-
- memset(&mbs, 0, sizeof(mbs));
- nchars = 0;
-
--#ifdef DARWIN
-+#ifdef HAVE_XLOCALE
- while (*s != '\0' && (nbytes = mbrlen_l(s, strlen(s), &mbs, loc)) != 0)
- #else
- while (*s != '\0' && (nbytes = mbrlen(s, strlen(s), &mbs)) != 0)
--#endif /* DARWIN */
-+#endif /* HAVE_XLOCALE */
- {
- if (nbytes == (size_t)-1) /* should never happen */ {
- ABORT(R_INTERNAL);
- }
- if (nbytes == (size_t)-2) /* encoding error */ {
- ABORT(R_BAD_DATA);
- }
-
-diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
-index 3cc8e1c..74016c6 100644
---- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
-+++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
-@@ -142,26 +142,35 @@
- 'R_DEFINED_UINT2=uint16_t',
- 'R_DEFINED_INT4=int32_t',
- 'R_DEFINED_UINT4=uint32_t',
- 'R_DEFINED_INT8=int64_t',
- 'R_DEFINED_UINT8=uint64_t',
- ],
-
- 'conditions' : [
-- ## Mac
-+ ## Mac and BSDs
- [ 'OS == "mac"', {
-+ 'defines' : [
-+ 'DARWIN',
-+ ],
-+ }],
-+ [ 'os_bsd == 1', {
-+ 'defines' : [
-+ 'BSD',
-+ ],
-+ }],
-+ [ 'OS == "mac" or os_bsd == 1', {
- 'cflags_mozilla': [
- '-Wall',
- '-Wno-parentheses',
- '-Wno-strict-prototypes',
- '-Wmissing-prototypes',
- ],
- 'defines' : [
-- 'DARWIN',
- 'HAVE_LIBM=1',
- 'HAVE_STRDUP=1',
- 'HAVE_STRLCPY=1',
- 'HAVE_SYS_TIME_H=1',
- 'HAVE_VFPRINTF=1',
- 'NEW_STDIO'
- 'RETSIGTYPE=void',
- 'TIME_WITH_SYS_TIME_H=1',
-diff --git media/mtransport/third_party/nrappkit/src/log/r_log.c media/mtransport/third_party/nrappkit/src/log/r_log.c
-index efb7ef2..aebf578 100644
---- mozilla/media/mtransport/third_party/nrappkit/src/log/r_log.c
-+++ mozilla/media/mtransport/third_party/nrappkit/src/log/r_log.c
-@@ -43,16 +43,17 @@ static char *RCSSTRING __UNUSED__ ="$Id: r_log.c,v 1.10 2008/11/25 22:25:18 adam
- #ifdef LINUX
- #define _BSD_SOURCE
- #endif
-
- #include "r_log.h"
- #include "hex.h"
-
- #include <string.h>
-+#include <errno.h>
- #ifndef _MSC_VER
- #include <strings.h>
- #include <syslog.h>
- #endif
- #include <registry.h>
- #include <time.h>
-
-
-diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-index bcb1ec0..bb73591 100644
---- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-+++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-@@ -33,7 +33,7 @@
- #ifndef _SYS_QUEUE_H_
- #define _SYS_QUEUE_H_
-
--#ifndef DARWIN
-+#if !defined(__FreeBSD__) && !defined(DARWIN)
- #include <stddef.h>
- #define __offsetof offsetof
- #endif
-diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c
-index a7d4ff1..ff11a60 100644
---- mozilla/media/mtransport/third_party/nrappkit/src/util/util.c
-+++ mozilla/media/mtransport/third_party/nrappkit/src/util/util.c
-@@ -40,16 +40,17 @@
- static char *RCSSTRING __UNUSED__ ="$Id: util.c,v 1.5 2007/11/21 00:09:13 adamcain Exp $";
-
- #ifndef WIN32
- #include <sys/uio.h>
- #include <pwd.h>
- #include <dirent.h>
- #endif
- #include <string.h>
-+#include <errno.h>
- #include <ctype.h>
- #include <sys/stat.h>
- #ifdef OPENSSL
- #include <openssl/evp.h>
- #endif
- #include "nr_common.h"
- #include "r_common.h"
- #include "registry.h"
-diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
-index 2a91e3d..31de641 100644
---- mozilla/media/webrtc/signaling/signaling.gyp
-+++ mozilla/media/webrtc/signaling/signaling.gyp
-@@ -212,16 +212,29 @@
- 'SIPCC_BUILD',
- 'HAVE_WINSOCK2_H',
- 'CPR_STDINT_INCLUDE=\\"mozilla/StandardInteger.h\\"'
- ],
-
- 'cflags_mozilla': [
- ],
- }],
-+ ['os_bsd==1', {
-+ 'include_dirs': [
-+ ],
-+ 'defines': [
-+ # avoiding pointless ifdef churn
-+ 'SIP_OS_OSX',
-+ 'OSX',
-+ 'SECLIB_OPENSSL',
-+ ],
-+
-+ 'cflags_mozilla': [
-+ ],
-+ }],
- ['OS=="mac"', {
- 'include_dirs': [
- ],
- 'defines': [
- 'SIP_OS_OSX',
- 'OSX',
- '_FORTIFY_SOURCE=2',
- ],
-@@ -747,17 +760,17 @@
- 'EXTERNAL_TICK_REQUIRED',
- 'GIPS_VER=3480',
- ],
-
- 'cflags_mozilla': [
- ],
-
- }],
-- ['OS=="mac"', {
-+ ['OS=="mac" or os_bsd==1', {
-
- 'include_dirs': [
- ],
-
- 'sources': [
- # SIPSTACK
- './src/sipcc/core/sipstack/sip_platform_task.c',
-
-@@ -792,24 +805,23 @@
- './src/sipcc/cpr/darwin/cpr_darwin_timers_using_select.c',
- './src/sipcc/cpr/darwin/cpr_darwin_tst.h',
- './src/sipcc/cpr/darwin/cpr_darwin_types.h',
- ],
-
-
- 'defines' : [
- 'SIP_OS_OSX',
-- '_POSIX_SOURCE',
-+ # using BSD extensions, leave _POSIX_SOURCE undefined
- 'CPR_MEMORY_LITTLE_ENDIAN',
- 'NO_SOCKET_POLLING',
- 'USE_TIMER_SELECT_BASED',
- 'FULL_BUILD',
- 'STUBBED_OUT',
- 'USE_PRINTF',
-- '_DARWIN_C_SOURCE',
- 'NO_NSPR_10_SUPPORT',
- ],
-
- 'cflags_mozilla': [
- ],
- }],
- ],
-
-diff --git media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
-index a7c47e1..4f191de 100644
---- mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
-+++ mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
-@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
- {
- static const char fname[] = "cprGetMessage";
-
- void *buffer = 0;
- cpr_msg_queue_t *msgq;
- cpr_msgq_node_t *node;
- struct timespec timeout;
- struct timeval tv;
-+#ifndef __APPLE__
-+ struct timezone tz;
-+#else
- // On the iPhone, there is a DarwinAlias problem with "timezone"
- struct _timezone {
- int tz_minuteswest; /* of Greenwich */
- int tz_dsttime; /* type of dst correction to apply */
- } tz;
-+#endif
-
- /* Initialize ppUserData */
- if (ppUserData) {
- *ppUserData = NULL;
- }
-
- msgq = (cpr_msg_queue_t *) msgQueue;
- if (msgq == NULL) {
-diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
-index a30e330..cfbd8a3 100644
---- mozilla/media/webrtc/signaling/test/Makefile.in
-+++ mozilla/media/webrtc/signaling/test/Makefile.in
-@@ -81,17 +81,17 @@ endif
- ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
- LIBS += \
- $(XLIBS) \
- $(TK_LIBS) \
- $(MOZ_PANGO_LIBS) \
- $(NULL)
- endif
-
--ifeq ($(OS_TARGET),Linux)
-+ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
- LIBS += \
- $(MOZ_CAIRO_OSLIBS) \
- $(NULL)
- endif
-
- ifeq ($(OS_TARGET),Darwin)
- LIBS += \
- -framework AudioToolbox \
-diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
-index 338d0b7..2241d41 100644
---- mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
-+++ mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
-@@ -1,16 +1,17 @@
- # Copyright (c) 2012 Mozilla Foundation. All rights reserved.
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
- import collections
- import gyp
- import gyp.common
- import sys
-+import platform
- import os
- import re
- import shlex
-
- generator_wants_sorted_dependencies = True
-
- generator_default_variables = {
- }
-@@ -107,30 +108,44 @@ endif
-
- def ensure_directory_exists(path):
- dir = os.path.dirname(path)
- if dir and not os.path.exists(dir):
- os.makedirs(dir)
-
- def GetFlavor(params):
- """Returns |params.flavor| if it's set, the system's default flavor else."""
-+ system = platform.system().lower()
- flavors = {
-- 'win32': 'win',
-- 'darwin': 'mac',
-- 'sunos5': 'solaris',
-- 'freebsd7': 'freebsd',
-- 'freebsd8': 'freebsd',
-+ 'microsoft': 'win',
-+ 'windows' : 'win',
-+ 'darwin' : 'mac',
-+ 'sunos' : 'solaris',
-+ 'dragonfly': 'bsd',
-+ 'freebsd' : 'bsd',
-+ 'netbsd' : 'bsd',
-+ 'openbsd' : 'bsd',
- }
-- flavor = flavors.get(sys.platform, 'linux')
-- return params.get('flavor', flavor)
-+
-+ if 'flavor' in params:
-+ return params['flavor']
-+ if system.startswith('cygwin'):
-+ return 'win'
-+ if system in flavors:
-+ return flavors[system]
-+
-+ return 'linux'
-
-
- def CalculateVariables(default_variables, params):
-+ flavor = GetFlavor(params)
-+ if flavor == 'bsd':
-+ flavor = platform.system().lower()
- generator_flags = params.get('generator_flags', {})
-- default_variables['OS'] = generator_flags.get('os', GetFlavor(params))
-+ default_variables['OS'] = generator_flags.get('os', flavor)
-
-
- def CalculateGeneratorInputInfo(params):
- """Calculate the generator specific info that gets fed to input (called by
- gyp)."""
- generator_flags = params.get('generator_flags', {})
- if generator_flags.get('adjust_static_libraries', False):
- global generator_wants_static_library_dependencies_adjusted
Deleted: trunk/mail/thunderbird/files/patch-bug810716
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug810716 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,68 +0,0 @@
-diff --git configure.in configure.in
-index 2084be9..eb6eeb2 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -3369,14 +3369,19 @@ fi
- AC_CACHE_CHECK(
- [for res_ninit()],
- ac_cv_func_res_ninit,
-- [AC_TRY_LINK([
-+ [AC_TRY_RUN([
- #ifdef linux
- #define _BSD_SOURCE 1
- #endif
-+ #include <sys/types.h>
-+ #include <netinet/in.h>
-+ #include <arpa/nameser.h>
- #include <resolv.h>
-- ],
-- [int foo = res_ninit(&_res);],
-+ int main(int argc, char **argv){
-+ int foo = res_ninit(&_res);
-+ }],
- [ac_cv_func_res_ninit=yes],
-+ [ac_cv_func_res_ninit=no],
- [ac_cv_func_res_ninit=no])
- ])
-
-diff --git extensions/auth/nsAuthGSSAPI.cpp extensions/auth/nsAuthGSSAPI.cpp
-index e828beb..6444246 100644
---- mozilla/extensions/auth/nsAuthGSSAPI.cpp
-+++ mozilla/extensions/auth/nsAuthGSSAPI.cpp
-@@ -39,6 +39,9 @@ typedef KLStatus (*KLCacheHasValidTickets_type)(
- #endif
-
- #if defined(HAVE_RES_NINIT)
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
- #include <resolv.h>
- #endif
-
-diff --git js/src/configure.in js/src/configure.in
-index e25f569..b9722f9 100644
---- mozilla/js/src/configure.in
-+++ mozilla/js/src/configure.in
-@@ -2797,14 +2797,19 @@ fi
- AC_CACHE_CHECK(
- [for res_ninit()],
- ac_cv_func_res_ninit,
-- [AC_TRY_LINK([
-+ [AC_TRY_RUN([
- #ifdef linux
- #define _BSD_SOURCE 1
- #endif
-+ #include <sys/types.h>
-+ #include <netinet/in.h>
-+ #include <arpa/nameser.h>
- #include <resolv.h>
-- ],
-- [int foo = res_ninit(&_res);],
-+ int main(int argc, char **argv){
-+ int foo = res_ninit(&_res);
-+ }],
- [ac_cv_func_res_ninit=yes],
-+ [ac_cv_func_res_ninit=no],
- [ac_cv_func_res_ninit=no])
- ])
-
Deleted: trunk/mail/thunderbird/files/patch-bug815219
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug815219 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
-changeset: 16465:dd53119788d8
-user: Mark Banner <bugzilla@standard8.plus.com>
-date: Fri Sep 06 10:09:39 2013 +0100
-summary: Port bug 815219 - Default to building with all available cores. rs=build system peer port,a=Standard8
-
-diff --git a/client.mk b/client.mk
---- client.mk
-+++ client.mk
-@@ -123,6 +123,13 @@ MOZCONFIG_OUT_LINES := $(subst $(CR), ,$
- START_COMMENT = \#
- MOZCONFIG_OUT_FILTERED := $(filter-out $(START_COMMENT)%,$(MOZCONFIG_OUT_LINES))
-
-+# Automatically add -jN to make flags if not defined. N defaults to number of cores.
-+ifeq (,$(findstring -j,$(MOZ_MAKE_FLAGS)))
-+ cores=$(shell $(PYTHON) -c 'import multiprocessing; print(multiprocessing.cpu_count())')
-+ MOZ_MAKE_FLAGS += -j$(cores)
-+endif
-+
-+
- ifndef MOZ_OBJDIR
- MOZ_OBJDIR = obj-$(CONFIG_GUESS)
- else
Modified: trunk/mail/thunderbird/files/patch-bug826985
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug826985 Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/files/patch-bug826985 Sun Jun 22 04:25:57 2014 (r1610)
@@ -26,22 +26,23 @@
dnl enable once Signaling lands
MOZ_WEBRTC_SIGNALING=1
AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -8981,6 +8984,10 @@ elif test "${OS_TARGET}" = "Android"; then
- fi
- fi
-
-+if test -n "$MOZ_LIBV4L2_LIBS"; then
-+ EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D use_libv4l2=1"
-+fi
-+
- if test -n "$MOZ_WEBRTC"; then
- AC_MSG_RESULT("generating WebRTC Makefiles...")
-
+diff --git build/gyp.mozbuild build/gyp.mozbuild
+index b483cd1..f1dd1f0 100644
+--- mozilla/build/gyp.mozbuild
++++ mozilla/build/gyp.mozbuild
+@@ -11,6 +11,7 @@ gyp_vars = {
+ 'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0,
+ 'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0,
+ 'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0,
++ 'use_libv4l2': 1 if CONFIG['MOZ_LIBV4L2_LIBS'] else 0,
+ # basic stuff for everything
+ 'include_internal_video_render': 0,
+ 'clang_use_chrome_plugins': 0,
diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
index b483cd1..f1dd1f0 100644
--- mozilla/media/webrtc/signaling/test/Makefile.in
+++ mozilla/media/webrtc/signaling/test/Makefile.in
-@@ -17,6 +17,7 @@ LIBS = \
+@@ -7,6 +7,7 @@ LIBS = \
$(NSPR_LIBS) \
$(NSS_LIBS) \
$(REALTIME_LIBS) \
@@ -53,7 +54,7 @@
index 239a292..bab496c 100644
--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-@@ -26,11 +26,23 @@
+@@ -25,10 +25,21 @@
#else
#include <linux/videodev2.h>
#endif
@@ -61,9 +62,8 @@
+#include <libv4l2.h>
+#endif
- #include "ref_count.h"
- #include "trace.h"
-
+ #include "webrtc/system_wrappers/interface/ref_count.h"
+ #include "webrtc/system_wrappers/interface/trace.h"
+#ifdef HAVE_LIBV4L2
+#define open v4l2_open
@@ -73,10 +73,9 @@
+#define mmap v4l2_mmap
+#define munmap v4l2_munmap
+#endif
-+
+
namespace webrtc
{
- namespace videocapturemodule
@@ -130,6 +142,11 @@ WebRtc_Word32 DeviceInfoLinux::GetDeviceName(
memset(deviceNameUTF8, 0, deviceNameLength);
memcpy(cameraName, cap.card, sizeof(cap.card));
@@ -152,13 +151,16 @@
],
diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
index 9c16ffa..1db3794 100644
---- mozilla/toolkit/library/Makefile.in
-+++ mozilla/toolkit/library/Makefile.in
-@@ -405,6 +405,7 @@ endif
+--- mozilla/toolkit/library/libxul.mk
++++ mozilla/toolkit/library/libxul.mk
+@@ -182,6 +182,10 @@ endif
+
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
- ifdef MOZ_WEBRTC
++ifdef MOZ_LIBV4L2_LIBS
+EXTRA_DSO_LDOPTS += $(MOZ_LIBV4L2_LIBS)
- ifdef MOZ_PEERCONNECTION
- COMPONENT_LIBS += peerconnection
- endif
++endif
++
+ ifdef MOZ_WEBRTC
+ ifeq (WINNT,$(OS_TARGET))
+ EXTRA_DSO_LDOPTS += \
Copied and modified: trunk/mail/thunderbird/files/patch-bug847568 (from r1609, trunk/mail/thunderbird/files/patch-z-bug847568)
==============================================================================
--- trunk/mail/thunderbird/files/patch-z-bug847568 Sun Jun 22 04:24:32 2014 (r1609, copy source)
+++ trunk/mail/thunderbird/files/patch-bug847568 Sun Jun 22 04:25:57 2014 (r1610)
@@ -33,7 +33,7 @@
index ac38f40..87536b7 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -8032,6 +8032,56 @@ if test "$USE_FC_FREETYPE"; then
+@@ -8032,6 +8032,52 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -46,9 +46,7 @@
+MOZ_NATIVE_HARFBUZZ=)
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
-+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.16)
-+else
-+ MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
++ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25)
+fi
+
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
@@ -64,7 +62,7 @@
+MOZ_NATIVE_GRAPHITE2=)
+
+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
-+ PKG_CHECK_MODULES(MOZ_GRAPHITE, graphite2)
++ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)
+
+ dnl graphite2.pc has bogus version, check manually
+ AC_TRY_COMPILE([ #include <graphite2/Font.h>
@@ -73,57 +71,35 @@
+ * 100 + GR2_VERSION_BUGFIX >= \
+ (major) * 10000 + (minor) * 100 + (bugfix) )
+ ], [
-+ #if !GR2_VERSION_REQUIRE(1,2,3)
++ #if !GR2_VERSION_REQUIRE(1,2,4)
+ #error "Insufficient graphite2 version."
+ #endif
+ ], [],
+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
-++else
-++ MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
+fi
+
+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
-+AC_SUBST(MOZ_GRAPHITE_CFLAGS)
-+AC_SUBST(MOZ_GRAPHITE_LIBS)
++AC_SUBST(MOZ_GRAPHITE2_CFLAGS)
++AC_SUBST(MOZ_GRAPHITE2_LIBS)
+
+dnl ========================================================
dnl Check for pixman and cairo
dnl ========================================================
-@@ -8379,18 +8412,6 @@ QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFI
- AC_SUBST(QCMS_LIBS)
-
- dnl ========================================================
--dnl HarfBuzz
--dnl ========================================================
--MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
--AC_SUBST(MOZ_HARFBUZZ_LIBS)
--
--dnl ========================================================
--dnl SIL Graphite
--dnl ========================================================
--MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
--AC_SUBST(MOZ_GRAPHITE_LIBS)
--
--dnl ========================================================
- dnl OTS
- dnl ========================================================
- MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
-diff --git content/base/src/Makefile.in content/base/src/Makefile.in
-index a618096..596901a 100644
---- mozilla/content/base/src/Makefile.in
-+++ mozilla/content/base/src/Makefile.in
-@@ -5,6 +5,10 @@
-
- include $(topsrcdir)/config/rules.mk
-
-+ifdef MOZ_NATIVE_HARFBUZZ
-+nsContentUtils.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
-+endif
-+
- # gcc requires -msse2 for this file since it uses SSE2 intrinsics. (See bug
- # 585538 comment 12.)
- ifneq (,$(INTEL_ARCHITECTURE))
+diff --git content/base/src/moz.build content/base/src/moz.build
+index d4f6380..0ee55df 100644
+--- mozilla/content/base/src/moz.build
++++ mozilla/content/base/src/moz.build
+@@ -179,6 +179,9 @@ SOURCES += [
+ 'nsObjectLoadingContent.cpp',
+ ]
+
++if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++ SOURCES['nsContentUtils.cpp'].flags += [CONFIG['MOZ_HARFBUZZ_CFLAGS']]
++
+ EXTRA_COMPONENTS += [
+ 'contentAreaDropListener.js',
+ 'contentAreaDropListener.manifest',
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
--- mozilla/gfx/moz.build
@@ -174,7 +150,7 @@
CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
++CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
+endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
@@ -196,29 +172,6 @@
+ifdef MOZ_NATIVE_HARFBUZZ
+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
+endif
-diff --git layout/media/Makefile.in layout/media/Makefile.in
-index 1cacbd7..a8cd156 100644
---- mozilla/layout/media/Makefile.in
-+++ mozilla/layout/media/Makefile.in
-@@ -18,10 +18,16 @@ endif
- SHARED_LIBRARY_LIBS = \
- $(MOZ_OTS_LIBS) \
- $(QCMS_LIBS) \
-- $(MOZ_GRAPHITE_LIBS) \
-- $(MOZ_HARFBUZZ_LIBS) \
- $(NULL)
-
-+ifndef MOZ_NATIVE_GRAPHITE2
-+SHARED_LIBRARY_LIBS += $(MOZ_GRAPHITE_LIBS)
-+endif
-+
-+ifndef MOZ_NATIVE_HARFBUZZ
-+SHARED_LIBRARY_LIBS += $(MOZ_HARFBUZZ_LIBS)
-+endif
-+
- ifdef MOZ_TREE_CAIRO
- SHARED_LIBRARY_LIBS += $(MOZ_CAIRO_LIBS)
- endif
diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in
index 1cacbd7..f5d72bb 100644
--- mozilla/netwerk/dns/Makefile.in
@@ -234,16 +187,16 @@
# Generate the include file containing compact, static definitions
# for effective TLD data.
etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat
-diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk
index 67f0db9..d42137a 100644
---- mozilla/toolkit/library/Makefile.in
-+++ mozilla/toolkit/library/Makefile.in
+--- mozilla/toolkit/library/libxul.mk
++++ mozilla/toolkit/library/libxul.mk
@@ -89,6 +89,14 @@ ifndef MOZ_TREE_PIXMAN
EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS)
endif
+ifdef MOZ_NATIVE_GRAPHITE2
-+EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE_LIBS)
++EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE2_LIBS)
+endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
Deleted: trunk/mail/thunderbird/files/patch-bug851992
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug851992 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,339 +0,0 @@
-diff --git a/config/Makefile.in b/config/Makefile.in
---- mozilla/config/Makefile.in
-+++ mozilla/config/Makefile.in
-@@ -97,16 +97,17 @@ export:: $(export-preqs)
- -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
- -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \
- -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \
- -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
- -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
- -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \
- -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
- -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
-+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
- $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
- $(INSTALL) system_wrappers $(DIST)
-
- GARBAGE_DIRS += system_wrappers
- endif
-
- ifdef WRAP_STL_INCLUDES
- ifdef GNU_CXX
-diff --git a/config/system-headers b/config/system-headers
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -1125,8 +1125,19 @@ gst/video/video.h
- sys/msg.h
- sys/ipc.h
- sys/thr.h
- sys/user.h
- kvm.h
- spawn.h
- err.h
- xlocale.h
-+#if MOZ_NATIVE_ICU==1
-+unicode/locid.h
-+unicode/numsys.h
-+unicode/ucal.h
-+unicode/ucol.h
-+unicode/udat.h
-+unicode/udatpg.h
-+unicode/uenum.h
-+unicode/unum.h
-+unicode/ustring.h
-+#endif
-diff --git a/configure.in b/configure.in
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -4134,16 +4134,32 @@ if test -n "$MOZ_NATIVE_FFI"; then
- PKG_CHECK_MODULES(MOZ_FFI, libffi > 3.0.9)
- else
- PKG_CHECK_MODULES(MOZ_FFI, libffi >= 3.0.9)
- fi
- MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_FFI_LIBS"
- fi
-
- dnl ========================================================
-+dnl system icu support
-+dnl ========================================================
-+MOZ_NATIVE_ICU=
-+MOZ_ARG_WITH_BOOL(system-icu,
-+[ --with-system-icu
-+ Use system icu (located with pkgconfig)],
-+ MOZ_NATIVE_ICU=1)
-+
-+if test -n "$MOZ_NATIVE_ICU"; then
-+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
-+ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_ICU)
-+
-+dnl ========================================================
- dnl Java SDK support
- dnl ========================================================
-
- JAVA_BIN_PATH=
- MOZ_ARG_WITH_STRING(java-bin-path,
- [ --with-java-bin-path=dir
- Location of Java binaries (java, javac, jar)],
- JAVA_BIN_PATH=$withval)
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
---- mozilla/js/src/Makefile.in.orig 2013-10-22 08:19:02.000000000 +0200
-+++ mozilla/js/src/Makefile.in 2013-10-29 10:11:58.272605098 +0100
-@@ -237,10 +237,14 @@
- # ICU headers need to be available whether we build with the complete
- # Internationalization API or not - ICU stubs rely on them.
-
-+ifdef MOZ_NATIVE_ICU
-+LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
-+else
- LOCAL_INCLUDES += \
- -I$(topsrcdir)/../../intl/icu/source/common \
- -I$(topsrcdir)/../../intl/icu/source/i18n \
- $(NULL)
-+endif
-
- ifdef ENABLE_INTL_API
-
-@@ -260,6 +264,7 @@
- ICU_MAKE = $(MAKE)
- endif
-
-+ifndef MOZ_NATIVE_ICU
- # - Build ICU as part of the "export" target, so things get built
- # in the right order.
- # - ICU requires GNU make according to its readme.html. pymake can't be used
-@@ -276,6 +281,7 @@
- $(call SUBMAKE,$@,intl/icu)
-
- endif
-+endif
-
- #
- # END ECMAScript Internationalization API
-@@ -413,7 +419,11 @@
- DEFINES += -DUSE_ZLIB
- endif
-
--SHARED_LIBRARY_LIBS += $(ICU_LIBS)
-+ifdef MOZ_NATIVE_ICU
-+EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
-+else
-+SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS)
-+endif
-
- # Prevent floating point errors caused by VC++ optimizations
- ifdef _MSC_VER
-diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in
---- mozilla/js/src/config/Makefile.in
-+++ mozilla/js/src/config/Makefile.in
-@@ -54,16 +54,17 @@ include $(topsrcdir)/config/rules.mk
-
- HOST_CFLAGS += -DUNICODE -D_UNICODE
-
- ifdef WRAP_SYSTEM_INCLUDES
- export:: \
- $(call mkdir_deps,system_wrappers_js) \
- $(NULL)
- $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \
-+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
- $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js
- $(INSTALL) system_wrappers_js $(DIST)
-
- GARBAGE_DIRS += system_wrappers_js
- endif
-
- GARBAGE += $(srcdir)/*.pyc *.pyc
-
-diff --git a/js/src/config/system-headers b/js/src/config/system-headers
---- mozilla/js/src/config/system-headers
-+++ mozilla/js/src/config/system-headers
-@@ -1125,8 +1125,19 @@ gst/video/video.h
- sys/msg.h
- sys/ipc.h
- sys/thr.h
- sys/user.h
- kvm.h
- spawn.h
- err.h
- xlocale.h
-+#if MOZ_NATIVE_ICU==1
-+unicode/locid.h
-+unicode/numsys.h
-+unicode/ucal.h
-+unicode/ucol.h
-+unicode/udat.h
-+unicode/udatpg.h
-+unicode/uenum.h
-+unicode/unum.h
-+unicode/ustring.h
-+#endif
-diff --git a/js/src/configure.in b/js/src/configure.in
---- mozilla/js/src/configure.in
-+++ mozilla/js/src/configure.in
-@@ -4406,59 +4406,68 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE
- AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION)
- AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION)
- fi
-
-
- dnl ========================================================
- dnl ECMAScript Internationalization API Support (uses ICU)
- dnl ========================================================
-+ICU_LIB_NAMES=
-+MOZ_NATIVE_ICU=
-+MOZ_ARG_WITH_BOOL(system-icu,
-+[ --with-system-icu
-+ Use system icu (located with pkgconfig)],
-+ MOZ_NATIVE_ICU=1)
-+
-+if test -n "$MOZ_NATIVE_ICU"; then
-+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
-+fi
-
- if test -n "$JS_STANDALONE"; then
- ENABLE_INTL_API=1
- fi
- MOZ_ARG_ENABLE_BOOL(intl-api,
- [ --enable-intl-api Enable ECMAScript Internationalization API (default=yes for standalone JS)],
- ENABLE_INTL_API=1,
- ENABLE_INTL_API= )
-
- dnl Settings for the implementation of the ECMAScript Internationalization API
- if test -n "$ENABLE_INTL_API"; then
- AC_DEFINE(ENABLE_INTL_API)
-- # We build ICU as a static library.
-- AC_DEFINE(U_STATIC_IMPLEMENTATION)
--
-- case "$OS_TARGET" in
-- WINNT)
-- ICU_LIB_NAMES="icuin icuuc icudt"
-- ;;
-- Darwin|Linux)
-- ICU_LIB_NAMES="icui18n icuuc icudata"
-- ;;
-- *)
-- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
-- esac
--
-- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
--else
-- ICU_LIB_NAMES=
-- ICU_LIBS=
-+
-+ if test -z "$MOZ_NATIVE_ICU"; then
-+ case "$OS_TARGET" in
-+ WINNT)
-+ ICU_LIB_NAMES="icuin icuuc icudt"
-+ ;;
-+ Darwin|Linux)
-+ ICU_LIB_NAMES="icui18n icuuc icudata"
-+ ;;
-+ *)
-+ AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
-+ esac
-+ MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
-+ fi
- fi
-
- AC_SUBST(ENABLE_INTL_API)
- AC_SUBST(ICU_LIB_NAMES)
--AC_SUBST(ICU_LIBS)
--
--dnl Source files that use ICU should have control over which parts of the ICU
--dnl namespace they want to use.
--AC_DEFINE(U_USING_ICU_NAMESPACE,0)
--
-+AC_SUBST(MOZ_ICU_LIBS)
-+AC_SUBST(MOZ_NATIVE_ICU)
-
- dnl Settings for ICU
--if test -n "$ENABLE_INTL_API" ; then
-+if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
-+ dnl We build ICU as a static library.
-+ AC_DEFINE(U_STATIC_IMPLEMENTATION)
-+
-+ dnl Source files that use ICU should have control over which parts of the ICU
-+ dnl namespace they want to use.
-+ AC_DEFINE(U_USING_ICU_NAMESPACE,0)
-+
- # Set ICU compile options
- ICU_CPPFLAGS=""
- # don't use icu namespace automatically in client code
- ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0"
- # don't include obsolete header files
- ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
- # remove chunks of the library that we don't need (yet)
- ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_LEGACY_CONVERSION"
-diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in
---- mozilla/js/src/gdb/Makefile.in
-+++ mozilla/js/src/gdb/Makefile.in
-@@ -14,16 +14,20 @@ include $(DEPTH)/config/autoconf.mk
- # Building against js_static requires that we declare mfbt sybols "exported"
- # on its behalf.
- DEFINES += -DEXPORT_JS_API -DIMPL_MFBT
-
- LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
-
- LOCAL_INCLUDES += -I$(topsrcdir) -I..
-
-+ifdef MOZ_NATIVE_ICU
-+EXTRA_LIBS += $(MOZ_ICU_LIBS)
-+endif
-+
- EXTRA_LIBS += $(MOZ_FFI_LIBS)
-
- # Place a GDB Python auto-load file next to the gdb-tests executable, both
- # in the build directory and in the dist/bin directory.
- PP_TARGETS += GDB_AUTOLOAD
- GDB_AUTOLOAD := gdb-tests-gdb.py.in
- GDB_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir))
-
-diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
---- mozilla/js/src/jsapi-tests/Makefile.in
-+++ mozilla/js/src/jsapi-tests/Makefile.in
-@@ -15,16 +15,20 @@ DEFINES += -DEXPORT_JS_API
- # Building against js_static requires that we declare mfbt sybols "exported"
- # on its behalf.
- DEFINES += -DIMPL_MFBT
-
- LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
-
- LOCAL_INCLUDES += -I$(topsrcdir) -I..
-
-+ifdef MOZ_NATIVE_ICU
-+EXTRA_LIBS += $(MOZ_ICU_LIBS)
-+endif
-+
- EXTRA_LIBS += $(MOZ_FFI_LIBS)
-
- ifdef QEMU_EXE
- MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB)
- endif
-
- # Place a GDB Python auto-load file next to the jsapi-tests executable in
- # the build directory.
-diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
---- mozilla/js/src/shell/Makefile.in
-+++ mozilla/js/src/shell/Makefile.in
-@@ -22,16 +22,19 @@ DEFINES += -DEXPORT_JS_API
- # Building against js_static requires that we declare mfbt sybols "exported"
- # on its behalf.
- DEFINES += -DIMPL_MFBT
-
- LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(MOZ_ZLIB_LIBS)
- ifdef MOZ_NATIVE_FFI
- EXTRA_LIBS += $(MOZ_FFI_LIBS)
- endif
-+ifdef MOZ_NATIVE_ICU
-+EXTRA_LIBS += $(MOZ_ICU_LIBS)
-+endif
-
- LOCAL_INCLUDES += -I$(topsrcdir) -I..
-
- ifeq ($(OS_ARCH),Darwin)
- ifeq ($(TARGET_CPU),x86_64)
- DARWIN_EXE_LDFLAGS += -pagezero_size 10000 -image_base 100000000
- endif
- endif
Deleted: trunk/mail/thunderbird/files/patch-bug876156
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug876156 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
-diff --git mfbt/Atomics.h mfbt/Atomics.h
-index d79af6c..40b9336 100644
---- mozilla/mfbt/Atomics.h
-+++ mozilla/mfbt/Atomics.h
-@@ -35,7 +35,7 @@
- */
- # if !defined(__linux__) && !defined(__OpenBSD__) && \
- (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && \
-- __has_include(<atomic>)
-+ __has_include_next(<atomic>)
- # define MOZ_HAVE_CXX11_ATOMICS
- # endif
- /*
Deleted: trunk/mail/thunderbird/files/patch-bug878791
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug878791 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/toolkit/components/osfile/osfile_unix_allthreads.jsm.orig 2013-05-11 21:19:53.000000000 +0200
-+++ mozilla/toolkit/components/osfile/osfile_unix_allthreads.jsm 2013-06-02 17:15:05.000000000 +0200
-@@ -40,7 +40,7 @@ if (typeof Components != "undefined") {
- // Open libc
- let libc;
- let libc_candidates = [ "libSystem.B.dylib",
-- "libc.so.6",
-+ "libc.so.7",
- "libc.so" ];
- for (let i = 0; i < libc_candidates.length; ++i) {
- try {
Deleted: trunk/mail/thunderbird/files/patch-bug886181
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug886181 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/modules/libpref/src/init/all.js~
-+++ mozilla/modules/libpref/src/init/all.js
-@@ -193,7 +193,7 @@ pref("media.webm.enabled", true);
- pref("media.dash.enabled", false);
- #endif
- #ifdef MOZ_GSTREAMER
--pref("media.gstreamer.enabled", false);
-+pref("media.gstreamer.enabled", true);
- #endif
- #ifdef MOZ_WEBRTC
- pref("media.navigator.enabled", true);
Deleted: trunk/mail/thunderbird/files/patch-bug889699
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug889699 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,175 +0,0 @@
-commit 7eb5827
-Author: Edwin Flores <eflores@mozilla.com>
-Date: Sat Jul 20 12:03:08 2013 +1200
-
- Bug 889699 - Make gstreamer backend return more accurate results for canPlayType() r=alessandro.d
----
- content/media/gstreamer/GStreamerFormatHelper.cpp | 90 +++++++++++++++++------
- 1 file changed, 66 insertions(+), 24 deletions(-)
-
-diff --git content/media/gstreamer/GStreamerFormatHelper.cpp content/media/gstreamer/GStreamerFormatHelper.cpp
-index f05ff8f..39f1fdf 100644
---- mozilla/content/media/gstreamer/GStreamerFormatHelper.cpp
-+++ mozilla/content/media/gstreamer/GStreamerFormatHelper.cpp
-@@ -6,7 +6,7 @@
-
- #include "GStreamerFormatHelper.h"
- #include "nsCharSeparatedTokenizer.h"
--#include "nsXPCOMStrings.h"
-+#include "nsString.h"
- #include "GStreamerLoader.h"
-
- #define ENTRY_FORMAT(entry) entry[0]
-@@ -36,7 +36,7 @@ void GStreamerFormatHelper::Shutdown() {
- }
- }
-
--char const *const GStreamerFormatHelper::mContainers[6][2] = {
-+static char const *const sContainers[6][2] = {
- {"video/mp4", "video/quicktime"},
- {"video/quicktime", "video/quicktime"},
- {"audio/mp4", "audio/x-m4a"},
-@@ -45,7 +45,7 @@ char const *const GStreamerFormatHelper::mContainers[6][2] = {
- {"audio/mp3", "audio/mpeg, mpegversion=(int)1"},
- };
-
--char const *const GStreamerFormatHelper::mCodecs[9][2] = {
-+static char const *const sCodecs[9][2] = {
- {"avc1.42E01E", "video/x-h264"},
- {"avc1.42001E", "video/x-h264"},
- {"avc1.58A01E", "video/x-h264"},
-@@ -57,6 +57,15 @@ char const *const GStreamerFormatHelper::mCodecs[9][2] = {
- {"mp3", "audio/mpeg, mpegversion=(int)1"},
- };
-
-+static char const * const sDefaultCodecCaps[][2] = {
-+ {"video/mp4", "video/x-h264"},
-+ {"video/quicktime", "video/x-h264"},
-+ {"audio/mp4", "audio/mpeg, mpegversion=(int)4"},
-+ {"audio/x-m4a", "audio/mpeg, mpegversion=(int)4"},
-+ {"audio/mp3", "audio/mpeg, layer=(int)3"},
-+ {"audio/mpeg", "audio/mpeg, layer=(int)3"}
-+};
-+
- GStreamerFormatHelper::GStreamerFormatHelper()
- : mFactories(nullptr),
- mCookie(static_cast<uint32_t>(-1))
-@@ -66,15 +75,15 @@ GStreamerFormatHelper::GStreamerFormatHelper()
- }
-
- mSupportedContainerCaps = gst_caps_new_empty();
-- for (unsigned int i = 0; i < G_N_ELEMENTS(mContainers); i++) {
-- const char* capsString = mContainers[i][1];
-+ for (unsigned int i = 0; i < G_N_ELEMENTS(sContainers); i++) {
-+ const char* capsString = sContainers[i][1];
- GstCaps* caps = gst_caps_from_string(capsString);
- gst_caps_append(mSupportedContainerCaps, caps);
- }
-
- mSupportedCodecCaps = gst_caps_new_empty();
-- for (unsigned int i = 0; i < G_N_ELEMENTS(mCodecs); i++) {
-- const char* capsString = mCodecs[i][1];
-+ for (unsigned int i = 0; i < G_N_ELEMENTS(sCodecs); i++) {
-+ const char* capsString = sCodecs[i][1];
- GstCaps* caps = gst_caps_from_string(capsString);
- gst_caps_append(mSupportedCodecCaps, caps);
- }
-@@ -92,6 +101,41 @@ GStreamerFormatHelper::~GStreamerFormatHelper() {
- g_list_free(mFactories);
- }
-
-+static GstCaps *
-+GetContainerCapsFromMIMEType(const char *aType) {
-+ /* convert aMIMEType to gst container caps */
-+ const char* capsString = nullptr;
-+ for (uint32_t i = 0; i < G_N_ELEMENTS(sContainers); i++) {
-+ if (!strcmp(ENTRY_FORMAT(sContainers[i]), aType)) {
-+ capsString = ENTRY_CAPS(sContainers[i]);
-+ break;
-+ }
-+ }
-+
-+ if (!capsString) {
-+ /* we couldn't find any matching caps */
-+ return nullptr;
-+ }
-+
-+ return gst_caps_from_string(capsString);
-+}
-+
-+static GstCaps *
-+GetDefaultCapsFromMIMEType(const char *aType) {
-+ GstCaps *caps = GetContainerCapsFromMIMEType(aType);
-+
-+ for (uint32_t i = 0; i < G_N_ELEMENTS(sDefaultCodecCaps); i++) {
-+ if (!strcmp(sDefaultCodecCaps[i][0], aType)) {
-+ GstCaps *tmp = gst_caps_from_string(sDefaultCodecCaps[i][1]);
-+
-+ gst_caps_append(caps, tmp);
-+ return caps;
-+ }
-+ }
-+
-+ return nullptr;
-+}
-+
- bool GStreamerFormatHelper::CanHandleMediaType(const nsACString& aMIMEType,
- const nsAString* aCodecs) {
- if (!sLoadOK) {
-@@ -101,7 +145,15 @@ bool GStreamerFormatHelper::CanHandleMediaType(const nsACString& aMIMEType,
- const char *type;
- NS_CStringGetData(aMIMEType, &type, NULL);
-
-- GstCaps* caps = ConvertFormatsToCaps(type, aCodecs);
-+ GstCaps *caps;
-+ if (aCodecs && !aCodecs->IsEmpty()) {
-+ caps = ConvertFormatsToCaps(type, aCodecs);
-+ } else {
-+ // Get a minimal set of codec caps for this MIME type we should support so
-+ // that we don't overreport MIME types we are able to play.
-+ caps = GetDefaultCapsFromMIMEType(type);
-+ }
-+
- if (!caps) {
- return false;
- }
-@@ -118,21 +170,11 @@ GstCaps* GStreamerFormatHelper::ConvertFormatsToCaps(const char* aMIMEType,
-
- unsigned int i;
-
-- /* convert aMIMEType to gst container caps */
-- const char* capsString = nullptr;
-- for (i = 0; i < G_N_ELEMENTS(mContainers); i++) {
-- if (!strcmp(ENTRY_FORMAT(mContainers[i]), aMIMEType)) {
-- capsString = ENTRY_CAPS(mContainers[i]);
-- break;
-- }
-- }
--
-- if (!capsString) {
-- /* we couldn't find any matching caps */
-+ GstCaps *caps = GetContainerCapsFromMIMEType(aMIMEType);
-+ if (!caps) {
- return nullptr;
- }
-
-- GstCaps* caps = gst_caps_from_string(capsString);
- /* container only */
- if (!aCodecs) {
- return caps;
-@@ -141,11 +183,11 @@ GstCaps* GStreamerFormatHelper::ConvertFormatsToCaps(const char* aMIMEType,
- nsCharSeparatedTokenizer tokenizer(*aCodecs, ',');
- while (tokenizer.hasMoreTokens()) {
- const nsSubstring& codec = tokenizer.nextToken();
-- capsString = nullptr;
-+ const char *capsString = nullptr;
-
-- for (i = 0; i < G_N_ELEMENTS(mCodecs); i++) {
-- if (codec.EqualsASCII(ENTRY_FORMAT(mCodecs[i]))) {
-- capsString = ENTRY_CAPS(mCodecs[i]);
-+ for (i = 0; i < G_N_ELEMENTS(sCodecs); i++) {
-+ if (codec.EqualsASCII(ENTRY_FORMAT(sCodecs[i]))) {
-+ capsString = ENTRY_CAPS(sCodecs[i]);
- break;
- }
- }
Deleted: trunk/mail/thunderbird/files/patch-bug893397
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug893397 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,201 +0,0 @@
-diff --git configure.in configure.in
-index 549ad06..2878d9f 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -8091,7 +8091,7 @@ case "$OS_TARGET" in
- NECKO_WIFI=1
- fi
- ;;
-- Darwin|SunOS|WINNT)
-+ Darwin|FreeBSD|SunOS|WINNT)
- NECKO_WIFI=1
- ;;
- Linux)
-diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build
-index 07b01de..11706af 100644
---- mozilla/netwerk/wifi/moz.build
-+++ mozilla/netwerk/wifi/moz.build
-@@ -31,6 +31,10 @@ if CONFIG['OS_ARCH'] == 'Darwin':
- CPP_SOURCES += [
- 'nsWifiScannerMac.cpp',
- ]
-+elif CONFIG['OS_ARCH'] == 'FreeBSD':
-+ CPP_SOURCES += [
-+ 'nsWifiScannerFreeBSD.cpp',
-+ ]
- elif CONFIG['OS_ARCH'] == 'WINNT':
- CPP_SOURCES += [
- 'nsWifiScannerWin.cpp',
-diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp
-new file mode 100644
-index 0000000..80d4cb6
---- /dev/null
-+++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp
-@@ -0,0 +1,167 @@
-+/* 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/. */
-+
-+// Developed by J.R. Oldroyd <fbsd@opal.com>, December 2012.
-+
-+// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces
-+// and then check for those with an 802.11 media type and able to return
-+// a list of stations. This is similar to ifconfig(8).
-+
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
-+#include <net/if_media.h>
-+#include <net80211/ieee80211_ioctl.h>
-+
-+#include <ifaddrs.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include "nsWifiAccessPoint.h"
-+
-+using namespace mozilla;
-+
-+static nsresult
-+FreeBSDGetAccessPointData(nsCOMArray<nsWifiAccessPoint> &accessPoints)
-+{
-+ // get list of interfaces
-+ struct ifaddrs *ifal;
-+ if (getifaddrs(&ifal) < 0) {
-+ return NS_ERROR_FAILURE;
-+ }
-+
-+ accessPoints.Clear();
-+
-+ // loop through the interfaces
-+ nsresult rv = NS_ERROR_FAILURE;
-+ struct ifaddrs *ifa;
-+ for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
-+ // limit to one interface per address
-+ if (ifa->ifa_addr->sa_family != AF_LINK) {
-+ continue;
-+ }
-+
-+ // store interface name in socket structure
-+ struct ifreq ifr;
-+ memset(&ifr, 0, sizeof(ifr));
-+ strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
-+ ifr.ifr_addr.sa_family = AF_LOCAL;
-+
-+ // open socket to interface
-+ int s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0);
-+ if (s < 0) {
-+ continue;
-+ }
-+
-+ // clear interface media structure
-+ struct ifmediareq ifmr;
-+ memset(&ifmr, 0, sizeof(ifmr));
-+ strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
-+
-+ // get interface media information
-+ if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
-+ close(s);
-+ continue;
-+ }
-+
-+ // check interface is a WiFi interface
-+ if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) {
-+ close(s);
-+ continue;
-+ }
-+
-+ // perform WiFi scan
-+ struct ieee80211req i802r;
-+ char iscanbuf[32*1024];
-+ memset(&i802r, 0, sizeof(i802r));
-+ strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
-+ i802r.i_type = IEEE80211_IOC_SCAN_RESULTS;
-+ i802r.i_data = iscanbuf;
-+ i802r.i_len = sizeof(iscanbuf);
-+ if (ioctl(s, SIOCG80211, &i802r) < 0) {
-+ close(s);
-+ continue;
-+ }
-+
-+ // close socket
-+ close(s);
-+
-+ // loop through WiFi networks and build geoloc-lookup structure
-+ char *vsr = (char *) i802r.i_data;
-+ unsigned len = i802r.i_len;
-+ while (len >= sizeof(struct ieee80211req_scan_result)) {
-+ struct ieee80211req_scan_result *isr =
-+ (struct ieee80211req_scan_result *) vsr;
-+
-+ // determine size of this entry
-+ char *id;
-+ int idlen;
-+ if (isr->isr_meshid_len) {
-+ id = vsr + isr->isr_ie_off + isr->isr_ssid_len;
-+ idlen = isr->isr_meshid_len;
-+ } else {
-+ id = vsr + isr->isr_ie_off;
-+ idlen = isr->isr_ssid_len;
-+ }
-+
-+ // copy network data
-+ char ssid[IEEE80211_NWID_LEN+1];
-+ strncpy(ssid, id, idlen);
-+ ssid[idlen] = '\0';
-+ nsWifiAccessPoint *ap = new nsWifiAccessPoint();
-+ ap->setSSID(ssid, strlen(ssid));
-+ ap->setMac(isr->isr_bssid);
-+ ap->setSignal(isr->isr_rssi);
-+ accessPoints.AppendObject(ap);
-+ rv = NS_OK;
-+
-+ // log the data
-+ LOG(( "FreeBSD access point: "
-+ "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, "
-+ "Strength: %d, Channel: %dMHz\n",
-+ ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2],
-+ isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5],
-+ isr->isr_rssi, isr->isr_freq));
-+
-+ // increment pointers
-+ len -= isr->isr_len;
-+ vsr += isr->isr_len;
-+ }
-+ }
-+
-+ freeifaddrs(ifal);
-+
-+ return rv;
-+}
-+
-+nsresult
-+nsWifiMonitor::DoScan()
-+{
-+ // Regularly get the access point data.
-+
-+ nsCOMArray<nsWifiAccessPoint> lastAccessPoints;
-+ nsCOMArray<nsWifiAccessPoint> accessPoints;
-+
-+ do {
-+ nsresult rv = FreeBSDGetAccessPointData(accessPoints);
-+ if (NS_FAILED(rv))
-+ return rv;
-+
-+ bool accessPointsChanged = !AccessPointsEqual(accessPoints, lastAccessPoints);
-+ ReplaceArray(lastAccessPoints, accessPoints);
-+
-+ rv = CallWifiListeners(lastAccessPoints, accessPointsChanged);
-+ NS_ENSURE_SUCCESS(rv, rv);
-+
-+ // wait for some reasonable amount of time. pref?
-+ LOG(("waiting on monitor\n"));
-+
-+ ReentrantMonitorAutoEnter mon(mReentrantMonitor);
-+ mon.Wait(PR_SecondsToInterval(60));
-+ }
-+ while (mKeepGoing);
-+
-+ return NS_OK;
-+}
Deleted: trunk/mail/thunderbird/files/patch-bug910875
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug910875 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,102 +0,0 @@
-diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
-index f231b1e..6087696 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
-@@ -16,7 +16,9 @@
- #include <assert.h>
- #include <string.h>
-
--#if defined(_WIN32)
-+#if defined(WEBRTC_DUMMY_AUDIO_BUILD)
-+// do not include platform specific headers
-+#elif defined(_WIN32)
- #include "audio_device_utility_win.h"
- #include "audio_device_wave_win.h"
- #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
-@@ -32,14 +34,8 @@
- #include <stdlib.h>
- #include "audio_device_utility_android.h"
- #include "audio_device_jni_android.h"
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- #include "audio_device_utility_linux.h"
-- #if defined(LINUX_ALSA)
-- #include "audio_device_alsa_linux.h"
-- #endif
-- #if defined(LINUX_PULSE)
-- #include "audio_device_pulse_linux.h"
-- #endif
- #elif defined(WEBRTC_IOS)
- #include "audio_device_utility_ios.h"
- #include "audio_device_ios.h"
-@@ -47,6 +43,12 @@
- #include "audio_device_utility_mac.h"
- #include "audio_device_mac.h"
- #endif
-+#if defined(LINUX_ALSA)
-+ #include "audio_device_alsa_linux.h"
-+#endif
-+#if defined(LINUX_PULSE)
-+ #include "audio_device_pulse_linux.h"
-+#endif
- #include "audio_device_dummy.h"
- #include "audio_device_utility_dummy.h"
- #include "critical_section_wrapper.h"
-@@ -161,7 +163,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Che
- #elif defined(WEBRTC_ANDROID)
- platform = kPlatformAndroid;
- WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is ANDROID");
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- platform = kPlatformLinux;
- WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is LINUX");
- #elif defined(WEBRTC_IOS)
-@@ -309,7 +311,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects()
-
- // Create the *Linux* implementation of the Audio Device
- //
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- if ((audioLayer == kLinuxPulseAudio) || (audioLayer == kPlatformDefaultAudio))
- {
- #if defined(LINUX_PULSE)
-@@ -355,7 +357,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects()
- //
- ptrAudioDeviceUtility = new AudioDeviceUtilityLinux(Id());
- }
--#endif // #if defined(WEBRTC_LINUX)
-+#endif // #if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
-
- // Create the *iPhone* implementation of the Audio Device
- //
-diff --git media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc
-index defd7f8..906c4a2 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc
-@@ -197,7 +197,7 @@ class AudioDeviceAPITest: public testing::Test {
- // Create default implementation instance
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
- kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
- kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
-@@ -1690,7 +1690,7 @@ TEST_F(AudioDeviceAPITest, CPULoad) {
-
- // TODO(kjellander): Fix flakiness causing failures on Windows.
- // TODO(phoglund): Fix flakiness causing failures on Linux.
--#if !defined(_WIN32) && !defined(WEBRTC_LINUX)
-+#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- TEST_F(AudioDeviceAPITest, StartAndStopRawOutputFileRecording) {
- // NOTE: this API is better tested in a functional test
- CheckInitialPlayoutStates();
-@@ -1759,7 +1759,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRawInputFileRecording) {
- // - size of raw_input_not_recording.pcm shall be 0
- // - size of raw_input_not_recording.pcm shall be > 0
- }
--#endif // !WIN32 && !WEBRTC_LINUX
-+#endif // !WIN32 && !WEBRTC_LINUX && !defined(WEBRTC_BSD)
-
- TEST_F(AudioDeviceAPITest, RecordingSampleRate) {
- uint32_t sampleRate(0);
Deleted: trunk/mail/thunderbird/files/patch-bug916216
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug916216 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,39 +0,0 @@
---- mozilla/media/webrtc/trunk/build/build_config.h~
-+++ mozilla/media/webrtc/trunk/build/build_config.h
-@@ -37,9 +37,15 @@
- #elif defined(_WIN32)
- #define OS_WIN 1
- #define TOOLKIT_VIEWS 1
--#elif defined(__FreeBSD__)
-+#elif defined(__DragonFly__)
-+#define OS_DRAGONFLY 1
-+#define TOOLKIT_GTK
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #define OS_FREEBSD 1
- #define TOOLKIT_GTK
-+#elif defined(__NetBSD__)
-+#define OS_NETBSD 1
-+#define TOOLKIT_GTK
- #elif defined(__OpenBSD__)
- #define OS_OPENBSD 1
- #define TOOLKIT_GTK
-@@ -56,15 +62,15 @@
-
- // For access to standard BSD features, use OS_BSD instead of a
- // more specific macro.
--#if defined(OS_FREEBSD) || defined(OS_OPENBSD)
-+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \
-+ || defined(OS_NETBSD) || defined(OS_OPENBSD)
- #define OS_BSD 1
- #endif
-
- // For access to standard POSIXish features, use OS_POSIX instead of a
- // more specific macro.
--#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \
-- defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \
-- defined(OS_NACL)
-+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
-+ defined(OS_SOLARIS) || defined(OS_ANDROID) || defined(OS_NACL)
- #define OS_POSIX 1
- #endif
-
Deleted: trunk/mail/thunderbird/files/patch-bug916589
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug916589 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,35 +0,0 @@
-diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-index 5b50785..7cf47d5 100644
---- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-+++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-@@ -33,9 +33,10 @@
- #ifndef _SYS_QUEUE_H_
- #define _SYS_QUEUE_H_
-
--#if !defined(__FreeBSD__) && !defined(DARWIN)
- #include <stddef.h>
--#define __offsetof offsetof
-+
-+#ifndef offsetof
-+#define offsetof(type, field) ((size_t)(&((type *)0)->field))
- #endif
-
- #define STAILQ_FOREACH_SAFE(var, head, field, tvar) \
-@@ -43,8 +44,6 @@
- (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \
- (var) = (tvar))
-
--// #define __offsetof(type, field) ((size_t)(&((type *)0)->field))
--
- /*
- * This file defines four types of data structures: singly-linked lists,
- * singly-linked tail queues, lists and tail queues.
-@@ -285,7 +284,7 @@ struct { \
- (STAILQ_EMPTY((head)) ? \
- NULL : \
- ((struct type *) \
-- ((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-+ ((char *)((head)->stqh_last) - offsetof(struct type, field))))
-
- #define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
-
Deleted: trunk/mail/thunderbird/files/patch-bug918177
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug918177 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,36 +0,0 @@
-diff --git config/stl-headers config/stl-headers
-index c057d8e..dc7f6f0 100644
---- mozilla/config/stl-headers
-+++ mozilla/config/stl-headers
-@@ -21,6 +21,7 @@ algorithm
- atomic
- deque
- ios
-+iosfwd
- iostream
- iterator
- limits
-diff --git config/system-headers config/system-headers
-index d31c94e..570c82a 100644
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -469,6 +469,7 @@ IOKit/IOMessage.h
- IOKit/pwr_mgt/IOPMLib.h
- iomanip
- ios
-+iosfwd
- iostream
- iostream.h
- iterator
-diff --git js/src/config/system-headers js/src/config/system-headers
-index d31c94e..570c82a 100644
---- mozilla/js/src/config/system-headers
-+++ mozilla/js/src/config/system-headers
-@@ -469,6 +469,7 @@ IOKit/IOMessage.h
- IOKit/pwr_mgt/IOPMLib.h
- iomanip
- ios
-+iosfwd
- iostream
- iostream.h
- iterator
Deleted: trunk/mail/thunderbird/files/patch-bug938730
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug938730 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,35 +0,0 @@
-commit 1961aa2
-Author: Kai Engert <kaie@kuix.de>
-Date: Wed Nov 20 20:25:12 2013 +0100
-
- Bug 938730 - avoid mix of memory allocators (crashes) when using system sqlite, r=asuth
----
- storage/src/Makefile.in | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git storage/src/Makefile.in storage/src/Makefile.in
-index 9418640..c7391ed 100644
---- mozilla/storage/src/Makefile.in
-+++ mozilla/storage/src/Makefile.in
-@@ -6,14 +6,21 @@
- # Don't use the jemalloc allocator on Android, because we can't guarantee
- # that Gecko will configure sqlite before it is first used (bug 730495).
- #
-+# Don't use the jemalloc allocator when using system sqlite. Linked in libraries
-+# (such as NSS) might trigger an initialization of sqlite and allocation
-+# of memory using the default allocator, prior to the storage service
-+# registering its allocator, causing memory management failures (bug 938730).
-+#
- # Note: On Windows our sqlite build assumes we use jemalloc. If you disable
- # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
- # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
- ifdef MOZ_MEMORY
-+ifndef MOZ_NATIVE_SQLITE
- ifneq ($(OS_TARGET), Android)
- DEFINES += -DMOZ_STORAGE_MEMORY
- endif
- endif
-+endif
-
- # For nsDependentJSString
- LOCAL_INCLUDES = \
Deleted: trunk/mail/thunderbird/files/patch-bug945046
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug945046 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,130 +0,0 @@
-diff --git config/system-headers config/system-headers
-index 432cba6..18a9627 100644
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -1157,3 +1157,4 @@ unicode/uenum.h
- unicode/unum.h
- unicode/ustring.h
- #endif
-+libutil.h
-diff --git js/src/config/system-headers js/src/config/system-headers
-index 432cba6..18a9627 100644
---- mozilla/js/src/config/system-headers
-+++ mozilla/js/src/config/system-headers
-@@ -1157,3 +1157,4 @@ unicode/uenum.h
- unicode/unum.h
- unicode/ustring.h
- #endif
-+libutil.h
-diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
-index 9975621..b4b037d 100644
---- mozilla/toolkit/library/Makefile.in
-+++ mozilla/toolkit/library/Makefile.in
-@@ -289,6 +289,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,kvm)
- EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
- endif
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+OS_LIBS += $(call EXPAND_LIBNAME,util)
-+endif
-+
- ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet wbemuuid)
- ifdef ACCESSIBILITY
-diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp
-index b8147c8..0ffb34e 100644
---- mozilla/xpcom/base/nsMemoryReporterManager.cpp
-+++ mozilla/xpcom/base/nsMemoryReporterManager.cpp
-@@ -153,6 +153,43 @@ static nsresult GetResidentFast(int64_t
- return GetResident(n);
- }
-
-+#ifdef __FreeBSD__
-+#include <libutil.h>
-+
-+static nsresult
-+GetKinfoVmentrySelf(int64_t* prss)
-+{
-+ int cnt;
-+ struct kinfo_vmentry *vmmap, *kve;
-+ if ((vmmap = kinfo_getvmmap(getpid(), &cnt)) == NULL)
-+ return NS_ERROR_FAILURE;
-+
-+ if (prss)
-+ *prss = 0;
-+
-+ for (int i = 0; i < cnt; i++) {
-+ kve = &vmmap[i];
-+ if (prss)
-+ *prss += kve->kve_private_resident;
-+ }
-+
-+ free(vmmap);
-+ return NS_OK;
-+}
-+
-+#define HAVE_PRIVATE_REPORTER
-+static nsresult
-+GetPrivate(int64_t* aN)
-+{
-+ int64_t priv;
-+ nsresult rv = GetKinfoVmentrySelf(&priv);
-+ if (NS_SUCCEEDED(rv))
-+ *aN = priv * getpagesize();
-+
-+ return NS_OK;
-+}
-+#endif // FreeBSD
-+
- #elif defined(SOLARIS)
-
- #include <procfs.h>
-@@ -327,6 +364,24 @@ static nsresult GetResidentFast(int64_t
- }
-
- #define HAVE_PRIVATE_REPORTER
-+static nsresult
-+GetPrivate(int64_t* aN)
-+{
-+ PROCESS_MEMORY_COUNTERS_EX pmcex;
-+ pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
-+
-+ if (!GetProcessMemoryInfo(
-+ GetCurrentProcess(),
-+ (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) {
-+ return NS_ERROR_FAILURE;
-+ }
-+
-+ *aN = pmcex.PrivateUsage;
-+ return NS_OK;
-+}
-+#endif // XP_<PLATFORM>
-+
-+#ifdef HAVE_PRIVATE_REPORTER
- class PrivateReporter MOZ_FINAL : public MemoryReporterBase
- {
- public:
-@@ -339,21 +394,10 @@ public:
-
- NS_IMETHOD GetAmount(int64_t *aAmount)
- {
-- PROCESS_MEMORY_COUNTERS_EX pmcex;
-- pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
--
-- if (!GetProcessMemoryInfo(
-- GetCurrentProcess(),
-- (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) {
-- return NS_ERROR_FAILURE;
-- }
--
-- *aAmount = pmcex.PrivateUsage;
-- return NS_OK;
-+ return GetPrivate(aAmount);
- }
- };
--
--#endif // XP_<PLATFORM>
-+#endif
-
- #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS
- class VsizeReporter MOZ_FINAL : public MemoryReporterBase
Deleted: trunk/mail/thunderbird/files/patch-bug946560
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug946560 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,44 +0,0 @@
-diff --git xpcom/base/nsMemoryInfoDumper.cpp xpcom/base/nsMemoryInfoDumper.cpp
-index 0b2f78c..d857374 100644
---- mozilla/xpcom/base/nsMemoryInfoDumper.cpp
-+++ mozilla/xpcom/base/nsMemoryInfoDumper.cpp
-@@ -30,7 +30,7 @@
- #include <unistd.h>
- #endif
-
--#ifdef XP_LINUX
-+#if defined(XP_LINUX) || defined(__FreeBSD__)
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -109,7 +109,7 @@ private:
-
- } // anonymous namespace
-
--#ifdef XP_LINUX // {
-+#if defined(XP_LINUX) || defined(__FreeBSD__) // {
- namespace {
-
- /*
-@@ -548,7 +548,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper(
- /* static */ void
- nsMemoryInfoDumper::Initialize()
- {
--#ifdef XP_LINUX
-+#if defined(XP_LINUX) || defined(__FreeBSD__)
- SignalPipeWatcher::Create();
- FifoWatcher::MaybeCreate();
- #endif
-diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp
-index 8c65665..8f6d0e9 100644
---- mozilla/xpcom/base/nsMemoryReporterManager.cpp
-+++ mozilla/xpcom/base/nsMemoryReporterManager.cpp
-@@ -824,7 +824,7 @@ nsMemoryReporterManager::Init()
- RegisterReporter(new mozilla::dmd::DMDReporter);
- #endif
-
--#if defined(XP_LINUX)
-+#if defined(XP_LINUX) || defined(__FreeBSD__)
- nsMemoryInfoDumper::Initialize();
- #endif
-
Modified: trunk/mail/thunderbird/files/patch-bug961264
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug961264 Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/files/patch-bug961264 Sun Jun 22 04:25:57 2014 (r1610)
@@ -142,9 +142,9 @@
index bddd46d..d4b522e 100644
--- mozilla/js/src/configure.in
+++ mozilla/js/src/configure.in
-@@ -2348,116 +2348,13 @@ fi
+@@ -2077,116 +2077,13 @@ AC_LANG_CPLUSPLUS
- AC_LANG_C
+ MOZ_CXX11
-dnl Check for .hidden assembler directive and visibility attribute.
-dnl Borrowed from glibc configure.in
@@ -249,7 +249,7 @@
- ])
- if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
- "$ac_cv_have_visibility_class_bug" = "no"; then
-- VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
+- VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
- WRAP_SYSTEM_INCLUDES=1
- else
- VISIBILITY_FLAGS='-fvisibility=hidden'
@@ -259,7 +259,7 @@
- fi # have visibility(hidden) attribute
+ AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
+ AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
-+ VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
++ VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
+ WRAP_SYSTEM_INCLUDES=1
fi # GNU_CC
Deleted: trunk/mail/thunderbird/files/patch-bug961816
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug961816 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,48 +0,0 @@
-diff --git config/system-headers config/system-headers
-index 8803150..ae38d68 100644
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -1158,3 +1158,4 @@ unicode/unum.h
- unicode/ustring.h
- #endif
- libutil.h
-+unwind.h
-diff --git configure.in configure.in
-index f452a5e..a1ebbcc 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -7455,7 +7455,10 @@ dnl ========================================================
- dnl = Support for gcc stack unwinding (from gcc 3.3)
- dnl ========================================================
- if test -z "$SKIP_LIBRARY_CHECKS"; then
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
- MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-+ AC_LANG_RESTORE
- fi
-
- dnl ========================================================
-diff --git config/system-headers config/system-headers
-index 8803150..ae38d68 100644
---- mozilla/js/src/config/system-headers
-+++ mozilla/js/src/config/system-headers
-@@ -1158,3 +1158,4 @@ unicode/unum.h
- unicode/ustring.h
- #endif
- libutil.h
-+unwind.h
-diff --git configure.in configure.in
-index f452a5e..a1ebbcc 100644
---- mozilla/js/src/configure.in
-+++ mozilla/js/src/configure.in
-@@ -7455,7 +7455,10 @@ dnl ========================================================
- dnl = Support for gcc stack unwinding (from gcc 3.3)
- dnl ========================================================
- if test -z "$SKIP_LIBRARY_CHECKS"; then
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
- MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-+ AC_LANG_RESTORE
- fi
-
- dnl ========================================================
Modified: trunk/mail/thunderbird/files/patch-bug962345
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug962345 Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/files/patch-bug962345 Sun Jun 22 04:25:57 2014 (r1610)
@@ -2,16 +2,7 @@
index 8803150..ae38d68 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
-@@ -1159,3 +1159,4 @@ unicode/ustring.h
- #endif
- libutil.h
- unwind.h
-+cairo-qt.h
-diff --git config/system-headers config/system-headers
-index 8803150..ae38d68 100644
---- mozilla/js/src/config/system-headers
-+++ mozilla/js/src/config/system-headers
-@@ -1159,3 +1159,4 @@ unicode/ustring.h
+@@ -1144,3 +1144,4 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
Deleted: trunk/mail/thunderbird/files/patch-bug975634
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug975634 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,63 +0,0 @@
-diff --git configure.in configure.in
-index 0d9236a..0447104 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -9034,6 +9034,20 @@ AC_SUBST(MOZ_FOLD_LIBS)
- AC_SUBST(MOZ_ENABLE_SZIP)
- AC_SUBST(MOZ_SZIP_FLAGS)
-
-+AC_MSG_CHECKING([for posix_fadvise])
-+AC_TRY_LINK([#define _XOPEN_SOURCE 600
-+ #include <fcntl.h>],
-+ [posix_fadvise(0, 0, 0, 0);],
-+ [ac_cv___posix_fadvise=true],
-+ [ac_cv___posix_fadvise=false])
-+
-+if test "$ac_cv___posix_fadvise" = true ; then
-+ AC_DEFINE(HAVE_POSIX_FADVISE)
-+ AC_MSG_RESULT(yes)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+
- AC_MSG_CHECKING([for posix_fallocate])
- AC_TRY_LINK([#define _XOPEN_SOURCE 600
- #include <fcntl.h>],
-diff --git js/src/configure.in js/src/configure.in
-index da9767c..352ba14 100644
---- mozilla/js/src/configure.in
-+++ mozilla/js/src/configure.in
-@@ -4025,6 +4025,20 @@ AC_SUBST(CXX_VERSION)
- AC_SUBST(MSMANIFEST_TOOL)
- AC_SUBST(MOZ_LINKER)
-
-+AC_MSG_CHECKING([for posix_fadvise])
-+AC_TRY_LINK([#define _XOPEN_SOURCE 600
-+ #include <fcntl.h>],
-+ [posix_fadvise(0, 0, 0, 0);],
-+ [ac_cv___posix_fadvise=true],
-+ [ac_cv___posix_fadvise=false])
-+
-+if test "$ac_cv___posix_fadvise" = true ; then
-+ AC_DEFINE(HAVE_POSIX_FADVISE)
-+ AC_MSG_RESULT(yes)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+
- AC_MSG_CHECKING([for posix_fallocate])
- AC_TRY_LINK([#define _XOPEN_SOURCE 600
- #include <fcntl.h>],
-diff --git xpcom/io/nsLocalFileUnix.cpp xpcom/io/nsLocalFileUnix.cpp
-index bacf06c..0e46e4a 100644
---- mozilla/xpcom/io/nsLocalFileUnix.cpp
-+++ mozilla/xpcom/io/nsLocalFileUnix.cpp
-@@ -382,7 +382,7 @@ nsLocalFile::OpenNSPRFileDesc(int32_t flags, int32_t mode, PRFileDesc **_retval)
- PR_Delete(mPath.get());
- }
-
--#if defined(LINUX) && !defined(ANDROID)
-+#if defined(HAVE_POSIX_FADVISE)
- if (flags & OS_READAHEAD) {
- posix_fadvise(PR_FileDesc2NativeHandle(*_retval), 0, 0,
- POSIX_FADV_SEQUENTIAL);
Deleted: trunk/mail/thunderbird/files/patch-bug977457
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug977457 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,27 +0,0 @@
-diff --git xpcom/base/nsStackWalk.cpp xpcom/base/nsStackWalk.cpp
-index bb0e15b..7641267 100644
---- mozilla/xpcom/base/nsStackWalk.cpp
-+++ mozilla/xpcom/base/nsStackWalk.cpp
-@@ -23,6 +23,12 @@ struct CriticalAddress {
- };
- static CriticalAddress gCriticalAddress;
-
-+// for _Unwind_Backtrace from libcxxrt or libunwind
-+// cxxabi.h from libcxxrt implicitly includes unwind.h first
-+#if defined(HAVE__UNWIND_BACKTRACE) && !defined(_GNU_SOURCE)
-+#define _GNU_SOURCE
-+#endif
-+
- #if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
- #include <dlfcn.h>
- #endif
-@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames,
- #elif defined(HAVE__UNWIND_BACKTRACE)
-
- // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
--#ifndef _GNU_SOURCE
--#define _GNU_SOURCE
--#endif
- #include <unwind.h>
-
- struct unwind_info {
Added: trunk/mail/thunderbird/files/patch-bug981348
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug981348 Sun Jun 22 04:25:57 2014 (r1610)
@@ -0,0 +1,41 @@
+diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
+index 4b21361..cb3be32 100644
+--- mozilla/dom/system/OSFileConstants.cpp
++++ mozilla/dom/system/OSFileConstants.cpp
+@@ -596,7 +596,7 @@ static const dom::ConstantSpec gLibcProperties[] =
+
+ { "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
+
+- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },
++ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },
+ { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },
+
+ #endif // defined(XP_UNIX)
+diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
+index b59fca4..0cf220b 100644
+--- mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm
++++ mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm
+@@ -228,8 +228,8 @@
+ let statvfs = new SharedAll.HollowStructure("statvfs",
+ Const.OSFILE_SIZEOF_STATVFS);
+
+- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
+- "f_bsize", Type.unsigned_long.implementation);
++ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
++ "f_frsize", Type.unsigned_long.implementation);
+ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
+ "f_bavail", Type.fsblkcnt_t.implementation);
+
+diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm
+index 99e5e9b..de642c5 100644
+--- mozilla/toolkit/components/osfile/modules/osfile_unix_front.jsm
++++ mozilla/toolkit/components/osfile/modules/osfile_unix_front.jsm
+@@ -373,7 +373,7 @@
+ throw_on_negative("statvfs", UnixFile.statvfs(sourcePath, fileSystemInfoPtr));
+
+ let bytes = new Type.uint64_t.implementation(
+- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
++ fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
+
+ return bytes.value;
+ };
Deleted: trunk/mail/thunderbird/files/patch-bug985848
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug985848 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
-
- //v4l includes
--#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- #include <sys/videoio.h>
- #elif defined(__sun)
- #include <sys/videodev2.h>
---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
-@@ -18,7 +18,7 @@
- #include <string.h>
-
- //v4l includes
--#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- #include <sys/videoio.h>
- #elif defined(__sun)
- #include <sys/videodev2.h>
Modified: trunk/mail/thunderbird/files/patch-clang34-disable-stdcall
==============================================================================
--- trunk/mail/thunderbird/files/patch-clang34-disable-stdcall Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/files/patch-clang34-disable-stdcall Sun Jun 22 04:25:57 2014 (r1610)
@@ -6,8 +6,8 @@
* NS_HIDDEN_(int) NS_FASTCALL func2(char *foo);
*/
--#if defined(__i386__) && defined(__GNUC__) && !defined(XP_OS2)
-+#if defined(__i386__) && defined(__GNUC__) && !defined(XP_OS2) && !(defined(__clang__) && __clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ == 0)
+-#if defined(__i386__) && defined(__GNUC__)
++#if defined(__i386__) && defined(__GNUC__) && !(defined(__clang__) && __clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ == 0)
#define NS_FASTCALL __attribute__ ((regparm (3), stdcall))
#define NS_CONSTRUCTOR_FASTCALL __attribute__ ((regparm (3), stdcall))
#elif defined(XP_WIN) && !defined(_WIN64)
Modified: trunk/mail/thunderbird/files/patch-config-baseconfig.mk
==============================================================================
--- trunk/mail/thunderbird/files/patch-config-baseconfig.mk Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/files/patch-config-baseconfig.mk Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,8 +1,6 @@
--- config/baseconfig.mk~
+++ config/baseconfig.mk
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
-
+@@ -1,7 +1,7 @@
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
Modified: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,13 +1,11 @@
--- mozilla/ipc/chromium/Makefile.in~
+++ mozilla/ipc/chromium/Makefile.in
-@@ -55,9 +60,7 @@ vpath %.c \
- $(srcdir)/src/third_party/libevent \
- $(NULL)
- else # } else {
--# message_pump_libevent.cc includes third_party/libevent/event.h,
--# which we put in $(DIST), see export rule below
--LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
- endif # }
+@@ -28,6 +28,8 @@ include $(topsrcdir)/config/rules.mk
+
+ ifdef MOZ_NATIVE_LIBEVENT # {
- vpath %.cc \
++OS_CPPFLAGS += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
++
+ export-preqs = \
+ $(call mkdir_deps,$(CURDIR)/third_party/libevent) \
+ $(NULL)
Deleted: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
-+++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -16,7 +16,7 @@
- #include "base/scoped_ptr.h"
- #include "base/time.h"
- #include "nsDependentSubstring.h"
--#include "third_party/libevent/event.h"
-+#include "event.h"
-
- // Lifecycle of struct event
- // Libevent uses two main data structures:
Deleted: trunk/mail/thunderbird/files/patch-z-bug1026828
==============================================================================
--- trunk/mail/thunderbird/files/patch-z-bug1026828 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
-diff --git storage/src/Makefile.in storage/src/Makefile.in
-index 4cd2551..5c40536 100644
---- mozilla/storage/src/Makefile.in
-+++ mozilla/storage/src/Makefile.in
-@@ -31,7 +31,7 @@ endif
- # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
- # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
- ifdef MOZ_MEMORY
--ifndef MOZ_NATIVE_SQLITE
-+ifneq (,$(not $(MOZ_NATIVE_SQLITE))$(MOZ_NATIVE_JEMALLOC))
- ifneq ($(OS_TARGET), Android)
- DEFINES += -DMOZ_STORAGE_MEMORY
- endif
Copied and modified: trunk/mail/thunderbird/files/patch-z-bug517422 (from r1609, trunk/mail/thunderbird/files/patch-zz-bug517422)
==============================================================================
--- trunk/mail/thunderbird/files/patch-zz-bug517422 Sun Jun 22 04:24:32 2014 (r1609, copy source)
+++ trunk/mail/thunderbird/files/patch-z-bug517422 Sun Jun 22 04:25:57 2014 (r1610)
@@ -18,52 +18,53 @@
$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
$(INSTALL) system_wrappers $(DIST)
-diff --git toolkit/toolkit.mozbuild toolkit/toolkit.mozbuild
-index c22a36c..2febb45 100644
---- mozilla/toolkit/toolkit.mozbuild
-+++ mozilla/toolkit/toolkit.mozbuild
-@@ -64,13 +64,13 @@ add_tier_dir('platform', 'rdf')
- if CONFIG['MOZ_JSDEBUGGER']:
- add_tier_dir('platform', 'js/jsd')
+diff --git config/external/moz.build config/external/moz.build
+index f67c5c7..eb909ce 100644
+--- mozilla/config/external/moz.build
++++ mozilla/config/external/moz.build
+@@ -15,13 +15,19 @@ if CONFIG['MOZ_UPDATER']:
+ if not CONFIG['MOZ_NATIVE_BZ2']:
+ external_dirs += ['modules/libbz2']
-if CONFIG['MOZ_VORBIS']:
++if not CONFIG['MOZ_NATIVE_OGG']:
++ external_dirs += ['media/libogg']
++
++if not CONFIG['MOZ_NATIVE_THEORA']:
++ external_dirs += ['media/libtheora']
++
+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:
- add_tier_dir('platform', 'media/libvorbis')
+ external_dirs += ['media/libvorbis']
-if CONFIG['MOZ_TREMOR']:
+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']:
- add_tier_dir('platform', 'media/libtremor')
+ external_dirs += ['media/libtremor']
-if CONFIG['MOZ_OPUS']:
+if CONFIG['MOZ_OPUS'] and not CONFIG['MOZ_NATIVE_OPUS']:
- add_tier_dir('platform', 'media/libopus')
+ external_dirs += ['media/libopus']
if CONFIG['MOZ_WEBM']:
-@@ -82,7 +82,10 @@ if CONFIG['MOZ_VP8'] and not CONFIG['MOZ
- add_tier_dir('platform', 'media/libvpx')
-
- if CONFIG['MOZ_OGG']:
-- add_tier_dir('platform', ['media/libogg', 'media/libtheora'])
-+ if not CONFIG['MOZ_NATIVE_OGG']:
-+ add_tier_dir('platform', 'media/libogg')
-+ if not CONFIG['MOZ_NATIVE_THEORA']:
-+ add_tier_dir('platform', 'media/libtheora')
-
- if CONFIG['MOZ_WEBRTC']:
- add_tier_dir('platform', [
-@@ -92,10 +95,10 @@ if CONFIG['MOZ_WEBRTC']:
- 'media/mtransport/standalone',
- ])
-
--if CONFIG['MOZ_SPEEX_RESAMPLER']:
-+if CONFIG['MOZ_SPEEX_RESAMPLER'] and not CONFIG['MOZ_NATIVE_SPEEX']:
- add_tier_dir('platform', 'media/libspeex_resampler')
-
--if CONFIG['MOZ_SOUNDTOUCH']:
-+if CONFIG['MOZ_SOUNDTOUCH'] and not CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
- add_tier_dir('platform', 'media/libsoundtouch')
+@@ -36,13 +42,15 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
+ if not CONFIG['MOZ_NATIVE_PNG']:
+ external_dirs += ['media/libpng']
+
++if not CONFIG['MOZ_NATIVE_SPEEX']:
++ external_dirs += ['media/libspeex_resampler']
++
++if not CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
++ external_dirs += ['media/libsoundtouch']
++
+ external_dirs += [
+ 'media/kiss_fft',
+ 'media/libcubeb',
+- 'media/libogg',
+- 'media/libtheora',
+- 'media/libspeex_resampler',
+- 'media/libsoundtouch',
+ ]
- if CONFIG['MOZ_CUBEB']:
+ PARALLEL_DIRS += ['../../' + i for i in external_dirs]
diff --git config/system-headers config/system-headers
index bef567c..9807c29 100644
--- mozilla/config/system-headers
@@ -120,7 +121,7 @@
index 87db361..7947626 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5211,6 +5211,57 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
+@@ -5211,6 +5211,63 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
fi
dnl ========================================================
@@ -134,6 +135,12 @@
+
+if test -n "$MOZ_NATIVE_OGG"; then
+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
++
++ _SAVE_LIBS=$LIBS
++ LIBS="$LIBS $MOZ_OGG_LIBS"
++ AC_CHECK_FUNC(ogg_set_mem_functions, [],
++ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)])
++ LIBS=$_SAVE_LIBS
+fi
+
+AC_SUBST(MOZ_NATIVE_OGG)
@@ -244,7 +251,7 @@
+MOZ_NATIVE_SOUNDTOUCH=)
+
+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
-+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0)
++ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.8.0)
+
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
@@ -276,15 +283,28 @@
dnl = Disable VP8 decoder support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(webm,
+diff --git content/media/AudioStream.h content/media/AudioStream.h
+index 085676d..00c54fb 100644
+--- mozilla/content/media/AudioStream.h
++++ mozilla/content/media/AudioStream.h
+@@ -26,7 +26,7 @@ public:
+ };
+
+ namespace soundtouch {
+-class SoundTouch;
++class MOZ_IMPORT_API SoundTouch;
+ }
+
+ namespace mozilla {
diff --git content/media/Makefile.in content/media/Makefile.in
index fd34449..c6c42c8 100644
--- mozilla/content/media/Makefile.in
+++ mozilla/content/media/Makefile.in
-@@ -6,4 +6,31 @@ include $(topsrcdir)/config/rules.mk
+@@ -6,3 +6,31 @@ include $(topsrcdir)/config/rules.mk
CFLAGS += $(GSTREAMER_CFLAGS)
CXXFLAGS += $(GSTREAMER_CFLAGS)
-
++
+ifdef MOZ_NATIVE_OGG
+CXXFLAGS += $(MOZ_OGG_CFLAGS)
+endif
@@ -324,98 +344,16 @@
+ifdef MOZ_NATIVE_SPEEX
+CFLAGS += $(MOZ_SPEEX_CFLAGS)
+endif
-+
- AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon
-diff --git layout/media/Makefile.in layout/media/Makefile.in
-index 1cacbd7..a8cd156 100644
---- mozilla/layout/media/Makefile.in
-+++ mozilla/layout/media/Makefile.in
-@@ -36,31 +36,45 @@ ifdef MOZ_TREE_PIXMAN
- SHARED_LIBRARY_LIBS += $(MOZ_PIXMAN_LIBS)
- endif
-
-+ifdef MOZ_OGG
-+ifndef MOZ_NATIVE_OGG
-+SHARED_LIBRARY_LIBS += \
-+ $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
-+ $(NULL)
-+endif
-+endif
-+
- ifdef MOZ_VORBIS
-+ifndef MOZ_NATIVE_VORBIS
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
-- $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_TREMOR
-+ifndef MOZ_NATIVE_TREMOR
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libtremor/lib/$(LIB_PREFIX)tremor.$(LIB_SUFFIX) \
-- $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_OGG
-+ifndef MOZ_NATIVE_THEORA
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_OPUS
-+ifndef MOZ_NATIVE_OPUS
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libopus/$(LIB_PREFIX)opus.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_WEBM
- SHARED_LIBRARY_LIBS += \
-@@ -77,16 +91,20 @@ endif
- endif
-
- ifdef MOZ_SPEEX_RESAMPLER
-+ifndef MOZ_NATIVE_SPEEX
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libspeex_resampler/src/$(LIB_PREFIX)speex_resampler.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_SOUNDTOUCH
-+ifndef MOZ_NATIVE_SOUNDTOUCH
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libsoundtouch/src/$(LIB_PREFIX)soundtouch.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_CUBEB
- SHARED_LIBRARY_LIBS += \
diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in
new file mode 100644
index 0000000..1f02dc0
--- /dev/null
+++ mozilla/media/libtheora/Makefile.in
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,9 @@
+# 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/.
+
-+DEPTH = @DEPTH@
-+topsrcdir = @top_srcdir@
-+srcdir = @srcdir@
-+VPATH = @srcdir@
-+
-+include $(DEPTH)/config/autoconf.mk
-+
+include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_NATIVE_OGG
@@ -426,18 +364,11 @@
index 0000000..1f02dc0
--- /dev/null
+++ mozilla/media/libtremor/Makefile.in
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,9 @@
+# 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/.
+
-+DEPTH = @DEPTH@
-+topsrcdir = @top_srcdir@
-+srcdir = @srcdir@
-+VPATH = @srcdir@
-+
-+include $(DEPTH)/config/autoconf.mk
-+
+include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_NATIVE_OGG
@@ -448,18 +379,11 @@
index 0000000..1f02dc0
--- /dev/null
+++ mozilla/media/libvorbis/Makefile.in
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,9 @@
+# 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/.
+
-+DEPTH = @DEPTH@
-+topsrcdir = @top_srcdir@
-+srcdir = @srcdir@
-+VPATH = @srcdir@
-+
-+include $(DEPTH)/config/autoconf.mk
-+
+include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_NATIVE_OGG
@@ -491,7 +415,7 @@
['build_with_mozilla==1', {
# Mozilla provides its own build of the opus library.
- 'include_dirs': [
-- '$(DIST)/include/opus',
+- '/media/libopus/include',
- ]
+ 'cflags_mozilla': [
+ '$(MOZ_OPUS_CFLAGS)',
@@ -499,10 +423,10 @@
}, {
'dependencies': [
'<(DEPTH)/third_party/opus/opus.gyp:opus'
-diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk
index d42137a..695e75a8 100644
---- mozilla/toolkit/library/Makefile.in
-+++ mozilla/toolkit/library/Makefile.in
+--- mozilla/toolkit/library/libxul.mk
++++ mozilla/toolkit/library/libxul.mk
@@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL
EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS)
endif
@@ -538,3 +462,31 @@
ifdef MOZ_NATIVE_LIBEVENT
EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS)
endif
+diff --git xpcom/build/nsXPComInit.cpp xpcom/build/nsXPComInit.cpp
+index 2cf281e..6d7af0e 100644
+--- mozilla/xpcom/build/nsXPComInit.cpp
++++ mozilla/xpcom/build/nsXPComInit.cpp
+@@ -130,7 +130,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports *, REFNSIID, void **)
+ #include "mozilla/VisualEventTracer.h"
+ #endif
+
++#ifndef MOZ_OGG_NO_MEM_REPORTING
+ #include "ogg/ogg.h"
++#endif
+ #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
+ #include "vpx_mem/vpx_mem.h"
+ #endif
+@@ -571,11 +573,13 @@ NS_InitXPCOM2(nsIServiceManager* *result,
+ // this oddness.
+ mozilla::SetICUMemoryFunctions();
+
++#ifndef MOZ_OGG_NO_MEM_REPORTING
+ // Do the same for libogg.
+ ogg_set_mem_functions(OggReporter::CountingMalloc,
+ OggReporter::CountingCalloc,
+ OggReporter::CountingRealloc,
+ OggReporter::CountingFree);
++#endif
+
+ #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
+ // And for VPX.
Deleted: trunk/mail/thunderbird/files/patch-z-bug847568
==============================================================================
--- trunk/mail/thunderbird/files/patch-z-bug847568 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,255 +0,0 @@
-# Allow building against system-wide graphite2/harfbuzz.
-
-diff --git config/Makefile.in config/Makefile.in
-index 14bfc0d..5383399 100644
---- mozilla/config/Makefile.in
-+++ mozilla/config/Makefile.in
-@@ -77,6 +77,8 @@ export:: $(export-preqs)
- -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
- -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
- -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
-+ -DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
-+ -DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
- $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
- $(INSTALL) system_wrappers $(DIST)
-
-diff --git config/system-headers config/system-headers
-index 18e8703..bdc5f82 100644
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -1145,3 +1145,11 @@ unicode/utypes.h
- #endif
- libutil.h
- unwind.h
-+#if MOZ_NATIVE_GRAPHITE2==1
-+graphite2/Font.h
-+graphite2/Segment.h
-+#endif
-+#if MOZ_NATIVE_HARFBUZZ==1
-+harfbuzz/hb-ot.h
-+harfbuzz/hb.h
-+#endif
-diff --git configure.in configure.in
-index ac38f40..87536b7 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -8032,6 +8032,56 @@ if test "$USE_FC_FREETYPE"; then
- fi
-
- dnl ========================================================
-+dnl Check for harfbuzz
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-harfbuzz,
-+[ --with-system-harfbuzz Use system harfbuzz (located with pkgconfig)],
-+MOZ_NATIVE_HARFBUZZ=1,
-+MOZ_NATIVE_HARFBUZZ=)
-+
-+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
-+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.16)
-+else
-+ MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
-+AC_SUBST(MOZ_HARFBUZZ_CFLAGS)
-+AC_SUBST(MOZ_HARFBUZZ_LIBS)
-+
-+dnl ========================================================
-+dnl Check for graphite2
-+dnl ========================================================
-+MOZ_ARG_WITH_BOOL(system-graphite2,
-+[ --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
-+MOZ_NATIVE_GRAPHITE2=1,
-+MOZ_NATIVE_GRAPHITE2=)
-+
-+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
-+ PKG_CHECK_MODULES(MOZ_GRAPHITE, graphite2)
-+
-+ dnl graphite2.pc has bogus version, check manually
-+ AC_TRY_COMPILE([ #include <graphite2/Font.h>
-+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \
-+ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \
-+ * 100 + GR2_VERSION_BUGFIX >= \
-+ (major) * 10000 + (minor) * 100 + (bugfix) )
-+ ], [
-+ #if !GR2_VERSION_REQUIRE(1,2,3)
-+ #error "Insufficient graphite2 version."
-+ #endif
-+ ], [],
-+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
-++else
-++ MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
-+AC_SUBST(MOZ_GRAPHITE_CFLAGS)
-+AC_SUBST(MOZ_GRAPHITE_LIBS)
-+
-+dnl ========================================================
- dnl Check for pixman and cairo
- dnl ========================================================
-
-@@ -8379,18 +8412,6 @@ QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFI
- AC_SUBST(QCMS_LIBS)
-
- dnl ========================================================
--dnl HarfBuzz
--dnl ========================================================
--MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
--AC_SUBST(MOZ_HARFBUZZ_LIBS)
--
--dnl ========================================================
--dnl SIL Graphite
--dnl ========================================================
--MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
--AC_SUBST(MOZ_GRAPHITE_LIBS)
--
--dnl ========================================================
- dnl OTS
- dnl ========================================================
- MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
-diff --git content/base/src/Makefile.in content/base/src/Makefile.in
-index a618096..596901a 100644
---- mozilla/content/base/src/Makefile.in
-+++ mozilla/content/base/src/Makefile.in
-@@ -5,6 +5,10 @@
-
- include $(topsrcdir)/config/rules.mk
-
-+ifdef MOZ_NATIVE_HARFBUZZ
-+nsContentUtils.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
-+endif
-+
- # gcc requires -msse2 for this file since it uses SSE2 intrinsics. (See bug
- # 585538 comment 12.)
- ifneq (,$(INTEL_ARCHITECTURE))
-diff --git gfx/moz.build gfx/moz.build
-index 519aa46..6929751 100644
---- mozilla/gfx/moz.build
-+++ mozilla/gfx/moz.build
-@@ -7,6 +7,12 @@
- if CONFIG['MOZ_TREE_CAIRO']:
- DIRS += ['cairo']
-
-+if not CONFIG['MOZ_NATIVE_GRAPHITE2']:
-+ DIRS += ['graphite2/src' ]
-+
-+if not CONFIG['MOZ_NATIVE_HARFBUZZ']:
-+ DIRS += ['harfbuzz/src']
-+
- DIRS += [
- '2d',
- 'ycbcr',
-@@ -15,8 +21,6 @@ DIRS += [
- 'qcms',
- 'gl',
- 'layers',
-- 'graphite2/src',
-- 'harfbuzz/src',
- 'ots/src',
- 'thebes',
- 'ipc',
-diff --git gfx/skia/Makefile.in gfx/skia/Makefile.in
-index ee0efb2..98e169d6f 100644
---- mozilla/gfx/skia/Makefile.in
-+++ mozilla/gfx/skia/Makefile.in
-@@ -15,6 +15,10 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
- OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS)
- endif
-
-+ifdef MOZ_NATIVE_HARFBUZZ
-+OS_CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
-+endif
-+
- include $(topsrcdir)/config/rules.mk
-
- ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1)
-diff --git gfx/thebes/Makefile.in gfx/thebes/Makefile.in
-index 45c36ae..79d32cf 100644
---- mozilla/gfx/thebes/Makefile.in
-+++ mozilla/gfx/thebes/Makefile.in
-@@ -13,6 +13,14 @@ DEFINES := $(filter-out -DUNICODE,$(DEFINES))
- CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
- CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
-
-+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
-+endif
-+
-+ifdef MOZ_NATIVE_HARFBUZZ
-+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
-+endif
-+
- ifeq ($(MOZ_WIDGET_TOOLKIT),android)
- CXXFLAGS += $(CAIRO_FT_CFLAGS)
- endif
-diff --git intl/unicharutil/util/Makefile.in intl/unicharutil/util/Makefile.in
-index f6b9f7c..60863f4 100644
---- mozilla/intl/unicharutil/util/Makefile.in
-+++ mozilla/intl/unicharutil/util/Makefile.in
-@@ -21,3 +21,7 @@ ifdef _MSC_VER
- OS_COMPILE_CXXFLAGS += -Zl
- OS_COMPILE_CFLAGS += -Zl
- endif
-+
-+ifdef MOZ_NATIVE_HARFBUZZ
-+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
-+endif
-diff --git layout/media/Makefile.in layout/media/Makefile.in
-index 1cacbd7..a8cd156 100644
---- mozilla/layout/media/Makefile.in
-+++ mozilla/layout/media/Makefile.in
-@@ -18,10 +18,16 @@ endif
- SHARED_LIBRARY_LIBS = \
- $(MOZ_OTS_LIBS) \
- $(QCMS_LIBS) \
-- $(MOZ_GRAPHITE_LIBS) \
-- $(MOZ_HARFBUZZ_LIBS) \
- $(NULL)
-
-+ifndef MOZ_NATIVE_GRAPHITE2
-+SHARED_LIBRARY_LIBS += $(MOZ_GRAPHITE_LIBS)
-+endif
-+
-+ifndef MOZ_NATIVE_HARFBUZZ
-+SHARED_LIBRARY_LIBS += $(MOZ_HARFBUZZ_LIBS)
-+endif
-+
- ifdef MOZ_TREE_CAIRO
- SHARED_LIBRARY_LIBS += $(MOZ_CAIRO_LIBS)
- endif
-diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in
-index 1cacbd7..f5d72bb 100644
---- mozilla/netwerk/dns/Makefile.in
-+++ mozilla/netwerk/dns/Makefile.in
-@@ -5,6 +5,10 @@
-
- include $(topsrcdir)/config/rules.mk
-
-+ifdef MOZ_NATIVE_HARFBUZZ
-+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
-+endif
-+
- # Generate the include file containing compact, static definitions
- # for effective TLD data.
- etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat
-diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
-index 67f0db9..d42137a 100644
---- mozilla/toolkit/library/Makefile.in
-+++ mozilla/toolkit/library/Makefile.in
-@@ -89,6 +89,14 @@ ifndef MOZ_TREE_PIXMAN
- EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS)
- endif
-
-+ifdef MOZ_NATIVE_GRAPHITE2
-+EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE_LIBS)
-+endif
-+
-+ifdef MOZ_NATIVE_HARFBUZZ
-+EXTRA_DSO_LDOPTS += $(MOZ_HARFBUZZ_LIBS)
-+endif
-+
- ifdef MOZ_DMD
- EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,dmd,$(DIST)/lib)
- endif
Deleted: trunk/mail/thunderbird/files/patch-zz-bug517422
==============================================================================
--- trunk/mail/thunderbird/files/patch-zz-bug517422 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,540 +0,0 @@
-# Allow more config/external/ libs built against system-wide version.
-
-diff --git config/Makefile.in config/Makefile.in
-index 5383399..0410004 100644
---- mozilla/config/Makefile.in
-+++ mozilla/config/Makefile.in
-@@ -79,6 +79,13 @@ export:: $(export-preqs)
- -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
- -DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
- -DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
-+ -DMOZ_NATIVE_OGG=$(MOZ_NATIVE_OGG) \
-+ -DMOZ_NATIVE_THEORA=$(MOZ_NATIVE_THEORA) \
-+ -DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \
-+ -DMOZ_NATIVE_TREMOR=$(MOZ_NATIVE_TREMOR) \
-+ -DMOZ_NATIVE_OPUS=$(MOZ_NATIVE_OPUS) \
-+ -DMOZ_NATIVE_SPEEX=$(MOZ_NATIVE_SPEEX) \
-+ -DMOZ_NATIVE_SOUNDTOUCH=$(MOZ_NATIVE_SOUNDTOUCH) \
- $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
- $(INSTALL) system_wrappers $(DIST)
-
-diff --git toolkit/toolkit.mozbuild toolkit/toolkit.mozbuild
-index c22a36c..2febb45 100644
---- mozilla/toolkit/toolkit.mozbuild
-+++ mozilla/toolkit/toolkit.mozbuild
-@@ -64,13 +64,13 @@ add_tier_dir('platform', 'rdf')
- if CONFIG['MOZ_JSDEBUGGER']:
- add_tier_dir('platform', 'js/jsd')
-
--if CONFIG['MOZ_VORBIS']:
-+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:
- add_tier_dir('platform', 'media/libvorbis')
-
--if CONFIG['MOZ_TREMOR']:
-+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']:
- add_tier_dir('platform', 'media/libtremor')
-
--if CONFIG['MOZ_OPUS']:
-+if CONFIG['MOZ_OPUS'] and not CONFIG['MOZ_NATIVE_OPUS']:
- add_tier_dir('platform', 'media/libopus')
-
- if CONFIG['MOZ_WEBM']:
-@@ -82,7 +82,10 @@ if CONFIG['MOZ_VP8'] and not CONFIG['MOZ
- add_tier_dir('platform', 'media/libvpx')
-
- if CONFIG['MOZ_OGG']:
-- add_tier_dir('platform', ['media/libogg', 'media/libtheora'])
-+ if not CONFIG['MOZ_NATIVE_OGG']:
-+ add_tier_dir('platform', 'media/libogg')
-+ if not CONFIG['MOZ_NATIVE_THEORA']:
-+ add_tier_dir('platform', 'media/libtheora')
-
- if CONFIG['MOZ_WEBRTC']:
- add_tier_dir('platform', [
-@@ -92,10 +95,10 @@ if CONFIG['MOZ_WEBRTC']:
- 'media/mtransport/standalone',
- ])
-
--if CONFIG['MOZ_SPEEX_RESAMPLER']:
-+if CONFIG['MOZ_SPEEX_RESAMPLER'] and not CONFIG['MOZ_NATIVE_SPEEX']:
- add_tier_dir('platform', 'media/libspeex_resampler')
-
--if CONFIG['MOZ_SOUNDTOUCH']:
-+if CONFIG['MOZ_SOUNDTOUCH'] and not CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
- add_tier_dir('platform', 'media/libsoundtouch')
-
- if CONFIG['MOZ_CUBEB']:
-diff --git config/system-headers config/system-headers
-index bef567c..9807c29 100644
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -1050,8 +1050,6 @@ X11/Xutil.h
- xpt_struct.h
- xpt_xdr.h
- zmouse.h
--speex/speex_resampler.h
--soundtouch/SoundTouch.h
- #if MOZ_NATIVE_PNG==1
- png.h
- #endif
-@@ -1119,6 +1117,8 @@ ogg/ogg.h
- ogg/os_types.h
- nestegg/nestegg.h
- cubeb/cubeb.h
-+speex/speex_resampler.h
-+soundtouch/SoundTouch.h
- #endif
- gst/gst.h
- gst/app/gstappsink.h
-@@ -1155,3 +1155,29 @@ graphite2/Segment.h
- harfbuzz/hb-ot.h
- harfbuzz/hb.h
- #endif
-+#if MOZ_NATIVE_OGG==1
-+ogg/ogg.h
-+ogg/os_types.h
-+#endif
-+#if MOZ_NATIVE_THEORA==1
-+theora/theoradec.h
-+#endif
-+#if MOZ_NATIVE_VORBIS==1
-+vorbis/codec.h
-+vorbis/vorbisenc.h
-+#endif
-+#if MOZ_NATIVE_TREMOR==1
-+tremor/ivorbiscodec.h
-+#endif
-+#if MOZ_NATIVE_OPUS==1
-+opus.h
-+opus_multistream.h
-+opus/opus.h
-+opus/opus_multistream.h
-+#endif
-+#if MOZ_NATIVE_SPEEX==1
-+speex/speex_resampler.h
-+#endif
-+#if MOZ_NATIVE_SOUNDTOUCH==1
-+soundtouch/SoundTouch.h
-+#endif
-diff --git configure.in configure.in
-index 87db361..7947626 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -5211,6 +5211,57 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
- fi
-
- dnl ========================================================
-+dnl Check for libogg
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-ogg,
-+[ --with-system-ogg Use system libogg (located with pkgconfig)],
-+MOZ_NATIVE_OGG=1,
-+MOZ_NATIVE_OGG=)
-+
-+if test -n "$MOZ_NATIVE_OGG"; then
-+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_OGG)
-+AC_SUBST(MOZ_OGG_CFLAGS)
-+AC_SUBST(MOZ_OGG_LIBS)
-+
-+dnl ========================================================
-+dnl Check for libvorbis
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-vorbis,
-+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)],
-+MOZ_NATIVE_VORBIS=1,
-+MOZ_NATIVE_VORBIS=)
-+
-+if test -n "$MOZ_NATIVE_VORBIS"; then
-+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_VORBIS)
-+AC_SUBST(MOZ_VORBIS_CFLAGS)
-+AC_SUBST(MOZ_VORBIS_LIBS)
-+
-+dnl ========================================================
-+dnl Check for integer-only libvorbis aka tremor
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-tremor,
-+[ --with-system-tremor Use system libtremor (located with pkgconfig)],
-+MOZ_NATIVE_TREMOR=1,
-+MOZ_NATIVE_TREMOR=)
-+
-+if test -n "$MOZ_NATIVE_TREMOR"; then
-+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_TREMOR)
-+AC_SUBST(MOZ_TREMOR_CFLAGS)
-+AC_SUBST(MOZ_TREMOR_LIBS)
-+
-+dnl ========================================================
- dnl = Disable Opus audio codec support
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5219,6 +5274,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
- MOZ_OPUS=1)
-
- dnl ========================================================
-+dnl Check for libopus
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-opus,
-+[ --with-system-opus Use system libopus (located with pkgconfig)],
-+MOZ_NATIVE_OPUS=1,
-+MOZ_NATIVE_OPUS=)
-+
-+if test -n "$MOZ_NATIVE_OPUS"; then
-+ PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1)
-+else
-+ MOZ_OPUS_CFLAGS='-I$(topsrcdir)/media/libopus/include'
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_OPUS)
-+AC_SUBST(MOZ_OPUS_CFLAGS)
-+AC_SUBST(MOZ_OPUS_LIBS)
-+
-+dnl ========================================================
-+dnl Check for libtheora
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-theora,
-+[ --with-system-theora Use system libtheora (located with pkgconfig)],
-+MOZ_NATIVE_THEORA=1,
-+MOZ_NATIVE_THEORA=)
-+
-+if test -n "$MOZ_NATIVE_THEORA"; then
-+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_THEORA)
-+AC_SUBST(MOZ_THEORA_CFLAGS)
-+AC_SUBST(MOZ_THEORA_LIBS)
-+
-+dnl ========================================================
-+dnl Check for libspeex resampler
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-speex,
-+[ --with-system-speex Use system libspeex (located with pkgconfig)],
-+MOZ_NATIVE_SPEEX=1,
-+MOZ_NATIVE_SPEEX=)
-+
-+if test -n "$MOZ_NATIVE_SPEEX"; then
-+ PKG_CHECK_MODULES(MOZ_SPEEX, speexdsp >= 1.2)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_SPEEX)
-+AC_SUBST(MOZ_SPEEX_CFLAGS)
-+AC_SUBST(MOZ_SPEEX_LIBS)
-+
-+dnl ========================================================
-+dnl Check for libsoundtouch
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-soundtouch,
-+[ --with-system-soundtouch Use system libsoundtouch (located with pkgconfig)],
-+MOZ_NATIVE_SOUNDTOUCH=1,
-+MOZ_NATIVE_SOUNDTOUCH=)
-+
-+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
-+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0)
-+
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ _SAVE_CXXFLAGS=$CXXFLAGS
-+ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
-+ AC_CACHE_CHECK(for soundtouch sample type,
-+ ac_cv_soundtouch_sample_type,
-+ [AC_TRY_COMPILE([#include <SoundTouch.h>
-+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES
-+ #error soundtouch expects float samples
-+ #endif],
-+ [],
-+ [ac_cv_soundtouch_sample_type=short],
-+ [ac_cv_soundtouch_sample_type=float])])
-+ CXXFLAGS=$_SAVE_CXXFLAGS
-+ AC_LANG_RESTORE
-+
-+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
-+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
-+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
-+ fi
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
-+AC_SUBST(MOZ_SOUNDTOUCH_CFLAGS)
-+AC_SUBST(MOZ_SOUNDTOUCH_LIBS)
-+
-+dnl ========================================================
- dnl = Disable VP8 decoder support
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(webm,
-diff --git content/media/Makefile.in content/media/Makefile.in
-index fd34449..c6c42c8 100644
---- mozilla/content/media/Makefile.in
-+++ mozilla/content/media/Makefile.in
-@@ -6,4 +6,31 @@ include $(topsrcdir)/config/rules.mk
-
- CFLAGS += $(GSTREAMER_CFLAGS)
- CXXFLAGS += $(GSTREAMER_CFLAGS)
-
-+ifdef MOZ_NATIVE_OGG
-+CXXFLAGS += $(MOZ_OGG_CFLAGS)
-+endif
-+
-+ifdef MOZ_NATIVE_THEORA
-+CXXFLAGS += $(MOZ_THEORA_CFLAGS)
-+endif
-+
-+ifdef MOZ_NATIVE_VORBIS
-+CXXFLAGS += $(MOZ_VORBIS_CFLAGS)
-+endif
-+
-+ifdef MOZ_NATIVE_TREMOR
-+CXXFLAGS += $(MOZ_TREMOR_CFLAGS)
-+endif
-+
-+ifdef MOZ_NATIVE_OPUS
-+CXXFLAGS += $(MOZ_OPUS_CFLAGS)
-+endif
-+
-+ifdef MOZ_NATIVE_SPEEX
-+CXXFLAGS += $(MOZ_SPEEX_CFLAGS)
-+endif
-+
-+ifdef MOZ_NATIVE_SOUNDTOUCH
-+CXXFLAGS += $(MOZ_SOUNDTOUCH_CFLAGS)
-+endif
-diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in
-index 4c14494..1cb98e2 100644
---- mozilla/media/libcubeb/src/Makefile.in
-+++ mozilla/media/libcubeb/src/Makefile.in
-@@ -9,3 +9,7 @@ CFLAGS += \
- $(MOZ_ALSA_CFLAGS) \
- $(MOZ_PULSEAUDIO_CFLAGS) \
- $(NULL)
-+
-+ifdef MOZ_NATIVE_SPEEX
-+CFLAGS += $(MOZ_SPEEX_CFLAGS)
-+endif
-+
- AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon
-diff --git layout/media/Makefile.in layout/media/Makefile.in
-index 1cacbd7..a8cd156 100644
---- mozilla/layout/media/Makefile.in
-+++ mozilla/layout/media/Makefile.in
-@@ -36,31 +36,45 @@ ifdef MOZ_TREE_PIXMAN
- SHARED_LIBRARY_LIBS += $(MOZ_PIXMAN_LIBS)
- endif
-
-+ifdef MOZ_OGG
-+ifndef MOZ_NATIVE_OGG
-+SHARED_LIBRARY_LIBS += \
-+ $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
-+ $(NULL)
-+endif
-+endif
-+
- ifdef MOZ_VORBIS
-+ifndef MOZ_NATIVE_VORBIS
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
-- $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_TREMOR
-+ifndef MOZ_NATIVE_TREMOR
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libtremor/lib/$(LIB_PREFIX)tremor.$(LIB_SUFFIX) \
-- $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_OGG
-+ifndef MOZ_NATIVE_THEORA
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_OPUS
-+ifndef MOZ_NATIVE_OPUS
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libopus/$(LIB_PREFIX)opus.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_WEBM
- SHARED_LIBRARY_LIBS += \
-@@ -77,16 +91,20 @@ endif
- endif
-
- ifdef MOZ_SPEEX_RESAMPLER
-+ifndef MOZ_NATIVE_SPEEX
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libspeex_resampler/src/$(LIB_PREFIX)speex_resampler.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_SOUNDTOUCH
-+ifndef MOZ_NATIVE_SOUNDTOUCH
- SHARED_LIBRARY_LIBS += \
- $(DEPTH)/media/libsoundtouch/src/$(LIB_PREFIX)soundtouch.$(LIB_SUFFIX) \
- $(NULL)
- endif
-+endif
-
- ifdef MOZ_CUBEB
- SHARED_LIBRARY_LIBS += \
-diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in
-new file mode 100644
-index 0000000..1f02dc0
---- /dev/null
-+++ mozilla/media/libtheora/Makefile.in
-@@ -0,0 +1,16 @@
-+# 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/.
-+
-+DEPTH = @DEPTH@
-+topsrcdir = @top_srcdir@
-+srcdir = @srcdir@
-+VPATH = @srcdir@
-+
-+include $(DEPTH)/config/autoconf.mk
-+
-+include $(topsrcdir)/config/rules.mk
-+
-+ifdef MOZ_NATIVE_OGG
-+CFLAGS += $(MOZ_OGG_CFLAGS)
-+endif
-diff --git media/libtremor/Makefile.in media/libtremor/Makefile.in
-new file mode 100644
-index 0000000..1f02dc0
---- /dev/null
-+++ mozilla/media/libtremor/Makefile.in
-@@ -0,0 +1,16 @@
-+# 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/.
-+
-+DEPTH = @DEPTH@
-+topsrcdir = @top_srcdir@
-+srcdir = @srcdir@
-+VPATH = @srcdir@
-+
-+include $(DEPTH)/config/autoconf.mk
-+
-+include $(topsrcdir)/config/rules.mk
-+
-+ifdef MOZ_NATIVE_OGG
-+CFLAGS += $(MOZ_OGG_CFLAGS)
-+endif
-diff --git media/libvorbis/Makefile.in media/libvorbis/Makefile.in
-new file mode 100644
-index 0000000..1f02dc0
---- /dev/null
-+++ mozilla/media/libvorbis/Makefile.in
-@@ -0,0 +1,16 @@
-+# 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/.
-+
-+DEPTH = @DEPTH@
-+topsrcdir = @top_srcdir@
-+srcdir = @srcdir@
-+VPATH = @srcdir@
-+
-+include $(DEPTH)/config/autoconf.mk
-+
-+include $(topsrcdir)/config/rules.mk
-+
-+ifdef MOZ_NATIVE_OGG
-+CFLAGS += $(MOZ_OGG_CFLAGS)
-+endif
-diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
-index bbc971c..6ed7e41 100644
---- mozilla/media/webrtc/signaling/test/Makefile.in
-+++ mozilla/media/webrtc/signaling/test/Makefile.in
-@@ -48,6 +48,12 @@ LIBS += \
- $(NULL)
- endif
-
-+ifdef MOZ_NATIVE_OPUS
-+LIBS += \
-+ $(MOZ_OPUS_LIBS) \
-+ $(NULL)
-+endif
-+
- ifdef MOZ_NATIVE_LIBVPX
- LIBS += \
- $(MOZ_LIBVPX_LIBS) \
-diff --git media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
-index 00e77e7..55f48ab 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
-+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
-@@ -14,9 +14,9 @@
- 'conditions': [
- ['build_with_mozilla==1', {
- # Mozilla provides its own build of the opus library.
-- 'include_dirs': [
-- '$(DIST)/include/opus',
-- ]
-+ 'cflags_mozilla': [
-+ '$(MOZ_OPUS_CFLAGS)',
-+ ],
- }, {
- 'dependencies': [
- '<(DEPTH)/third_party/opus/opus.gyp:opus'
-diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
-index d42137a..695e75a8 100644
---- mozilla/toolkit/library/Makefile.in
-+++ mozilla/toolkit/library/Makefile.in
-@@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL
- EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS)
- endif
-
-+ifdef MOZ_NATIVE_OGG
-+EXTRA_DSO_LDOPTS += $(MOZ_OGG_LIBS)
-+endif
-+
-+ifdef MOZ_NATIVE_THEORA
-+EXTRA_DSO_LDOPTS += $(MOZ_THEORA_LIBS)
-+endif
-+
-+ifdef MOZ_NATIVE_VORBIS
-+EXTRA_DSO_LDOPTS += $(MOZ_VORBIS_LIBS)
-+endif
-+
-+ifdef MOZ_NATIVE_TREMOR
-+EXTRA_DSO_LDOPTS += $(MOZ_TREMOR_LIBS)
-+endif
-+
-+ifdef MOZ_NATIVE_OPUS
-+EXTRA_DSO_LDOPTS += $(MOZ_OPUS_LIBS)
-+endif
-+
-+ifdef MOZ_NATIVE_SPEEX
-+EXTRA_DSO_LDOPTS += $(MOZ_SPEEX_LIBS)
-+endif
-+
-+ifdef MOZ_NATIVE_SOUNDTOUCH
-+EXTRA_DSO_LDOPTS += $(MOZ_SOUNDTOUCH_LIBS)
-+endif
-+
- ifdef MOZ_NATIVE_LIBEVENT
- EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS)
- endif
Modified: trunk/www/firefox-i18n/Makefile
==============================================================================
--- trunk/www/firefox-i18n/Makefile Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/firefox-i18n/Makefile Sun Jun 22 04:25:57 2014 (r1610)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/firefox-i18n/Makefile 355802 2014-05-30 08:50:20Z marino $
PORTNAME= firefox-i18n
-PORTVERSION= 31.0b1
+PORTVERSION= 31.0b3
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
PKGNAMEPREFIX=
Modified: trunk/www/firefox-i18n/Makefile.lang
==============================================================================
--- trunk/www/firefox-i18n/Makefile.lang Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/firefox-i18n/Makefile.lang Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,13 +1,13 @@
# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
# $FreeBSD: head/www/firefox-i18n/Makefile.lang 342632 2014-02-05 05:23:30Z beat $
-FIREFOX_I18N_ALL_= ach af ar as ast be bg bn-BD bn-IN br bs ca cs csb \
- cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES \
- es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he \
- hi-IN hr hu hy-AM id is it ja kk km kn ko ku lij lt \
- lv mai mk ml mr nb-NO nl nn-NO or pa-IN pl pt-BR \
- pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th \
- tr uk vi zh-CN zh-TW zu
+FIREFOX_I18N_ALL_= ach af an ar as ast be bg bn-BD bn-IN br bs ca cs \
+ csb cy da de el en-GB en-US en-ZA eo es-AR es-CL \
+ es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl \
+ gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km \
+ kn ko ku lij lt lv mai mk ml mr ms nb-NO nl nn-NO \
+ or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq \
+ sr sv-SE sw ta te th tr uk vi xh zh-CN zh-TW zu
.if defined(FIREFOX_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package)
FIREFOX_I18N= ${FIREFOX_I18N_ALL_}
@@ -18,6 +18,9 @@
.if ${PORT_OPTIONS:MLANG_AF}
FIREFOX_I18N+= af
.endif
+.if ${PORT_OPTIONS:MLANG_AN}
+FIREFOX_I18N+= an
+.endif
.if ${PORT_OPTIONS:MLANG_AR}
FIREFOX_I18N+= ar
.endif
@@ -132,6 +135,9 @@
.if ${PORT_OPTIONS:MLANG_HR}
FIREFOX_I18N+= hr
.endif
+.if ${PORT_OPTIONS:MLANG_HSB}
+FIREFOX_I18N+= hsb
+.endif
.if ${PORT_OPTIONS:MLANG_HU}
FIREFOX_I18N+= hu
.endif
@@ -186,6 +192,9 @@
.if ${PORT_OPTIONS:MLANG_MR}
FIREFOX_I18N+= mr
.endif
+.if ${PORT_OPTIONS:MLANG_MS}
+FIREFOX_I18N+= ms
+.endif
.if ${PORT_OPTIONS:MLANG_NB}
FIREFOX_I18N+= nb-NO
.endif
@@ -240,6 +249,9 @@
.if ${PORT_OPTIONS:MLANG_SV}
FIREFOX_I18N+= sv-SE
.endif
+.if ${PORT_OPTIONS:MLANG_SW}
+FIREFOX_I18N+= sw
+.endif
.if ${PORT_OPTIONS:MLANG_TA}
FIREFOX_I18N+= ta
.endif
@@ -258,6 +270,9 @@
.if ${PORT_OPTIONS:MLANG_VI}
FIREFOX_I18N+= vi
.endif
+.if ${PORT_OPTIONS:MLANG_XH}
+FIREFOX_I18N+= xh
+.endif
.if ${PORT_OPTIONS:MLANG_CN}
FIREFOX_I18N+= zh-CN
.endif
Modified: trunk/www/firefox-i18n/Makefile.option
==============================================================================
--- trunk/www/firefox-i18n/Makefile.option Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/firefox-i18n/Makefile.option Sun Jun 22 04:25:57 2014 (r1610)
@@ -3,6 +3,7 @@
OPTIONS_DEFINE= LANG_ACH \
LANG_AF \
+ LANG_AN \
LANG_SQ \
LANG_AR \
LANG_AS \
@@ -38,6 +39,7 @@
LANG_HE \
LANG_HI \
LANG_HR \
+ LANG_HSB \
LANG_HU \
LANG_IS \
LANG_ID \
@@ -56,6 +58,7 @@
LANG_ML \
LANG_MR \
LANG_MN \
+ LANG_MS \
LANG_NB \
LANG_NN \
LANG_OR \
@@ -77,6 +80,7 @@
LANG_SK \
LANG_SL \
LANG_SV \
+ LANG_SW \
LANG_TW \
LANG_TA \
LANG_TE \
@@ -85,6 +89,7 @@
LANG_UK \
LANG_VI \
LANG_CY \
+ LANG_XH \
LANG_ZA \
LANG_ZU
@@ -93,8 +98,13 @@
LANG_MN LANG_PBR LANG_PA LANG_RU LANG_ES LANG_SON LANG_TE
LANG_ACH_DESC?= Acholi language support
+LANG_AN_DESC?= Aragonese language support
LANG_AS_DESC?= Assamese language support
LANG_CSB_DESC?= Kashubian language support
LANG_FF_DESC?= Pulaar Fulfulde language support
+LANG_HSB_DESC?= Upper Sorbian language support
LANG_KM_DESC?= Khmer language support
LANG_LIJ_DESC?= Ligurian (Genoa) language support
+LANG_MS_DESC?= Malay language support
+LANG_SW_DESC?= Kiingereza (US) language support
+LANG_XH_DESC?= Xhosa language support
Modified: trunk/www/firefox-i18n/distinfo
==============================================================================
--- trunk/www/firefox-i18n/distinfo Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/firefox-i18n/distinfo Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,170 +1,180 @@
-SHA256 (xpi/firefox-i18n-31.0b1/ach.xpi) = 8cec4d3a3bf41fdfcde6b84d2f3d3ec210d4ac4990bb86696d2967ef771ec36b
-SIZE (xpi/firefox-i18n-31.0b1/ach.xpi) = 392758
-SHA256 (xpi/firefox-i18n-31.0b1/af.xpi) = 83c2c043198154fe33ea69fbe128e7439b4cebe19fb1e4f6abf8ca35733a1701
-SIZE (xpi/firefox-i18n-31.0b1/af.xpi) = 386545
-SHA256 (xpi/firefox-i18n-31.0b1/ar.xpi) = d084c2b1508b0b887b1b806e8df3ca1f297b4de033283e78c5460862e5cd4d3c
-SIZE (xpi/firefox-i18n-31.0b1/ar.xpi) = 415278
-SHA256 (xpi/firefox-i18n-31.0b1/as.xpi) = 10c63bce40018ae444d75819fad65a1822d8804167e44a7215165fd15e0caced
-SIZE (xpi/firefox-i18n-31.0b1/as.xpi) = 430891
-SHA256 (xpi/firefox-i18n-31.0b1/ast.xpi) = 5fa9b228b11894051c4ba8f6155f6ae66c19eb3b3b31a24bbaeffdc98fd080c2
-SIZE (xpi/firefox-i18n-31.0b1/ast.xpi) = 334663
-SHA256 (xpi/firefox-i18n-31.0b1/be.xpi) = a62a2068845a865cac81209e855de2d383e921acdcf3c7d3045083fa9b097433
-SIZE (xpi/firefox-i18n-31.0b1/be.xpi) = 346221
-SHA256 (xpi/firefox-i18n-31.0b1/bg.xpi) = f38705b66ee1e855f40e90baa8a7ffb9fec6e32391ef93cbd3f9982bcfce1516
-SIZE (xpi/firefox-i18n-31.0b1/bg.xpi) = 420786
-SHA256 (xpi/firefox-i18n-31.0b1/bn-BD.xpi) = 6c2e94118163a47f0ec99f37f2c176848a79993a6cc1c0a64c914f080caec1bb
-SIZE (xpi/firefox-i18n-31.0b1/bn-BD.xpi) = 440180
-SHA256 (xpi/firefox-i18n-31.0b1/bn-IN.xpi) = 24ea30485f9e04ea5f416332b8da4f07c224006a5859f9cac6843da04c1e1c6f
-SIZE (xpi/firefox-i18n-31.0b1/bn-IN.xpi) = 444916
-SHA256 (xpi/firefox-i18n-31.0b1/br.xpi) = f2d47762a34ded34942fe800d2b9530de5e7f2c579dc2bbb9c23a66975a973ae
-SIZE (xpi/firefox-i18n-31.0b1/br.xpi) = 372027
-SHA256 (xpi/firefox-i18n-31.0b1/bs.xpi) = 625132bf1b9d8f221849f003913c9c202e9d520be71f1a428d0830d872f2db25
-SIZE (xpi/firefox-i18n-31.0b1/bs.xpi) = 380815
-SHA256 (xpi/firefox-i18n-31.0b1/ca.xpi) = 1e4a25757eaa53ee16f6aca99ae03db06b4a12d6ca6ab70467c40f026e7b0cb8
-SIZE (xpi/firefox-i18n-31.0b1/ca.xpi) = 382244
-SHA256 (xpi/firefox-i18n-31.0b1/cs.xpi) = af9563b37cdb6bec7144c1232bd35561eba300dbdfe624bfd81451652c5f5bfb
-SIZE (xpi/firefox-i18n-31.0b1/cs.xpi) = 373301
-SHA256 (xpi/firefox-i18n-31.0b1/csb.xpi) = b4f7c8efaa16a8784563f392b126e0e4fd6bd794516771f3fd2d0b421b485e40
-SIZE (xpi/firefox-i18n-31.0b1/csb.xpi) = 366018
-SHA256 (xpi/firefox-i18n-31.0b1/cy.xpi) = 2d88026386744bdee4b258f1ba4e2b32daf3569a8d6d532cca7934f0a6ecd8b7
-SIZE (xpi/firefox-i18n-31.0b1/cy.xpi) = 373049
-SHA256 (xpi/firefox-i18n-31.0b1/da.xpi) = 5729da5a4837a615a8e496ca3d63b1d6b0bf105f3a93787da396ee3e9a27a8f8
-SIZE (xpi/firefox-i18n-31.0b1/da.xpi) = 367971
-SHA256 (xpi/firefox-i18n-31.0b1/de.xpi) = 0fab593ac4f90bdfa8e54e2a137ecfe158af8e67bff288a50c22fab38c753851
-SIZE (xpi/firefox-i18n-31.0b1/de.xpi) = 377475
-SHA256 (xpi/firefox-i18n-31.0b1/el.xpi) = 846876441361aa99fbdce050f1166c5f0f44d087a63b6032d1bc9958d6bd8f51
-SIZE (xpi/firefox-i18n-31.0b1/el.xpi) = 410535
-SHA256 (xpi/firefox-i18n-31.0b1/en-GB.xpi) = 0e4302fd599be039eda9d46b44bbc3ccccc434a824e175014bac3d441c23c20d
-SIZE (xpi/firefox-i18n-31.0b1/en-GB.xpi) = 365339
-SHA256 (xpi/firefox-i18n-31.0b1/en-US.xpi) = ab6f6e87d1da50aeb26da1bf68bf790b6bcba75d179d38c3d9b81ca7e8d56974
-SIZE (xpi/firefox-i18n-31.0b1/en-US.xpi) = 370220
-SHA256 (xpi/firefox-i18n-31.0b1/en-ZA.xpi) = 03f42b8eb9b4e9217892426a55ad6c0fc845a1736f4ec7f1174bccdb44a44ab3
-SIZE (xpi/firefox-i18n-31.0b1/en-ZA.xpi) = 362829
-SHA256 (xpi/firefox-i18n-31.0b1/eo.xpi) = c1e60c76098832855cd604e9f0a21d76b2d7aa6ec1baa8e0bec46aef5229b3a0
-SIZE (xpi/firefox-i18n-31.0b1/eo.xpi) = 387256
-SHA256 (xpi/firefox-i18n-31.0b1/es-AR.xpi) = bc118749a7d26e304b7a4724c895b5b4a3a5f6e24ff271d474f16cdf18fc1397
-SIZE (xpi/firefox-i18n-31.0b1/es-AR.xpi) = 382689
-SHA256 (xpi/firefox-i18n-31.0b1/es-CL.xpi) = b35520e993eed3a20273493335e61338ac8ea4439956e46cb439f21a2c06de12
-SIZE (xpi/firefox-i18n-31.0b1/es-CL.xpi) = 325177
-SHA256 (xpi/firefox-i18n-31.0b1/es-ES.xpi) = eb58edbed4321c98e4c6fd8f3a9172c91f42aa5edc7ecf794b1788f8ea2fa9bd
-SIZE (xpi/firefox-i18n-31.0b1/es-ES.xpi) = 314550
-SHA256 (xpi/firefox-i18n-31.0b1/es-MX.xpi) = 69d309a08e93227266ed2001a70a7da32daf41ee038790c87c2fbc6b70a83d8b
-SIZE (xpi/firefox-i18n-31.0b1/es-MX.xpi) = 384995
-SHA256 (xpi/firefox-i18n-31.0b1/et.xpi) = b4b30d8993477814cc60ee5e1670adee5c378bad61095598075e9f3bad7d9f99
-SIZE (xpi/firefox-i18n-31.0b1/et.xpi) = 360584
-SHA256 (xpi/firefox-i18n-31.0b1/eu.xpi) = 0622fb4bc62c9c75f8139146f160acef8b0ed98cb3ef90017fd7713baff17a4b
-SIZE (xpi/firefox-i18n-31.0b1/eu.xpi) = 380552
-SHA256 (xpi/firefox-i18n-31.0b1/fa.xpi) = 86b158c992295d042afb6cb49babe607c96d8c326c75c2c5c23f839dcde8bb33
-SIZE (xpi/firefox-i18n-31.0b1/fa.xpi) = 428410
-SHA256 (xpi/firefox-i18n-31.0b1/ff.xpi) = 71fb2448694518fbf7a0cf6ed437afc319b3bdcf04f4ccc3d6c0b4fb5d9964db
-SIZE (xpi/firefox-i18n-31.0b1/ff.xpi) = 382465
-SHA256 (xpi/firefox-i18n-31.0b1/fi.xpi) = b19999c5031fec75d2c74394e191a46d3fdfdf5f21e9f36db838d03fd35c55fd
-SIZE (xpi/firefox-i18n-31.0b1/fi.xpi) = 375062
-SHA256 (xpi/firefox-i18n-31.0b1/fr.xpi) = 2bc1a1924374f185f55124112d0c8fc4813c9674af2d68443fd8587cf6cded52
-SIZE (xpi/firefox-i18n-31.0b1/fr.xpi) = 388785
-SHA256 (xpi/firefox-i18n-31.0b1/fy-NL.xpi) = 6bd2fa262df9c71e32b2146f553d41b6baa4ddc292a7d806a605fe73d38c6795
-SIZE (xpi/firefox-i18n-31.0b1/fy-NL.xpi) = 384252
-SHA256 (xpi/firefox-i18n-31.0b1/ga-IE.xpi) = 3f8a168286a3015af959c2213599bf75bcaae8e78e973d55c135b9f00fda2fab
-SIZE (xpi/firefox-i18n-31.0b1/ga-IE.xpi) = 388745
-SHA256 (xpi/firefox-i18n-31.0b1/gd.xpi) = 21dd22b6d747594c1ef6ed1cc14cd6068f23da755cb8a99215d53c27989cb2e8
-SIZE (xpi/firefox-i18n-31.0b1/gd.xpi) = 385943
-SHA256 (xpi/firefox-i18n-31.0b1/gl.xpi) = 89bb2022d9e41cdceb48afdc6cc92e4c1fd6be9ab0629ce8cc7338b04b5364f7
-SIZE (xpi/firefox-i18n-31.0b1/gl.xpi) = 372922
-SHA256 (xpi/firefox-i18n-31.0b1/gu-IN.xpi) = 6bd373453f03bd46467de0c551fdaa808c4cdf41a45658989db7617d7b98e2fe
-SIZE (xpi/firefox-i18n-31.0b1/gu-IN.xpi) = 405823
-SHA256 (xpi/firefox-i18n-31.0b1/he.xpi) = b339edcb6f55da91a22c23a892aa2d7546ab24eb25262f7e9db805c05a130d44
-SIZE (xpi/firefox-i18n-31.0b1/he.xpi) = 395182
-SHA256 (xpi/firefox-i18n-31.0b1/hi-IN.xpi) = 1ccc32ed489dc90547743a4174bd60320c66fdab74b8c0d8ce2962d2518393b3
-SIZE (xpi/firefox-i18n-31.0b1/hi-IN.xpi) = 423724
-SHA256 (xpi/firefox-i18n-31.0b1/hr.xpi) = c065a7b3048819a5b8690646786acd2a9850dcfd1a881a92efaeec684b6af95a
-SIZE (xpi/firefox-i18n-31.0b1/hr.xpi) = 388270
-SHA256 (xpi/firefox-i18n-31.0b1/hu.xpi) = 650794899c1dac9331dbbbcbe9144eee1cc446ec08296cc25b7afbbf57214b96
-SIZE (xpi/firefox-i18n-31.0b1/hu.xpi) = 381536
-SHA256 (xpi/firefox-i18n-31.0b1/hy-AM.xpi) = f476c8aca168339dc51235f93488dde74609b02616d8d36efa3ba0e2aa94950c
-SIZE (xpi/firefox-i18n-31.0b1/hy-AM.xpi) = 434198
-SHA256 (xpi/firefox-i18n-31.0b1/id.xpi) = c446371f665a221338591a771f65d437b3173745a603b53b9350a51493534e81
-SIZE (xpi/firefox-i18n-31.0b1/id.xpi) = 361368
-SHA256 (xpi/firefox-i18n-31.0b1/is.xpi) = 708394799fdbb43087771927f89ba9bfe4e68359160f7b487d4f8c23ca629fe4
-SIZE (xpi/firefox-i18n-31.0b1/is.xpi) = 382782
-SHA256 (xpi/firefox-i18n-31.0b1/it.xpi) = 22f575729874382fbad57c563552c8a252bb601faaf173946427bab5b42f2706
-SIZE (xpi/firefox-i18n-31.0b1/it.xpi) = 313228
-SHA256 (xpi/firefox-i18n-31.0b1/ja.xpi) = 7830bb2c15b68ca0bfa5735281ad5a4fa941d308a3d100ff516755bb724191e6
-SIZE (xpi/firefox-i18n-31.0b1/ja.xpi) = 413047
-SHA256 (xpi/firefox-i18n-31.0b1/kk.xpi) = f5a488476e9c17df5ad1a919f7558dc2c0e8aeb53e721671ceb687bcad5be431
-SIZE (xpi/firefox-i18n-31.0b1/kk.xpi) = 417785
-SHA256 (xpi/firefox-i18n-31.0b1/km.xpi) = e385053afb72525b27fc0f8aaaa03b340b73e21f340adb86595854f0eafc4506
-SIZE (xpi/firefox-i18n-31.0b1/km.xpi) = 458277
-SHA256 (xpi/firefox-i18n-31.0b1/kn.xpi) = b6a6bd5f6446af71a026af2c348cd8a2cc18bf8bd3536db5c2ce8fc37dd16d74
-SIZE (xpi/firefox-i18n-31.0b1/kn.xpi) = 441213
-SHA256 (xpi/firefox-i18n-31.0b1/ko.xpi) = b8fd71ca1d0af5a1e65b02595f9f25b55a8ac157e70415c2af678ada492f7b9e
-SIZE (xpi/firefox-i18n-31.0b1/ko.xpi) = 385137
-SHA256 (xpi/firefox-i18n-31.0b1/ku.xpi) = e19c13dcfcb06ed0284410193597ae34e80e88502661b3e10738e95b28d6203f
-SIZE (xpi/firefox-i18n-31.0b1/ku.xpi) = 393390
-SHA256 (xpi/firefox-i18n-31.0b1/lij.xpi) = f010feb995ce48634694e372c1d55c5a502afed88c5694b5a98f6c44cb28f728
-SIZE (xpi/firefox-i18n-31.0b1/lij.xpi) = 368187
-SHA256 (xpi/firefox-i18n-31.0b1/lt.xpi) = 018b83d913bd6f5896b4e9e96eceba6614659e55087a2960e484122f09cd4aa9
-SIZE (xpi/firefox-i18n-31.0b1/lt.xpi) = 402001
-SHA256 (xpi/firefox-i18n-31.0b1/lv.xpi) = ab613597a9b60e24381bc3042e55d6d16f5f6a58c4fb05455e9d06f9adb8f8af
-SIZE (xpi/firefox-i18n-31.0b1/lv.xpi) = 366130
-SHA256 (xpi/firefox-i18n-31.0b1/mai.xpi) = 00960d32c201f5b3412245a65cbdb4a1842674c2f2dd097dde9ff580f5771d81
-SIZE (xpi/firefox-i18n-31.0b1/mai.xpi) = 423555
-SHA256 (xpi/firefox-i18n-31.0b1/mk.xpi) = 11c8dc3c3689e9619dc7c0120a605af1ba65a559efb0d6bf75f89fde78f43d3a
-SIZE (xpi/firefox-i18n-31.0b1/mk.xpi) = 430938
-SHA256 (xpi/firefox-i18n-31.0b1/ml.xpi) = 1b06cc6219e6f07bfe0d773ed272b2c9e36faf450fe7b19966553be58cb604d2
-SIZE (xpi/firefox-i18n-31.0b1/ml.xpi) = 444207
-SHA256 (xpi/firefox-i18n-31.0b1/mr.xpi) = d8aca5e610bb42fe9035d5fbbe97981bed33c424b41a5c67a836b5f3488117bf
-SIZE (xpi/firefox-i18n-31.0b1/mr.xpi) = 433614
-SHA256 (xpi/firefox-i18n-31.0b1/nb-NO.xpi) = d31f24d094d87fc6c9b32494636a8f5251644ce677a553af6916c404b8f775a5
-SIZE (xpi/firefox-i18n-31.0b1/nb-NO.xpi) = 375676
-SHA256 (xpi/firefox-i18n-31.0b1/nl.xpi) = 982073e3feb82fe4df11fcf2f0d048ccc39966a6568dbebff6dc57244b283868
-SIZE (xpi/firefox-i18n-31.0b1/nl.xpi) = 373208
-SHA256 (xpi/firefox-i18n-31.0b1/nn-NO.xpi) = 87afc8179e1bf8d7744568799581a566d041a568bcc1e032d55831e97d652ed1
-SIZE (xpi/firefox-i18n-31.0b1/nn-NO.xpi) = 372435
-SHA256 (xpi/firefox-i18n-31.0b1/or.xpi) = 9502554091e7729be7db8d4026b7c8eeb15a80329b5841fceb76a253babc1d92
-SIZE (xpi/firefox-i18n-31.0b1/or.xpi) = 447073
-SHA256 (xpi/firefox-i18n-31.0b1/pa-IN.xpi) = 8400d02f79ab26e328f25858f9b55d0e6549180ab74d26b84d198bc3d9a70bb0
-SIZE (xpi/firefox-i18n-31.0b1/pa-IN.xpi) = 421649
-SHA256 (xpi/firefox-i18n-31.0b1/pl.xpi) = 0ba7defd34c8f7f721351c65275230bc55be3988557607b5913db14240605f26
-SIZE (xpi/firefox-i18n-31.0b1/pl.xpi) = 357070
-SHA256 (xpi/firefox-i18n-31.0b1/pt-BR.xpi) = f40edcd2e2a7bf55a8f5d5500511cff73f4e9c054c72678f9fca7804a358d94a
-SIZE (xpi/firefox-i18n-31.0b1/pt-BR.xpi) = 384233
-SHA256 (xpi/firefox-i18n-31.0b1/pt-PT.xpi) = 792c79e3bce2775ebd3ada4f24b0441a322a59edf166e3801cc3a4fc0da2847e
-SIZE (xpi/firefox-i18n-31.0b1/pt-PT.xpi) = 368666
-SHA256 (xpi/firefox-i18n-31.0b1/rm.xpi) = fd0db4a105a9cf9769760c2d3bbc65b0fcc52fe09bdb7fe23aab0e813b2a7847
-SIZE (xpi/firefox-i18n-31.0b1/rm.xpi) = 381607
-SHA256 (xpi/firefox-i18n-31.0b1/ro.xpi) = 94556ad8007444bb1c072920447157edc80c8ea10003b08f1fe7879b60749c99
-SIZE (xpi/firefox-i18n-31.0b1/ro.xpi) = 394843
-SHA256 (xpi/firefox-i18n-31.0b1/ru.xpi) = 2043b8d2cc4affb53f116c0a76455c453201f33752c4fd4cddbeb69307a45e56
-SIZE (xpi/firefox-i18n-31.0b1/ru.xpi) = 350221
-SHA256 (xpi/firefox-i18n-31.0b1/si.xpi) = 55e91c1352e295a746f5fbe20579b60d7c4db7e4cbe2f7ba2d992e0f40b32141
-SIZE (xpi/firefox-i18n-31.0b1/si.xpi) = 418679
-SHA256 (xpi/firefox-i18n-31.0b1/sk.xpi) = 1afce04d21ff7cd299f48134673f0703a168c03e240f9d5edb933a80e1b92e2e
-SIZE (xpi/firefox-i18n-31.0b1/sk.xpi) = 384025
-SHA256 (xpi/firefox-i18n-31.0b1/sl.xpi) = b2e74790b1ee546f8f8d089919bbf72293180f6bc8a604d0569f5541e576b735
-SIZE (xpi/firefox-i18n-31.0b1/sl.xpi) = 365802
-SHA256 (xpi/firefox-i18n-31.0b1/son.xpi) = 02439095c42d01d36b8dc593e8c770dc3fd188f62240b64c817c375788a7ec0c
-SIZE (xpi/firefox-i18n-31.0b1/son.xpi) = 377467
-SHA256 (xpi/firefox-i18n-31.0b1/sq.xpi) = 90797ead6d625b5bc39fdccebfb3eacfe42efb0d1cf0d17a67b13a7ed51ac4d3
-SIZE (xpi/firefox-i18n-31.0b1/sq.xpi) = 387418
-SHA256 (xpi/firefox-i18n-31.0b1/sr.xpi) = 0ee6327555763c8fc32f92b53cdd0fa356b14d0f46e9193fcb95d4691dd2f09e
-SIZE (xpi/firefox-i18n-31.0b1/sr.xpi) = 408225
-SHA256 (xpi/firefox-i18n-31.0b1/sv-SE.xpi) = b6aa7f726d51ea02f45b750432dddcfeca2ab8e8138375821c30a3e790c642ab
-SIZE (xpi/firefox-i18n-31.0b1/sv-SE.xpi) = 381348
-SHA256 (xpi/firefox-i18n-31.0b1/ta.xpi) = c73d3a28b6f09ab614663fb87a59bda36838d9ea56b0afa3339210bbb2e0742f
-SIZE (xpi/firefox-i18n-31.0b1/ta.xpi) = 430007
-SHA256 (xpi/firefox-i18n-31.0b1/te.xpi) = 70719903c2c1c59e80e905b6f61f77a2323fad8c0d62965169eef83667644132
-SIZE (xpi/firefox-i18n-31.0b1/te.xpi) = 444914
-SHA256 (xpi/firefox-i18n-31.0b1/th.xpi) = a5631453bac007e4d0f793026822756cd4708e30505cf6d04b5177718e90bfa2
-SIZE (xpi/firefox-i18n-31.0b1/th.xpi) = 433582
-SHA256 (xpi/firefox-i18n-31.0b1/tr.xpi) = 4870ab1d02b8cd2751bcd23cf469545e5ed4917a86d29fe8beea5c5c99009121
-SIZE (xpi/firefox-i18n-31.0b1/tr.xpi) = 383940
-SHA256 (xpi/firefox-i18n-31.0b1/uk.xpi) = 69b128d348a585949b54cc1d8845c4410c0143914e6003ef6aaca06c84b7670d
-SIZE (xpi/firefox-i18n-31.0b1/uk.xpi) = 410326
-SHA256 (xpi/firefox-i18n-31.0b1/vi.xpi) = 5a7ec3579b4f941d91b0198695c1bec374e802f64d6f69409138a5c4175bc4b7
-SIZE (xpi/firefox-i18n-31.0b1/vi.xpi) = 395698
-SHA256 (xpi/firefox-i18n-31.0b1/zh-CN.xpi) = 57729dae5ad9b55346c44e9a4caffdb2a512401ff81b375b88561e6560445776
-SIZE (xpi/firefox-i18n-31.0b1/zh-CN.xpi) = 401953
-SHA256 (xpi/firefox-i18n-31.0b1/zh-TW.xpi) = 7ece73606b9b2b5639df3e485892800205c2b2a4045c1f1a3965f36529b63048
-SIZE (xpi/firefox-i18n-31.0b1/zh-TW.xpi) = 394844
-SHA256 (xpi/firefox-i18n-31.0b1/zu.xpi) = 3ee9f88a416f0fe91eef67e7b26ae113376b9f465a8fb3d336527cc3de2e8e3f
-SIZE (xpi/firefox-i18n-31.0b1/zu.xpi) = 388670
+SHA256 (xpi/firefox-i18n-31.0b3/ach.xpi) = 85176b224e03663bf9f9669eafa7d45fa092f4043a2b694e7356bf58e25b6334
+SIZE (xpi/firefox-i18n-31.0b3/ach.xpi) = 412547
+SHA256 (xpi/firefox-i18n-31.0b3/af.xpi) = a44afdd1645a9e8c0e474b1800bb190c085af89e1f3f512a0c6c9f0ce3f0cfc9
+SIZE (xpi/firefox-i18n-31.0b3/af.xpi) = 398311
+SHA256 (xpi/firefox-i18n-31.0b3/an.xpi) = 9ca8bb12516ba7032fa26866ab7f9d728c3af88036137aef7b5b8d936a4219c3
+SIZE (xpi/firefox-i18n-31.0b3/an.xpi) = 389473
+SHA256 (xpi/firefox-i18n-31.0b3/ar.xpi) = 83e220e8221f9f479a4ebd8486e06ec2ba12605b9ad3896e97c406babc9a23cc
+SIZE (xpi/firefox-i18n-31.0b3/ar.xpi) = 427044
+SHA256 (xpi/firefox-i18n-31.0b3/as.xpi) = 27f7fecd93f0364e2e4ab77b595b199bf3ca457e6e7f58697ab68a35f74f49e5
+SIZE (xpi/firefox-i18n-31.0b3/as.xpi) = 430891
+SHA256 (xpi/firefox-i18n-31.0b3/ast.xpi) = a369e7fe76b21268c087eec8c897367b425bd0117331d2174c30c319cbc0538c
+SIZE (xpi/firefox-i18n-31.0b3/ast.xpi) = 334663
+SHA256 (xpi/firefox-i18n-31.0b3/be.xpi) = 73d9e43cbb485e83652461a2bd63dd7d26e811d57622c64504da2aaab8a1e047
+SIZE (xpi/firefox-i18n-31.0b3/be.xpi) = 357987
+SHA256 (xpi/firefox-i18n-31.0b3/bg.xpi) = 1dabec070853fc9b285079816085718e83535011b5b37604a1120323ef2e6501
+SIZE (xpi/firefox-i18n-31.0b3/bg.xpi) = 420786
+SHA256 (xpi/firefox-i18n-31.0b3/bn-BD.xpi) = cb76861a69ae68a9972b91abf556a364b116134d7d06baa6a0423d3a0c6d8a5a
+SIZE (xpi/firefox-i18n-31.0b3/bn-BD.xpi) = 451946
+SHA256 (xpi/firefox-i18n-31.0b3/bn-IN.xpi) = 1263757503a8694c722ec431693fa496d40f75d18507283bb749b03cc4615a76
+SIZE (xpi/firefox-i18n-31.0b3/bn-IN.xpi) = 444916
+SHA256 (xpi/firefox-i18n-31.0b3/br.xpi) = 97869535e0a577764227a27a80da861dada3499cb98c4543f3ee9f20c3c8194d
+SIZE (xpi/firefox-i18n-31.0b3/br.xpi) = 372027
+SHA256 (xpi/firefox-i18n-31.0b3/bs.xpi) = f938a37b1316ab94db1c635912fa8eb35367991aa2a6c3e5cafd4084bb12ec1f
+SIZE (xpi/firefox-i18n-31.0b3/bs.xpi) = 396235
+SHA256 (xpi/firefox-i18n-31.0b3/ca.xpi) = 454b07ffe83a3a0158f1bb537b31009fb44c9defd4edf6fecac357a3c90c0c53
+SIZE (xpi/firefox-i18n-31.0b3/ca.xpi) = 385898
+SHA256 (xpi/firefox-i18n-31.0b3/cs.xpi) = cc6df07ef12f687150a0a9acba33e6912208123cf8be9db2c4001419a2a87d47
+SIZE (xpi/firefox-i18n-31.0b3/cs.xpi) = 373301
+SHA256 (xpi/firefox-i18n-31.0b3/csb.xpi) = d104de7000a3d7cb09d50d9de86a407ffe8f620b49325732072ea244404a2d73
+SIZE (xpi/firefox-i18n-31.0b3/csb.xpi) = 366018
+SHA256 (xpi/firefox-i18n-31.0b3/cy.xpi) = c42109cb82dc77229a3923fbeac127ab28e2bed33d5cac9aa0f148de48a7b6ab
+SIZE (xpi/firefox-i18n-31.0b3/cy.xpi) = 373049
+SHA256 (xpi/firefox-i18n-31.0b3/da.xpi) = 61e442fc3df41db4e7773b7072e9427618ab8c1e3b2df90bbec02419ccd24df8
+SIZE (xpi/firefox-i18n-31.0b3/da.xpi) = 367971
+SHA256 (xpi/firefox-i18n-31.0b3/de.xpi) = ef460e52a949a059ebf5f805098977dfd2204a1d9393ab73e04f04c3a6354837
+SIZE (xpi/firefox-i18n-31.0b3/de.xpi) = 377475
+SHA256 (xpi/firefox-i18n-31.0b3/el.xpi) = 7f9d31cb2335c0f6360af913ea58c637f9323d3c5d7a4508dba62db26984979f
+SIZE (xpi/firefox-i18n-31.0b3/el.xpi) = 422301
+SHA256 (xpi/firefox-i18n-31.0b3/en-GB.xpi) = 83b1e3253abdab060cca5f1ad4dc00608149d8244e957521fa3dcb02bd813515
+SIZE (xpi/firefox-i18n-31.0b3/en-GB.xpi) = 373362
+SHA256 (xpi/firefox-i18n-31.0b3/en-US.xpi) = 74de40a548126a419d3a143aef4608538a375817f44100b861ea4b8155ff9574
+SIZE (xpi/firefox-i18n-31.0b3/en-US.xpi) = 390009
+SHA256 (xpi/firefox-i18n-31.0b3/en-ZA.xpi) = 65094917cfe3f18566e130cf9f06dbe7b4308b4b5fe7b0ff444178eadce29130
+SIZE (xpi/firefox-i18n-31.0b3/en-ZA.xpi) = 370852
+SHA256 (xpi/firefox-i18n-31.0b3/eo.xpi) = 4ffaea5b558c4d88fa79bfdd08977dbf68275d22edc1a06aff4a5f9401cf0b3c
+SIZE (xpi/firefox-i18n-31.0b3/eo.xpi) = 399022
+SHA256 (xpi/firefox-i18n-31.0b3/es-AR.xpi) = 10e6991690d8d139d6100ce10589aa37cb07f92a80353e9967bfb0b7196157c0
+SIZE (xpi/firefox-i18n-31.0b3/es-AR.xpi) = 382689
+SHA256 (xpi/firefox-i18n-31.0b3/es-CL.xpi) = 30674f33a4face88794e05954546d7d09348b3bf68b05165bc7b167fcffb1b5e
+SIZE (xpi/firefox-i18n-31.0b3/es-CL.xpi) = 325130
+SHA256 (xpi/firefox-i18n-31.0b3/es-ES.xpi) = 138082821212dbb0f0f374fe990927d3e99cc3b23e23f1b5078a41c35650b862
+SIZE (xpi/firefox-i18n-31.0b3/es-ES.xpi) = 318204
+SHA256 (xpi/firefox-i18n-31.0b3/es-MX.xpi) = 59c27cf15c6ee71b0abe84ccb80d27b9d438f779ab34926c6b1ab668a32a2293
+SIZE (xpi/firefox-i18n-31.0b3/es-MX.xpi) = 384995
+SHA256 (xpi/firefox-i18n-31.0b3/et.xpi) = 34bff5a3e6f8adc660a43bb25cb86c916e6dcb10a90aa0ebc7059e6c15ca6c21
+SIZE (xpi/firefox-i18n-31.0b3/et.xpi) = 360584
+SHA256 (xpi/firefox-i18n-31.0b3/eu.xpi) = 87d8fd1557d52e23f52e9c6d62d97d727bdde214bc45afdcc369cc5ad11f377e
+SIZE (xpi/firefox-i18n-31.0b3/eu.xpi) = 392318
+SHA256 (xpi/firefox-i18n-31.0b3/fa.xpi) = 961c8862fcadac41ccbd50ca46bc15f1e8933575053ce88bb443f64b41560961
+SIZE (xpi/firefox-i18n-31.0b3/fa.xpi) = 440176
+SHA256 (xpi/firefox-i18n-31.0b3/ff.xpi) = 400212a92eb320229acaa3888c7b1f2fb8630dda9ac11fceb56930f2ed0b96f9
+SIZE (xpi/firefox-i18n-31.0b3/ff.xpi) = 382465
+SHA256 (xpi/firefox-i18n-31.0b3/fi.xpi) = b16c8bbb77cf475adcd93f8624c59fb4d7ff582e26acc8ed6e589a01a3898106
+SIZE (xpi/firefox-i18n-31.0b3/fi.xpi) = 375062
+SHA256 (xpi/firefox-i18n-31.0b3/fr.xpi) = 09d30c9746f80357e8923b6d38863bdd4c39c645742b2e3017d9465a22a9f20c
+SIZE (xpi/firefox-i18n-31.0b3/fr.xpi) = 388785
+SHA256 (xpi/firefox-i18n-31.0b3/fy-NL.xpi) = 3767c6ad52035da5aa62fc4e42b7df910a47f3cc44dcadeb65daf90ac89d7f97
+SIZE (xpi/firefox-i18n-31.0b3/fy-NL.xpi) = 384252
+SHA256 (xpi/firefox-i18n-31.0b3/ga-IE.xpi) = 28f3e52750b065329eb90b1d6bba06e7ec08dbc480b05b530f77aa289d88b3a2
+SIZE (xpi/firefox-i18n-31.0b3/ga-IE.xpi) = 392399
+SHA256 (xpi/firefox-i18n-31.0b3/gd.xpi) = d1142a8e6773d07e82fd408b5945b8bfb5ae0e0fb462db30a7b43338ecc5fe01
+SIZE (xpi/firefox-i18n-31.0b3/gd.xpi) = 385336
+SHA256 (xpi/firefox-i18n-31.0b3/gl.xpi) = e491a40226741d5aa30f8eee9094083c675ef775d0cd40dc8c5c11aba2c424c1
+SIZE (xpi/firefox-i18n-31.0b3/gl.xpi) = 372922
+SHA256 (xpi/firefox-i18n-31.0b3/gu-IN.xpi) = aeac479de7d6708847bb615a3ab5f1b7fc8e8fa6071f8a697f5ce1ee10c90336
+SIZE (xpi/firefox-i18n-31.0b3/gu-IN.xpi) = 405823
+SHA256 (xpi/firefox-i18n-31.0b3/he.xpi) = ef6fb914c423cd3f2973b99210aa91c3a25666d59cdf31e819d353fe718ec909
+SIZE (xpi/firefox-i18n-31.0b3/he.xpi) = 406948
+SHA256 (xpi/firefox-i18n-31.0b3/hi-IN.xpi) = 0a39849200e75b5b8a58611e96390fd968d9d5f95996974746ee1d892d834f57
+SIZE (xpi/firefox-i18n-31.0b3/hi-IN.xpi) = 423724
+SHA256 (xpi/firefox-i18n-31.0b3/hr.xpi) = 7b928b3306b0d6fe7026ceaf837fa1545b6028839811a04cb6eb94e25f5a8779
+SIZE (xpi/firefox-i18n-31.0b3/hr.xpi) = 403690
+SHA256 (xpi/firefox-i18n-31.0b3/hsb.xpi) = 0b8ebaa8fa146b1c4607e73a414c994787fbcc8883aec4d78a7244d48c3cf51f
+SIZE (xpi/firefox-i18n-31.0b3/hsb.xpi) = 395399
+SHA256 (xpi/firefox-i18n-31.0b3/hu.xpi) = 7810cd809e51daed9fb38154c8598d7b385db738b69d0a43818a74f9fc83c7a3
+SIZE (xpi/firefox-i18n-31.0b3/hu.xpi) = 380819
+SHA256 (xpi/firefox-i18n-31.0b3/hy-AM.xpi) = 504cfbc7cf678417a5ffbcd5381551dd1e063b221d1cecb67dbff2fbcb8a35a7
+SIZE (xpi/firefox-i18n-31.0b3/hy-AM.xpi) = 445964
+SHA256 (xpi/firefox-i18n-31.0b3/id.xpi) = e1a9425db14c0a3372d455125900966dd9c77d886a092d708b3339d7f4fc46b9
+SIZE (xpi/firefox-i18n-31.0b3/id.xpi) = 360623
+SHA256 (xpi/firefox-i18n-31.0b3/is.xpi) = 1cf33e2f369a1b31de0f34040999578d8f9bde643b0584b055ac06ca5df6edfb
+SIZE (xpi/firefox-i18n-31.0b3/is.xpi) = 394548
+SHA256 (xpi/firefox-i18n-31.0b3/it.xpi) = 3afc7dd5c42ecf96095800da7739ae76307d26937bfe56ccdbb011a1475afef9
+SIZE (xpi/firefox-i18n-31.0b3/it.xpi) = 313228
+SHA256 (xpi/firefox-i18n-31.0b3/ja.xpi) = 55d7342d03ea60c17a70d01bd0fb673a046f0d328dbdd428187f7675d56750ce
+SIZE (xpi/firefox-i18n-31.0b3/ja.xpi) = 413047
+SHA256 (xpi/firefox-i18n-31.0b3/kk.xpi) = 56f9416b149338e5657b65d0952cd2e9a4ca26258afa27397c17c3c84ad9fdc9
+SIZE (xpi/firefox-i18n-31.0b3/kk.xpi) = 421439
+SHA256 (xpi/firefox-i18n-31.0b3/km.xpi) = b3de175c2637bf937c1e7c869ec2e91e94a93e459135c9a25f073fbc25ac1e72
+SIZE (xpi/firefox-i18n-31.0b3/km.xpi) = 473697
+SHA256 (xpi/firefox-i18n-31.0b3/kn.xpi) = 62648999b6a2c9d9386a1f734101bc5c34848d52d5368190ebcf6176bb22c0e9
+SIZE (xpi/firefox-i18n-31.0b3/kn.xpi) = 441213
+SHA256 (xpi/firefox-i18n-31.0b3/ko.xpi) = d23bd9aa75878ba6c0df402b3e574b461911ed65f24fdb27b5f6072f624e9c73
+SIZE (xpi/firefox-i18n-31.0b3/ko.xpi) = 385137
+SHA256 (xpi/firefox-i18n-31.0b3/ku.xpi) = e654d81b4b1b570a5dcf61d5aa7e680a586c88c1fb72934e9a57204a75d9a471
+SIZE (xpi/firefox-i18n-31.0b3/ku.xpi) = 405156
+SHA256 (xpi/firefox-i18n-31.0b3/lij.xpi) = 26854bfc2652f4a570cc8facccf27af99fdef29f4bd4a256ac6a6a05ac31a507
+SIZE (xpi/firefox-i18n-31.0b3/lij.xpi) = 368187
+SHA256 (xpi/firefox-i18n-31.0b3/lt.xpi) = 15233695a3486002935f5d2c5a7287eaa75753df708df846714911ef96c79550
+SIZE (xpi/firefox-i18n-31.0b3/lt.xpi) = 405655
+SHA256 (xpi/firefox-i18n-31.0b3/lv.xpi) = 2f548987b91eac3bf8d88fbdf0563452b62a26a78fa92985282a38a9b30ff398
+SIZE (xpi/firefox-i18n-31.0b3/lv.xpi) = 377896
+SHA256 (xpi/firefox-i18n-31.0b3/mai.xpi) = e38d2133cf701ffac935a6df236a2615c5318d4fb320732df591112b5dd1b513
+SIZE (xpi/firefox-i18n-31.0b3/mai.xpi) = 427209
+SHA256 (xpi/firefox-i18n-31.0b3/mk.xpi) = 5fe3d0b82f503a69b42d39178072f3b379a0459d15d1e3b88f7d8412fde5080f
+SIZE (xpi/firefox-i18n-31.0b3/mk.xpi) = 442704
+SHA256 (xpi/firefox-i18n-31.0b3/ml.xpi) = f6c73294d06cb139f5e556ca133cf5babb5ece69ad6772ac6deaa8d75b6ae4c9
+SIZE (xpi/firefox-i18n-31.0b3/ml.xpi) = 448576
+SHA256 (xpi/firefox-i18n-31.0b3/mr.xpi) = b00baf6597bd8a8f77e0e4d653c2465bef48c360ace808a323c3d2c2aa2e1ed2
+SIZE (xpi/firefox-i18n-31.0b3/mr.xpi) = 433614
+SHA256 (xpi/firefox-i18n-31.0b3/ms.xpi) = fb426c788b58123647d03c3a691d8b8e7f5f9b6b7987e02540b41853c1fa12ae
+SIZE (xpi/firefox-i18n-31.0b3/ms.xpi) = 403451
+SHA256 (xpi/firefox-i18n-31.0b3/nb-NO.xpi) = bcf7f338cd6941d210dabd3d01013bfc817d8344d887ad71f4aa9b0bf1e011de
+SIZE (xpi/firefox-i18n-31.0b3/nb-NO.xpi) = 374329
+SHA256 (xpi/firefox-i18n-31.0b3/nl.xpi) = 2c882285c536bd9e29d18e19bb123038bfe70c16f280d73b88cbea7962241386
+SIZE (xpi/firefox-i18n-31.0b3/nl.xpi) = 373208
+SHA256 (xpi/firefox-i18n-31.0b3/nn-NO.xpi) = 05d5aba5d07c88ef1ad3420212bede800df778f04c8e4a62c7bfe3cb2eba4b60
+SIZE (xpi/firefox-i18n-31.0b3/nn-NO.xpi) = 372435
+SHA256 (xpi/firefox-i18n-31.0b3/or.xpi) = f5ae546e127043d82a54634dee5cae95330058c4b211fe6ff71056cd095fc7e0
+SIZE (xpi/firefox-i18n-31.0b3/or.xpi) = 447073
+SHA256 (xpi/firefox-i18n-31.0b3/pa-IN.xpi) = 209a51861477de406e5d98d6d6998481b32ef8d6a0dc9098b69085fa67b8a89c
+SIZE (xpi/firefox-i18n-31.0b3/pa-IN.xpi) = 421649
+SHA256 (xpi/firefox-i18n-31.0b3/pl.xpi) = e8db6f01202016124a5a9803b8d9b34a913f1a9b594a707dd2aaed2a982cb004
+SIZE (xpi/firefox-i18n-31.0b3/pl.xpi) = 357070
+SHA256 (xpi/firefox-i18n-31.0b3/pt-BR.xpi) = 6db2fa8ae189a0a8ebfbc955570b17e74523856f44b12116115f445a32c24165
+SIZE (xpi/firefox-i18n-31.0b3/pt-BR.xpi) = 387887
+SHA256 (xpi/firefox-i18n-31.0b3/pt-PT.xpi) = 96800a4bb8efe4f308074d56f24efdf5ec1a530347c78b837595d54df404831c
+SIZE (xpi/firefox-i18n-31.0b3/pt-PT.xpi) = 368666
+SHA256 (xpi/firefox-i18n-31.0b3/rm.xpi) = cfae70c7b0e7bc6d7d2b823e6ad0f98c1f30c0fcf39997da372f5a55d43fe4ed
+SIZE (xpi/firefox-i18n-31.0b3/rm.xpi) = 381607
+SHA256 (xpi/firefox-i18n-31.0b3/ro.xpi) = bb1e54763abb5696d3d4d4b90af64199f6d02d187c203063e08b3b7b7d234dce
+SIZE (xpi/firefox-i18n-31.0b3/ro.xpi) = 406609
+SHA256 (xpi/firefox-i18n-31.0b3/ru.xpi) = 39531f0a6e5ff1685b4248f7a2ddc28ff166def0ba6bbea5e73ff9936048c231
+SIZE (xpi/firefox-i18n-31.0b3/ru.xpi) = 350221
+SHA256 (xpi/firefox-i18n-31.0b3/si.xpi) = f9b93920d585553e82804c51f7ecf2aafbfca2889d72b925900e3c56801cc9e5
+SIZE (xpi/firefox-i18n-31.0b3/si.xpi) = 430445
+SHA256 (xpi/firefox-i18n-31.0b3/sk.xpi) = 4d5651ed7c2c7c0584b451084c8991c5f2ffe68e46616ed643177795267b18fe
+SIZE (xpi/firefox-i18n-31.0b3/sk.xpi) = 384025
+SHA256 (xpi/firefox-i18n-31.0b3/sl.xpi) = 174bf2951ca18666ddbe46b0195c9eb8f387c86abd9fbe827e5c976be4c6f2e6
+SIZE (xpi/firefox-i18n-31.0b3/sl.xpi) = 369456
+SHA256 (xpi/firefox-i18n-31.0b3/son.xpi) = f736d49b99d7a8d2159ea6d3b8974bda2b02dad1588e68e950061a1a53058d86
+SIZE (xpi/firefox-i18n-31.0b3/son.xpi) = 377467
+SHA256 (xpi/firefox-i18n-31.0b3/sq.xpi) = 3a4d51ef9ec0f4dcd9c7a5efa72bf502160a52f4b18b2689e4b21971609c15c7
+SIZE (xpi/firefox-i18n-31.0b3/sq.xpi) = 399184
+SHA256 (xpi/firefox-i18n-31.0b3/sr.xpi) = 1ee1557f1988dc4f908d5c87ad1248592219d5d40cf601ead55bd5b2ba1d8cc2
+SIZE (xpi/firefox-i18n-31.0b3/sr.xpi) = 408225
+SHA256 (xpi/firefox-i18n-31.0b3/sv-SE.xpi) = e08d914d705c6532c81f4c35c25ca0640d4296669f4723ca3d1657c786887718
+SIZE (xpi/firefox-i18n-31.0b3/sv-SE.xpi) = 381348
+SHA256 (xpi/firefox-i18n-31.0b3/sw.xpi) = 290c5795c41f9db699e163d77fd7bf463a8b10c6d55446c17e5f402362a6b0f4
+SIZE (xpi/firefox-i18n-31.0b3/sw.xpi) = 408767
+SHA256 (xpi/firefox-i18n-31.0b3/ta.xpi) = 606e06c889981149642b245da9513828cce9008f9e1d17dc43d5bc82cc9c63bc
+SIZE (xpi/firefox-i18n-31.0b3/ta.xpi) = 430007
+SHA256 (xpi/firefox-i18n-31.0b3/te.xpi) = f58064ed59c71625d575248d473c73b319a13abfcacf113833240dde81907403
+SIZE (xpi/firefox-i18n-31.0b3/te.xpi) = 444914
+SHA256 (xpi/firefox-i18n-31.0b3/th.xpi) = 01b03f52ea345632b98fac4e3ef9771cedece528cb07f7de2c9ed018796702e9
+SIZE (xpi/firefox-i18n-31.0b3/th.xpi) = 445348
+SHA256 (xpi/firefox-i18n-31.0b3/tr.xpi) = 75b4c11d7c3a1ab174751921e72fb6a3dd1932e73577b5d5c5e2a84bd807f608
+SIZE (xpi/firefox-i18n-31.0b3/tr.xpi) = 387594
+SHA256 (xpi/firefox-i18n-31.0b3/uk.xpi) = cf717a8a96152b843446726660d103d2838d207e0f97e84c54b646d9207b45d2
+SIZE (xpi/firefox-i18n-31.0b3/uk.xpi) = 410326
+SHA256 (xpi/firefox-i18n-31.0b3/vi.xpi) = 53bca91ddaa09771484c9d3c8eafbee701d057dc18ebf81e5edd83c6c75dd911
+SIZE (xpi/firefox-i18n-31.0b3/vi.xpi) = 395698
+SHA256 (xpi/firefox-i18n-31.0b3/xh.xpi) = e04650f486770546a7746013b87aa6a21f941f83c0796655a02f768ef8046498
+SIZE (xpi/firefox-i18n-31.0b3/xh.xpi) = 380199
+SHA256 (xpi/firefox-i18n-31.0b3/zh-CN.xpi) = 0032f85cfb7f6c3f91310bb78b7929d84c88a570617312de3252703815a04082
+SIZE (xpi/firefox-i18n-31.0b3/zh-CN.xpi) = 401953
+SHA256 (xpi/firefox-i18n-31.0b3/zh-TW.xpi) = f5f67c7c1f7445fc7bfa1a44ff36682371cfb392f22d189bd375b148423b7a73
+SIZE (xpi/firefox-i18n-31.0b3/zh-TW.xpi) = 394844
+SHA256 (xpi/firefox-i18n-31.0b3/zu.xpi) = 9d15a2361d4c5aaccb6ab364f3177e37f3c99f6425d4ccc3947cc946bb29bc4e
+SIZE (xpi/firefox-i18n-31.0b3/zu.xpi) = 400436
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/firefox-nightly/Makefile.hgrev Sun Jun 22 04:25:57 2014 (r1610)
@@ -1 +1 @@
-HGREV= 188079:d2d875512712
+HGREV= 189927:5948b714c174
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/firefox-nightly/distinfo Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/d2d875512712.tar.bz2) = 0876a6fb8e65ef765838d4f57a4cbdb9248fd6ad0dff771f319fff1c7a397725
-SIZE (firefox-nightly/d2d875512712.tar.bz2) = 148653042
+SHA256 (firefox-nightly/5948b714c174.tar.bz2) = 8eead02dec36271fb325310cad11e962b232d849c9a0b618919baa05d9e41e65
+SIZE (firefox-nightly/5948b714c174.tar.bz2) = 149635037
Deleted: trunk/www/firefox-nightly/files/patch-bug1015547
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug1015547 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,95 +0,0 @@
-diff --git configure.in configure.in
-index 7bed45f..053de17 100644
---- configure.in
-+++ configure.in
-@@ -2950,7 +2950,7 @@ dnl Checks for library functions.
- dnl ========================================================
- AC_PROG_GCC_TRADITIONAL
- AC_FUNC_MEMCMP
--AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r)
-+AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r arc4random arc4random_buf)
-
- dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
- AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
-diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp
-index 0687344..ca3ff8b 100644
---- xpcom/base/nsUUIDGenerator.cpp
-+++ xpcom/base/nsUUIDGenerator.cpp
-@@ -16,6 +16,10 @@
-
- #include "nsUUIDGenerator.h"
-
-+#ifdef ANDROID
-+extern "C" NS_EXPORT void arc4random_buf(void *, size_t);
-+#endif
-+
- using namespace mozilla;
-
- NS_IMPL_ISUPPORTS(nsUUIDGenerator, nsIUUIDGenerator)
-@@ -35,7 +39,7 @@ nsUUIDGenerator::Init()
- // We're a service, so we're guaranteed that Init() is not going
- // to be reentered while we're inside Init().
-
--#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
- /* initialize random number generator using NSPR random noise */
- unsigned int seed;
-
-@@ -72,7 +76,7 @@ nsUUIDGenerator::Init()
- }
- #endif
-
--#endif /* non XP_WIN and non XP_MACOSX */
-+#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
-
- return NS_OK;
- }
-@@ -122,13 +126,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
- * back to it; instead, we use the value returned when we called
- * initstate, since older glibc's have broken setstate() return values
- */
--#ifndef ANDROID
-+#ifndef HAVE_ARC4RANDOM
- setstate(mState);
- #endif
-
-+#ifdef HAVE_ARC4RANDOM_BUF
-+ arc4random_buf(aId, sizeof(nsID));
-+#else /* HAVE_ARC4RANDOM_BUF */
- size_t bytesLeft = sizeof(nsID);
- while (bytesLeft > 0) {
--#ifdef ANDROID
-+#ifdef HAVE_ARC4RANDOM
- long rval = arc4random();
- const size_t mRBytes = 4;
- #else
-@@ -150,6 +157,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
-
- bytesLeft -= toWrite;
- }
-+#endif /* HAVE_ARC4RANDOM_BUF */
-
- /* Put in the version */
- aId->m2 &= 0x0fff;
-@@ -159,7 +167,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
- aId->m3[0] &= 0x3f;
- aId->m3[0] |= 0x80;
-
--#ifndef ANDROID
-+#ifndef HAVE_ARC4RANDOM
- /* Restore the previous RNG state */
- setstate(mSavedState);
- #endif
-diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h
-index 6a24212..68ed6f2 100644
---- xpcom/base/nsUUIDGenerator.h
-+++ xpcom/base/nsUUIDGenerator.h
-@@ -29,7 +29,7 @@ private:
- protected:
-
- mozilla::Mutex mLock;
--#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
- char mState[128];
- char* mSavedState;
- uint8_t mRBytes;
Deleted: trunk/www/firefox-nightly/files/patch-bug1023028
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug1023028 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,88 +0,0 @@
-diff --git configure.in configure.in
-index 41aebf5..c2dfac7 100644
---- configure.in
-+++ configure.in
-@@ -1302,6 +1302,9 @@ dnl ========================================================
- dnl GNU specific defaults
- dnl ========================================================
- if test "$GNU_CC"; then
-+ MMX_FLAGS="-mmmx"
-+ SSE_FLAGS="-msse"
-+ SSE2_FLAGS="-msse2"
- # Per bug 719659 comment 2, some of the headers on ancient build machines
- # may require gnu89 inline semantics. But otherwise, we use C99.
- # But on OS X we just use C99 plus GNU extensions, in order to fix
-@@ -1915,10 +1918,6 @@ case "$target" in
- fi
- TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
-
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
--
- if test "x$lto_is_enabled" = "xyes"; then
- echo "Skipping -dead_strip because lto is enabled."
- dnl DTrace and -dead_strip don't interact well. See bug 403132.
-@@ -2010,10 +2009,6 @@ ia64*-hpux*)
- fi
- TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
--
- MOZ_GFX_OPTIMIZE_MOBILE=1
- MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions"
- ;;
-@@ -2035,10 +2030,6 @@ ia64*-hpux*)
- MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK"
- fi
-
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
--
- TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-
- MOZ_MEMORY=1
-@@ -2084,10 +2075,6 @@ ia64*-hpux*)
- DLL_PREFIX=
- IMPORT_LIB_SUFFIX=dll.a
-
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
--
- # We use mix of both POSIX and Win32 printf format across the tree, so format
- # warnings are useless on mingw.
- MOZ_C_SUPPORTS_WARNING(-Wno-, format, ac_c_has_wno_format)
-@@ -2297,9 +2284,6 @@ ia64*-hpux*)
- fi
- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(notdir $@) -o $@'
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(notdir $@)) -o $@'
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
- ;;
-
- *-openbsd*)
-@@ -2315,9 +2299,6 @@ ia64*-hpux*)
- if test "$LIBRUNPATH"; then
- DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
- fi
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
- ;;
-
- *-solaris*)
-@@ -2399,9 +2380,6 @@ ia64*-hpux*)
- if test "$OS_RELEASE" = "5.3"; then
- AC_DEFINE(MUST_UNDEF_HAVE_BOOLEAN_AFTER_INCLUDES)
- fi
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
- fi
- if test "$OS_RELEASE" = "5.5.1"; then
- AC_DEFINE(NEED_USLEEP_PROTOTYPE)
Deleted: trunk/www/firefox-nightly/files/patch-bug1026828
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug1026828 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
-diff --git storage/src/moz.build storage/src/moz.build
-index 4cd2551..5c40536 100644
---- storage/src/moz.build
-+++ storage/src/moz.build
-@@ -50,11 +50,14 @@ FINAL_LIBRARY = 'storagecomps'
- # (such as NSS) might trigger an initialization of sqlite and allocation
- # of memory using the default allocator, prior to the storage service
- # registering its allocator, causing memory management failures (bug 938730).
-+# However, this is not an issue if both the jemalloc allocator and the default
-+# allocator are the same thing.
- #
- # Note: On Windows our sqlite build assumes we use jemalloc. If you disable
- # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
- # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
--if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_NATIVE_SQLITE']:
-+if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_NATIVE_SQLITE']
-+ or CONFIG['MOZ_NATIVE_JEMALLOC']):
- if CONFIG['OS_TARGET'] != 'Android':
- DEFINES['MOZ_STORAGE_MEMORY'] = True
-
Added: trunk/www/firefox-nightly/files/patch-bug1028036
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug1028036 Sun Jun 22 04:25:57 2014 (r1610)
@@ -0,0 +1,13 @@
+diff --git layout/style/nsAnimationManager.h layout/style/nsAnimationManager.h
+index ae1f25d..21a8648 100644
+--- layout/style/nsAnimationManager.h
++++ layout/style/nsAnimationManager.h
+@@ -110,7 +110,7 @@ public:
+ }
+
+ void UpdateStyleAndEvents(ElementAnimations* aEA,
+- TimeStamp aRefreshTime,
++ mozilla::TimeStamp aRefreshTime,
+ mozilla::EnsureStyleRuleFlags aFlags);
+
+ // nsIStyleRuleProcessor (parts)
Added: trunk/www/firefox-nightly/files/patch-bug1028049
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug1028049 Sun Jun 22 04:25:57 2014 (r1610)
@@ -0,0 +1,12 @@
+diff --git dom/camera/CameraPreferences.cpp dom/camera/CameraPreferences.cpp
+index 82a6ff9..a4df3fe 100644
+--- dom/camera/CameraPreferences.cpp
++++ dom/camera/CameraPreferences.cpp
+@@ -5,6 +5,7 @@
+
+ #include "CameraPreferences.h"
+ #include "CameraCommon.h"
++#include "mozilla/ArrayUtils.h"
+ #include "mozilla/Monitor.h"
+ #include "mozilla/StaticPtr.h"
+ #include "mozilla/Preferences.h"
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/firefox/Makefile Sun Jun 22 04:25:57 2014 (r1610)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/firefox/Makefile 339634 2014-01-13 21:00:02Z rene $
PORTNAME= firefox
-DISTVERSION= 31.0b1
+DISTVERSION= 31.0b3
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/firefox/distinfo Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,2 +1,2 @@
-SHA256 (firefox-31.0b1.source.tar.bz2) = 82c4189e4d707146dcf0f626a41edd969f12bb587c3e34cda2dd4b6355ff231a
-SIZE (firefox-31.0b1.source.tar.bz2) = 147114352
+SHA256 (firefox-31.0b3.source.tar.bz2) = 096a4efaeb8688d07b052327cbecf9f4d4ab0224d7c935a731f3699abfe55ba1
+SIZE (firefox-31.0b3.source.tar.bz2) = 147710352
Deleted: trunk/www/firefox/files/patch-bug1023028
==============================================================================
--- trunk/www/firefox/files/patch-bug1023028 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,88 +0,0 @@
-diff --git configure.in configure.in
-index 41aebf5..c2dfac7 100644
---- configure.in
-+++ configure.in
-@@ -1302,6 +1302,9 @@ dnl ========================================================
- dnl GNU specific defaults
- dnl ========================================================
- if test "$GNU_CC"; then
-+ MMX_FLAGS="-mmmx"
-+ SSE_FLAGS="-msse"
-+ SSE2_FLAGS="-msse2"
- # Per bug 719659 comment 2, some of the headers on ancient build machines
- # may require gnu89 inline semantics. But otherwise, we use C99.
- # But on OS X we just use C99 plus GNU extensions, in order to fix
-@@ -1915,10 +1918,6 @@ case "$target" in
- fi
- TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
-
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
--
- if test "x$lto_is_enabled" = "xyes"; then
- echo "Skipping -dead_strip because lto is enabled."
- dnl DTrace and -dead_strip don't interact well. See bug 403132.
-@@ -2010,10 +2009,6 @@ ia64*-hpux*)
- fi
- TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
--
- MOZ_GFX_OPTIMIZE_MOBILE=1
- MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions"
- ;;
-@@ -2035,10 +2030,6 @@ ia64*-hpux*)
- MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK"
- fi
-
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
--
- TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-
- MOZ_MEMORY=1
-@@ -2084,10 +2075,6 @@ ia64*-hpux*)
- DLL_PREFIX=
- IMPORT_LIB_SUFFIX=dll.a
-
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
--
- # We use mix of both POSIX and Win32 printf format across the tree, so format
- # warnings are useless on mingw.
- MOZ_C_SUPPORTS_WARNING(-Wno-, format, ac_c_has_wno_format)
-@@ -2297,9 +2284,6 @@ ia64*-hpux*)
- fi
- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(notdir $@) -o $@'
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(notdir $@)) -o $@'
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
- ;;
-
- *-openbsd*)
-@@ -2315,9 +2299,6 @@ ia64*-hpux*)
- if test "$LIBRUNPATH"; then
- DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
- fi
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
- ;;
-
- *-solaris*)
-@@ -2399,9 +2380,6 @@ ia64*-hpux*)
- if test "$OS_RELEASE" = "5.3"; then
- AC_DEFINE(MUST_UNDEF_HAVE_BOOLEAN_AFTER_INCLUDES)
- fi
-- MMX_FLAGS="-mmmx"
-- SSE_FLAGS="-msse"
-- SSE2_FLAGS="-msse2"
- fi
- if test "$OS_RELEASE" = "5.5.1"; then
- AC_DEFINE(NEED_USLEEP_PROTOTYPE)
Modified: trunk/www/linux-firefox/Makefile
==============================================================================
--- trunk/www/linux-firefox/Makefile Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/linux-firefox/Makefile Sun Jun 22 04:25:57 2014 (r1610)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/linux-firefox/Makefile 336446 2013-12-14 13:42:06Z flo $
PORTNAME= firefox
-DISTVERSION= 31.0b1
+DISTVERSION= 31.0b3
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
Modified: trunk/www/linux-firefox/distinfo
==============================================================================
--- trunk/www/linux-firefox/distinfo Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/linux-firefox/distinfo Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,5 +1,5 @@
-SHA256 (firefox-31.0b1.tar.bz2) = 2c91fb8864990bcb87d4f3697336f28b52c15c0c2e78e9d9298de9cb6a20654b
-SIZE (firefox-31.0b1.tar.bz2) = 39786720
+SHA256 (firefox-31.0b3.tar.bz2) = 42debd5f54e1a83b518726cc0177ae78c12a4d365f8cfea820809ad9bbb39ee7
+SIZE (firefox-31.0b3.tar.bz2) = 39852365
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
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/seamonkey/Makefile Sun Jun 22 04:25:57 2014 (r1610)
@@ -2,25 +2,26 @@
# $FreeBSD: head/www/seamonkey/Makefile 339634 2014-01-13 21:00:02Z rene $
PORTNAME= seamonkey
-DISTVERSION= 2.27b1
+PORTVERSION= 2.28.b1
+DISTVERSION= 31.0b1
CATEGORIES?= www mail news editors irc ipv6
-MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/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}
+MASTER_SITES= MOZILLA/thunderbird/releases/${DISTVERSION}/source \
+ https://ftp.mozilla.org/pub/mozilla.org/thunderbird/candidates/${DISTVERSION}-candidates/build1/source/
+DISTFILES= thunderbird-${DISTVERSION}.source${EXTRACT_SUFX}
+EXTRACT_ONLY= thunderbird-${DISTVERSION}.source${EXTRACT_SUFX}
MAINTAINER= gecko@FreeBSD.org
COMMENT= The open source, standards compliant web browser
-BUILD_DEPENDS= nspr>=4.10.3:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \
nss>=3.16:${PORTSDIR}/security/nss \
- soundtouch>=1.7.0:${PORTSDIR}/audio/soundtouch \
+ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
- sqlite3>=3.8.3.1:${PORTSDIR}/databases/sqlite3 \
+ sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
zip:${PORTSDIR}/archivers/zip \
@@ -30,7 +31,7 @@
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
EM_VERSION= 1.6.1_pre20140112
-L_VERSION= 3.2
+L_VERSION= 3.3
SSP_UNSAFE= yes
USE_AUTOTOOLS= autoconf213:env
Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/seamonkey/distinfo Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.26.source.tar.bz2) = 985262d39f38fc20d307e810c371c9f581f7c55a66cfabd6b5561c236116b874
-SIZE (seamonkey-2.26.source.tar.bz2) = 165548355
+SHA256 (thunderbird-31.0b1.source.tar.bz2) = 39385e202c66b288e110d674e7da6801ea22f919d07d85cf1d75f5301ba58cb3
+SIZE (thunderbird-31.0b1.source.tar.bz2) = 170609945
SHA256 (enigmail-1.6.1_pre20140112.tar.xz) = 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149
SIZE (enigmail-1.6.1_pre20140112.tar.xz) = 916028
Copied and modified: trunk/www/seamonkey/files/patch-bug1023028 (from r1609, trunk/www/firefox/files/patch-bug1023028)
==============================================================================
--- trunk/www/firefox/files/patch-bug1023028 Sun Jun 22 04:24:32 2014 (r1609, copy source)
+++ trunk/www/seamonkey/files/patch-bug1023028 Sun Jun 22 04:25:57 2014 (r1610)
@@ -1,7 +1,7 @@
diff --git configure.in configure.in
index 41aebf5..c2dfac7 100644
---- configure.in
-+++ configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
@@ -1302,6 +1302,9 @@ dnl ========================================================
dnl GNU specific defaults
dnl ========================================================
Modified: trunk/www/seamonkey/files/patch-bug826985
==============================================================================
--- trunk/www/seamonkey/files/patch-bug826985 Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/seamonkey/files/patch-bug826985 Sun Jun 22 04:25:57 2014 (r1610)
@@ -151,8 +151,8 @@
],
diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
index 9c16ffa..1db3794 100644
---- mozilla/toolkit/library/Makefile.in
-+++ mozilla/toolkit/library/Makefile.in
+--- mozilla/toolkit/library/libxul.mk
++++ mozilla/toolkit/library/libxul.mk
@@ -182,6 +182,10 @@ endif
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
Modified: trunk/www/seamonkey/files/patch-bug847568
==============================================================================
--- trunk/www/seamonkey/files/patch-bug847568 Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/seamonkey/files/patch-bug847568 Sun Jun 22 04:25:57 2014 (r1610)
@@ -187,10 +187,10 @@
# Generate the include file containing compact, static definitions
# for effective TLD data.
etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat
-diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk
index 67f0db9..d42137a 100644
---- mozilla/toolkit/library/Makefile.in
-+++ mozilla/toolkit/library/Makefile.in
+--- mozilla/toolkit/library/libxul.mk
++++ mozilla/toolkit/library/libxul.mk
@@ -89,6 +89,14 @@ ifndef MOZ_TREE_PIXMAN
EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS)
endif
Deleted: trunk/www/seamonkey/files/patch-bug893397
==============================================================================
--- trunk/www/seamonkey/files/patch-bug893397 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,201 +0,0 @@
-diff --git configure.in configure.in
-index 549ad06..2878d9f 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -8091,7 +8091,7 @@ case "$OS_TARGET" in
- NECKO_WIFI=1
- fi
- ;;
-- Darwin|SunOS|WINNT)
-+ Darwin|FreeBSD|SunOS|WINNT)
- NECKO_WIFI=1
- ;;
- Linux)
-diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build
-index 07b01de..11706af 100644
---- mozilla/netwerk/wifi/moz.build
-+++ mozilla/netwerk/wifi/moz.build
-@@ -35,6 +35,10 @@ if CONFIG['OS_ARCH'] == 'Darwin':
- UNIFIED_SOURCES += [
- 'osx_corewlan.mm',
- ]
-+elif CONFIG['OS_ARCH'] == 'FreeBSD':
-+ UNIFIED_SOURCES += [
-+ 'nsWifiScannerFreeBSD.cpp',
-+ ]
- elif CONFIG['OS_ARCH'] == 'WINNT':
- UNIFIED_SOURCES += [
- 'nsWifiScannerWin.cpp',
-diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp
-new file mode 100644
-index 0000000..80d4cb6
---- /dev/null
-+++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp
-@@ -0,0 +1,167 @@
-+/* 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/. */
-+
-+// Developed by J.R. Oldroyd <fbsd@opal.com>, December 2012.
-+
-+// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces
-+// and then check for those with an 802.11 media type and able to return
-+// a list of stations. This is similar to ifconfig(8).
-+
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
-+#include <net/if_media.h>
-+#include <net80211/ieee80211_ioctl.h>
-+
-+#include <ifaddrs.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include "nsWifiAccessPoint.h"
-+
-+using namespace mozilla;
-+
-+static nsresult
-+FreeBSDGetAccessPointData(nsCOMArray<nsWifiAccessPoint> &accessPoints)
-+{
-+ // get list of interfaces
-+ struct ifaddrs *ifal;
-+ if (getifaddrs(&ifal) < 0) {
-+ return NS_ERROR_FAILURE;
-+ }
-+
-+ accessPoints.Clear();
-+
-+ // loop through the interfaces
-+ nsresult rv = NS_ERROR_FAILURE;
-+ struct ifaddrs *ifa;
-+ for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
-+ // limit to one interface per address
-+ if (ifa->ifa_addr->sa_family != AF_LINK) {
-+ continue;
-+ }
-+
-+ // store interface name in socket structure
-+ struct ifreq ifr;
-+ memset(&ifr, 0, sizeof(ifr));
-+ strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
-+ ifr.ifr_addr.sa_family = AF_LOCAL;
-+
-+ // open socket to interface
-+ int s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0);
-+ if (s < 0) {
-+ continue;
-+ }
-+
-+ // clear interface media structure
-+ struct ifmediareq ifmr;
-+ memset(&ifmr, 0, sizeof(ifmr));
-+ strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
-+
-+ // get interface media information
-+ if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
-+ close(s);
-+ continue;
-+ }
-+
-+ // check interface is a WiFi interface
-+ if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) {
-+ close(s);
-+ continue;
-+ }
-+
-+ // perform WiFi scan
-+ struct ieee80211req i802r;
-+ char iscanbuf[32*1024];
-+ memset(&i802r, 0, sizeof(i802r));
-+ strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
-+ i802r.i_type = IEEE80211_IOC_SCAN_RESULTS;
-+ i802r.i_data = iscanbuf;
-+ i802r.i_len = sizeof(iscanbuf);
-+ if (ioctl(s, SIOCG80211, &i802r) < 0) {
-+ close(s);
-+ continue;
-+ }
-+
-+ // close socket
-+ close(s);
-+
-+ // loop through WiFi networks and build geoloc-lookup structure
-+ char *vsr = (char *) i802r.i_data;
-+ unsigned len = i802r.i_len;
-+ while (len >= sizeof(struct ieee80211req_scan_result)) {
-+ struct ieee80211req_scan_result *isr =
-+ (struct ieee80211req_scan_result *) vsr;
-+
-+ // determine size of this entry
-+ char *id;
-+ int idlen;
-+ if (isr->isr_meshid_len) {
-+ id = vsr + isr->isr_ie_off + isr->isr_ssid_len;
-+ idlen = isr->isr_meshid_len;
-+ } else {
-+ id = vsr + isr->isr_ie_off;
-+ idlen = isr->isr_ssid_len;
-+ }
-+
-+ // copy network data
-+ char ssid[IEEE80211_NWID_LEN+1];
-+ strncpy(ssid, id, idlen);
-+ ssid[idlen] = '\0';
-+ nsWifiAccessPoint *ap = new nsWifiAccessPoint();
-+ ap->setSSID(ssid, strlen(ssid));
-+ ap->setMac(isr->isr_bssid);
-+ ap->setSignal(isr->isr_rssi);
-+ accessPoints.AppendObject(ap);
-+ rv = NS_OK;
-+
-+ // log the data
-+ LOG(( "FreeBSD access point: "
-+ "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, "
-+ "Strength: %d, Channel: %dMHz\n",
-+ ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2],
-+ isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5],
-+ isr->isr_rssi, isr->isr_freq));
-+
-+ // increment pointers
-+ len -= isr->isr_len;
-+ vsr += isr->isr_len;
-+ }
-+ }
-+
-+ freeifaddrs(ifal);
-+
-+ return rv;
-+}
-+
-+nsresult
-+nsWifiMonitor::DoScan()
-+{
-+ // Regularly get the access point data.
-+
-+ nsCOMArray<nsWifiAccessPoint> lastAccessPoints;
-+ nsCOMArray<nsWifiAccessPoint> accessPoints;
-+
-+ do {
-+ nsresult rv = FreeBSDGetAccessPointData(accessPoints);
-+ if (NS_FAILED(rv))
-+ return rv;
-+
-+ bool accessPointsChanged = !AccessPointsEqual(accessPoints, lastAccessPoints);
-+ ReplaceArray(lastAccessPoints, accessPoints);
-+
-+ rv = CallWifiListeners(lastAccessPoints, accessPointsChanged);
-+ NS_ENSURE_SUCCESS(rv, rv);
-+
-+ // wait for some reasonable amount of time. pref?
-+ LOG(("waiting on monitor\n"));
-+
-+ ReentrantMonitorAutoEnter mon(mReentrantMonitor);
-+ mon.Wait(PR_SecondsToInterval(60));
-+ }
-+ while (mKeepGoing);
-+
-+ return NS_OK;
-+}
Deleted: trunk/www/seamonkey/files/patch-bug916589
==============================================================================
--- trunk/www/seamonkey/files/patch-bug916589 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,35 +0,0 @@
-diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-index 5b50785..7cf47d5 100644
---- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-+++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-@@ -33,9 +33,10 @@
- #ifndef _SYS_QUEUE_H_
- #define _SYS_QUEUE_H_
-
--#if !defined(__FreeBSD__) && !defined(DARWIN)
- #include <stddef.h>
--#define __offsetof offsetof
-+
-+#ifndef offsetof
-+#define offsetof(type, field) ((size_t)(&((type *)0)->field))
- #endif
-
- #define STAILQ_FOREACH_SAFE(var, head, field, tvar) \
-@@ -43,8 +44,6 @@
- (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \
- (var) = (tvar))
-
--// #define __offsetof(type, field) ((size_t)(&((type *)0)->field))
--
- /*
- * This file defines four types of data structures: singly-linked lists,
- * singly-linked tail queues, lists and tail queues.
-@@ -285,7 +284,7 @@ struct { \
- (STAILQ_EMPTY((head)) ? \
- NULL : \
- ((struct type *) \
-- ((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-+ ((char *)((head)->stqh_last) - offsetof(struct type, field))))
-
- #define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
-
Deleted: trunk/www/seamonkey/files/patch-bug975397
==============================================================================
--- trunk/www/seamonkey/files/patch-bug975397 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,73 +0,0 @@
-commit 2fe45fb
-Author: L. David Baron <dbaron@dbaron.org>
-Date: Wed Apr 2 22:56:19 2014 -0700
-
- Bug 975397 - Call TrackImage when constructing a new nsStyleBorder. r=heycam
-
- I confirmed that the crashtest crashes in the harness without the patch.
-
- --HG--
- rename : layout/reftests/backgrounds/blue-32x32.png => layout/style/crashtests/blue-32x32.png
----
- layout/base/nsCSSRendering.cpp | 9 +++++++++
- layout/style/crashtests/blue-32x32.png | Bin 0 -> 110 bytes
- layout/style/crashtests/border-image-visited-link.html | 10 ++++++++++
- layout/style/crashtests/crashtests.list | 1 +
- 4 files changed, 20 insertions(+)
-
-diff --git layout/base/nsCSSRendering.cpp layout/base/nsCSSRendering.cpp
-index d91309b..2d8bb46 100644
---- mozilla/layout/base/nsCSSRendering.cpp
-+++ mozilla/layout/base/nsCSSRendering.cpp
-@@ -419,6 +419,10 @@ nsCSSRendering::PaintBorder(nsPresContext* aPresContext,
- }
-
- nsStyleBorder newStyleBorder(*styleBorder);
-+ // We could do something fancy to avoid the TrackImage/UntrackImage
-+ // work, but it doesn't seem worth it. (We need to call TrackImage
-+ // since we're not going through nsRuleNode::ComputeBorderData.)
-+ newStyleBorder.TrackImage(aPresContext);
-
- NS_FOR_CSS_SIDES(side) {
- newStyleBorder.SetBorderColor(side,
-@@ -428,6 +432,11 @@ nsCSSRendering::PaintBorder(nsPresContext* aPresContext,
- PaintBorderWithStyleBorder(aPresContext, aRenderingContext, aForFrame,
- aDirtyRect, aBorderArea, newStyleBorder,
- aStyleContext, aSkipSides);
-+
-+ // We could do something fancy to avoid the TrackImage/UntrackImage
-+ // work, but it doesn't seem worth it. (We need to call UntrackImage
-+ // since we're not going through nsStyleBorder::Destroy.)
-+ newStyleBorder.UntrackImage(aPresContext);
- }
-
- void
-diff --git layout/style/crashtests/blue-32x32.png layout/style/crashtests/blue-32x32.png
-new file mode 100644
-index 0000000..deefd19
-Binary files /dev/null and layout/style/crashtests/blue-32x32.png differ
-diff --git layout/style/crashtests/border-image-visited-link.html layout/style/crashtests/border-image-visited-link.html
-new file mode 100644
-index 0000000..b6e3ae5
---- /dev/null
-+++ mozilla/layout/style/crashtests/border-image-visited-link.html
-@@ -0,0 +1,10 @@
-+<!DOCTYPE HTML>
-+<title>border-image on link with visited styles</title>
-+<style>
-+
-+:link { color: blue }
-+:visited { color: purple }
-+:link, :visited { border: medium solid; border-image: url(blue-32x32.png) 4 4 4 4; }
-+
-+</style>
-+<a href="http://example.com/">test</a>;
-diff --git layout/style/crashtests/crashtests.list layout/style/crashtests/crashtests.list
-index e414f28..acd709c3 100644
---- mozilla/layout/style/crashtests/crashtests.list
-+++ mozilla/layout/style/crashtests/crashtests.list
-@@ -104,3 +104,4 @@ load 945048-1.html
- load 972199-1.html
- load 989965-1.html
- load large_border_image_width.html
-+load border-image-visited-link.html
Deleted: trunk/www/seamonkey/files/patch-bug993467
==============================================================================
--- trunk/www/seamonkey/files/patch-bug993467 Sun Jun 22 04:25:57 2014 (r1609)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- config/config.mk~
-+++ config/config.mk
-@@ -411,7 +411,7 @@ MY_RULES := $(DEPTH)/config/myrules.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) \
Modified: trunk/www/seamonkey/files/patch-z-bug517422
==============================================================================
--- trunk/www/seamonkey/files/patch-z-bug517422 Sun Jun 22 04:24:32 2014 (r1609)
+++ trunk/www/seamonkey/files/patch-z-bug517422 Sun Jun 22 04:25:57 2014 (r1610)
@@ -251,7 +251,7 @@
+MOZ_NATIVE_SOUNDTOUCH=)
+
+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
-+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0)
++ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.8.0)
+
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
@@ -423,10 +423,10 @@
}, {
'dependencies': [
'<(DEPTH)/third_party/opus/opus.gyp:opus'
-diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk
index d42137a..695e75a8 100644
---- mozilla/toolkit/library/Makefile.in
-+++ mozilla/toolkit/library/Makefile.in
+--- mozilla/toolkit/library/libxul.mk
++++ mozilla/toolkit/library/libxul.mk
@@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL
EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS)
endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406220425.s5M4Pv9V041251>