diff options
65 files changed, 1743 insertions, 990 deletions
diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk index 35be7cfd50c4..0bf667556a3b 100644 --- a/Mk/Uses/gecko.mk +++ b/Mk/Uses/gecko.mk @@ -39,12 +39,12 @@ RUN_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul .elif ${_GECKO_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 24 -_GECKO_VERSIONS= 24 28 +_GECKO_VERSIONS= 24 29 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 24_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -25_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +29_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 69e681e9658c..3cb46090bf81 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -33,7 +33,8 @@ Gecko_Pre_Include= bsd.gecko.mk # listed in '_ALL_DEPENDS'. If your port doesn't # need one of those then you can use '-' like # 'USE_MOZILLA= -png -vpx' to subtract the -# dependencies. +# dependencies. Experimental deps use '+' like +# 'USE_MOZILLA= +speex +theora'. # # GECKO_PLIST_PRE_FILES Manual add files in the plist if it needs. # @@ -140,7 +141,7 @@ MOZ_OPTIONS+= --enable-jemalloc .endif # Standard depends -_ALL_DEPENDS= cairo event ffi harfbuzz hunspell icu jpeg nspr nss opus png pixman sqlite vorbis vpx +_ALL_DEPENDS= cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss opus png pixman soundtouch sqlite vorbis vpx cairo_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo cairo_MOZ_OPTIONS= --enable-system-cairo @@ -155,10 +156,13 @@ ffi_MOZ_OPTIONS= --enable-system-ffi ffi_EXTRACT_AFTER_ARGS= --exclude mozilla*/js/src/ctypes/libffi .if exists(${FILESDIR}/patch-bug847568) || exists(${FILESDIR}/patch-z-bug847568) +graphite_LIB_DEPENDS= libgraphite2.so:${PORTSDIR}/graphics/graphite2 +graphite_MOZ_OPTIONS= --with-system-graphite2 +graphite_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/graphite2 + harfbuzz_LIB_DEPENDS= libharfbuzz.so:${PORTSDIR}/print/harfbuzz -harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz --with-system-graphite2 -harfbuzz_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/harfbuzz \ - --exclude mozilla*/gfx/graphite2 +harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz +harfbuzz_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/harfbuzz .endif hunspell_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell @@ -197,11 +201,27 @@ png_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} png_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libpng +.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) +soundtouch_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch +soundtouch_MOZ_OPTIONS= --with-system-soundtouch +soundtouch_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libsoundtouch + +# XXX disabled: bug 913854 not yet upstreamed +speex_LIB_DEPENDS= libspeexdsp.so:${PORTSDIR}/audio/speex +speex_MOZ_OPTIONS= --with-system-speex +speex_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libspeex_resampler +.endif + sqlite_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 sqlite_MOZ_OPTIONS= --enable-system-sqlite sqlite_EXTRACT_AFTER_ARGS= --exclude mozilla*/db/sqlite3 .if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) +# XXX disabled: update to 1.2.x or review backported fixes +theora_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora +theora_MOZ_OPTIONS= --with-system-theora +theora_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libtheora + vorbis_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis vorbis_MOZ_OPTIONS= --with-system-vorbis --with-system-ogg vorbis_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvorbis \ @@ -217,7 +237,7 @@ vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx ${use:S/-/_WITHOUT_/}= ${TRUE} .endfor -.for dep in ${_ALL_DEPENDS} +.for dep in ${_ALL_DEPENDS} ${USE_MOZILLA:M+*:S/+//} .if !defined(_WITHOUT_${dep}) BUILD_DEPENDS+= ${${dep}_BUILD_DEPENDS} LIB_DEPENDS+= ${${dep}_LIB_DEPENDS} @@ -367,7 +387,12 @@ MOZ_OPTIONS+= --enable-alsa .endif .if ${PORT_OPTIONS:MPULSEAUDIO} +. if ${PORT_OPTIONS:MALSA} BUILD_DEPENDS+= pulseaudio>0:${PORTSDIR}/audio/pulseaudio +. else +# pull pulse package if we cannot fallback to another backend +LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio +. endif MOZ_OPTIONS+= --enable-pulseaudio .else MOZ_OPTIONS+= --disable-pulseaudio diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile index cee11e90da7f..0da7b19b0793 100644 --- a/mail/linux-thunderbird/Makefile +++ b/mail/linux-thunderbird/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 24.4.0 +DISTVERSION= 24.5.0 CATEGORIES= mail news net-im ipv6 DISTNAME= ${PORTNAME}-${DISTVERSION} MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo index 39c1f51eaa06..ad1ca8b67468 100644 --- a/mail/linux-thunderbird/distinfo +++ b/mail/linux-thunderbird/distinfo @@ -1,5 +1,5 @@ -SHA256 (thunderbird-24.4.0.tar.bz2) = 376ab51e3c424db7e235b2e94494d48ce2fa9a8f1fbf5ef5cf9e367bbaf7422d -SIZE (thunderbird-24.4.0.tar.bz2) = 28923795 +SHA256 (thunderbird-24.5.0.tar.bz2) = 6441f90eda22808c37bca023748efee7735cf9b18b1d21ce75878c10da8baad7 +SIZE (thunderbird-24.5.0.tar.bz2) = 28958353 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index 32d573d80398..af8718b757a7 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 24.4.0 +PORTVERSION= 24.5.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -15,7 +15,7 @@ COMMENT= Localized interface for Thunderbird EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip USES= zip:infozip gecko:thunderbird -USE_XPI= firefox linux-firefox +USE_XPI= thunderbird NO_BUILD= yes NO_ARCH= yes diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo index 5342117134c1..d404ffe8fa8b 100644 --- a/mail/thunderbird-i18n/distinfo +++ b/mail/thunderbird-i18n/distinfo @@ -1,110 +1,110 @@ -SHA256 (xpi/thunderbird-i18n-24.4.0/ar.xpi) = ea847b5e42930343d2ec2e2f9182d59ff84d23b6a864e2c93eb0455cf452f296 -SIZE (xpi/thunderbird-i18n-24.4.0/ar.xpi) = 457862 -SHA256 (xpi/thunderbird-i18n-24.4.0/ast.xpi) = 0ec76e7938dafb72e7fe94941dd9514223d8c5c3880cb4bfd92c2075c7a1528b -SIZE (xpi/thunderbird-i18n-24.4.0/ast.xpi) = 373831 -SHA256 (xpi/thunderbird-i18n-24.4.0/be.xpi) = f16da428ed0246b0f08e00bc0f23eddba4e524dd856b30e93628f7fe0a636fce -SIZE (xpi/thunderbird-i18n-24.4.0/be.xpi) = 416882 -SHA256 (xpi/thunderbird-i18n-24.4.0/bg.xpi) = 7d2e98470e62bb63c7acfd5f350cfb909598755b33ad2ff77d9792d3de341b7f -SIZE (xpi/thunderbird-i18n-24.4.0/bg.xpi) = 485023 -SHA256 (xpi/thunderbird-i18n-24.4.0/bn-BD.xpi) = 72afde682492061234e3887253fd10fccfc738677b952a5b2932d1963f181ed7 -SIZE (xpi/thunderbird-i18n-24.4.0/bn-BD.xpi) = 537257 -SHA256 (xpi/thunderbird-i18n-24.4.0/br.xpi) = bf218d7f6d2eaf2f6444944de439cefe8f33e4e56a36eef83ee3e8986a98b944 -SIZE (xpi/thunderbird-i18n-24.4.0/br.xpi) = 427679 -SHA256 (xpi/thunderbird-i18n-24.4.0/ca.xpi) = 7f22bd3ec7b29c272dd3c35062c2fb6d92cfbe248365d1e8ea9c86a1af83fdfd -SIZE (xpi/thunderbird-i18n-24.4.0/ca.xpi) = 429746 -SHA256 (xpi/thunderbird-i18n-24.4.0/cs.xpi) = f139479d6984a6bf62b2a9ac398f16fd2ad057aa47115fae7072b50446877ede -SIZE (xpi/thunderbird-i18n-24.4.0/cs.xpi) = 431476 -SHA256 (xpi/thunderbird-i18n-24.4.0/da.xpi) = 0c59bf84b45dc399fa3090d3d34a5f27772630300115b10546fb7172823d0a4f -SIZE (xpi/thunderbird-i18n-24.4.0/da.xpi) = 409626 -SHA256 (xpi/thunderbird-i18n-24.4.0/de.xpi) = 7bf488e61a07ab600b057921b117376eadf919a874e59f3350c16a171bcc5a5b -SIZE (xpi/thunderbird-i18n-24.4.0/de.xpi) = 408674 -SHA256 (xpi/thunderbird-i18n-24.4.0/el.xpi) = ba85515ab06c4255f2b0953c8a9f6e0d4ccf26f4a240e8972b29fbde708d08ce -SIZE (xpi/thunderbird-i18n-24.4.0/el.xpi) = 464552 -SHA256 (xpi/thunderbird-i18n-24.4.0/en-GB.xpi) = 3ceb78e9d95e104113121d4667c25b48bdc2faedcab168884453765dd4994a8f -SIZE (xpi/thunderbird-i18n-24.4.0/en-GB.xpi) = 400962 -SHA256 (xpi/thunderbird-i18n-24.4.0/en-US.xpi) = 9d59b39cb6e8c38a1f94b91ec28882a324a460a7725dfad5fc4dcfca852a93a1 -SIZE (xpi/thunderbird-i18n-24.4.0/en-US.xpi) = 402144 -SHA256 (xpi/thunderbird-i18n-24.4.0/es-AR.xpi) = 6ff2ec8f30aba2261dfa59b7fc3cf664502966e1d9247f2a0f6b0290b4752c0d -SIZE (xpi/thunderbird-i18n-24.4.0/es-AR.xpi) = 425657 -SHA256 (xpi/thunderbird-i18n-24.4.0/es-ES.xpi) = 52721d25f1c81d8562dd830d0b946e3b3573e88e07370f53d4bfc181bd87ed5b -SIZE (xpi/thunderbird-i18n-24.4.0/es-ES.xpi) = 366308 -SHA256 (xpi/thunderbird-i18n-24.4.0/et.xpi) = b4ceaedc90bc8bd6efa8a77de2f58ea239b24dd3df3cc88db65857eb51b5f98b -SIZE (xpi/thunderbird-i18n-24.4.0/et.xpi) = 422894 -SHA256 (xpi/thunderbird-i18n-24.4.0/eu.xpi) = 1369771f945eca750e85fa17ee02fccd57c58ca07e57ebe7ac8e4cc93a26a400 -SIZE (xpi/thunderbird-i18n-24.4.0/eu.xpi) = 418497 -SHA256 (xpi/thunderbird-i18n-24.4.0/fi.xpi) = 96dab3bfecee70e22015ae1f6c207e396c29d8670f270ed3f972f81fa7c383db -SIZE (xpi/thunderbird-i18n-24.4.0/fi.xpi) = 424264 -SHA256 (xpi/thunderbird-i18n-24.4.0/fr.xpi) = 3848ae6f610b8862ff96ec7a0b54e6485f76831283ac12a619f0ce8107a59655 -SIZE (xpi/thunderbird-i18n-24.4.0/fr.xpi) = 431288 -SHA256 (xpi/thunderbird-i18n-24.4.0/fy-NL.xpi) = 2506c3ad7483c1c7d1ba23970a22fe069833a12bd63e2963f07d97176b476c85 -SIZE (xpi/thunderbird-i18n-24.4.0/fy-NL.xpi) = 426098 -SHA256 (xpi/thunderbird-i18n-24.4.0/ga-IE.xpi) = 313765ea94fd9b05738a8322f84bdf3368827695342ae09fe3ab1da8b9f99277 -SIZE (xpi/thunderbird-i18n-24.4.0/ga-IE.xpi) = 437114 -SHA256 (xpi/thunderbird-i18n-24.4.0/gd.xpi) = 63a4b1fb749551596b5f94130e63645585d384bcf57ead9256008241e8bbefd7 -SIZE (xpi/thunderbird-i18n-24.4.0/gd.xpi) = 440091 -SHA256 (xpi/thunderbird-i18n-24.4.0/gl.xpi) = ac58f14a44b67bb6fd6c20efe79e81ad05c5a10b174595f5cf077d676a76d0bd -SIZE (xpi/thunderbird-i18n-24.4.0/gl.xpi) = 427543 -SHA256 (xpi/thunderbird-i18n-24.4.0/he.xpi) = b563c9372a99c6e5aff15ba73e70424828acf2083402b22de1d033380432cd81 -SIZE (xpi/thunderbird-i18n-24.4.0/he.xpi) = 457065 -SHA256 (xpi/thunderbird-i18n-24.4.0/hr.xpi) = db5718e663468cdcc2d4701dd5b01e6b2e39e0bb6ca11e58a4056c7c22e4db20 -SIZE (xpi/thunderbird-i18n-24.4.0/hr.xpi) = 422387 -SHA256 (xpi/thunderbird-i18n-24.4.0/hu.xpi) = 4b516919dd26a7d6294e57ca6b45f07ca1f65e887ad49c3ded5458d7f895b066 -SIZE (xpi/thunderbird-i18n-24.4.0/hu.xpi) = 441512 -SHA256 (xpi/thunderbird-i18n-24.4.0/hy-AM.xpi) = 09a95139e9bbcabd0b3ca45eb8c5d6f3f8fbbbb2cae8d22c85b505f0f5feff8e -SIZE (xpi/thunderbird-i18n-24.4.0/hy-AM.xpi) = 477922 -SHA256 (xpi/thunderbird-i18n-24.4.0/id.xpi) = 5a4d8b2e0e96972d91fe60c1799c66f6387ea0858392dd545a2dcef02c753a8e -SIZE (xpi/thunderbird-i18n-24.4.0/id.xpi) = 457498 -SHA256 (xpi/thunderbird-i18n-24.4.0/is.xpi) = e85519acd2619815c350f49c9406c4f36585cc61c6555448bc2a323cf0bbf2ca -SIZE (xpi/thunderbird-i18n-24.4.0/is.xpi) = 425710 -SHA256 (xpi/thunderbird-i18n-24.4.0/it.xpi) = d32a5e3ed927502c7163243b59686e977a42c85822eeae964c0635ded3071002 -SIZE (xpi/thunderbird-i18n-24.4.0/it.xpi) = 357933 -SHA256 (xpi/thunderbird-i18n-24.4.0/ja.xpi) = 425c787bc6f432b246f165c4e6bdbd814f6d058bb662a873c61f72ace8816515 -SIZE (xpi/thunderbird-i18n-24.4.0/ja.xpi) = 475559 -SHA256 (xpi/thunderbird-i18n-24.4.0/ko.xpi) = 23750b422f4395630555b4dd60ed86a6f8d70a328d0334d1a04431c85a537562 -SIZE (xpi/thunderbird-i18n-24.4.0/ko.xpi) = 428070 -SHA256 (xpi/thunderbird-i18n-24.4.0/lt.xpi) = 93873a2aad2433626675f23be74781d74472971edb0c891d1bfcfc29d10e920d -SIZE (xpi/thunderbird-i18n-24.4.0/lt.xpi) = 443260 -SHA256 (xpi/thunderbird-i18n-24.4.0/nb-NO.xpi) = fbfd546b9617631c4df0cb85cf2e939d75b56c3c6ff7601f4556f840df7fb3e3 -SIZE (xpi/thunderbird-i18n-24.4.0/nb-NO.xpi) = 418922 -SHA256 (xpi/thunderbird-i18n-24.4.0/nl.xpi) = 7fd2b9560a00e3172a573796899fba26d1d1cae69e2b17c81213a223da8c2712 -SIZE (xpi/thunderbird-i18n-24.4.0/nl.xpi) = 418763 -SHA256 (xpi/thunderbird-i18n-24.4.0/nn-NO.xpi) = d0fc15725d6a8f120040ba4051740a10d47fcdfce3345619a4cd7598370dafac -SIZE (xpi/thunderbird-i18n-24.4.0/nn-NO.xpi) = 421134 -SHA256 (xpi/thunderbird-i18n-24.4.0/pa-IN.xpi) = c0c55f8c1b8009795e30318297b527f9ece985db4439b2ad0dbe7af937da62c4 -SIZE (xpi/thunderbird-i18n-24.4.0/pa-IN.xpi) = 508273 -SHA256 (xpi/thunderbird-i18n-24.4.0/pl.xpi) = ce486fffc5366b91d8d57b43ffcf5af93c7119960136344892cad5b32fcbb877 -SIZE (xpi/thunderbird-i18n-24.4.0/pl.xpi) = 401752 -SHA256 (xpi/thunderbird-i18n-24.4.0/pt-BR.xpi) = 2b9ecf69dc46a62fb613eddcdd7d2c417046eff3ca20c400e7ec8389f1ae9436 -SIZE (xpi/thunderbird-i18n-24.4.0/pt-BR.xpi) = 430909 -SHA256 (xpi/thunderbird-i18n-24.4.0/pt-PT.xpi) = 3f3b6695433f8a23d1fc1c90426165168a31e6ee505a9e0dc30773fb87d1ef0a -SIZE (xpi/thunderbird-i18n-24.4.0/pt-PT.xpi) = 425025 -SHA256 (xpi/thunderbird-i18n-24.4.0/rm.xpi) = d4281b792ad6c2662b9dda2e4d087a11b50978901d508e7855cd945d9578ab06 -SIZE (xpi/thunderbird-i18n-24.4.0/rm.xpi) = 432384 -SHA256 (xpi/thunderbird-i18n-24.4.0/ro.xpi) = efd0d40b632d181aa289dcf9a21d8ba213f90ca6f43a886e7cc67a4b1d3e88d0 -SIZE (xpi/thunderbird-i18n-24.4.0/ro.xpi) = 497491 -SHA256 (xpi/thunderbird-i18n-24.4.0/ru.xpi) = 284e9c3fcaee7caa55f442d3fe6127d68bbd1a0e294015a3d97bcbac9a477a13 -SIZE (xpi/thunderbird-i18n-24.4.0/ru.xpi) = 425097 -SHA256 (xpi/thunderbird-i18n-24.4.0/si.xpi) = 9f97455e774e74b4a3d5effe631d7b4eaeebdee3f0f0fdcc3b3ec90c17a7de67 -SIZE (xpi/thunderbird-i18n-24.4.0/si.xpi) = 511167 -SHA256 (xpi/thunderbird-i18n-24.4.0/sk.xpi) = 8154cdc41071c4e4d06dd8bf37b5166e6078a90c00753e13d01d20c5a4b5ba4e -SIZE (xpi/thunderbird-i18n-24.4.0/sk.xpi) = 440106 -SHA256 (xpi/thunderbird-i18n-24.4.0/sl.xpi) = 4fbd8dce101e088cec044113cf298464b56f729d7de9c48c3e295aa8763a8b20 -SIZE (xpi/thunderbird-i18n-24.4.0/sl.xpi) = 421706 -SHA256 (xpi/thunderbird-i18n-24.4.0/sq.xpi) = 3d6ce7ca0a312345d7c8b7006fd05961e7f23c67bbbe73da971448de916ea511 -SIZE (xpi/thunderbird-i18n-24.4.0/sq.xpi) = 435215 -SHA256 (xpi/thunderbird-i18n-24.4.0/sr.xpi) = 95fc6006ce2b05f66945710e56304d2abda2295272b4fe6c976a7885cdc63b85 -SIZE (xpi/thunderbird-i18n-24.4.0/sr.xpi) = 518889 -SHA256 (xpi/thunderbird-i18n-24.4.0/sv-SE.xpi) = c509fa6766b0bad5e0fea3bb66e8faf56a4c3ed6a955d64ef2dd3aaf354c5dbe -SIZE (xpi/thunderbird-i18n-24.4.0/sv-SE.xpi) = 423815 -SHA256 (xpi/thunderbird-i18n-24.4.0/ta-LK.xpi) = ca2a242106b6b8cfd4123961704aaa0ea50ef08a59413ab5782971460d47a371 -SIZE (xpi/thunderbird-i18n-24.4.0/ta-LK.xpi) = 534923 -SHA256 (xpi/thunderbird-i18n-24.4.0/tr.xpi) = 6e49a73b80664b92d590888d34f19aa2f77490459c2a9d89cdf6d65ca5f4a569 -SIZE (xpi/thunderbird-i18n-24.4.0/tr.xpi) = 438067 -SHA256 (xpi/thunderbird-i18n-24.4.0/uk.xpi) = 8846c8bf8f30206afb21663fc0b37ca05f382cd2704beb5dbbf2fac94276e500 -SIZE (xpi/thunderbird-i18n-24.4.0/uk.xpi) = 480949 -SHA256 (xpi/thunderbird-i18n-24.4.0/vi.xpi) = 9986e317e7c830111e9e018fd37f9e39c99a5b841115c7b661c5b296532c8548 -SIZE (xpi/thunderbird-i18n-24.4.0/vi.xpi) = 495558 -SHA256 (xpi/thunderbird-i18n-24.4.0/zh-CN.xpi) = 230d8f16b03d1b2f1b3a6a502f78027d0e9d7fe8d62751ddf85935d4247fa696 -SIZE (xpi/thunderbird-i18n-24.4.0/zh-CN.xpi) = 449181 -SHA256 (xpi/thunderbird-i18n-24.4.0/zh-TW.xpi) = 4041db9d40a5c2d6256f8d3cf3e307d1708fa7db8645291383f6d09241225bdd -SIZE (xpi/thunderbird-i18n-24.4.0/zh-TW.xpi) = 450001 +SHA256 (xpi/thunderbird-i18n-24.5.0/ar.xpi) = 61c387758c281431653c0d2a40f9779dea513358129fca8838b7568bfcb2f046 +SIZE (xpi/thunderbird-i18n-24.5.0/ar.xpi) = 457862 +SHA256 (xpi/thunderbird-i18n-24.5.0/ast.xpi) = a24e106915b718563a6b59e43d0152c027ac8f851192ca9c26135eaf2d0bf5f4 +SIZE (xpi/thunderbird-i18n-24.5.0/ast.xpi) = 373831 +SHA256 (xpi/thunderbird-i18n-24.5.0/be.xpi) = 46f2f6a22fc8eaa40793be47e7f3351297182cc7ddfb8116b00da965d6ef4a20 +SIZE (xpi/thunderbird-i18n-24.5.0/be.xpi) = 416882 +SHA256 (xpi/thunderbird-i18n-24.5.0/bg.xpi) = e36c78b5dc1667c2a66000a94d4858fd315637b2072491abd5678739c3745f88 +SIZE (xpi/thunderbird-i18n-24.5.0/bg.xpi) = 485023 +SHA256 (xpi/thunderbird-i18n-24.5.0/bn-BD.xpi) = 84b0646dc6ab24c3d366dcb93f30c0e93a53215f2d837acfbfe6757d36cf8b2a +SIZE (xpi/thunderbird-i18n-24.5.0/bn-BD.xpi) = 537258 +SHA256 (xpi/thunderbird-i18n-24.5.0/br.xpi) = 735a7dcf944090ded122ac7fd94ca081599018091b6b948629281b2dd053ea11 +SIZE (xpi/thunderbird-i18n-24.5.0/br.xpi) = 427679 +SHA256 (xpi/thunderbird-i18n-24.5.0/ca.xpi) = b44c121db7370a79569b8309658dcff73df319f19ce446695964a8913dfffa6d +SIZE (xpi/thunderbird-i18n-24.5.0/ca.xpi) = 429746 +SHA256 (xpi/thunderbird-i18n-24.5.0/cs.xpi) = 500809375921ab12902f81c0d700c6b66ec2c3bd3a0d03cd58fd94bc59e61040 +SIZE (xpi/thunderbird-i18n-24.5.0/cs.xpi) = 431476 +SHA256 (xpi/thunderbird-i18n-24.5.0/da.xpi) = d9c3e799b534164318262e936b9a5b50016ffea58276d67a6f6cca3c8fad6a83 +SIZE (xpi/thunderbird-i18n-24.5.0/da.xpi) = 409626 +SHA256 (xpi/thunderbird-i18n-24.5.0/de.xpi) = e03fa8c3a32b66955c7b95ccb0651d555e73f62411ed55aa2a44237dbc27b624 +SIZE (xpi/thunderbird-i18n-24.5.0/de.xpi) = 408674 +SHA256 (xpi/thunderbird-i18n-24.5.0/el.xpi) = 490f21edef433189cbcb0e16acb87ebc6e4047bce5c53ae35073782ac2539ea5 +SIZE (xpi/thunderbird-i18n-24.5.0/el.xpi) = 464552 +SHA256 (xpi/thunderbird-i18n-24.5.0/en-GB.xpi) = df6884048a7cc4579cf8d01b9846f4a4fada50c35486a5ef753b92c9e6e9eca4 +SIZE (xpi/thunderbird-i18n-24.5.0/en-GB.xpi) = 400962 +SHA256 (xpi/thunderbird-i18n-24.5.0/en-US.xpi) = 7b6c84303047b2cd7b8def5050978852d5133837f2b805b445da553b7c61ad26 +SIZE (xpi/thunderbird-i18n-24.5.0/en-US.xpi) = 402144 +SHA256 (xpi/thunderbird-i18n-24.5.0/es-AR.xpi) = 1f89c991a958a89913c4ce7d398d3727505f1c5ea18188691f2503d4fc4808f0 +SIZE (xpi/thunderbird-i18n-24.5.0/es-AR.xpi) = 425656 +SHA256 (xpi/thunderbird-i18n-24.5.0/es-ES.xpi) = f4793deb6ddbe8be6af31fe809ba2e6b1a85c16c42fc023d9c798b2a48ed1aab +SIZE (xpi/thunderbird-i18n-24.5.0/es-ES.xpi) = 366308 +SHA256 (xpi/thunderbird-i18n-24.5.0/et.xpi) = 96a8367da63bbb573386ef2301089a676b963e5000a7638dd616cf66f0fefc06 +SIZE (xpi/thunderbird-i18n-24.5.0/et.xpi) = 422893 +SHA256 (xpi/thunderbird-i18n-24.5.0/eu.xpi) = b3617b39f949ad5e2cc06ad96de92eb76240fb5299fc9ef65479365a390ba2f3 +SIZE (xpi/thunderbird-i18n-24.5.0/eu.xpi) = 418497 +SHA256 (xpi/thunderbird-i18n-24.5.0/fi.xpi) = 3732e9d56156d836dbe69cac9e0d17e2b9e65b3436d54337f01bad07ca79ad86 +SIZE (xpi/thunderbird-i18n-24.5.0/fi.xpi) = 424264 +SHA256 (xpi/thunderbird-i18n-24.5.0/fr.xpi) = 4f6749e30cd43d41d3ad963e09e891c5455f4afba5d659482c945bf2d3ffa041 +SIZE (xpi/thunderbird-i18n-24.5.0/fr.xpi) = 431289 +SHA256 (xpi/thunderbird-i18n-24.5.0/fy-NL.xpi) = 5fd8a7748cb741587e6f8f5608edd1b930adfd597d7c41572ef938acabf5527d +SIZE (xpi/thunderbird-i18n-24.5.0/fy-NL.xpi) = 426098 +SHA256 (xpi/thunderbird-i18n-24.5.0/ga-IE.xpi) = 5c680e902636dbbdb0850afd8c52016716d2a45bee15661626f8e66dc40d7f3c +SIZE (xpi/thunderbird-i18n-24.5.0/ga-IE.xpi) = 437114 +SHA256 (xpi/thunderbird-i18n-24.5.0/gd.xpi) = 49941bbc298c4ca251dc799280236e3f687a75a1650bf47ece9da7a6390f1c76 +SIZE (xpi/thunderbird-i18n-24.5.0/gd.xpi) = 440091 +SHA256 (xpi/thunderbird-i18n-24.5.0/gl.xpi) = 2498b883e3cd6d7a81c02824afdaede981228dde6f0a9c13217a34e6d6dfa7c1 +SIZE (xpi/thunderbird-i18n-24.5.0/gl.xpi) = 427543 +SHA256 (xpi/thunderbird-i18n-24.5.0/he.xpi) = a5546f26a205db3a0196c5032c8e69314affecd2174f7880f5ae517af73785f9 +SIZE (xpi/thunderbird-i18n-24.5.0/he.xpi) = 457065 +SHA256 (xpi/thunderbird-i18n-24.5.0/hr.xpi) = b225e5428b4ec30eb618fcac0de66557e2f7bfdc88957dc739ec142d7968a3b2 +SIZE (xpi/thunderbird-i18n-24.5.0/hr.xpi) = 422387 +SHA256 (xpi/thunderbird-i18n-24.5.0/hu.xpi) = a24e6b47bb40a6b71319b5a4f7638574e3eede2163238da059bf0876cf7ec3fa +SIZE (xpi/thunderbird-i18n-24.5.0/hu.xpi) = 441511 +SHA256 (xpi/thunderbird-i18n-24.5.0/hy-AM.xpi) = a8021d93dc1f3d372ee94d4c7eaacae2f30df06e2bd6cfc37a1ab564c90b6fb4 +SIZE (xpi/thunderbird-i18n-24.5.0/hy-AM.xpi) = 477923 +SHA256 (xpi/thunderbird-i18n-24.5.0/id.xpi) = 41222ef78db07a5da8b388485cd3536184caf8eb7264830e410026c279972454 +SIZE (xpi/thunderbird-i18n-24.5.0/id.xpi) = 457499 +SHA256 (xpi/thunderbird-i18n-24.5.0/is.xpi) = 3fdd5a7f5692ba2103bec6037d77bf848f78cb02eb1644d46641e89fe52cae2c +SIZE (xpi/thunderbird-i18n-24.5.0/is.xpi) = 425710 +SHA256 (xpi/thunderbird-i18n-24.5.0/it.xpi) = 7c9a296019584d63c44ec03dda76200b83f07f50dcbafbe7c3b69af8f894f5cd +SIZE (xpi/thunderbird-i18n-24.5.0/it.xpi) = 357933 +SHA256 (xpi/thunderbird-i18n-24.5.0/ja.xpi) = 624bf5f383fbcaf6eff9164232b72395733ae01a3a1f5e10d4a3e6fda10de1b8 +SIZE (xpi/thunderbird-i18n-24.5.0/ja.xpi) = 475559 +SHA256 (xpi/thunderbird-i18n-24.5.0/ko.xpi) = 830f3245b7f246e2269a758b7cc9186d7aadbf519ee72fa33b3d2325e285a291 +SIZE (xpi/thunderbird-i18n-24.5.0/ko.xpi) = 428071 +SHA256 (xpi/thunderbird-i18n-24.5.0/lt.xpi) = dff8b84bcfbb8c07d76d415b6ef378d6024bd81f0655ca438927572b85f4e37c +SIZE (xpi/thunderbird-i18n-24.5.0/lt.xpi) = 443259 +SHA256 (xpi/thunderbird-i18n-24.5.0/nb-NO.xpi) = 2ae8f6c1a61d6f17cfb4f86d5d9926688fb8a403ab64fe1950c89a8997bcdd55 +SIZE (xpi/thunderbird-i18n-24.5.0/nb-NO.xpi) = 418922 +SHA256 (xpi/thunderbird-i18n-24.5.0/nl.xpi) = da2532d21fb594927f59979d4c022297b0ee5f0c29cdf2209d7e4f9296931cd9 +SIZE (xpi/thunderbird-i18n-24.5.0/nl.xpi) = 418764 +SHA256 (xpi/thunderbird-i18n-24.5.0/nn-NO.xpi) = 2a52857fca772239f14207755946dbdd36ba1c0209f8c09f30cfe6cdc94a5892 +SIZE (xpi/thunderbird-i18n-24.5.0/nn-NO.xpi) = 421134 +SHA256 (xpi/thunderbird-i18n-24.5.0/pa-IN.xpi) = f817ef8578af107efe45cc2406be7568440c1b4e020c3764afbec774b3b17a4b +SIZE (xpi/thunderbird-i18n-24.5.0/pa-IN.xpi) = 508272 +SHA256 (xpi/thunderbird-i18n-24.5.0/pl.xpi) = 13fd347b116e6d5e1c0b168f020270cc179f32b1e056e333cc3a86a8406f901a +SIZE (xpi/thunderbird-i18n-24.5.0/pl.xpi) = 401752 +SHA256 (xpi/thunderbird-i18n-24.5.0/pt-BR.xpi) = 57f7c85aa5ff76cd01387ff1752a63e8d2b26749765dd7daf7137de4a06eb6fe +SIZE (xpi/thunderbird-i18n-24.5.0/pt-BR.xpi) = 430909 +SHA256 (xpi/thunderbird-i18n-24.5.0/pt-PT.xpi) = 828f0920581519070aa58c366f603d964638a60b2de74ad49fcf9397db169145 +SIZE (xpi/thunderbird-i18n-24.5.0/pt-PT.xpi) = 425025 +SHA256 (xpi/thunderbird-i18n-24.5.0/rm.xpi) = b5ad4b75ba5670223b6f16686830f2eed904a764c72a61c88e054d9574518d44 +SIZE (xpi/thunderbird-i18n-24.5.0/rm.xpi) = 432384 +SHA256 (xpi/thunderbird-i18n-24.5.0/ro.xpi) = a5a8215d718a6be1c576059168c9913c55d557b26bed500a4e39a888e0f18c4b +SIZE (xpi/thunderbird-i18n-24.5.0/ro.xpi) = 497491 +SHA256 (xpi/thunderbird-i18n-24.5.0/ru.xpi) = 53277de17e52ed168368153902b498ea478eed06e00fc9a3f6b880cfbcb48c1f +SIZE (xpi/thunderbird-i18n-24.5.0/ru.xpi) = 425097 +SHA256 (xpi/thunderbird-i18n-24.5.0/si.xpi) = aca1ede31da89a6ab476aad09696306f61522cdd878c5e1dabd37ba7f5b28713 +SIZE (xpi/thunderbird-i18n-24.5.0/si.xpi) = 511166 +SHA256 (xpi/thunderbird-i18n-24.5.0/sk.xpi) = a64b7290e92579b75a6cf34ba1baed18bb086265c8452c08ddb0228c714b5ed5 +SIZE (xpi/thunderbird-i18n-24.5.0/sk.xpi) = 440106 +SHA256 (xpi/thunderbird-i18n-24.5.0/sl.xpi) = ebab16114f3fe94cd15c9993a94693412afa121ce8975afadf54bf06d9a5fbab +SIZE (xpi/thunderbird-i18n-24.5.0/sl.xpi) = 421706 +SHA256 (xpi/thunderbird-i18n-24.5.0/sq.xpi) = 5f933fa1e66e16c15d6237099cf65f5f3300ff423d3352f6e5aa3b2d207c7f0a +SIZE (xpi/thunderbird-i18n-24.5.0/sq.xpi) = 435215 +SHA256 (xpi/thunderbird-i18n-24.5.0/sr.xpi) = 21ee6b0854e5e0052ef4eacca593c0ff41ea000dd0dc75f1d7b647b34591ad49 +SIZE (xpi/thunderbird-i18n-24.5.0/sr.xpi) = 518889 +SHA256 (xpi/thunderbird-i18n-24.5.0/sv-SE.xpi) = 17e752fbcf6e24203b6d27bce06df39766a7878fced1db516b96e2f9ec7e7426 +SIZE (xpi/thunderbird-i18n-24.5.0/sv-SE.xpi) = 423815 +SHA256 (xpi/thunderbird-i18n-24.5.0/ta-LK.xpi) = 55b10f60dea2abc565c69c841988110b989e69e7ce880500f9990af1b7e7437a +SIZE (xpi/thunderbird-i18n-24.5.0/ta-LK.xpi) = 534922 +SHA256 (xpi/thunderbird-i18n-24.5.0/tr.xpi) = 25b1be7c836addc60bfa36e6c759dcd2b12c73c468351bc830f125080489dd92 +SIZE (xpi/thunderbird-i18n-24.5.0/tr.xpi) = 438066 +SHA256 (xpi/thunderbird-i18n-24.5.0/uk.xpi) = 331ed11d6d4b873db63e33db707a205d98eb0f4b6201a75921431b2e7e4e0755 +SIZE (xpi/thunderbird-i18n-24.5.0/uk.xpi) = 480949 +SHA256 (xpi/thunderbird-i18n-24.5.0/vi.xpi) = 993eb8b5869166b51dab725fea1126445cc132cafadab1b5096f6850f2aaadd3 +SIZE (xpi/thunderbird-i18n-24.5.0/vi.xpi) = 495558 +SHA256 (xpi/thunderbird-i18n-24.5.0/zh-CN.xpi) = e587849f5bae5bbb65bc68087fb9bbe672162e5bca69a7e99f0ca7e4559d5354 +SIZE (xpi/thunderbird-i18n-24.5.0/zh-CN.xpi) = 449181 +SHA256 (xpi/thunderbird-i18n-24.5.0/zh-TW.xpi) = ace0e695c8112ba1754f16603ee14418303ae053b97f8af0b23272a308c4f066 +SIZE (xpi/thunderbird-i18n-24.5.0/zh-TW.xpi) = 450000 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 89b063e8efc5..da038530def1 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 24.4.0 +DISTVERSION= 24.5.0 CATEGORIES= mail news net-im ipv6 -MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source +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} @@ -16,7 +17,9 @@ BUILD_DEPENDS= nspr>=4.10.2:${PORTSDIR}/devel/nspr \ 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 \ libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 2317ce0dad71..ce5374633ed3 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,4 +1,4 @@ -SHA256 (thunderbird-24.4.0.source.tar.bz2) = 9aecdc2bf00cbe33629169aca8225a30d2674f4d372e845c2fc38c5d9f2bc7b6 -SIZE (thunderbird-24.4.0.source.tar.bz2) = 140040804 +SHA256 (thunderbird-24.5.0.source.tar.bz2) = 971c48db11328613340ed97a92018403647b8cca6a692b3d6b4145aed124382a +SIZE (thunderbird-24.5.0.source.tar.bz2) = 140048545 SHA256 (enigmail-1.6.tar.gz) = 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d SIZE (enigmail-1.6.tar.gz) = 1231111 diff --git a/mail/thunderbird/files/patch-bug916589 b/mail/thunderbird/files/patch-bug916589 index be2c2bc97fd4..c6aef052c4ce 100644 --- a/mail/thunderbird/files/patch-bug916589 +++ b/mail/thunderbird/files/patch-bug916589 @@ -2,12 +2,16 @@ diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/qu 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 -@@ -31,11 +31,14 @@ +@@ -31,11 +31,18 @@ */ -#ifndef _SYS_QUEUE_H_ +#if (defined(BSD) && !defined(__OpenBSD__)) || defined(DARWIN) +#include_next <sys/queue.h> ++# if defined(__DragonFly__) ++#define STAILQ_FOREACH_SAFE STAILQ_FOREACH_MUTABLE ++#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE ++# endif +#elif !defined(_SYS_QUEUE_H_) #define _SYS_QUEUE_H_ diff --git a/mail/thunderbird/files/patch-no-videoio.h b/mail/thunderbird/files/patch-bug985848 index f23d04ad6157..f23d04ad6157 100644 --- a/mail/thunderbird/files/patch-no-videoio.h +++ b/mail/thunderbird/files/patch-bug985848 diff --git a/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp b/mail/thunderbird/files/patch-bug991253 index 32241fdfe270..32241fdfe270 100644 --- a/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp +++ b/mail/thunderbird/files/patch-bug991253 diff --git a/mail/thunderbird/files/patch-bug791305 b/mail/thunderbird/files/patch-ijg-libjpeg index 633415128199..06e9099ba36c 100644 --- a/mail/thunderbird/files/patch-bug791305 +++ b/mail/thunderbird/files/patch-ijg-libjpeg @@ -1,19 +1,4 @@ -commit c269a16 -Author: Jeff Muizelaar <jmuizelaar@mozilla.com> -Date: Fri Sep 14 15:54:55 2012 -0400 - - Bug 791305. Use libjpeg's color conversion code instead of our own. r=joe,r=khuey - - libjpeg-turbo supports converting directly to a format compatible with cairo's - FORMAT_RGB24. Use that instead of our own handcoded function. This also gives - us SSE2 and NEON version of this function. - - --HG-- - extra : rebase_source : 18f48925f023a33ec2a097d4f4e5cc2ab40be1e9 ---- - configure.in | 6 +- - image/decoders/nsJPEGDecoder.cpp | 311 ++------------------------------------- - 2 files changed, 20 insertions(+), 297 deletions(-) +# Partially revert bug 791305 to allow building with system IJG jpeg library diff --git configure.in configure.in index f0aeb5d..1c01010 100644 diff --git a/mail/thunderbird/files/patch-mozilla-media-mtransport-third_party-nICEr-src-util-mbslen.c b/mail/thunderbird/files/patch-mozilla-media-mtransport-third_party-nICEr-src-util-mbslen.c new file mode 100644 index 000000000000..149bf0b40182 --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-media-mtransport-third_party-nICEr-src-util-mbslen.c @@ -0,0 +1,16 @@ +--- mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c~ ++++ mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c +@@ -54,6 +54,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # endif + #endif + ++#ifdef __DragonFly__ ++#include <osreldate.h> ++# if __DragonFly_version > 300502 ++# define HAVE_XLOCALE ++# endif ++#endif ++ + #ifdef HAVE_XLOCALE + #include <xlocale.h> + #endif /* HAVE_XLOCALE */ diff --git a/mail/thunderbird/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp b/mail/thunderbird/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp deleted file mode 100644 index 272a02bdb9e0..000000000000 --- a/mail/thunderbird/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" diff --git a/mail/thunderbird/files/patch-z-bug847568 b/mail/thunderbird/files/patch-z-bug847568 index 00f8cf9d5441..24b8db490685 100644 --- a/mail/thunderbird/files/patch-z-bug847568 +++ b/mail/thunderbird/files/patch-z-bug847568 @@ -14,10 +14,10 @@ index 14bfc0d..5383399 100644 $(INSTALL) system_wrappers $(DIST) diff --git config/system-headers config/system-headers -index 126391e..b711fc3 100644 +index 18e8703..bdc5f82 100644 --- mozilla/config/system-headers +++ mozilla/config/system-headers -@@ -1144,3 +1144,11 @@ unicode/utypes.h +@@ -1145,3 +1145,11 @@ unicode/utypes.h #endif libutil.h unwind.h @@ -30,40 +30,58 @@ index 126391e..b711fc3 100644 +harfbuzz/hb.h +#endif diff --git configure.in configure.in -index bbc7b40..1747206 100644 +index ac38f40..87536b7 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -7830,6 +7830,38 @@ if test "$USE_FC_FREETYPE"; then +@@ -8032,6 +8032,56 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== -+dnl Check for graphite2 and harfbuzz ++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= ) ++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= ) ++MOZ_NATIVE_GRAPHITE2=) + +if test -n "$MOZ_NATIVE_GRAPHITE2"; then -+ PKG_CHECK_MODULES(MOZ_GRAPHITE, graphite2 >= 1.2.3) -+else -+ MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' ++ 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) @@ -133,7 +151,7 @@ index 519aa46..6929751 100644 'thebes', 'ipc', diff --git gfx/skia/Makefile.in gfx/skia/Makefile.in -index 07a77a3..067f7bd 100644 +index ee0efb2..98e169d6f 100644 --- mozilla/gfx/skia/Makefile.in +++ mozilla/gfx/skia/Makefile.in @@ -15,6 +15,10 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) @@ -146,9 +164,9 @@ index 07a77a3..067f7bd 100644 + include $(topsrcdir)/config/rules.mk - ifneq (,$(INTEL_ARCHITECTURE)) + ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1) diff --git gfx/thebes/Makefile.in gfx/thebes/Makefile.in -index e9f6b6c..0df2d8d 100644 +index 45c36ae..79d32cf 100644 --- mozilla/gfx/thebes/Makefile.in +++ mozilla/gfx/thebes/Makefile.in @@ -13,6 +13,14 @@ DEFINES := $(filter-out -DUNICODE,$(DEFINES)) @@ -167,7 +185,7 @@ index e9f6b6c..0df2d8d 100644 CXXFLAGS += $(CAIRO_FT_CFLAGS) endif diff --git intl/unicharutil/util/Makefile.in intl/unicharutil/util/Makefile.in -index f6b9f7c..11c44f4 100644 +index f6b9f7c..60863f4 100644 --- mozilla/intl/unicharutil/util/Makefile.in +++ mozilla/intl/unicharutil/util/Makefile.in @@ -21,3 +21,7 @@ ifdef _MSC_VER @@ -176,7 +194,7 @@ index f6b9f7c..11c44f4 100644 endif + +ifdef MOZ_NATIVE_HARFBUZZ -+nsUnicodePropertyData.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS) ++CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) +endif diff --git layout/media/Makefile.in layout/media/Makefile.in index 1cacbd7..a8cd156 100644 @@ -202,22 +220,25 @@ index 1cacbd7..a8cd156 100644 SHARED_LIBRARY_LIBS += $(MOZ_CAIRO_LIBS) endif diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in -index 1cacbd7..a8cd156 100644 +index 1cacbd7..f5d72bb 100644 --- mozilla/netwerk/dns/Makefile.in +++ mozilla/netwerk/dns/Makefile.in -@@ -9,3 +9,7 @@ include $(topsrcdir)/config/rules.mk - # for effective TLD data. - etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat - $(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc -+ +@@ -5,6 +5,10 @@ + + include $(topsrcdir)/config/rules.mk + +ifdef MOZ_NATIVE_HARFBUZZ -+nsIDNService.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS) ++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 007f272..27f488e 100644 +index 67f0db9..d42137a 100644 --- mozilla/toolkit/library/Makefile.in +++ mozilla/toolkit/library/Makefile.in -@@ -103,6 +103,14 @@ ifndef MOZ_TREE_PIXMAN +@@ -89,6 +89,14 @@ ifndef MOZ_TREE_PIXMAN EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS) endif diff --git a/mail/thunderbird/files/patch-zz-bug517422 b/mail/thunderbird/files/patch-zz-bug517422 index de36705907e2..3922c5b27fad 100644 --- a/mail/thunderbird/files/patch-zz-bug517422 +++ b/mail/thunderbird/files/patch-zz-bug517422 @@ -1,16 +1,20 @@ -# Allow building against system-wide ogg/vorbis/opus. +# Allow more config/external/ libs built against system-wide version. diff --git config/Makefile.in config/Makefile.in -index 5383399..4393ae8 100644 +index 5383399..0410004 100644 --- mozilla/config/Makefile.in +++ mozilla/config/Makefile.in -@@ -79,6 +79,9 @@ export:: $(export-preqs) +@@ -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) @@ -26,7 +30,8 @@ index c22a36c..2febb45 100644 +if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']: add_tier_dir('platform', 'media/libvorbis') - if CONFIG['MOZ_TREMOR']: +-if CONFIG['MOZ_TREMOR']: ++if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']: add_tier_dir('platform', 'media/libtremor') -if CONFIG['MOZ_OPUS']: @@ -34,22 +39,54 @@ index c22a36c..2febb45 100644 add_tier_dir('platform', 'media/libopus') if CONFIG['MOZ_WEBM']: -@@ -82,7 +82,9 @@ if CONFIG['MOZ_VP8'] and not CONFIG['MOZ +@@ -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') -+ add_tier_dir('platform', 'media/libtheora') ++ 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 b711fc3..fd3c14f 100644 +index bef567c..9807c29 100644 --- mozilla/config/system-headers +++ mozilla/config/system-headers -@@ -1152,3 +1152,17 @@ graphite2/Segment.h +@@ -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 @@ -57,21 +94,33 @@ index b711fc3..fd3c14f 100644 +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 df49287..05e97ff 100644 +index 87db361..7947626 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -5143,6 +5143,40 @@ if test -n "$MOZ_OGG"; then +@@ -5211,6 +5211,57 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then fi dnl ======================================================== @@ -81,7 +130,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-ogg, +[ --with-system-ogg Use system libogg (located with pkgconfig)], +MOZ_NATIVE_OGG=1, -+MOZ_NATIVE_OGG= ) ++MOZ_NATIVE_OGG=) + +if test -n "$MOZ_NATIVE_OGG"; then + PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1) @@ -98,7 +147,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-vorbis, +[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], +MOZ_NATIVE_VORBIS=1, -+MOZ_NATIVE_VORBIS= ) ++MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then + PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4) @@ -109,10 +158,27 @@ index df49287..05e97ff 100644 +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, -@@ -5151,6 +5185,25 @@ MOZ_ARG_DISABLE_BOOL(opus, +@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) dnl ======================================================== @@ -122,7 +188,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-opus, +[ --with-system-opus Use system libopus (located with pkgconfig)], +MOZ_NATIVE_OPUS=1, -+MOZ_NATIVE_OPUS= ) ++MOZ_NATIVE_OPUS=) + +if test -n "$MOZ_NATIVE_OPUS"; then + PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1) @@ -135,14 +201,66 @@ index df49287..05e97ff 100644 +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) ++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 68f360e..76f2d57 100644 +index fd34449..c6c42c8 100644 --- mozilla/content/media/Makefile.in +++ mozilla/content/media/Makefile.in -@@ -7,4 +7,16 @@ include $(topsrcdir)/config/rules.mk +@@ -6,4 +6,31 @@ include $(topsrcdir)/config/rules.mk + CFLAGS += $(GSTREAMER_CFLAGS) CXXFLAGS += $(GSTREAMER_CFLAGS) @@ -150,20 +268,48 @@ index 68f360e..76f2d57 100644 +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 -@@ -30,12 +36,21 @@ ifdef MOZ_TREE_PIXMAN +@@ -36,31 +36,45 @@ ifdef MOZ_TREE_PIXMAN SHARED_LIBRARY_LIBS += $(MOZ_PIXMAN_LIBS) endif @@ -185,9 +331,21 @@ index 1cacbd7..a8cd156 100644 +endif ifdef MOZ_TREMOR ++ifndef MOZ_NATIVE_TREMOR SHARED_LIBRARY_LIBS += \ -@@ -51,10 +66,12 @@ 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 @@ -199,6 +357,27 @@ index 1cacbd7..a8cd156 100644 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 @@ -266,7 +445,7 @@ index 0000000..1f02dc0 +CFLAGS += $(MOZ_OGG_CFLAGS) +endif diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in -index c5e82c4..91ef86a 100644 +index bbc971c..6ed7e41 100644 --- mozilla/media/webrtc/signaling/test/Makefile.in +++ mozilla/media/webrtc/signaling/test/Makefile.in @@ -48,6 +48,12 @@ LIBS += \ @@ -300,10 +479,10 @@ index 00e77e7..55f48ab 100644 'dependencies': [ '<(DEPTH)/third_party/opus/opus.gyp:opus' diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in -index 27f488e..cd27084 100644 +index d42137a..695e75a8 100644 --- mozilla/toolkit/library/Makefile.in +++ mozilla/toolkit/library/Makefile.in -@@ -91,6 +91,18 @@ ifdef MOZ_NATIVE_HUNSPELL +@@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS) endif @@ -311,14 +490,30 @@ index 27f488e..cd27084 100644 +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 diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile index 5647b6a976ac..c4a7957b797e 100644 --- a/security/ca_root_nss/Makefile +++ b/security/ca_root_nss/Makefile @@ -24,7 +24,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.15.5 +VERSION_NSS= 3.16 #NSS_SUFFIX= .with.ckbi.1.93 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl diff --git a/security/ca_root_nss/distinfo b/security/ca_root_nss/distinfo index 3814cfddee29..ca6d01f6d9e5 100644 --- a/security/ca_root_nss/distinfo +++ b/security/ca_root_nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.15.5.tar.gz) = 1442c85624b7de74c7745132a65aa0de47d280c4f01f293d111bc0b6d8271f43 -SIZE (nss-3.15.5.tar.gz) = 6367893 +SHA256 (nss-3.16.tar.gz) = 2bb4faa200962caacf0454f1e870e74aa9a543809e5c440f7978bcce58e0bfe8 +SIZE (nss-3.16.tar.gz) = 6378110 diff --git a/security/nss/Makefile b/security/nss/Makefile index a48224fa7554..f936f604e927 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.15.5 +PORTVERSION= 3.16 #DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src @@ -11,10 +11,10 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Libraries to support development of security-enabled applications BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ - nspr>=4.10.2:${PORTSDIR}/devel/nspr \ + nspr>=4.10.3:${PORTSDIR}/devel/nspr \ sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3 -LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss @@ -24,7 +24,7 @@ USES= gmake perl5 USE_PERL5= build MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \ SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \ - NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1 + NSS_USE_SYSTEM_SQLITE=1 CFLAGS+= -I${LOCALBASE}/include/nspr SUB_FILES= nss-config nss.pc diff --git a/security/nss/distinfo b/security/nss/distinfo index 3814cfddee29..ca6d01f6d9e5 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.15.5.tar.gz) = 1442c85624b7de74c7745132a65aa0de47d280c4f01f293d111bc0b6d8271f43 -SIZE (nss-3.15.5.tar.gz) = 6367893 +SHA256 (nss-3.16.tar.gz) = 2bb4faa200962caacf0454f1e870e74aa9a543809e5c440f7978bcce58e0bfe8 +SIZE (nss-3.16.tar.gz) = 6378110 diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile index b895ea79af17..743b2efff2e2 100644 --- a/www/firefox-esr-i18n/Makefile +++ b/www/firefox-esr-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -PORTVERSION= 24.4.0 +PORTVERSION= 24.5.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= diff --git a/www/firefox-esr-i18n/distinfo b/www/firefox-esr-i18n/distinfo index 1db0b44c51b8..881e6ae4ea10 100644 --- a/www/firefox-esr-i18n/distinfo +++ b/www/firefox-esr-i18n/distinfo @@ -1,178 +1,178 @@ -SHA256 (xpi/firefox-24.4.0/ach.xpi) = 6c9b14a2cae9c80cc4bc672e159cf59e392a0b3fcf9e1db6a548d006fd9407e9 -SIZE (xpi/firefox-24.4.0/ach.xpi) = 339946 -SHA256 (xpi/firefox-24.4.0/af.xpi) = 097e30e4362c61cb73b727426e71e6807564955b66afa4c4fa34736f9b4fb9a5 -SIZE (xpi/firefox-24.4.0/af.xpi) = 333184 -SHA256 (xpi/firefox-24.4.0/ak.xpi) = d67cd4cdf43f2470b00dc2aa26ddce7cd57074ab040542899ef83dbbfba9e9b7 -SIZE (xpi/firefox-24.4.0/ak.xpi) = 340940 -SHA256 (xpi/firefox-24.4.0/ar.xpi) = d3a941366892bc83cc4fb8f9f9bb616ae8cd9267005e586a3280aee5d0af715d -SIZE (xpi/firefox-24.4.0/ar.xpi) = 360849 -SHA256 (xpi/firefox-24.4.0/as.xpi) = a474fa95ab4f3242c33b9684c4565e093962050f365cae48796fbec9c03a382f -SIZE (xpi/firefox-24.4.0/as.xpi) = 378085 -SHA256 (xpi/firefox-24.4.0/ast.xpi) = f838b197e83f9e21a082552b8b4bc5b89145a75c26544cd3e88b9de3aeb15839 -SIZE (xpi/firefox-24.4.0/ast.xpi) = 292876 -SHA256 (xpi/firefox-24.4.0/be.xpi) = ebcccc35617106a647923714c24e02ba7c495da54f2b8e6f5840a99c5a70a174 -SIZE (xpi/firefox-24.4.0/be.xpi) = 316955 -SHA256 (xpi/firefox-24.4.0/bg.xpi) = 4077846e7683c064b1a7e5626a06888cd760d3728e6911764482cd8933aeb2e1 -SIZE (xpi/firefox-24.4.0/bg.xpi) = 373136 -SHA256 (xpi/firefox-24.4.0/bn-BD.xpi) = 3ece7fb100ef39de164f6051c7843b672af617f02557f944e04c21370b39ee80 -SIZE (xpi/firefox-24.4.0/bn-BD.xpi) = 394939 -SHA256 (xpi/firefox-24.4.0/bn-IN.xpi) = a525964c6ee4a393b17dee20c7f54a9ffec5ba8f7a78172e17fc2a422cc90c7d -SIZE (xpi/firefox-24.4.0/bn-IN.xpi) = 427780 -SHA256 (xpi/firefox-24.4.0/br.xpi) = 65938d9974751a2c7f71a3df3a30dea0944656dc97a27280fede8bfb5758ced2 -SIZE (xpi/firefox-24.4.0/br.xpi) = 330509 -SHA256 (xpi/firefox-24.4.0/bs.xpi) = 1c8d46fe6086cddea58bb54c8081cbdb05c1fe068f041bcaa1dae3899bdaa2a4 -SIZE (xpi/firefox-24.4.0/bs.xpi) = 341620 -SHA256 (xpi/firefox-24.4.0/ca.xpi) = 4ef5227bef8d3e946c8f36353361623cb5333b1f32e0196558409e6c806ce1a7 -SIZE (xpi/firefox-24.4.0/ca.xpi) = 341257 -SHA256 (xpi/firefox-24.4.0/cs.xpi) = 0c460f153c77fe668c8279e1a61b9d8df1eb2fc1ecb47027a1edc8ef8d5a5157 -SIZE (xpi/firefox-24.4.0/cs.xpi) = 335946 -SHA256 (xpi/firefox-24.4.0/csb.xpi) = 7d3478b8966bb077e74a9d42643e2b1e0d714fdabd8e1b0a84e6005fd3e4a155 -SIZE (xpi/firefox-24.4.0/csb.xpi) = 329796 -SHA256 (xpi/firefox-24.4.0/cy.xpi) = 7227d1e9c29cc3ca5cb311691ee53b31e937ca3c132c65374ad7aa1d04450887 -SIZE (xpi/firefox-24.4.0/cy.xpi) = 330643 -SHA256 (xpi/firefox-24.4.0/da.xpi) = f3208663201b779744ae107ff409c0d61fee9db2d97a3ff3b6905ab9a8b067ac -SIZE (xpi/firefox-24.4.0/da.xpi) = 326881 -SHA256 (xpi/firefox-24.4.0/de.xpi) = bded7217b67006cde313a4e8f517c911a09cddb3be1860ae13f1837e24515d29 -SIZE (xpi/firefox-24.4.0/de.xpi) = 323258 -SHA256 (xpi/firefox-24.4.0/el.xpi) = d2db91792610a0871ac4284c03411d34a2031b2fe219a6d311a90718b85cfbcd -SIZE (xpi/firefox-24.4.0/el.xpi) = 365320 -SHA256 (xpi/firefox-24.4.0/en-GB.xpi) = 8bf0bc0409da9b9b573c7c23561135819e5f468011551a04f74faed939d0a275 -SIZE (xpi/firefox-24.4.0/en-GB.xpi) = 318297 -SHA256 (xpi/firefox-24.4.0/en-US.xpi) = e8048f4ede5b107c355c3a8bf9993263588846dd88da9c0469b31479eb3ccee5 -SIZE (xpi/firefox-24.4.0/en-US.xpi) = 320993 -SHA256 (xpi/firefox-24.4.0/en-ZA.xpi) = 26ba9959aff13112aa9b15dcf9180425f32fdfc699cb037e9969ad62d3384160 -SIZE (xpi/firefox-24.4.0/en-ZA.xpi) = 319321 -SHA256 (xpi/firefox-24.4.0/eo.xpi) = bcfafbb225eb5a660265a36a7cd6d5d59070fc2187566d8e9517c63fab4bbc02 -SIZE (xpi/firefox-24.4.0/eo.xpi) = 334939 -SHA256 (xpi/firefox-24.4.0/es-AR.xpi) = 6d1ae40351dc435ddf10be8f49525620d29c62a8b1214f7228cd54bc0ad79192 -SIZE (xpi/firefox-24.4.0/es-AR.xpi) = 334010 -SHA256 (xpi/firefox-24.4.0/es-CL.xpi) = ec1387cd96aed7079f5ec59d3521345852fcaed4fccaf4fbf109683cfb1ff104 -SIZE (xpi/firefox-24.4.0/es-CL.xpi) = 287026 -SHA256 (xpi/firefox-24.4.0/es-ES.xpi) = cdb1e3b61c3eb60dde4d2588b58767f6e313b4f274b8380af22b801b1f2b9d97 -SIZE (xpi/firefox-24.4.0/es-ES.xpi) = 277859 -SHA256 (xpi/firefox-24.4.0/es-MX.xpi) = 571d502b2ec13960714f894908fc8cd636b37fb42646f961a8d5609d8164534d -SIZE (xpi/firefox-24.4.0/es-MX.xpi) = 302624 -SHA256 (xpi/firefox-24.4.0/et.xpi) = d80f8622c5d731384a0d63e3913cdbdec4065463690652ed5ccb85b012232678 -SIZE (xpi/firefox-24.4.0/et.xpi) = 327697 -SHA256 (xpi/firefox-24.4.0/eu.xpi) = a9f7959d3b9a15bdcde205709762e8a3ee49b3dd7a7a661314f530340d5d99bf -SIZE (xpi/firefox-24.4.0/eu.xpi) = 332422 -SHA256 (xpi/firefox-24.4.0/fa.xpi) = 18f347d60c7d74bd55d4e3d41cbcaf91ddc8b50e5ab270bf12ee6bb234ac8df7 -SIZE (xpi/firefox-24.4.0/fa.xpi) = 375633 -SHA256 (xpi/firefox-24.4.0/ff.xpi) = 6b36e0ef8313dedd5137855fc63745f8f134b889f0971e8f13887ecf33e27d6d -SIZE (xpi/firefox-24.4.0/ff.xpi) = 332815 -SHA256 (xpi/firefox-24.4.0/fi.xpi) = 6c24f1edd0c528684493e9524041dbaa240b69fc35580e5c92f44f6205b31c64 -SIZE (xpi/firefox-24.4.0/fi.xpi) = 328891 -SHA256 (xpi/firefox-24.4.0/fr.xpi) = 263af45a3ccb7581ab54ba4276f7465227a1827593f44ac6f3d81e3ac3b2ec06 -SIZE (xpi/firefox-24.4.0/fr.xpi) = 339178 -SHA256 (xpi/firefox-24.4.0/fy-NL.xpi) = 5e07a386ccd1b57d6b4943a79ae07254fc95f8ee6866bd29f1f1615b788af298 -SIZE (xpi/firefox-24.4.0/fy-NL.xpi) = 336589 -SHA256 (xpi/firefox-24.4.0/ga-IE.xpi) = 4ee9a6892c91c37386dd1fec94cd6d9f71c637940bd54a5f4de2b30444760389 -SIZE (xpi/firefox-24.4.0/ga-IE.xpi) = 345294 -SHA256 (xpi/firefox-24.4.0/gd.xpi) = ade6ba8fcd860cd701e24dcebe68adafe8012bb28b9581b35742c55b91519467 -SIZE (xpi/firefox-24.4.0/gd.xpi) = 344811 -SHA256 (xpi/firefox-24.4.0/gl.xpi) = f76240bdf1dd6148d2e719117e2c208cfe67e48df32d6d3947993f9ab924e6fa -SIZE (xpi/firefox-24.4.0/gl.xpi) = 336919 -SHA256 (xpi/firefox-24.4.0/gu-IN.xpi) = 61574576e87ad030b8fbd6218f10d5aab37ab59173983f565e33a26209c4e196 -SIZE (xpi/firefox-24.4.0/gu-IN.xpi) = 359359 -SHA256 (xpi/firefox-24.4.0/he.xpi) = 09d40f8270f4ba52a771299174cf5a50b44485a179875b0ac40dbf2d5a0369db -SIZE (xpi/firefox-24.4.0/he.xpi) = 354630 -SHA256 (xpi/firefox-24.4.0/hi-IN.xpi) = e8fc479ae81d15f3f56a20ec47b138e98d71f0316fd330b66dba00725a20a2fd -SIZE (xpi/firefox-24.4.0/hi-IN.xpi) = 379121 -SHA256 (xpi/firefox-24.4.0/hr.xpi) = 601ed868c7ad23af8546ecee0b2933c3ada82cff6c5add3a532a83d32806fbcb -SIZE (xpi/firefox-24.4.0/hr.xpi) = 336840 -SHA256 (xpi/firefox-24.4.0/hu.xpi) = bdbdac9b971df54bb6e44cf64dfe3843d90cf6d8095b9e616de718f92b5c11b9 -SIZE (xpi/firefox-24.4.0/hu.xpi) = 344103 -SHA256 (xpi/firefox-24.4.0/hy-AM.xpi) = 7c4de83faf3cdd4ff6ffbfec2847238ab00acd6b1d608a9061a10809b86b30c8 -SIZE (xpi/firefox-24.4.0/hy-AM.xpi) = 385180 -SHA256 (xpi/firefox-24.4.0/id.xpi) = 4547931f4361cb06c0a66b0ee1f909f60b7324acffadc127eaa2b2c78824a038 -SIZE (xpi/firefox-24.4.0/id.xpi) = 319795 -SHA256 (xpi/firefox-24.4.0/is.xpi) = f9bb8e5d44768c3cd2b28216b07b27349e977312b2c1a34d96d6e98d83277c9f -SIZE (xpi/firefox-24.4.0/is.xpi) = 331826 -SHA256 (xpi/firefox-24.4.0/it.xpi) = e218243a4c38268876a6a25573b513f4fe6a89fe518cf62eca13f66990070079 -SIZE (xpi/firefox-24.4.0/it.xpi) = 271925 -SHA256 (xpi/firefox-24.4.0/ja.xpi) = 1cdfde63a969340652ac9c39468d86fae722b6bb3ae4ce454dd4b694b3b26dd1 -SIZE (xpi/firefox-24.4.0/ja.xpi) = 370903 -SHA256 (xpi/firefox-24.4.0/kk.xpi) = 299a2273d78956c46b5d673dc80d831cc3b92885b1fe03fce28a0d6d4f44f57b -SIZE (xpi/firefox-24.4.0/kk.xpi) = 377502 -SHA256 (xpi/firefox-24.4.0/km.xpi) = 11683106c4a09343ade9fb61f07c15ec6b6f8869b8e7ade15cf76e1b6f434120 -SIZE (xpi/firefox-24.4.0/km.xpi) = 400559 -SHA256 (xpi/firefox-24.4.0/kn.xpi) = c0dc5d43d75f0aaf590c9f11bf2425684fed5b8e1cc00e3720d2bffd4dfc5923 -SIZE (xpi/firefox-24.4.0/kn.xpi) = 391033 -SHA256 (xpi/firefox-24.4.0/ko.xpi) = 7ff1514c8945f97621bd21075fe5f544d1c89c7f830933973f2b66324e27db7e -SIZE (xpi/firefox-24.4.0/ko.xpi) = 346164 -SHA256 (xpi/firefox-24.4.0/ku.xpi) = e5c8f561e80bf6c8f80e733b7403e04169eb91376227cab8795b4e63e8e009c8 -SIZE (xpi/firefox-24.4.0/ku.xpi) = 355632 -SHA256 (xpi/firefox-24.4.0/lg.xpi) = 6fa17d6767b7cef6e5d7c199dd82d1aab826d4bb54d016117f88bd2a5dc82acb -SIZE (xpi/firefox-24.4.0/lg.xpi) = 351111 -SHA256 (xpi/firefox-24.4.0/lij.xpi) = 6ca4d46dca097703a6c55cd12837f596f52c5c0dd3ef55f59f72476c4615c576 -SIZE (xpi/firefox-24.4.0/lij.xpi) = 322700 -SHA256 (xpi/firefox-24.4.0/lt.xpi) = 17cd459c6a7a699408b361d4debf37afd1d722c96b7f78754e2c5848c941215a -SIZE (xpi/firefox-24.4.0/lt.xpi) = 352045 -SHA256 (xpi/firefox-24.4.0/lv.xpi) = c14a6897ff67d17d37b677382d30b1e3b392dd70b7cfeadf72315a7fc7c9e25c -SIZE (xpi/firefox-24.4.0/lv.xpi) = 328664 -SHA256 (xpi/firefox-24.4.0/mai.xpi) = 7aa629e4625e892e2802c9ef062daf2ef6bf5ec8cf99b5fad3e718d1f19d8d3d -SIZE (xpi/firefox-24.4.0/mai.xpi) = 379767 -SHA256 (xpi/firefox-24.4.0/mk.xpi) = 77124e0e3278b61acd48acb2c62179fdf7101d268a721d5ee6332c62d767b902 -SIZE (xpi/firefox-24.4.0/mk.xpi) = 376316 -SHA256 (xpi/firefox-24.4.0/ml.xpi) = a73740c766b7e9a1cd74cb7903bc925d348a6c9731bc59620ec756ec6250e3a3 -SIZE (xpi/firefox-24.4.0/ml.xpi) = 399677 -SHA256 (xpi/firefox-24.4.0/mr.xpi) = 72cebc76ac9974241ee443a8bd6154b2051a697dc1d02d4d1ce1e51eec16099b -SIZE (xpi/firefox-24.4.0/mr.xpi) = 380231 -SHA256 (xpi/firefox-24.4.0/nb-NO.xpi) = 5b962da03635d5bab53b5ed4ff6dd42e4bc4450035a1f47b70c050a987a92827 -SIZE (xpi/firefox-24.4.0/nb-NO.xpi) = 330966 -SHA256 (xpi/firefox-24.4.0/nl.xpi) = ceb11793de0f9ab3f76491104ac92fc863454e8284254ffbc19c4540b79590b5 -SIZE (xpi/firefox-24.4.0/nl.xpi) = 331404 -SHA256 (xpi/firefox-24.4.0/nn-NO.xpi) = 3c05475c86ff4f06382067a560e2c0a451ef956dcce5bd0c4b0945d93112fef3 -SIZE (xpi/firefox-24.4.0/nn-NO.xpi) = 333906 -SHA256 (xpi/firefox-24.4.0/nso.xpi) = e5088e7becf14b568d97ba788ba6d3d7f8849f909343ae08cf4fddaf9b791cb0 -SIZE (xpi/firefox-24.4.0/nso.xpi) = 336297 -SHA256 (xpi/firefox-24.4.0/or.xpi) = eb47be1342121d0b9da8f67581393920498d173d6caa38972d14b2f49db22188 -SIZE (xpi/firefox-24.4.0/or.xpi) = 364592 -SHA256 (xpi/firefox-24.4.0/pa-IN.xpi) = caa2c2819a365d5aa012b3782905bab9a6bfefd0a70b3f490297ff6d1fc1e1de -SIZE (xpi/firefox-24.4.0/pa-IN.xpi) = 365653 -SHA256 (xpi/firefox-24.4.0/pl.xpi) = 62bb7ab15c891c46cd39242c89a79deec25d2890158150cd97bd682c042e9897 -SIZE (xpi/firefox-24.4.0/pl.xpi) = 341995 -SHA256 (xpi/firefox-24.4.0/pt-BR.xpi) = 01cfd10c7a28d65e8196c408af32f4e0a2186c695425d1f5bc8ce424f6f5e022 -SIZE (xpi/firefox-24.4.0/pt-BR.xpi) = 334605 -SHA256 (xpi/firefox-24.4.0/pt-PT.xpi) = 68dc954bebb472ed88d2a57ce49234bc7fb4f741bc8c45e3531585d0e20ba7bd -SIZE (xpi/firefox-24.4.0/pt-PT.xpi) = 332739 -SHA256 (xpi/firefox-24.4.0/rm.xpi) = cbed0f16189d775b736b019bf9c2a701e18caf10a19c704c8a995c57064704e4 -SIZE (xpi/firefox-24.4.0/rm.xpi) = 339697 -SHA256 (xpi/firefox-24.4.0/ro.xpi) = 0f4ef300df7cde26c0e8cde12aaa1b898afc095ccfef8176ff0ad10b574de711 -SIZE (xpi/firefox-24.4.0/ro.xpi) = 362236 -SHA256 (xpi/firefox-24.4.0/ru.xpi) = 0eafd9766b4048d615262bcc537b2fd4607fc7e46e391b165eab86080c9ea282 -SIZE (xpi/firefox-24.4.0/ru.xpi) = 322761 -SHA256 (xpi/firefox-24.4.0/si.xpi) = 7fd6911233b6cf3a8ebe8b9e2bd57be05f754cd81d48fd548cd154919196f3a2 -SIZE (xpi/firefox-24.4.0/si.xpi) = 372982 -SHA256 (xpi/firefox-24.4.0/sk.xpi) = ccbb12bc8cd84e20aab4273ddae867cb6c633d0396e1cb0bbf81b437f70adf9e -SIZE (xpi/firefox-24.4.0/sk.xpi) = 347878 -SHA256 (xpi/firefox-24.4.0/sl.xpi) = 20988a15236a879ecdf0c047a858664ad9edccc1e3e9d3324e991c4d595e3b19 -SIZE (xpi/firefox-24.4.0/sl.xpi) = 331572 -SHA256 (xpi/firefox-24.4.0/son.xpi) = cc1f2044d01a6f18f86f270ddac4a4dc4e8f27325d592fb0b6785868671581a9 -SIZE (xpi/firefox-24.4.0/son.xpi) = 328899 -SHA256 (xpi/firefox-24.4.0/sq.xpi) = 22eea4fca9b37dfc631562f4a74b1f1462cd709a7dc9c710f7b2ca235b3be179 -SIZE (xpi/firefox-24.4.0/sq.xpi) = 340676 -SHA256 (xpi/firefox-24.4.0/sr.xpi) = 6df58a1187e6021ecceb612aaec17afc594f12cb9a3083faad37b4616c6d1f27 -SIZE (xpi/firefox-24.4.0/sr.xpi) = 385108 -SHA256 (xpi/firefox-24.4.0/sv-SE.xpi) = b45a5cf64718b756e36e3bb812d82c9181fa802759e3bcbb09cb23f194fe4694 -SIZE (xpi/firefox-24.4.0/sv-SE.xpi) = 333506 -SHA256 (xpi/firefox-24.4.0/ta-LK.xpi) = 958d69eeaf59525a777e9ba4cff13fd046d59a7714c77b413ddf9946528c3ea2 -SIZE (xpi/firefox-24.4.0/ta-LK.xpi) = 384155 -SHA256 (xpi/firefox-24.4.0/ta.xpi) = d02a7be5340619219de9e50d8c6adb44001c92e4423ed1f0ae75425f5e7fbc2e -SIZE (xpi/firefox-24.4.0/ta.xpi) = 381423 -SHA256 (xpi/firefox-24.4.0/te.xpi) = b7eceef56d4cd9228c88ac1b833263e12880a16bc0cb55164b55627dc9da7a2d -SIZE (xpi/firefox-24.4.0/te.xpi) = 394563 -SHA256 (xpi/firefox-24.4.0/th.xpi) = 7f9f89f6635d3aa496f0aaf51ca9e1f8c5f6f603b1844976c726cd73168c1a9b -SIZE (xpi/firefox-24.4.0/th.xpi) = 379822 -SHA256 (xpi/firefox-24.4.0/tr.xpi) = 7c06d25c15592691402b8b0f4ebd365ca37f63b471d4f3833507f5c6dd25ec5c -SIZE (xpi/firefox-24.4.0/tr.xpi) = 340387 -SHA256 (xpi/firefox-24.4.0/uk.xpi) = 3511f4c1ef862b746cd05cc24a785f6f2977dd2f40dd75145be9bf101f6666d8 -SIZE (xpi/firefox-24.4.0/uk.xpi) = 365699 -SHA256 (xpi/firefox-24.4.0/vi.xpi) = 3939e74ccdc7cf50442d5c84365433f8ee6d6d411a420ebf6d00795d9275f84a -SIZE (xpi/firefox-24.4.0/vi.xpi) = 358430 -SHA256 (xpi/firefox-24.4.0/zh-CN.xpi) = 62af57b1a883c7d0219b093d816b81a773ac0edee3eb0712e239d738dfe3803c -SIZE (xpi/firefox-24.4.0/zh-CN.xpi) = 358182 -SHA256 (xpi/firefox-24.4.0/zh-TW.xpi) = 2ca77f34354bf418a54d372dc0a490bd72bf0fea75271f21284be5c35376f864 -SIZE (xpi/firefox-24.4.0/zh-TW.xpi) = 351832 -SHA256 (xpi/firefox-24.4.0/zu.xpi) = 9b83e06d4db31a6a80ed0adb072faeff2040e11f619dc5e136f275960eb50a12 -SIZE (xpi/firefox-24.4.0/zu.xpi) = 340394 +SHA256 (xpi/firefox-24.5.0/ach.xpi) = 89bb3134815fceb3e21b3a0e03c705e4f8df4178271be8798714a78acfdb8368 +SIZE (xpi/firefox-24.5.0/ach.xpi) = 339946 +SHA256 (xpi/firefox-24.5.0/af.xpi) = dbf83ac1bfba4a3c325478813dc7f3b7d90e80d4ade272eb5e17ad97d7837933 +SIZE (xpi/firefox-24.5.0/af.xpi) = 333184 +SHA256 (xpi/firefox-24.5.0/ak.xpi) = 03557473c95e9c8a816784edbf6250a42931887008934f9cc3a908e6f08a6c23 +SIZE (xpi/firefox-24.5.0/ak.xpi) = 340941 +SHA256 (xpi/firefox-24.5.0/ar.xpi) = 461679df4d27aadc21fd04b04fe91fcceeea54a0779e2ab9c564e4647db0f281 +SIZE (xpi/firefox-24.5.0/ar.xpi) = 360850 +SHA256 (xpi/firefox-24.5.0/as.xpi) = 65f041d1ce7f15a2a859c78cea161dd78f73fc4ab2cb56da45eef85f0580093e +SIZE (xpi/firefox-24.5.0/as.xpi) = 378086 +SHA256 (xpi/firefox-24.5.0/ast.xpi) = 8a1061bdb8d92c13322097c4824590615d03cba95a49a0e84794c7eb3072bf34 +SIZE (xpi/firefox-24.5.0/ast.xpi) = 292876 +SHA256 (xpi/firefox-24.5.0/be.xpi) = 156fda23ce2e89c2869f474d25ab49e85bf790b131906601c5187e708aae0774 +SIZE (xpi/firefox-24.5.0/be.xpi) = 316955 +SHA256 (xpi/firefox-24.5.0/bg.xpi) = 5181d2094822162aa17583c1a82709d1a8abdeff28d2f5629848cc65acf5c5a8 +SIZE (xpi/firefox-24.5.0/bg.xpi) = 373136 +SHA256 (xpi/firefox-24.5.0/bn-BD.xpi) = bb073f7e4f6cdb4145c2ebbea5ce37dc056b13d89e7dfc0bbb0692f2ea6ba7f5 +SIZE (xpi/firefox-24.5.0/bn-BD.xpi) = 394939 +SHA256 (xpi/firefox-24.5.0/bn-IN.xpi) = b3546e14be577515a3b4f3eac1b72737f0492e7f18f313d29f565757fcb722d6 +SIZE (xpi/firefox-24.5.0/bn-IN.xpi) = 427780 +SHA256 (xpi/firefox-24.5.0/br.xpi) = aa14900294be897d503ede9cd329ef0a80dd01041523086119a34537e8b77502 +SIZE (xpi/firefox-24.5.0/br.xpi) = 330509 +SHA256 (xpi/firefox-24.5.0/bs.xpi) = 5cb77e0b9c67935ba8a1bc91352552cb2aff201eb1bfe7e116b9d4876396d66a +SIZE (xpi/firefox-24.5.0/bs.xpi) = 341621 +SHA256 (xpi/firefox-24.5.0/ca.xpi) = 85a0c9e67bbd6a2b3207a6025f6e8293900fda05b01556a50a9a14dcf85d2e7d +SIZE (xpi/firefox-24.5.0/ca.xpi) = 341257 +SHA256 (xpi/firefox-24.5.0/cs.xpi) = ce6815b1563758701654b3bc3f1cbd5a5ea1d006cc0066a832b514118f054a3f +SIZE (xpi/firefox-24.5.0/cs.xpi) = 335947 +SHA256 (xpi/firefox-24.5.0/csb.xpi) = 5ee8a4d05b7747ebddc32dabb9e8054422ca715ec8d0f1428f20af7092563f28 +SIZE (xpi/firefox-24.5.0/csb.xpi) = 329796 +SHA256 (xpi/firefox-24.5.0/cy.xpi) = f50f8c73a9871530a11ba6f18d33b0f0b44996923d03d87b2e4fd1832cb0af11 +SIZE (xpi/firefox-24.5.0/cy.xpi) = 330643 +SHA256 (xpi/firefox-24.5.0/da.xpi) = be6a10a1af27e35168e66b21d12ee0b31a22a557f1c101e7a3c31b74bca773bc +SIZE (xpi/firefox-24.5.0/da.xpi) = 326882 +SHA256 (xpi/firefox-24.5.0/de.xpi) = 810293bb68ee37989d779c28670a82ee191b22f2e02538f6635c5bd78a40106f +SIZE (xpi/firefox-24.5.0/de.xpi) = 323258 +SHA256 (xpi/firefox-24.5.0/el.xpi) = b0879237952cc2fcc55a592a47cd2716417dc165024998541c566c6fbaa561d4 +SIZE (xpi/firefox-24.5.0/el.xpi) = 365320 +SHA256 (xpi/firefox-24.5.0/en-GB.xpi) = 7719b15c422cf477d3ada1591ce85e47e428ccaea817a6de58d98c94328982d4 +SIZE (xpi/firefox-24.5.0/en-GB.xpi) = 318298 +SHA256 (xpi/firefox-24.5.0/en-US.xpi) = 9365305ecbd19e8fa23e1cdb003452d9fe624b668098888f676f3d1088d89e71 +SIZE (xpi/firefox-24.5.0/en-US.xpi) = 320993 +SHA256 (xpi/firefox-24.5.0/en-ZA.xpi) = cedee816a20945a4e613d14c653d0d6549533fb41c7b35baf04d269de903c44d +SIZE (xpi/firefox-24.5.0/en-ZA.xpi) = 319321 +SHA256 (xpi/firefox-24.5.0/eo.xpi) = 121c95dd6087373846416c66d8d455a8f5aaa7026d1cd327be27acb68931e75a +SIZE (xpi/firefox-24.5.0/eo.xpi) = 334940 +SHA256 (xpi/firefox-24.5.0/es-AR.xpi) = 3015be6ce0b6064773e95ba22e85ce2698b61e08f4fe9a588a01f7f0e8e95feb +SIZE (xpi/firefox-24.5.0/es-AR.xpi) = 334010 +SHA256 (xpi/firefox-24.5.0/es-CL.xpi) = f3279fb89da82408da9d42c179b21e43c579485fa0e6bd501810749c3c54048c +SIZE (xpi/firefox-24.5.0/es-CL.xpi) = 287027 +SHA256 (xpi/firefox-24.5.0/es-ES.xpi) = b6b20b2effc291c2fac5f6251dc350ae60764c5bf15d94eec42dc029dd03cbe6 +SIZE (xpi/firefox-24.5.0/es-ES.xpi) = 277860 +SHA256 (xpi/firefox-24.5.0/es-MX.xpi) = 24093829c9e9c220edd544c3ccd660976bcf8f6b105b33181069a47b6ed977e0 +SIZE (xpi/firefox-24.5.0/es-MX.xpi) = 302625 +SHA256 (xpi/firefox-24.5.0/et.xpi) = 4c7c05bf0bb5e5908ff9e2d331d0349a2550068da5fd4b1a82e80e09a42f3807 +SIZE (xpi/firefox-24.5.0/et.xpi) = 327698 +SHA256 (xpi/firefox-24.5.0/eu.xpi) = ce23102fbdb04b3844fc7885275edd7bfa7921ea34c651f977b369b1ce984b48 +SIZE (xpi/firefox-24.5.0/eu.xpi) = 332422 +SHA256 (xpi/firefox-24.5.0/fa.xpi) = 55cf194048cbb765d28491522cbf3a59b9b502766222dc843616e9a6503b663f +SIZE (xpi/firefox-24.5.0/fa.xpi) = 375634 +SHA256 (xpi/firefox-24.5.0/ff.xpi) = 3125954890f30fb6ed594363fb1a1ce4106a6c71f542ffaf77ddf0891884ff2e +SIZE (xpi/firefox-24.5.0/ff.xpi) = 332815 +SHA256 (xpi/firefox-24.5.0/fi.xpi) = 7e1daf06bf51ef963d8c8c832cfa039bcd97488e9f916c2d483113157e3c86f2 +SIZE (xpi/firefox-24.5.0/fi.xpi) = 328892 +SHA256 (xpi/firefox-24.5.0/fr.xpi) = 740443f01961855f55956c7bfe67b70599fd81641c8a58e0a3ba27fe1d88ba4f +SIZE (xpi/firefox-24.5.0/fr.xpi) = 339178 +SHA256 (xpi/firefox-24.5.0/fy-NL.xpi) = be38c251d43ee3be8036528fe51053c434cc2d4ee04d5d9d771c58254cad261c +SIZE (xpi/firefox-24.5.0/fy-NL.xpi) = 336593 +SHA256 (xpi/firefox-24.5.0/ga-IE.xpi) = b1f92ecffe17f85f790e7ae67f61050349fac7ab94566352e489137b75cfc8bd +SIZE (xpi/firefox-24.5.0/ga-IE.xpi) = 345295 +SHA256 (xpi/firefox-24.5.0/gd.xpi) = 410feda6a4a6d93b35ef807379d0f879f48200c22a45dca2111a3977952441fb +SIZE (xpi/firefox-24.5.0/gd.xpi) = 344812 +SHA256 (xpi/firefox-24.5.0/gl.xpi) = f32f085c60954ec5cb639504ccd5a01ad205cbb3287e838f5ca20f0c35ffcb9b +SIZE (xpi/firefox-24.5.0/gl.xpi) = 336919 +SHA256 (xpi/firefox-24.5.0/gu-IN.xpi) = e84e03197a8dda85924493e3459e577cf69f1ba7cb0f9f0f39614ff2d5bbd771 +SIZE (xpi/firefox-24.5.0/gu-IN.xpi) = 359359 +SHA256 (xpi/firefox-24.5.0/he.xpi) = 4e81fa8fdba015cb59ad651802634494ddafb9bf00fdc9ac79253b9ad4a9e5db +SIZE (xpi/firefox-24.5.0/he.xpi) = 354631 +SHA256 (xpi/firefox-24.5.0/hi-IN.xpi) = d4280e84dda7f30e272848e9d2764387d400030f89d2cd9cb3d9c3b0d37f5b90 +SIZE (xpi/firefox-24.5.0/hi-IN.xpi) = 379121 +SHA256 (xpi/firefox-24.5.0/hr.xpi) = 87a5b71bd29ca1bdfcf41fa47a674b08292097a2e5e02b0d66a4992ef1f13125 +SIZE (xpi/firefox-24.5.0/hr.xpi) = 336841 +SHA256 (xpi/firefox-24.5.0/hu.xpi) = 3cd756b11e7336aeeac0817d0926fed814725c6391b7da0528c090a5b90fea8c +SIZE (xpi/firefox-24.5.0/hu.xpi) = 344103 +SHA256 (xpi/firefox-24.5.0/hy-AM.xpi) = df292c89159675f8ac95de5c0eb0cc9604ba809bc0df5b93261defee05ef00ea +SIZE (xpi/firefox-24.5.0/hy-AM.xpi) = 385181 +SHA256 (xpi/firefox-24.5.0/id.xpi) = 351efda2d5e392d107d9070a9a2a20cbadb72536c5a49903ca2bed970eaba84b +SIZE (xpi/firefox-24.5.0/id.xpi) = 319795 +SHA256 (xpi/firefox-24.5.0/is.xpi) = a9fe3ff50ad3884c8dc5dda592f7f046867c5afa450571d3189d66ce556ed97d +SIZE (xpi/firefox-24.5.0/is.xpi) = 331826 +SHA256 (xpi/firefox-24.5.0/it.xpi) = 6cb83701d40c29e80bbb554b713af64defdebbb2ec79fca157ce39b1e4368843 +SIZE (xpi/firefox-24.5.0/it.xpi) = 271926 +SHA256 (xpi/firefox-24.5.0/ja.xpi) = 047262fa65b084a51d49371446072444e1c01f1abe08e71a0c96fa01a60b2589 +SIZE (xpi/firefox-24.5.0/ja.xpi) = 370904 +SHA256 (xpi/firefox-24.5.0/kk.xpi) = 8e06e5a4d0ac56ce7b2d70b0b457e4e68f1e6e26ece277839e4c3695d1cb17e6 +SIZE (xpi/firefox-24.5.0/kk.xpi) = 377502 +SHA256 (xpi/firefox-24.5.0/km.xpi) = 35327b91598f75e316c74f1747d8aef6178cb3c4e22589d91ec4f472d75977ea +SIZE (xpi/firefox-24.5.0/km.xpi) = 400559 +SHA256 (xpi/firefox-24.5.0/kn.xpi) = dc7a37b155a5b778890e64b356c69f6daa94af980fd1eaae7413cf5a55963f0e +SIZE (xpi/firefox-24.5.0/kn.xpi) = 391033 +SHA256 (xpi/firefox-24.5.0/ko.xpi) = 4e8fc61a5dbf760468b0994c2482621da257d7fb00540f26030b508c61aee607 +SIZE (xpi/firefox-24.5.0/ko.xpi) = 346164 +SHA256 (xpi/firefox-24.5.0/ku.xpi) = c2443c2f57c40d09f8176c48ec61a7be89a86b31ea1afe7b606626f3e5f719d9 +SIZE (xpi/firefox-24.5.0/ku.xpi) = 355632 +SHA256 (xpi/firefox-24.5.0/lg.xpi) = f739ff649c7313878889bcd037b9e9faa0c5fee884b07ac097fcdad7e6e699e2 +SIZE (xpi/firefox-24.5.0/lg.xpi) = 351111 +SHA256 (xpi/firefox-24.5.0/lij.xpi) = f211bdfd39359d6d83be9ea9357c6b22133d52292418ba0588c3b7330abc483c +SIZE (xpi/firefox-24.5.0/lij.xpi) = 322703 +SHA256 (xpi/firefox-24.5.0/lt.xpi) = 1b1e85e0f0817b7ad6cb1f8bdc80b232aed8ff0e005946345fb7474bd92cbe0a +SIZE (xpi/firefox-24.5.0/lt.xpi) = 352045 +SHA256 (xpi/firefox-24.5.0/lv.xpi) = 9d319f965e9545e50076de73ce9a51e25c457332595d8d5d35bf6bc0b0df5afb +SIZE (xpi/firefox-24.5.0/lv.xpi) = 328665 +SHA256 (xpi/firefox-24.5.0/mai.xpi) = da093cbb6a1e2786ef6561dd91a60bb0fa81e4f1fad603efa566205ac188984c +SIZE (xpi/firefox-24.5.0/mai.xpi) = 379767 +SHA256 (xpi/firefox-24.5.0/mk.xpi) = 965011e03d977df7cdfa4e00e9c1864570bfe26515103664c0c7f739ae6d1ae5 +SIZE (xpi/firefox-24.5.0/mk.xpi) = 376316 +SHA256 (xpi/firefox-24.5.0/ml.xpi) = 8ffbe5d36f5dbf6e07a4e93be42f81bbd01d67473702d6a926451098b01b210b +SIZE (xpi/firefox-24.5.0/ml.xpi) = 399678 +SHA256 (xpi/firefox-24.5.0/mr.xpi) = 1d48a15eab812fdbd999ffa16bc5244cec414e4becc63acb4e6c57e8d9d06598 +SIZE (xpi/firefox-24.5.0/mr.xpi) = 380232 +SHA256 (xpi/firefox-24.5.0/nb-NO.xpi) = 8080a307c0f0ffbf6e87d2709b72048ecaf17b92bc95fd317522ab2044c06f35 +SIZE (xpi/firefox-24.5.0/nb-NO.xpi) = 330966 +SHA256 (xpi/firefox-24.5.0/nl.xpi) = b05435549d6aa06fa4167d034022bdcb399b4cb406d8929ae2c20f57d64d7712 +SIZE (xpi/firefox-24.5.0/nl.xpi) = 331405 +SHA256 (xpi/firefox-24.5.0/nn-NO.xpi) = 550abb8abdea1aac0738535b6b6ee0d84c551a36307b8d6d402592fc2b6cffe9 +SIZE (xpi/firefox-24.5.0/nn-NO.xpi) = 333907 +SHA256 (xpi/firefox-24.5.0/nso.xpi) = 5de065f05acf39ddc493b158ab277cbca78091626242aa50e5b85575ea79c546 +SIZE (xpi/firefox-24.5.0/nso.xpi) = 336298 +SHA256 (xpi/firefox-24.5.0/or.xpi) = ec6d6b647bbc342ef65256cb6e645b3b67db9bfbd9e4e502d83c3bc8c0025741 +SIZE (xpi/firefox-24.5.0/or.xpi) = 364593 +SHA256 (xpi/firefox-24.5.0/pa-IN.xpi) = bbef2c9f3b3d02efd46ab9fcdf56be10ae94a187b4a70191927849e3b2f3cc60 +SIZE (xpi/firefox-24.5.0/pa-IN.xpi) = 365653 +SHA256 (xpi/firefox-24.5.0/pl.xpi) = 3d6583fcd2fc1d8de25eae5996927ba1bd7f90333c978f9f558873dd120c6b5e +SIZE (xpi/firefox-24.5.0/pl.xpi) = 341995 +SHA256 (xpi/firefox-24.5.0/pt-BR.xpi) = 24d5a37fc39bb64d11535625a707bd741f04c603a01e91515d3650c09925c7b0 +SIZE (xpi/firefox-24.5.0/pt-BR.xpi) = 334606 +SHA256 (xpi/firefox-24.5.0/pt-PT.xpi) = d6e489bab3a960bd988d1f1d59c113151820aaa894f116ec168f1cfde8bc9351 +SIZE (xpi/firefox-24.5.0/pt-PT.xpi) = 332740 +SHA256 (xpi/firefox-24.5.0/rm.xpi) = e1aeed564f7492fccbbb0c98918c3a9077501f05ece5493e5c125fabe47f422d +SIZE (xpi/firefox-24.5.0/rm.xpi) = 339698 +SHA256 (xpi/firefox-24.5.0/ro.xpi) = 86d84a90e8bbebeb174d740482b355d93fd63be01efdfc49a85b008262b41aff +SIZE (xpi/firefox-24.5.0/ro.xpi) = 362237 +SHA256 (xpi/firefox-24.5.0/ru.xpi) = 46e7530980ac1b7761d049cb6bde008e94f0ceef0187be8629b722cfd16148a7 +SIZE (xpi/firefox-24.5.0/ru.xpi) = 322761 +SHA256 (xpi/firefox-24.5.0/si.xpi) = deb60b658a54e26b286cf6f1a4996175169333d257ad8a1038faabdc663ddd84 +SIZE (xpi/firefox-24.5.0/si.xpi) = 372983 +SHA256 (xpi/firefox-24.5.0/sk.xpi) = 76bfa6a2bc4c526053fa9a81f3d8be99f1ffe5440c0d3b7f5e419bd723ccc3a6 +SIZE (xpi/firefox-24.5.0/sk.xpi) = 347879 +SHA256 (xpi/firefox-24.5.0/sl.xpi) = a60eeff81f3b3c9a765fead2b00c4ac7d96778b51d8185401dcbb6b5c2c727da +SIZE (xpi/firefox-24.5.0/sl.xpi) = 331572 +SHA256 (xpi/firefox-24.5.0/son.xpi) = e6dc41c014cfe9921f9617837ca5cfbc30da9ba8b0bf0dc97da0370ece749072 +SIZE (xpi/firefox-24.5.0/son.xpi) = 328903 +SHA256 (xpi/firefox-24.5.0/sq.xpi) = c09e2ca9d828763ae9f1056cddcf44771f4fb06b6e2ea919d40b8c9d9c3a6746 +SIZE (xpi/firefox-24.5.0/sq.xpi) = 340677 +SHA256 (xpi/firefox-24.5.0/sr.xpi) = 10aab262ca85ca8fe67aadc1ec718a6b26ed762308ea950edfee75d0c25aa1b5 +SIZE (xpi/firefox-24.5.0/sr.xpi) = 385108 +SHA256 (xpi/firefox-24.5.0/sv-SE.xpi) = 4e26bd50b1770d57a5fa434972d63626fe399fb27452f90e4bdb4450bd14140d +SIZE (xpi/firefox-24.5.0/sv-SE.xpi) = 333507 +SHA256 (xpi/firefox-24.5.0/ta-LK.xpi) = a7d1d5d44fa2b13f5fbc90bb66d29d14201922b4304e91eb463d5ba9a76b8e39 +SIZE (xpi/firefox-24.5.0/ta-LK.xpi) = 384156 +SHA256 (xpi/firefox-24.5.0/ta.xpi) = 1c322d1d87f7ad0b2b2792939dd353d63c864ca5d1038807046fb8f09be5cb82 +SIZE (xpi/firefox-24.5.0/ta.xpi) = 381423 +SHA256 (xpi/firefox-24.5.0/te.xpi) = 4c81cb886077916ab8e622933a1ce832dd4656b72bee9505506059b8d98ee331 +SIZE (xpi/firefox-24.5.0/te.xpi) = 394563 +SHA256 (xpi/firefox-24.5.0/th.xpi) = 1274f67c577a3325423774e17862ceb832a2523564816ef6f9b6bf2e6e6891fe +SIZE (xpi/firefox-24.5.0/th.xpi) = 379823 +SHA256 (xpi/firefox-24.5.0/tr.xpi) = e969d229c5ee5e5d75e9709c07ef2f482974aa27e2c07741d371e29e2c5ae58f +SIZE (xpi/firefox-24.5.0/tr.xpi) = 340387 +SHA256 (xpi/firefox-24.5.0/uk.xpi) = 6352035d5b50ba368aa4bce0bd9fca4811de4467a249e41708c1a771b72e1b26 +SIZE (xpi/firefox-24.5.0/uk.xpi) = 365699 +SHA256 (xpi/firefox-24.5.0/vi.xpi) = 6b915f53d4d375e99f20b955634bcc97e5dafd68e29b51f32d8b91ee02650a96 +SIZE (xpi/firefox-24.5.0/vi.xpi) = 358430 +SHA256 (xpi/firefox-24.5.0/zh-CN.xpi) = 43d21947d10746a7e41caf8df030b32c9ba834f26f47288e5c7d2b2959281fa5 +SIZE (xpi/firefox-24.5.0/zh-CN.xpi) = 358183 +SHA256 (xpi/firefox-24.5.0/zh-TW.xpi) = 88ab281a92fe9d1734cf199c562c80bdd1ccc603ec4c7c45ef82a460a68b6e0b +SIZE (xpi/firefox-24.5.0/zh-TW.xpi) = 351833 +SHA256 (xpi/firefox-24.5.0/zu.xpi) = e0b7089d4e2cf97fb6f3843fb83cf15266a0106326ff6c98616356e064b0749c +SIZE (xpi/firefox-24.5.0/zu.xpi) = 340395 diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 74c76a9447f4..6c647b858349 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 24.4.0 +DISTVERSION= 24.5.0 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source @@ -17,7 +17,9 @@ BUILD_DEPENDS= nspr>=4.10.2:${PORTSDIR}/devel/nspr \ 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 \ libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index 2ef7d1a4281d..b872161f5c4c 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-24.4.0esr.source.tar.bz2) = b56fb5f16e0fe42bdf9ba560a64bca3633cdea5d264f7e9beca01b7a355efd6e -SIZE (firefox-24.4.0esr.source.tar.bz2) = 119614180 +SHA256 (firefox-24.5.0esr.source.tar.bz2) = 1670e72511cad6047eb8726fa6c2362adcb95b5d53a3c327c4c38bed4b788701 +SIZE (firefox-24.5.0esr.source.tar.bz2) = 119830718 diff --git a/www/firefox-esr/files/patch-bug916589 b/www/firefox-esr/files/patch-bug916589 index 664a7b167314..5748c3316f85 100644 --- a/www/firefox-esr/files/patch-bug916589 +++ b/www/firefox-esr/files/patch-bug916589 @@ -2,12 +2,16 @@ diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/qu index 5b50785..7cf47d5 100644 --- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h +++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -@@ -31,11 +31,14 @@ +@@ -31,11 +31,18 @@ */ -#ifndef _SYS_QUEUE_H_ +#if (defined(BSD) && !defined(__OpenBSD__)) || defined(DARWIN) +#include_next <sys/queue.h> ++# if defined(__DragonFly__) ++#define STAILQ_FOREACH_SAFE STAILQ_FOREACH_MUTABLE ++#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE ++# endif +#elif !defined(_SYS_QUEUE_H_) #define _SYS_QUEUE_H_ diff --git a/www/firefox-esr/files/patch-no-videoio.h b/www/firefox-esr/files/patch-bug985848 index c20c0e039827..c20c0e039827 100644 --- a/www/firefox-esr/files/patch-no-videoio.h +++ b/www/firefox-esr/files/patch-bug985848 diff --git a/www/firefox-esr/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp b/www/firefox-esr/files/patch-bug991253 index 161feb2ca7b5..161feb2ca7b5 100644 --- a/www/firefox-esr/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp +++ b/www/firefox-esr/files/patch-bug991253 diff --git a/www/firefox-esr/files/patch-bug791305 b/www/firefox-esr/files/patch-ijg-libjpeg index ef75e4a17bb5..406bb1627d6e 100644 --- a/www/firefox-esr/files/patch-bug791305 +++ b/www/firefox-esr/files/patch-ijg-libjpeg @@ -1,19 +1,4 @@ -commit c269a16 -Author: Jeff Muizelaar <jmuizelaar@mozilla.com> -Date: Fri Sep 14 15:54:55 2012 -0400 - - Bug 791305. Use libjpeg's color conversion code instead of our own. r=joe,r=khuey - - libjpeg-turbo supports converting directly to a format compatible with cairo's - FORMAT_RGB24. Use that instead of our own handcoded function. This also gives - us SSE2 and NEON version of this function. - - --HG-- - extra : rebase_source : 18f48925f023a33ec2a097d4f4e5cc2ab40be1e9 ---- - configure.in | 6 +- - image/decoders/nsJPEGDecoder.cpp | 311 ++------------------------------------- - 2 files changed, 20 insertions(+), 297 deletions(-) +# Partially revert bug 791305 to allow building with system IJG jpeg library diff --git configure.in configure.in index f0aeb5d..1c01010 100644 diff --git a/www/firefox-esr/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c b/www/firefox-esr/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c new file mode 100644 index 000000000000..69658e277b41 --- /dev/null +++ b/www/firefox-esr/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c @@ -0,0 +1,16 @@ +--- media/mtransport/third_party/nICEr/src/util/mbslen.c~ ++++ media/mtransport/third_party/nICEr/src/util/mbslen.c +@@ -54,6 +54,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # endif + #endif + ++#ifdef __DragonFly__ ++#include <osreldate.h> ++# if __DragonFly_version > 300502 ++# define HAVE_XLOCALE ++# endif ++#endif ++ + #ifdef HAVE_XLOCALE + #include <xlocale.h> + #endif /* HAVE_XLOCALE */ diff --git a/www/firefox-esr/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox-esr/files/patch-security_manager_ssl_src_nsNSSComponent.cpp deleted file mode 100644 index f30d12229ccd..000000000000 --- a/www/firefox-esr/files/patch-security_manager_ssl_src_nsNSSComponent.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" diff --git a/www/firefox-esr/files/patch-z-bug847568 b/www/firefox-esr/files/patch-z-bug847568 index 14f7e151aa94..9c8105691ab2 100644 --- a/www/firefox-esr/files/patch-z-bug847568 +++ b/www/firefox-esr/files/patch-z-bug847568 @@ -14,10 +14,10 @@ index 14bfc0d..5383399 100644 $(INSTALL) system_wrappers $(DIST) diff --git config/system-headers config/system-headers -index 126391e..b711fc3 100644 +index 18e8703..bdc5f82 100644 --- config/system-headers +++ config/system-headers -@@ -1144,3 +1144,11 @@ unicode/utypes.h +@@ -1145,3 +1145,11 @@ unicode/utypes.h #endif libutil.h unwind.h @@ -30,40 +30,58 @@ index 126391e..b711fc3 100644 +harfbuzz/hb.h +#endif diff --git configure.in configure.in -index bbc7b40..1747206 100644 +index ac38f40..87536b7 100644 --- configure.in +++ configure.in -@@ -7830,6 +7830,38 @@ if test "$USE_FC_FREETYPE"; then +@@ -8032,6 +8032,56 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== -+dnl Check for graphite2 and harfbuzz ++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= ) ++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= ) ++MOZ_NATIVE_GRAPHITE2=) + +if test -n "$MOZ_NATIVE_GRAPHITE2"; then -+ PKG_CHECK_MODULES(MOZ_GRAPHITE, graphite2 >= 1.2.3) -+else -+ MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' ++ 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) @@ -133,7 +151,7 @@ index 519aa46..6929751 100644 'thebes', 'ipc', diff --git gfx/skia/Makefile.in gfx/skia/Makefile.in -index 07a77a3..067f7bd 100644 +index ee0efb2..98e169d6f 100644 --- gfx/skia/Makefile.in +++ gfx/skia/Makefile.in @@ -15,6 +15,10 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) @@ -146,9 +164,9 @@ index 07a77a3..067f7bd 100644 + include $(topsrcdir)/config/rules.mk - ifneq (,$(INTEL_ARCHITECTURE)) + ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1) diff --git gfx/thebes/Makefile.in gfx/thebes/Makefile.in -index e9f6b6c..0df2d8d 100644 +index 45c36ae..79d32cf 100644 --- gfx/thebes/Makefile.in +++ gfx/thebes/Makefile.in @@ -13,6 +13,14 @@ DEFINES := $(filter-out -DUNICODE,$(DEFINES)) @@ -167,7 +185,7 @@ index e9f6b6c..0df2d8d 100644 CXXFLAGS += $(CAIRO_FT_CFLAGS) endif diff --git intl/unicharutil/util/Makefile.in intl/unicharutil/util/Makefile.in -index f6b9f7c..11c44f4 100644 +index f6b9f7c..60863f4 100644 --- intl/unicharutil/util/Makefile.in +++ intl/unicharutil/util/Makefile.in @@ -21,3 +21,7 @@ ifdef _MSC_VER @@ -176,7 +194,7 @@ index f6b9f7c..11c44f4 100644 endif + +ifdef MOZ_NATIVE_HARFBUZZ -+nsUnicodePropertyData.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS) ++CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) +endif diff --git layout/media/Makefile.in layout/media/Makefile.in index 1cacbd7..a8cd156 100644 @@ -202,22 +220,25 @@ index 1cacbd7..a8cd156 100644 SHARED_LIBRARY_LIBS += $(MOZ_CAIRO_LIBS) endif diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in -index 1cacbd7..a8cd156 100644 +index 1cacbd7..f5d72bb 100644 --- netwerk/dns/Makefile.in +++ netwerk/dns/Makefile.in -@@ -9,3 +9,7 @@ include $(topsrcdir)/config/rules.mk - # for effective TLD data. - etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat - $(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc -+ +@@ -5,6 +5,10 @@ + + include $(topsrcdir)/config/rules.mk + +ifdef MOZ_NATIVE_HARFBUZZ -+nsIDNService.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS) ++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 007f272..27f488e 100644 +index 67f0db9..d42137a 100644 --- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -103,6 +103,14 @@ ifndef MOZ_TREE_PIXMAN +@@ -89,6 +89,14 @@ ifndef MOZ_TREE_PIXMAN EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS) endif diff --git a/www/firefox-esr/files/patch-zz-bug517422 b/www/firefox-esr/files/patch-zz-bug517422 index 85db66a2acdc..acdd451854cd 100644 --- a/www/firefox-esr/files/patch-zz-bug517422 +++ b/www/firefox-esr/files/patch-zz-bug517422 @@ -1,16 +1,20 @@ -# Allow building against system-wide ogg/vorbis/opus. +# Allow more config/external/ libs built against system-wide version. diff --git config/Makefile.in config/Makefile.in -index 5383399..4393ae8 100644 +index 5383399..0410004 100644 --- config/Makefile.in +++ config/Makefile.in -@@ -79,6 +79,9 @@ export:: $(export-preqs) +@@ -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) @@ -26,7 +30,8 @@ index c22a36c..2febb45 100644 +if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']: add_tier_dir('platform', 'media/libvorbis') - if CONFIG['MOZ_TREMOR']: +-if CONFIG['MOZ_TREMOR']: ++if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']: add_tier_dir('platform', 'media/libtremor') -if CONFIG['MOZ_OPUS']: @@ -34,22 +39,54 @@ index c22a36c..2febb45 100644 add_tier_dir('platform', 'media/libopus') if CONFIG['MOZ_WEBM']: -@@ -82,7 +82,9 @@ if CONFIG['MOZ_VP8'] and not CONFIG['MOZ +@@ -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') -+ add_tier_dir('platform', 'media/libtheora') ++ 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 b711fc3..fd3c14f 100644 +index bef567c..9807c29 100644 --- config/system-headers +++ config/system-headers -@@ -1152,3 +1152,17 @@ graphite2/Segment.h +@@ -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 @@ -57,21 +94,33 @@ index b711fc3..fd3c14f 100644 +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 df49287..05e97ff 100644 +index 87db361..7947626 100644 --- configure.in +++ configure.in -@@ -5143,6 +5143,40 @@ if test -n "$MOZ_OGG"; then +@@ -5211,6 +5211,57 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then fi dnl ======================================================== @@ -81,7 +130,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-ogg, +[ --with-system-ogg Use system libogg (located with pkgconfig)], +MOZ_NATIVE_OGG=1, -+MOZ_NATIVE_OGG= ) ++MOZ_NATIVE_OGG=) + +if test -n "$MOZ_NATIVE_OGG"; then + PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1) @@ -98,7 +147,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-vorbis, +[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], +MOZ_NATIVE_VORBIS=1, -+MOZ_NATIVE_VORBIS= ) ++MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then + PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4) @@ -109,10 +158,27 @@ index df49287..05e97ff 100644 +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, -@@ -5151,6 +5185,25 @@ MOZ_ARG_DISABLE_BOOL(opus, +@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) dnl ======================================================== @@ -122,7 +188,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-opus, +[ --with-system-opus Use system libopus (located with pkgconfig)], +MOZ_NATIVE_OPUS=1, -+MOZ_NATIVE_OPUS= ) ++MOZ_NATIVE_OPUS=) + +if test -n "$MOZ_NATIVE_OPUS"; then + PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1) @@ -135,14 +201,66 @@ index df49287..05e97ff 100644 +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) ++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 68f360e..76f2d57 100644 +index fd34449..c6c42c8 100644 --- content/media/Makefile.in +++ content/media/Makefile.in -@@ -7,4 +7,16 @@ include $(topsrcdir)/config/rules.mk +@@ -6,4 +6,31 @@ include $(topsrcdir)/config/rules.mk + CFLAGS += $(GSTREAMER_CFLAGS) CXXFLAGS += $(GSTREAMER_CFLAGS) @@ -150,20 +268,48 @@ index 68f360e..76f2d57 100644 +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 +--- media/libcubeb/src/Makefile.in ++++ 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 --- layout/media/Makefile.in +++ layout/media/Makefile.in -@@ -30,12 +36,21 @@ ifdef MOZ_TREE_PIXMAN +@@ -36,31 +36,45 @@ ifdef MOZ_TREE_PIXMAN SHARED_LIBRARY_LIBS += $(MOZ_PIXMAN_LIBS) endif @@ -185,9 +331,21 @@ index 1cacbd7..a8cd156 100644 +endif ifdef MOZ_TREMOR ++ifndef MOZ_NATIVE_TREMOR SHARED_LIBRARY_LIBS += \ -@@ -51,10 +66,12 @@ 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 @@ -199,6 +357,27 @@ index 1cacbd7..a8cd156 100644 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 @@ -266,7 +445,7 @@ index 0000000..1f02dc0 +CFLAGS += $(MOZ_OGG_CFLAGS) +endif diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in -index c5e82c4..91ef86a 100644 +index bbc971c..6ed7e41 100644 --- media/webrtc/signaling/test/Makefile.in +++ media/webrtc/signaling/test/Makefile.in @@ -48,6 +48,12 @@ LIBS += \ @@ -300,10 +479,10 @@ index 00e77e7..55f48ab 100644 'dependencies': [ '<(DEPTH)/third_party/opus/opus.gyp:opus' diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in -index 27f488e..cd27084 100644 +index d42137a..695e75a8 100644 --- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -91,6 +91,18 @@ ifdef MOZ_NATIVE_HUNSPELL +@@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS) endif @@ -311,14 +490,30 @@ index 27f488e..cd27084 100644 +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 diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index e363b9f38cc6..f780a5295973 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 28.0 +PORTVERSION= 29.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -14,7 +14,7 @@ COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:firefox,28 +USES= zip:infozip gecko:firefox,29 USE_XPI= firefox linux-firefox NO_ARCH= yes diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo index 6cee9edc94ab..2c33b60cfb34 100644 --- a/www/firefox-i18n/distinfo +++ b/www/firefox-i18n/distinfo @@ -1,170 +1,176 @@ -SHA256 (xpi/firefox-i18n-28.0/ach.xpi) = b136b56da7f11a953ea881fed60ad15a20d91682c2dbe4a3519358f44d981dab -SIZE (xpi/firefox-i18n-28.0/ach.xpi) = 365708 -SHA256 (xpi/firefox-i18n-28.0/af.xpi) = d31886aff8bbb30347f7287c93ce4b9b55f898bebeb0897486be5ad5101cd381 -SIZE (xpi/firefox-i18n-28.0/af.xpi) = 359588 -SHA256 (xpi/firefox-i18n-28.0/ar.xpi) = 6868b3ac85f67f7c5d604f1ec0bb40238fa7f99b9615d97709c9c3eecf6586cc -SIZE (xpi/firefox-i18n-28.0/ar.xpi) = 388973 -SHA256 (xpi/firefox-i18n-28.0/as.xpi) = 0c7e712625db2b4fd3c8626a88b03c4f91dacd252dc8db0b332da205ff2e3d8f -SIZE (xpi/firefox-i18n-28.0/as.xpi) = 404105 -SHA256 (xpi/firefox-i18n-28.0/ast.xpi) = c339a8c821547204d1c50ae504cdc3ba53a85c8d0ac3a315f22c68d9da2dfe51 -SIZE (xpi/firefox-i18n-28.0/ast.xpi) = 316220 -SHA256 (xpi/firefox-i18n-28.0/be.xpi) = 210247068b21cead73b623d9b860d1607247015f5462d388aa7d886466ba8391 -SIZE (xpi/firefox-i18n-28.0/be.xpi) = 342303 -SHA256 (xpi/firefox-i18n-28.0/bg.xpi) = bdc9aee10f414c86a463e08103afea3e5cad57c5818d0e71f9565faf05934f4a -SIZE (xpi/firefox-i18n-28.0/bg.xpi) = 393202 -SHA256 (xpi/firefox-i18n-28.0/bn-BD.xpi) = 4d4423b348cd226eea97a0295485f88057f80f42498744099a75bdcad4fa6f1d -SIZE (xpi/firefox-i18n-28.0/bn-BD.xpi) = 418538 -SHA256 (xpi/firefox-i18n-28.0/bn-IN.xpi) = 41e6dad5dcf383ad0448973bf7692d21d3c08aaf51e5a756ee85739b8664ed22 -SIZE (xpi/firefox-i18n-28.0/bn-IN.xpi) = 413539 -SHA256 (xpi/firefox-i18n-28.0/br.xpi) = 9d1432b1b097e69bd5b23cca38696f3768111a7695112c27320b6c0eb4c85cbb -SIZE (xpi/firefox-i18n-28.0/br.xpi) = 353930 -SHA256 (xpi/firefox-i18n-28.0/bs.xpi) = ec26c60cbb118b93be7ee14f99d08023192d64e4cfed348cc092059161795955 -SIZE (xpi/firefox-i18n-28.0/bs.xpi) = 363402 -SHA256 (xpi/firefox-i18n-28.0/ca.xpi) = 699f55f7c6d05e30750bc5081f20834c1cf6042760281a42b8ba8eaa93cc546f -SIZE (xpi/firefox-i18n-28.0/ca.xpi) = 362967 -SHA256 (xpi/firefox-i18n-28.0/cs.xpi) = c0419442a82ef33874a602c969068e81f652ce9b81dd758c26fcf50668d3f751 -SIZE (xpi/firefox-i18n-28.0/cs.xpi) = 356815 -SHA256 (xpi/firefox-i18n-28.0/csb.xpi) = eadf904b54438b17e8bacca9987444b7b0cd0367fa2c2c26202ebbf9bd5b70e0 -SIZE (xpi/firefox-i18n-28.0/csb.xpi) = 347618 -SHA256 (xpi/firefox-i18n-28.0/cy.xpi) = 113041740f7494150fb22ebd857fdbbb8fa23b063154ea04c9b82ce89a25eefc -SIZE (xpi/firefox-i18n-28.0/cy.xpi) = 354719 -SHA256 (xpi/firefox-i18n-28.0/da.xpi) = 40cebc8db2232409003f2a23d3ce254ec38ae651bd0160c26815f1a9c438328e -SIZE (xpi/firefox-i18n-28.0/da.xpi) = 348722 -SHA256 (xpi/firefox-i18n-28.0/de.xpi) = 2f69ef2213355e608eba50787ec19ba7b1e57f87c3b0f334697ca8de4716ad5e -SIZE (xpi/firefox-i18n-28.0/de.xpi) = 355502 -SHA256 (xpi/firefox-i18n-28.0/el.xpi) = f13121675409c9c39ebff994844ef61df73de1d9e2ae77e784cc477f63ee723d -SIZE (xpi/firefox-i18n-28.0/el.xpi) = 389423 -SHA256 (xpi/firefox-i18n-28.0/en-GB.xpi) = 60c7e40108749db48bf1026d3a0981724843d65c8569a49a34c64e4de642a401 -SIZE (xpi/firefox-i18n-28.0/en-GB.xpi) = 342860 -SHA256 (xpi/firefox-i18n-28.0/en-US.xpi) = b9a491b4315f2326b9e4b03295982b872a916b75478452e8744903c52496ce3a -SIZE (xpi/firefox-i18n-28.0/en-US.xpi) = 345900 -SHA256 (xpi/firefox-i18n-28.0/en-ZA.xpi) = cf5d7fe183e312bc9a7b5c3121e73fbb31bb441277436c814bd2c75ef3b7fb89 -SIZE (xpi/firefox-i18n-28.0/en-ZA.xpi) = 338114 -SHA256 (xpi/firefox-i18n-28.0/eo.xpi) = 2e08a1463a6842bf0b03b9a856006dcf1fcaea42c452f9aa96d50a2b35a45bef -SIZE (xpi/firefox-i18n-28.0/eo.xpi) = 361749 -SHA256 (xpi/firefox-i18n-28.0/es-AR.xpi) = f9b9528fdb5f3c9afd6a15086673dba708ced06adf0e3064b4436e85aa2362d0 -SIZE (xpi/firefox-i18n-28.0/es-AR.xpi) = 357323 -SHA256 (xpi/firefox-i18n-28.0/es-CL.xpi) = a8fcd6440ae1184f274e6f8a00aebdeebf8b9768e5ec47ddb5cadd00efc71c14 -SIZE (xpi/firefox-i18n-28.0/es-CL.xpi) = 306617 -SHA256 (xpi/firefox-i18n-28.0/es-ES.xpi) = c332b136719394dbe623efe29c443acf0d35674fef27c0afb86cfb0243e72e90 -SIZE (xpi/firefox-i18n-28.0/es-ES.xpi) = 300690 -SHA256 (xpi/firefox-i18n-28.0/es-MX.xpi) = c7ccd0f83b0d962eb1e1ce4eec752fd5bdba6c8ad0f8774b2147a2fc58c25af7 -SIZE (xpi/firefox-i18n-28.0/es-MX.xpi) = 361856 -SHA256 (xpi/firefox-i18n-28.0/et.xpi) = 0e97596ac377a289749437790e314400ee3a40d4ece77493d876f347e198a4d6 -SIZE (xpi/firefox-i18n-28.0/et.xpi) = 345628 -SHA256 (xpi/firefox-i18n-28.0/eu.xpi) = 424c8ab11aec74ce8c608d55c09cba9a9bff047f917042ea92f54f1f2933ad05 -SIZE (xpi/firefox-i18n-28.0/eu.xpi) = 361444 -SHA256 (xpi/firefox-i18n-28.0/fa.xpi) = 37f16c79b6b558bfef6cc10078c9f42557154ffbd00c7b157cf1279b9a0330ff -SIZE (xpi/firefox-i18n-28.0/fa.xpi) = 401703 -SHA256 (xpi/firefox-i18n-28.0/ff.xpi) = ef10639f9dc81fa67c285f32b8e391e626099b3d64b6b627c8e0376e9eac77c6 -SIZE (xpi/firefox-i18n-28.0/ff.xpi) = 354038 -SHA256 (xpi/firefox-i18n-28.0/fi.xpi) = 73102b5d087b3dd3fd711422405c715b73ffe2edb60c359df474d6234167683b -SIZE (xpi/firefox-i18n-28.0/fi.xpi) = 352826 -SHA256 (xpi/firefox-i18n-28.0/fr.xpi) = c1968bd6466f33d23f0ae9166fee86b7c0987b7ff25ff4b70c50b68ed6dc8416 -SIZE (xpi/firefox-i18n-28.0/fr.xpi) = 368924 -SHA256 (xpi/firefox-i18n-28.0/fy-NL.xpi) = 98ae07fa2c2958347eb856c910c0699e201e61084ee8544bfc939f1b1a6de2b9 -SIZE (xpi/firefox-i18n-28.0/fy-NL.xpi) = 362225 -SHA256 (xpi/firefox-i18n-28.0/ga-IE.xpi) = cc2b07595c5dcfb958e178527d5e8f9e681d89ab3125bb0706d9bdbf10341bb6 -SIZE (xpi/firefox-i18n-28.0/ga-IE.xpi) = 370253 -SHA256 (xpi/firefox-i18n-28.0/gd.xpi) = 0664ca2275edbd252fdcf263e35bfa92a77c9efe36b65bd659400c1b0cf788d6 -SIZE (xpi/firefox-i18n-28.0/gd.xpi) = 365215 -SHA256 (xpi/firefox-i18n-28.0/gl.xpi) = b867e7cf30c0aa412d460ac5df7f8dfb6fc2b9698c523103df277c35caaef3ef -SIZE (xpi/firefox-i18n-28.0/gl.xpi) = 356135 -SHA256 (xpi/firefox-i18n-28.0/gu-IN.xpi) = 49bde1c80351816c2a5e5f4d1adfc820c14f506ed0a3482459528c2fe62b3ba2 -SIZE (xpi/firefox-i18n-28.0/gu-IN.xpi) = 383829 -SHA256 (xpi/firefox-i18n-28.0/he.xpi) = d73be9210a92fb32097a8c2f4496e70c1bfbcbb30739a1104d8ec9d70080e0ce -SIZE (xpi/firefox-i18n-28.0/he.xpi) = 377878 -SHA256 (xpi/firefox-i18n-28.0/hi-IN.xpi) = 857e2b2d0a18f78edc77253f4d0fc46efb56207dcdd889540d6b4a13dd078e75 -SIZE (xpi/firefox-i18n-28.0/hi-IN.xpi) = 402393 -SHA256 (xpi/firefox-i18n-28.0/hr.xpi) = c7f5903ba41003a7ed58103bade0b90e8f68bffc2c4fc1045de35e6e12eac97b -SIZE (xpi/firefox-i18n-28.0/hr.xpi) = 368420 -SHA256 (xpi/firefox-i18n-28.0/hu.xpi) = b8b393d12a7e507974c9e8f1460937c6478cfa88b8e01b50022a18379ccdd45b -SIZE (xpi/firefox-i18n-28.0/hu.xpi) = 365031 -SHA256 (xpi/firefox-i18n-28.0/hy-AM.xpi) = f70dd6f55428fa489a092b534dfcc641bd4ca8cc2c974c2e414a6ef02ddd7bca -SIZE (xpi/firefox-i18n-28.0/hy-AM.xpi) = 411717 -SHA256 (xpi/firefox-i18n-28.0/id.xpi) = 1802597955551e1a34d3678dd697f868899a73b7dfe71d3ec587730daa9a41e8 -SIZE (xpi/firefox-i18n-28.0/id.xpi) = 342613 -SHA256 (xpi/firefox-i18n-28.0/is.xpi) = 7350573b17652d5d4ef10b0cb22fa3aa6c983d1cca079e886773169171ad10ef -SIZE (xpi/firefox-i18n-28.0/is.xpi) = 357816 -SHA256 (xpi/firefox-i18n-28.0/it.xpi) = b5a435bd9b3d5cd0ab08fb1b8465e68b5e0ebbf6f048d7f72ef22c8ff75de68d -SIZE (xpi/firefox-i18n-28.0/it.xpi) = 298277 -SHA256 (xpi/firefox-i18n-28.0/ja.xpi) = ba5f461f81e1214b2a6fc8909ad730e7b43acb54cce4558ac271eb9d2155feba -SIZE (xpi/firefox-i18n-28.0/ja.xpi) = 397187 -SHA256 (xpi/firefox-i18n-28.0/kk.xpi) = bcf04952d1fc3f14c719a3892a08e11b27945a1909e86fc814afa65e67b042a2 -SIZE (xpi/firefox-i18n-28.0/kk.xpi) = 400317 -SHA256 (xpi/firefox-i18n-28.0/km.xpi) = 4abb71c4afecf5ab5106690aea017a79f39b3f8befc7da9099deb504b546be91 -SIZE (xpi/firefox-i18n-28.0/km.xpi) = 430426 -SHA256 (xpi/firefox-i18n-28.0/kn.xpi) = 4bb0d4fac170af23d99783faa838121bfb6adb718b332b7b916757ff34c5b997 -SIZE (xpi/firefox-i18n-28.0/kn.xpi) = 414253 -SHA256 (xpi/firefox-i18n-28.0/ko.xpi) = 98abfda2e65edead79ef433f663473c362e9a329d68ea6da0245288fc9c85aef -SIZE (xpi/firefox-i18n-28.0/ko.xpi) = 364490 -SHA256 (xpi/firefox-i18n-28.0/ku.xpi) = 3abdfaafdf41877b903750f1189b4888ea2f2d269b90190f3dba31dfa9ed1eb4 -SIZE (xpi/firefox-i18n-28.0/ku.xpi) = 370338 -SHA256 (xpi/firefox-i18n-28.0/lij.xpi) = 298cc4c9b933e033cd470f7d427b5a46023f89bce41d6a0f1607063e791bed6b -SIZE (xpi/firefox-i18n-28.0/lij.xpi) = 343230 -SHA256 (xpi/firefox-i18n-28.0/lt.xpi) = db38c3cf9466a8ee5bd4b41d8b248c4d045dcb2a28166eced4092d964a1339c4 -SIZE (xpi/firefox-i18n-28.0/lt.xpi) = 375228 -SHA256 (xpi/firefox-i18n-28.0/lv.xpi) = db860bb6da3225641dcd20b089da86bbbb4cf2d2c89a6f2ff76cd3c5a76017ff -SIZE (xpi/firefox-i18n-28.0/lv.xpi) = 352613 -SHA256 (xpi/firefox-i18n-28.0/mai.xpi) = 1dd4d584f32cdbfaa5fdb0797f0fbf9e8509939a4f959735aa7ccd73a976ab73 -SIZE (xpi/firefox-i18n-28.0/mai.xpi) = 402487 -SHA256 (xpi/firefox-i18n-28.0/mk.xpi) = 4261272a0c4fdcb0b5a0ecc0c2bdc5a7ee92c975fb64df8e503d0f3b8e33b7ca -SIZE (xpi/firefox-i18n-28.0/mk.xpi) = 403249 -SHA256 (xpi/firefox-i18n-28.0/ml.xpi) = 9ad7ab15bc18921f4d9c66ffc81d42b03c1d3eaa18942d91c9d6268e392c42cb -SIZE (xpi/firefox-i18n-28.0/ml.xpi) = 422955 -SHA256 (xpi/firefox-i18n-28.0/mr.xpi) = 6a6ea853ff5b59b589c3bffb5cc8cefff049bfb2e62f96375c673c6761b436b8 -SIZE (xpi/firefox-i18n-28.0/mr.xpi) = 400779 -SHA256 (xpi/firefox-i18n-28.0/nb-NO.xpi) = f8eb9decdbbe8cb29736a2462111800955c10fb703e1a19c2949f9b501df99d9 -SIZE (xpi/firefox-i18n-28.0/nb-NO.xpi) = 352710 -SHA256 (xpi/firefox-i18n-28.0/nl.xpi) = f3cdb52c0f6d06b65733873db3b2e955f86be6ccd345f7fadbb0e164c6a9ca1b -SIZE (xpi/firefox-i18n-28.0/nl.xpi) = 354060 -SHA256 (xpi/firefox-i18n-28.0/nn-NO.xpi) = 0f9c63147569243acc6a79148c80f0343bd4515a181b76dea082062c09c4ae29 -SIZE (xpi/firefox-i18n-28.0/nn-NO.xpi) = 350907 -SHA256 (xpi/firefox-i18n-28.0/or.xpi) = 4077c172b622174323b253ff8ce5a917d8e354d0a6bdfbd20cce8e626a134c87 -SIZE (xpi/firefox-i18n-28.0/or.xpi) = 415914 -SHA256 (xpi/firefox-i18n-28.0/pa-IN.xpi) = 43dd812f1408246270421f628c754b6742cf24fcf0ca6f700743ea3c523152e7 -SIZE (xpi/firefox-i18n-28.0/pa-IN.xpi) = 390707 -SHA256 (xpi/firefox-i18n-28.0/pl.xpi) = 18b5fde187f321ddc3a8f4a84adfab74573ee8109fca026dec5aa77c2ddaddfd -SIZE (xpi/firefox-i18n-28.0/pl.xpi) = 350840 -SHA256 (xpi/firefox-i18n-28.0/pt-BR.xpi) = 39d2f7a4da6be9f6645555d74a7919d4869084425658de599e9ea4e1cb59a07e -SIZE (xpi/firefox-i18n-28.0/pt-BR.xpi) = 364786 -SHA256 (xpi/firefox-i18n-28.0/pt-PT.xpi) = 01e6a29c67209fff477fa0c7b3fa4323493001c5e213fc27c337d9038c4ae7d2 -SIZE (xpi/firefox-i18n-28.0/pt-PT.xpi) = 351712 -SHA256 (xpi/firefox-i18n-28.0/rm.xpi) = 1816eb801fac06e94744b6aa2ebcb1a246e6dbf649cbac451eeb56fd28b44371 -SIZE (xpi/firefox-i18n-28.0/rm.xpi) = 355274 -SHA256 (xpi/firefox-i18n-28.0/ro.xpi) = 3aea16672c42490a2e0fca07e49137ce8fd5b31bdb41e0ec761cd25e234ce80e -SIZE (xpi/firefox-i18n-28.0/ro.xpi) = 389917 -SHA256 (xpi/firefox-i18n-28.0/ru.xpi) = 3322b9e7b6033f0f5e75a2a351ec3acc89566af33dcdb4088b63c2d190591df6 -SIZE (xpi/firefox-i18n-28.0/ru.xpi) = 338409 -SHA256 (xpi/firefox-i18n-28.0/si.xpi) = 14575b7ad943feb270d17c085035d7a8f4868df757891d115eddf660b24ca070 -SIZE (xpi/firefox-i18n-28.0/si.xpi) = 395716 -SHA256 (xpi/firefox-i18n-28.0/sk.xpi) = b943274c6e43b367a263ba3ae412df339d278d803792d9f24446610b3d75d99e -SIZE (xpi/firefox-i18n-28.0/sk.xpi) = 367790 -SHA256 (xpi/firefox-i18n-28.0/sl.xpi) = 3de9c88b58fd5742239d12c9718601bb818928f64232b3b692405d34f1fb41ee -SIZE (xpi/firefox-i18n-28.0/sl.xpi) = 350314 -SHA256 (xpi/firefox-i18n-28.0/son.xpi) = ecc81bed49d7a9fd411fe782f299c604c30445fe27ca2f435a4a781130906ac1 -SIZE (xpi/firefox-i18n-28.0/son.xpi) = 350556 -SHA256 (xpi/firefox-i18n-28.0/sq.xpi) = 44dc62e8306e19c0f03da86d24b081a4ecb1bf8a3ce5a9a6c404118a33b7b88a -SIZE (xpi/firefox-i18n-28.0/sq.xpi) = 366311 -SHA256 (xpi/firefox-i18n-28.0/sr.xpi) = 4c930c91f103fc6da8e98c36c2bbe73d52eddb81e767db8ee52b31d434d90503 -SIZE (xpi/firefox-i18n-28.0/sr.xpi) = 405134 -SHA256 (xpi/firefox-i18n-28.0/sv-SE.xpi) = ede9dea32ce9a76c2dcafa2fa7e0c945c14fcad474bb0f17e1dc5fe66d949c6b -SIZE (xpi/firefox-i18n-28.0/sv-SE.xpi) = 358314 -SHA256 (xpi/firefox-i18n-28.0/ta.xpi) = 3f2159a4dca0be04b92bc8b0e75141605573f029ef25f2866723766e3d67b10d -SIZE (xpi/firefox-i18n-28.0/ta.xpi) = 408325 -SHA256 (xpi/firefox-i18n-28.0/te.xpi) = 084fb31b336c1cde2b306cc0ef267bef3ee0ebe98fc4ce63af65b8a88a405827 -SIZE (xpi/firefox-i18n-28.0/te.xpi) = 421139 -SHA256 (xpi/firefox-i18n-28.0/th.xpi) = d3facd06cba97a1e5417bfec468fafb5773b898c687639f323470aef4ca3e84e -SIZE (xpi/firefox-i18n-28.0/th.xpi) = 406135 -SHA256 (xpi/firefox-i18n-28.0/tr.xpi) = ec03c8da04ddd2f0be3a44fd2fed31fec74ac48f5d421bcd9e760fe93e317cae -SIZE (xpi/firefox-i18n-28.0/tr.xpi) = 361998 -SHA256 (xpi/firefox-i18n-28.0/uk.xpi) = 03964470eabe2d81b66c2b048bd797da3175673863edc2f66390ba18ede2352c -SIZE (xpi/firefox-i18n-28.0/uk.xpi) = 388297 -SHA256 (xpi/firefox-i18n-28.0/vi.xpi) = a7e91ac2ae79cddd545fae73ed8c39af5a9b03a15d92174bfe3efb4a1fafcf67 -SIZE (xpi/firefox-i18n-28.0/vi.xpi) = 378856 -SHA256 (xpi/firefox-i18n-28.0/zh-CN.xpi) = ad95ab921f7c1d561f65dd37eed544c00e7c0d003475feeae40b3dcedee4913e -SIZE (xpi/firefox-i18n-28.0/zh-CN.xpi) = 381762 -SHA256 (xpi/firefox-i18n-28.0/zh-TW.xpi) = a6378d8a1251f3fb1e2f6148a9767529fe9eaed0d44572b958fd37c64c3feab7 -SIZE (xpi/firefox-i18n-28.0/zh-TW.xpi) = 375528 -SHA256 (xpi/firefox-i18n-28.0/zu.xpi) = ccc10b9e39733e6abdd9bd8a52c6ee3cf6c32801635d874aec9533dcc90b821b -SIZE (xpi/firefox-i18n-28.0/zu.xpi) = 365908 +SHA256 (xpi/firefox-i18n-29.0/ach.xpi) = c6ccf91e05b119f39b0d83905ed143e36187649f62389156803a76318300a299 +SIZE (xpi/firefox-i18n-29.0/ach.xpi) = 373393 +SHA256 (xpi/firefox-i18n-29.0/af.xpi) = adf809368117ba8499a6e2f99b331ab32b62c499ba1174e2fe0918f72819e2b3 +SIZE (xpi/firefox-i18n-29.0/af.xpi) = 367124 +SHA256 (xpi/firefox-i18n-29.0/an.xpi) = a82aa53f398d619cdc203adc4b904b58d7f281550d8f631439c53269fa56a4bd +SIZE (xpi/firefox-i18n-29.0/an.xpi) = 373502 +SHA256 (xpi/firefox-i18n-29.0/ar.xpi) = 9dd29397169946d0ea425483c2c3c60f67d8dbc784b3af302416c36aa0b82cae +SIZE (xpi/firefox-i18n-29.0/ar.xpi) = 396597 +SHA256 (xpi/firefox-i18n-29.0/as.xpi) = 2f3a75d484e415551f9d19fb56c8208d6f65beab8db582b7d62f760f1f2f67f4 +SIZE (xpi/firefox-i18n-29.0/as.xpi) = 415330 +SHA256 (xpi/firefox-i18n-29.0/ast.xpi) = f232691daac61375b54312e6ef04cf4edb1270bc569694516d65c9a07f14f033 +SIZE (xpi/firefox-i18n-29.0/ast.xpi) = 324861 +SHA256 (xpi/firefox-i18n-29.0/be.xpi) = 46d25d6aef317349a915d99ee46325ae4de2947dbfd774343c5093f46b5ce098 +SIZE (xpi/firefox-i18n-29.0/be.xpi) = 340365 +SHA256 (xpi/firefox-i18n-29.0/bg.xpi) = a13eaeda2a8e664cb6849b5073b7da6bbf524b1038d40bda6a2b1c61314e6c07 +SIZE (xpi/firefox-i18n-29.0/bg.xpi) = 400750 +SHA256 (xpi/firefox-i18n-29.0/bn-BD.xpi) = be518dbeff0b3e15b28a196bd31c314b67b0c0116ae20c910b93b3a4b27f67d0 +SIZE (xpi/firefox-i18n-29.0/bn-BD.xpi) = 426365 +SHA256 (xpi/firefox-i18n-29.0/bn-IN.xpi) = cd49bf2e39e388ac3ae8f74df4e823f6a7a8ceec6da44fba7c0b59f09179a62d +SIZE (xpi/firefox-i18n-29.0/bn-IN.xpi) = 421119 +SHA256 (xpi/firefox-i18n-29.0/br.xpi) = 1ba6c16865e0181fea267e45e7f4c87a8518f615b522aea9fb952ec94b984bd2 +SIZE (xpi/firefox-i18n-29.0/br.xpi) = 363996 +SHA256 (xpi/firefox-i18n-29.0/bs.xpi) = e968879eda41d0f96e35a21936d883c92110d40497e247a6510977c167dab4aa +SIZE (xpi/firefox-i18n-29.0/bs.xpi) = 371223 +SHA256 (xpi/firefox-i18n-29.0/ca.xpi) = 602eaef7df208c516efeb4333a050e3433e0f3baad901fe0ea6278ba6678a576 +SIZE (xpi/firefox-i18n-29.0/ca.xpi) = 370413 +SHA256 (xpi/firefox-i18n-29.0/cs.xpi) = 7c57f8242a5c9c7ebfeb22fe24c4d6906a378c9c95e95de22a8fb8020911d0a2 +SIZE (xpi/firefox-i18n-29.0/cs.xpi) = 364875 +SHA256 (xpi/firefox-i18n-29.0/csb.xpi) = 86ffb57f543e8efca951974214f9f84b036c42ed9cb8d0d90974fa6691f2e0fe +SIZE (xpi/firefox-i18n-29.0/csb.xpi) = 355955 +SHA256 (xpi/firefox-i18n-29.0/cy.xpi) = 7e41a6edfc20ca0ef55f8e2e34740521b87f36f48ee97dfcad69b25be0f235c6 +SIZE (xpi/firefox-i18n-29.0/cy.xpi) = 364982 +SHA256 (xpi/firefox-i18n-29.0/da.xpi) = f31a19e5512cf07b40548c676d5e53003734bb72d1898d8fe5a0d92d6cbab868 +SIZE (xpi/firefox-i18n-29.0/da.xpi) = 355875 +SHA256 (xpi/firefox-i18n-29.0/de.xpi) = f1e7a8b7b71373bd566c35559667a4da73b92fe86aebfd7acb0b24f2b0090895 +SIZE (xpi/firefox-i18n-29.0/de.xpi) = 363985 +SHA256 (xpi/firefox-i18n-29.0/el.xpi) = 28ce4ac766d10aef112451128ffe56119e972bfe9210a052c534945dee829820 +SIZE (xpi/firefox-i18n-29.0/el.xpi) = 397064 +SHA256 (xpi/firefox-i18n-29.0/en-GB.xpi) = 27e1a9560dacc0b8665f0bf4155669a208a934684fafe8907ee88e1c7927cdd2 +SIZE (xpi/firefox-i18n-29.0/en-GB.xpi) = 352794 +SHA256 (xpi/firefox-i18n-29.0/en-US.xpi) = 0b665ea8cbec2a5db2d130827c3aeb8be79133a611b0241ee11198d2a68cfcfe +SIZE (xpi/firefox-i18n-29.0/en-US.xpi) = 352631 +SHA256 (xpi/firefox-i18n-29.0/en-ZA.xpi) = 00c54af05c8428e387409359f403993f1a141da9a30d4925a92be57fdbfb0eb7 +SIZE (xpi/firefox-i18n-29.0/en-ZA.xpi) = 343162 +SHA256 (xpi/firefox-i18n-29.0/eo.xpi) = f9f6f9071d6b8c128495ed95620180756112647eb76d680583957763ec63554d +SIZE (xpi/firefox-i18n-29.0/eo.xpi) = 369151 +SHA256 (xpi/firefox-i18n-29.0/es-AR.xpi) = 269b4e8486ffb176a1a5082203398ed7f7c398ee0a3377888319431f1697a380 +SIZE (xpi/firefox-i18n-29.0/es-AR.xpi) = 367827 +SHA256 (xpi/firefox-i18n-29.0/es-CL.xpi) = 13c7a3fed0b61018161e45dd20ce6130583b68f270d4a71f4a1703be26d7dc46 +SIZE (xpi/firefox-i18n-29.0/es-CL.xpi) = 314748 +SHA256 (xpi/firefox-i18n-29.0/es-ES.xpi) = e50a73028675b28b8f60094731c96b24713178025a491aa24bacb805dd554e71 +SIZE (xpi/firefox-i18n-29.0/es-ES.xpi) = 305433 +SHA256 (xpi/firefox-i18n-29.0/es-MX.xpi) = a1966155e366c8b9eeaa87eb1d6e76a3c187c3bf6701b27b68c21b41627097cf +SIZE (xpi/firefox-i18n-29.0/es-MX.xpi) = 372449 +SHA256 (xpi/firefox-i18n-29.0/et.xpi) = 1091cb9efa635996c0c9458a62aeaf03023bbaf2428b291ef2d0993ed9139609 +SIZE (xpi/firefox-i18n-29.0/et.xpi) = 352878 +SHA256 (xpi/firefox-i18n-29.0/eu.xpi) = a09f19ceb466f2c7a2e46b4a1f2dec3775d9b0d9a670ba04733b2ae7afbcbda9 +SIZE (xpi/firefox-i18n-29.0/eu.xpi) = 369441 +SHA256 (xpi/firefox-i18n-29.0/fa.xpi) = f27dca27d9215deae207b4ca38e7260421d74fd482eb8a1ddc6d6d0e39c1bc36 +SIZE (xpi/firefox-i18n-29.0/fa.xpi) = 409149 +SHA256 (xpi/firefox-i18n-29.0/ff.xpi) = 23be65bdb50c441ea75e5f3ed143160091a70191192dd4405da7f5a2d7335587 +SIZE (xpi/firefox-i18n-29.0/ff.xpi) = 361587 +SHA256 (xpi/firefox-i18n-29.0/fi.xpi) = 1dc290cf22dcfab88dcb7bdb0a2ecaad4be6163ee1bd8af13f4962ed037c1a11 +SIZE (xpi/firefox-i18n-29.0/fi.xpi) = 363340 +SHA256 (xpi/firefox-i18n-29.0/fr.xpi) = ada8b98915422b83aa4c62bf514456a27e9cedc82ddb6377178ce396f10729a3 +SIZE (xpi/firefox-i18n-29.0/fr.xpi) = 376279 +SHA256 (xpi/firefox-i18n-29.0/fy-NL.xpi) = 6a4d8b5ac760d8860aba66c779f302e19955fd5a232c237297dde3974b72cb25 +SIZE (xpi/firefox-i18n-29.0/fy-NL.xpi) = 372388 +SHA256 (xpi/firefox-i18n-29.0/ga-IE.xpi) = 25f92f7562f119c97189290f8e4746223d2db2ddf3fd260e3ce246119bcfb483 +SIZE (xpi/firefox-i18n-29.0/ga-IE.xpi) = 378267 +SHA256 (xpi/firefox-i18n-29.0/gd.xpi) = b6f370e9e0b6c8d7c9840999d185c50dc9832ba15691c6c2c2f61dd099bf4912 +SIZE (xpi/firefox-i18n-29.0/gd.xpi) = 375410 +SHA256 (xpi/firefox-i18n-29.0/gl.xpi) = b9e476f99b13b29fd84189283b9a7641ee41d641c171a4fa3587493bcb329a97 +SIZE (xpi/firefox-i18n-29.0/gl.xpi) = 363693 +SHA256 (xpi/firefox-i18n-29.0/gu-IN.xpi) = 1730b390f911b26f1d5107cdf79e9dedf1a970be7da9de96010ff1e83da3a1b0 +SIZE (xpi/firefox-i18n-29.0/gu-IN.xpi) = 391891 +SHA256 (xpi/firefox-i18n-29.0/he.xpi) = 5c62998721b69b83e63b4ec107a62e08d03d482c84de2fb3fc2c0844ab1f2315 +SIZE (xpi/firefox-i18n-29.0/he.xpi) = 385480 +SHA256 (xpi/firefox-i18n-29.0/hi-IN.xpi) = 19774e11ea7d30fa748f3d1aedce3c642dfcf83d3eacde963acf16ea38960a0a +SIZE (xpi/firefox-i18n-29.0/hi-IN.xpi) = 410179 +SHA256 (xpi/firefox-i18n-29.0/hr.xpi) = 17240437b1e72eac60776cb3a307d60cbd59abd0444eee475fca8396ef52817f +SIZE (xpi/firefox-i18n-29.0/hr.xpi) = 376605 +SHA256 (xpi/firefox-i18n-29.0/hu.xpi) = 518c74f77b1150ee0a17b94cafe09f3b1a84f972bf0fc6912a7ab32f5aedba08 +SIZE (xpi/firefox-i18n-29.0/hu.xpi) = 372533 +SHA256 (xpi/firefox-i18n-29.0/hy-AM.xpi) = 3052a32a950786aa0e540d4b4ae134d43def23141670c3625bcc9c0f35ad22c3 +SIZE (xpi/firefox-i18n-29.0/hy-AM.xpi) = 419572 +SHA256 (xpi/firefox-i18n-29.0/id.xpi) = 9f8d98a8b1546072a3675383252fbef3fd0fa9c4c41c3d3a9e1e50bb19535019 +SIZE (xpi/firefox-i18n-29.0/id.xpi) = 352597 +SHA256 (xpi/firefox-i18n-29.0/is.xpi) = 021226df2158678fecc9d0958b8a9a27a3cd70e584c9f34d0c7fa444870d78ad +SIZE (xpi/firefox-i18n-29.0/is.xpi) = 364694 +SHA256 (xpi/firefox-i18n-29.0/it.xpi) = 80dde52c62e44e3706c3a228f091c1473bd871f3428c8efa0338890310b954f5 +SIZE (xpi/firefox-i18n-29.0/it.xpi) = 304003 +SHA256 (xpi/firefox-i18n-29.0/ja.xpi) = 5f23242ee1cd8045abd7564a095c5ba11bd98283b1530f1e3c29cf5fbce362c4 +SIZE (xpi/firefox-i18n-29.0/ja.xpi) = 405190 +SHA256 (xpi/firefox-i18n-29.0/kk.xpi) = b608322fe2364a15c2f96ed88449dfac1a71621081489677015aba1593eac32a +SIZE (xpi/firefox-i18n-29.0/kk.xpi) = 408438 +SHA256 (xpi/firefox-i18n-29.0/km.xpi) = a86a3d15e836df6f767b7af53ec3cbe9c329716adfacbe14811739c878365d8d +SIZE (xpi/firefox-i18n-29.0/km.xpi) = 438772 +SHA256 (xpi/firefox-i18n-29.0/kn.xpi) = 06bc663cf5bd3c70895ba07133cbe14adf36f08a1c375d8e3a9083ab4cda8981 +SIZE (xpi/firefox-i18n-29.0/kn.xpi) = 421792 +SHA256 (xpi/firefox-i18n-29.0/ko.xpi) = eda45d7394b912213cd1e724cf8b45126c7f60cc15cc7289b11c1abb7112b0e1 +SIZE (xpi/firefox-i18n-29.0/ko.xpi) = 372824 +SHA256 (xpi/firefox-i18n-29.0/ku.xpi) = 6fed426902356d91a149187050e97a88b590064be33a996229e328c9ac2ddb5a +SIZE (xpi/firefox-i18n-29.0/ku.xpi) = 377944 +SHA256 (xpi/firefox-i18n-29.0/lij.xpi) = ffcc04ba6231154b7129225b4f8a62ff81c942940b8d055f38d2c770da5baa46 +SIZE (xpi/firefox-i18n-29.0/lij.xpi) = 353132 +SHA256 (xpi/firefox-i18n-29.0/lt.xpi) = 5f0ab5186966f4ef688d089cc1c02256fd58009023b1a65087243cf47898877d +SIZE (xpi/firefox-i18n-29.0/lt.xpi) = 382910 +SHA256 (xpi/firefox-i18n-29.0/lv.xpi) = 7904ce0bd050e3c7bdc5047af6a8483ec6353d7180bf638f73dc4e86caec41cd +SIZE (xpi/firefox-i18n-29.0/lv.xpi) = 360720 +SHA256 (xpi/firefox-i18n-29.0/mai.xpi) = c900355b017b2d6f823749eb2b59e7138885a106a3f935be9a7e91f50e50380b +SIZE (xpi/firefox-i18n-29.0/mai.xpi) = 410012 +SHA256 (xpi/firefox-i18n-29.0/mk.xpi) = 2beb5a8a7c8d4a824b8901a6cbcaf81297347c4b83b1b55bab8855e0e5e87e6b +SIZE (xpi/firefox-i18n-29.0/mk.xpi) = 411450 +SHA256 (xpi/firefox-i18n-29.0/ml.xpi) = 49995a410b48b0c53ff4994633602f868796c24a28d54bd1260b1f43adc79475 +SIZE (xpi/firefox-i18n-29.0/ml.xpi) = 430792 +SHA256 (xpi/firefox-i18n-29.0/mr.xpi) = 87bd2e7b71bcc21458b5d44dd83d9f2eeb461c53cd74c4a76d4eb2a6cba033c1 +SIZE (xpi/firefox-i18n-29.0/mr.xpi) = 408570 +SHA256 (xpi/firefox-i18n-29.0/ms.xpi) = 07a8b2295a6633ec838a6c8a431faff915b5f92e60d3c36aa92f1d6697bd8a49 +SIZE (xpi/firefox-i18n-29.0/ms.xpi) = 368830 +SHA256 (xpi/firefox-i18n-29.0/nb-NO.xpi) = afea740e93a87b7821fcf7885f8c44d8dcd865d1e2418d05530299ca2471a2d3 +SIZE (xpi/firefox-i18n-29.0/nb-NO.xpi) = 362513 +SHA256 (xpi/firefox-i18n-29.0/nl.xpi) = 36dd807b1b080c45a6b68fae77843d30f4cf7291bd29a61a8cebd509aeb470cd +SIZE (xpi/firefox-i18n-29.0/nl.xpi) = 361308 +SHA256 (xpi/firefox-i18n-29.0/nn-NO.xpi) = 9522236bee6c980595ce05f9320d915a31b272a28a878eeab867329357156a9a +SIZE (xpi/firefox-i18n-29.0/nn-NO.xpi) = 358819 +SHA256 (xpi/firefox-i18n-29.0/or.xpi) = 2b78878aa2c06143887d7f7c1f73f3c2d5c98cba58e06df5d96ecfbf9888e143 +SIZE (xpi/firefox-i18n-29.0/or.xpi) = 423772 +SHA256 (xpi/firefox-i18n-29.0/pa-IN.xpi) = 3a372d31c10dfc267cc381974a365eb4b44b6dd70d3054ac624f84fe3b41801c +SIZE (xpi/firefox-i18n-29.0/pa-IN.xpi) = 401685 +SHA256 (xpi/firefox-i18n-29.0/pl.xpi) = 950ed718076217f4ee11c0a21cdc59005b06757af81a4d5cd028d00dc853c3b0 +SIZE (xpi/firefox-i18n-29.0/pl.xpi) = 354459 +SHA256 (xpi/firefox-i18n-29.0/pt-BR.xpi) = 28d5e2814fa7ac74b9ce44c73b1680d6b2360820f51d373c81fc4fc8304b7a7f +SIZE (xpi/firefox-i18n-29.0/pt-BR.xpi) = 372122 +SHA256 (xpi/firefox-i18n-29.0/pt-PT.xpi) = fd74a1e2243899aae3c39e46a2d101338afa10da731a60f1b94ba6deffa2a9b2 +SIZE (xpi/firefox-i18n-29.0/pt-PT.xpi) = 359723 +SHA256 (xpi/firefox-i18n-29.0/rm.xpi) = 9ed40581c971918ea80b17e21acc8b331519b82ee322c6829e482edda6867914 +SIZE (xpi/firefox-i18n-29.0/rm.xpi) = 362965 +SHA256 (xpi/firefox-i18n-29.0/ro.xpi) = d237497e017ef6764fae81477b1ad6593d6d03c432641e14bc87e88cb1ab30c8 +SIZE (xpi/firefox-i18n-29.0/ro.xpi) = 397540 +SHA256 (xpi/firefox-i18n-29.0/ru.xpi) = 5c58a458ce5aa0cb974bd7c750dd155dd0080385bfe97344bb07ca7070d46f1e +SIZE (xpi/firefox-i18n-29.0/ru.xpi) = 344166 +SHA256 (xpi/firefox-i18n-29.0/si.xpi) = f423bc581a57d4f1e315d3f4e591eee9b0b34b0ad26c7356957684ea80607371 +SIZE (xpi/firefox-i18n-29.0/si.xpi) = 403345 +SHA256 (xpi/firefox-i18n-29.0/sk.xpi) = c6e1d20bb1cead467ef3a4782e48f72fe9d577d2e5bf40aafe0f0700f6d86f88 +SIZE (xpi/firefox-i18n-29.0/sk.xpi) = 375676 +SHA256 (xpi/firefox-i18n-29.0/sl.xpi) = c5b6e6aed27cfa73480b89134786f2a450d4fe0f1879389262f0f6dc9892bcd2 +SIZE (xpi/firefox-i18n-29.0/sl.xpi) = 358502 +SHA256 (xpi/firefox-i18n-29.0/son.xpi) = 482834fa2c49c3bddfb48127d83258c1dde5dfc0cc5fd17fd66304fa65e6dcd8 +SIZE (xpi/firefox-i18n-29.0/son.xpi) = 358441 +SHA256 (xpi/firefox-i18n-29.0/sq.xpi) = f001eece8b1b7fc9eec35084679155802062fedd1aa096c2ba74be8e22682131 +SIZE (xpi/firefox-i18n-29.0/sq.xpi) = 374244 +SHA256 (xpi/firefox-i18n-29.0/sr.xpi) = f590d1a96a5231b4a448ca27bde8ffd2a3721f5c8d628475e4705980013d4c21 +SIZE (xpi/firefox-i18n-29.0/sr.xpi) = 412774 +SHA256 (xpi/firefox-i18n-29.0/sv-SE.xpi) = ccb78f6c29e470b15df6c0b0a1a9186ea6da1e95a01c5acf88d6d5663c0ddd37 +SIZE (xpi/firefox-i18n-29.0/sv-SE.xpi) = 368437 +SHA256 (xpi/firefox-i18n-29.0/ta.xpi) = 3a240719bae5fdd5f1dee8502a573c68d496dbcbb89e40fa2588a8f8cded48d1 +SIZE (xpi/firefox-i18n-29.0/ta.xpi) = 416214 +SHA256 (xpi/firefox-i18n-29.0/te.xpi) = 1a42033323e58bb24a230ccc547498d6b54864e6566ce38f97c8f5bc9dc802b1 +SIZE (xpi/firefox-i18n-29.0/te.xpi) = 429025 +SHA256 (xpi/firefox-i18n-29.0/th.xpi) = 9c91150755449786b400af12067d648f5751e78396bf72f9c604874dcdee5f11 +SIZE (xpi/firefox-i18n-29.0/th.xpi) = 413958 +SHA256 (xpi/firefox-i18n-29.0/tr.xpi) = 49c22b8f7384f83249cd1468e14f9aea657a4196fcf11125bfc44e112b6f93cb +SIZE (xpi/firefox-i18n-29.0/tr.xpi) = 369613 +SHA256 (xpi/firefox-i18n-29.0/uk.xpi) = 2f232cc5a4e4b72e11e4751be8667f5c532952ba5864369e07a9438c25afc317 +SIZE (xpi/firefox-i18n-29.0/uk.xpi) = 399496 +SHA256 (xpi/firefox-i18n-29.0/vi.xpi) = e210ec8c8f985d5c6e31e37e191c35d270c310c647cb6e32cc1bf35e93194348 +SIZE (xpi/firefox-i18n-29.0/vi.xpi) = 386470 +SHA256 (xpi/firefox-i18n-29.0/xh.xpi) = 693c3c04abe48a7bf8e0c13c8192451bb70687581b79da13bf2905499c2150e8 +SIZE (xpi/firefox-i18n-29.0/xh.xpi) = 363925 +SHA256 (xpi/firefox-i18n-29.0/zh-CN.xpi) = fe6b9bb7d2dd6227fb6ea3b5ad7ecca1fb02105f10cecefc232aa9f7bc0c7096 +SIZE (xpi/firefox-i18n-29.0/zh-CN.xpi) = 389326 +SHA256 (xpi/firefox-i18n-29.0/zh-TW.xpi) = 34cf42493ffa140f869b48d6deaa10d43664e7dd7bfea6bd4a979062ef476bc1 +SIZE (xpi/firefox-i18n-29.0/zh-TW.xpi) = 386290 +SHA256 (xpi/firefox-i18n-29.0/zu.xpi) = 0ba903dcf73dcd6255e81eb049c0660eb876caef4c83b5ffbc5e1470a5918bc6 +SIZE (xpi/firefox-i18n-29.0/zu.xpi) = 373428 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index b0d3ccaad13f..4a37b245eaab 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,22 +2,25 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 28.0 +DISTVERSION= 29.0 PORTEPOCH= 1 CATEGORIES= www ipv6 -MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source +MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ + https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.10.3:${PORTSDIR}/devel/nspr \ - nss>=3.15.4:${PORTSDIR}/security/nss \ + nss>=3.16:${PORTSDIR}/security/nss \ + soundtouch>=1.7.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.1:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.8.2:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ @@ -78,6 +81,10 @@ CXXFLAGS+= -O1 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 + post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 9f74482ee364..ba0c27ea77cd 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-28.0.source.tar.bz2) = 2ffd0484e7eab52166b851681878a86d54223a6764c756721430fae8e1599628 -SIZE (firefox-28.0.source.tar.bz2) = 134968426 +SHA256 (firefox-29.0.source.tar.bz2) = 64402a1f1359f3ea30767a94977ae823ac25b39c6d54f9fe6db444ed127db892 +SIZE (firefox-29.0.source.tar.bz2) = 143163777 diff --git a/www/firefox/files/patch-bug806917 b/www/firefox/files/patch-bug806917 index 16e326831c71..ca6d5302613b 100644 --- a/www/firefox/files/patch-bug806917 +++ b/www/firefox/files/patch-bug806917 @@ -5,24 +5,24 @@ Date: Fri Jan 03 08:16:54 2014 -0800 Bug 806917 - support GStreamer 1.0 --- configure.in | 66 ++- - content/media/gstreamer/GStreamerAllocator.cpp | 198 +++++++ + content/media/gstreamer/GStreamerAllocator.cpp | 197 +++++++ content/media/gstreamer/GStreamerAllocator.h | 25 + content/media/gstreamer/GStreamerFormatHelper.cpp | 13 +- content/media/gstreamer/GStreamerFunctionList.h | 93 +++- content/media/gstreamer/GStreamerLoader.cpp | 48 +- content/media/gstreamer/GStreamerLoader.h | 8 + - content/media/gstreamer/GStreamerReader-0.10.cpp | 203 +++++++ + content/media/gstreamer/GStreamerReader-0.10.cpp | 200 +++++++ content/media/gstreamer/GStreamerReader.cpp | 632 ++++++++++++++-------- content/media/gstreamer/GStreamerReader.h | 42 +- content/media/gstreamer/moz.build | 11 +- content/media/test/manifest.js | 6 +- - 12 files changed, 1061 insertions(+), 284 deletions(-) + 12 files changed, 1057 insertions(+), 284 deletions(-) diff --git configure.in configure.in index 9776b8d..0b1698d 100644 --- configure.in +++ configure.in -@@ -3955,6 +3955,7 @@ MOZ_SAMPLE_TYPE_FLOAT32= +@@ -3988,6 +3988,7 @@ MOZ_SAMPLE_TYPE_FLOAT32= MOZ_SAMPLE_TYPE_S16= MOZ_OPUS=1 MOZ_WEBM=1 @@ -30,12 +30,13 @@ index 9776b8d..0b1698d 100644 MOZ_DIRECTSHOW= MOZ_WMF= MOZ_FMP4= -@@ -5606,43 +5607,60 @@ dnl = Enable GStreamer - dnl ======================================================== - if test "$OS_TARGET" = "Linux"; then - MOZ_GSTREAMER=1 -+ GST_API_VERSION=0.10 - fi +@@ -5634,44 +5635,61 @@ WINNT|Darwin|Android) + ;; + *) + MOZ_GSTREAMER=1 ++ GST_API_VERSION=0.10 + ;; + esac -MOZ_ARG_ENABLE_BOOL(gstreamer, -[ --enable-gstreamer Enable GStreamer support], @@ -120,7 +121,7 @@ new file mode 100644 index 0000000..69d0385 --- /dev/null +++ content/media/gstreamer/GStreamerAllocator.cpp -@@ -0,0 +1,198 @@ +@@ -0,0 +1,197 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif @@ -179,8 +180,7 @@ index 0000000..69d0385 + mem->image->Release(); + + ImageContainer* container = ((MozGfxMemoryAllocator*) mem->memory.allocator)->reader->GetImageContainer(); -+ ImageFormat format = PLANAR_YCBCR; -+ mem->image = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get()); ++ mem->image = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(ImageFormat::PLANAR_YCBCR).get()); + mem->data = mem->image->AllocateAndGetNewBuffer(mem->memory.size); +} + @@ -673,7 +673,7 @@ new file mode 100644 index 0000000..fb98bde --- /dev/null +++ content/media/gstreamer/GStreamerReader-0.10.cpp -@@ -0,0 +1,203 @@ +@@ -0,0 +1,200 @@ +#include "nsError.h" +#include "MediaDecoderStateMachine.h" +#include "AbstractMediaDecoder.h" @@ -718,13 +718,10 @@ index 0000000..fb98bde +{ + /* allocate an image using the container */ + ImageContainer* container = mDecoder->GetImageContainer(); -+ if (!container) { -+ // We don't have an ImageContainer. We probably belong to an <audio> -+ // element. -+ return GST_FLOW_NOT_SUPPORTED; ++ if (container == nullptr) { ++ return GST_FLOW_ERROR; + } -+ ImageFormat format = PLANAR_YCBCR; -+ PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get()); ++ PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(ImageFormat::PLANAR_YCBCR).get()); + nsRefPtr<PlanarYCbCrImage> image = dont_AddRef(img); + + /* prepare a GstBuffer pointing to the underlying PlanarYCbCrImage buffer */ @@ -802,16 +799,16 @@ index 0000000..fb98bde + + PlanarYCbCrImage::Data data; + data.mPicX = data.mPicY = 0; -+ data.mPicSize = nsIntSize(mPicture.width, mPicture.height); -+ data.mStereoMode = STEREO_MODE_MONO; ++ data.mPicSize = gfx::IntSize(mPicture.width, mPicture.height); ++ data.mStereoMode = StereoMode::MONO; + + data.mYChannel = GST_BUFFER_DATA(aBuffer); + data.mYStride = gst_video_format_get_row_stride(mFormat, 0, mPicture.width); -+ data.mYSize = nsIntSize(data.mYStride, ++ data.mYSize = gfx::IntSize(data.mYStride, + gst_video_format_get_component_height(mFormat, 0, mPicture.height)); + data.mYSkip = 0; + data.mCbCrStride = gst_video_format_get_row_stride(mFormat, 1, mPicture.width); -+ data.mCbCrSize = nsIntSize(data.mCbCrStride, ++ data.mCbCrSize = gfx::IntSize(data.mCbCrStride, + gst_video_format_get_component_height(mFormat, 1, mPicture.height)); + data.mCbChannel = data.mYChannel + gst_video_format_get_component_offset(mFormat, 1, + mPicture.width, mPicture.height); @@ -1047,7 +1044,7 @@ index 2be45dc..54509e3 100644 g_object_set(mPlayBin, "uri", "appsrc://", "video-sink", mVideoSink, -@@ -331,7 +340,7 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo, +@@ -331,13 +340,12 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo, /* Little trick: set the target caps to "skip" so that playbin2 fails to * find a decoder for the stream we want to skip. */ @@ -1056,7 +1053,13 @@ index 2be45dc..54509e3 100644 g_object_set(filter, "caps", filterCaps, nullptr); gst_caps_unref(filterCaps); gst_object_unref(filter); -@@ -358,6 +367,7 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo, + } + +- /* start the pipeline */ + LOG(PR_LOG_DEBUG, "starting metadata pipeline"); + gst_element_set_state(mPlayBin, GST_STATE_PAUSED); + +@@ -358,6 +366,7 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo, gst_message_unref(message); ret = NS_ERROR_FAILURE; } else { @@ -1227,7 +1230,7 @@ index 2be45dc..54509e3 100644 * something else has happened (Eos, etc...). Return to the state machine * to process it. */ -@@ -524,24 +573,43 @@ bool GStreamerReader::DecodeAudioData() +@@ -533,24 +584,44 @@ bool GStreamerReader::DecodeAudioData() } } @@ -1245,8 +1248,9 @@ index 2be45dc..54509e3 100644 int64_t timestamp = GST_BUFFER_TIMESTAMP(buffer); timestamp = gst_segment_to_stream_time(&mAudioSegment, GST_FORMAT_TIME, timestamp); -+ ++ timestamp = GST_TIME_AS_USECONDS(timestamp); ++ int64_t duration = 0; if (GST_CLOCK_TIME_IS_VALID(GST_BUFFER_DURATION(buffer))) duration = GST_TIME_AS_USECONDS(GST_BUFFER_DURATION(buffer)); @@ -1313,7 +1317,7 @@ index 2be45dc..54509e3 100644 if ((aKeyFrameSkip && !isKeyframe)) { gst_buffer_unref(buffer); return true; -@@ -618,73 +695,55 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, +@@ -611,10 +687,18 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, "frame has invalid timestamp"); timestamp = GST_TIME_AS_USECONDS(timestamp); @@ -1326,16 +1330,14 @@ index 2be45dc..54509e3 100644 + if (timestamp < aTimeThreshold) { LOG(PR_LOG_DEBUG, "skipping frame %" GST_TIME_FORMAT -- " threshold %" GST_TIME_FORMAT, + " threshold %" GST_TIME_FORMAT, - GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold)); -+ " threshold %" GST_TIME_FORMAT, -+ GST_TIME_ARGS(timestamp * 1000), -+ GST_TIME_ARGS(aTimeThreshold * 1000)); ++ GST_TIME_ARGS(timestamp * 1000), ++ GST_TIME_ARGS(aTimeThreshold * 1000)); gst_buffer_unref(buffer); return true; } -- - if (!buffer) +@@ -623,61 +707,36 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, /* no more frames */ return false; @@ -1499,7 +1501,7 @@ index 2be45dc..54509e3 100644 if (format == GST_FORMAT_TIME) { LOG(PR_LOG_DEBUG, "pipeline duration %" GST_TIME_FORMAT, GST_TIME_ARGS (duration)); -@@ -866,108 +954,6 @@ gboolean GStreamerReader::SeekData(GstAppSrc* aSrc, guint64 aOffset) +@@ -893,109 +984,6 @@ gboolean GStreamerReader::SeekData(GstAppSrc* aSrc, guint64 aOffset) return NS_SUCCEEDED(rv); } @@ -1563,8 +1565,9 @@ index 2be45dc..54509e3 100644 - // element. - return GST_FLOW_NOT_SUPPORTED; - } -- ImageFormat format = PLANAR_YCBCR; -- PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get()); +- PlanarYCbCrImage* img = +- reinterpret_cast<PlanarYCbCrImage*>( +- container->CreateImage(ImageFormat::PLANAR_YCBCR).get()); - nsRefPtr<PlanarYCbCrImage> image = dont_AddRef(img); - - /* prepare a GstBuffer pointing to the underlying PlanarYCbCrImage buffer */ @@ -1791,16 +1794,16 @@ index 2be45dc..54509e3 100644 + "Unsupported number of components in video frame"); + + aData->mPicX = aData->mPicY = 0; -+ aData->mPicSize = nsIntSize(mPicture.width, mPicture.height); -+ aData->mStereoMode = STEREO_MODE_MONO; ++ aData->mPicSize = gfx::IntSize(mPicture.width, mPicture.height); ++ aData->mStereoMode = StereoMode::MONO; + + aData->mYChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 0); + aData->mYStride = GST_VIDEO_FRAME_COMP_STRIDE(aFrame, 0); -+ aData->mYSize = nsIntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 0), ++ aData->mYSize = gfx::IntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 0), + GST_VIDEO_FRAME_COMP_HEIGHT(aFrame, 0)); + aData->mYSkip = GST_VIDEO_FRAME_COMP_PSTRIDE(aFrame, 0) - 1; + aData->mCbCrStride = GST_VIDEO_FRAME_COMP_STRIDE(aFrame, 1); -+ aData->mCbCrSize = nsIntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 1), ++ aData->mCbCrSize = gfx::IntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 1), + GST_VIDEO_FRAME_COMP_HEIGHT(aFrame, 1)); + aData->mCbChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 1); + aData->mCrChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 2); diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985 index 524499cef75c..3c633bbb466c 100644 --- a/www/firefox/files/patch-bug826985 +++ b/www/firefox/files/patch-bug826985 @@ -26,25 +26,26 @@ index 55e4cd1..76567b3 100644 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 +--- build/gyp.mozbuild ++++ 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 --- media/webrtc/signaling/test/Makefile.in +++ media/webrtc/signaling/test/Makefile.in -@@ -17,6 +17,7 @@ LIBS = \ +@@ -7,6 +7,7 @@ LIBS = \ + $(NSPR_LIBS) \ $(NSS_LIBS) \ $(REALTIME_LIBS) \ - $(MOZ_JS_LIBS) \ + $(MOZ_LIBV4L2_LIBS) \ $(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \ @@ -152,11 +153,14 @@ diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in index 9c16ffa..1db3794 100644 --- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -121,6 +121,7 @@ endif +@@ -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_WEBRTC_SIGNALING - SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/webrtc/signaling/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ ++endif ++ + ifdef MOZ_WEBRTC + ifeq (WINNT,$(OS_TARGET)) + EXTRA_DSO_LDOPTS += \ diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568 index bb98b518518b..a253bbdcaf66 100644 --- a/www/firefox/files/patch-bug847568 +++ b/www/firefox/files/patch-bug847568 @@ -14,10 +14,10 @@ index 14bfc0d..5383399 100644 $(INSTALL) system_wrappers $(DIST) diff --git config/system-headers config/system-headers -index 126391e..b711fc3 100644 +index 18e8703..bdc5f82 100644 --- config/system-headers +++ config/system-headers -@@ -1144,3 +1144,11 @@ unicode/utypes.h +@@ -1145,3 +1145,11 @@ unicode/utypes.h #endif libutil.h unwind.h @@ -30,36 +30,54 @@ index 126391e..b711fc3 100644 +harfbuzz/hb.h +#endif diff --git configure.in configure.in -index bbc7b40..1747206 100644 +index ac38f40..87536b7 100644 --- configure.in +++ configure.in -@@ -7848,6 +7848,34 @@ if test "$USE_FC_FREETYPE"; then +@@ -8032,6 +8032,52 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== -+dnl Check for graphite2 and harfbuzz ++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= ) ++MOZ_NATIVE_HARFBUZZ=) + +if test -n "$MOZ_NATIVE_HARFBUZZ"; then + PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25) +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= ) ++MOZ_NATIVE_GRAPHITE2=) + +if test -n "$MOZ_NATIVE_GRAPHITE2"; then -+ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2 >= 1.2.4) ++ PKG_CHECK_MODULES(MOZ_GRAPHITE2, 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,4) ++ #error "Insufficient graphite2 version." ++ #endif ++ ], [], ++ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) +fi ++ +AC_SUBST(MOZ_NATIVE_GRAPHITE2) +AC_SUBST(MOZ_GRAPHITE2_CFLAGS) +AC_SUBST(MOZ_GRAPHITE2_LIBS) @@ -110,7 +128,7 @@ index 519aa46..6929751 100644 'thebes', 'ipc', diff --git gfx/skia/Makefile.in gfx/skia/Makefile.in -index 07a77a3..067f7bd 100644 +index ee0efb2..98e169d6f 100644 --- gfx/skia/Makefile.in +++ gfx/skia/Makefile.in @@ -15,6 +15,10 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) @@ -123,9 +141,9 @@ index 07a77a3..067f7bd 100644 + include $(topsrcdir)/config/rules.mk - ifneq (,$(INTEL_ARCHITECTURE)) + ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1) diff --git gfx/thebes/Makefile.in gfx/thebes/Makefile.in -index e9f6b6c..0df2d8d 100644 +index 45c36ae..79d32cf 100644 --- gfx/thebes/Makefile.in +++ gfx/thebes/Makefile.in @@ -13,6 +13,14 @@ DEFINES := $(filter-out -DUNICODE,$(DEFINES)) @@ -144,7 +162,7 @@ index e9f6b6c..0df2d8d 100644 CXXFLAGS += $(CAIRO_FT_CFLAGS) endif diff --git intl/unicharutil/util/Makefile.in intl/unicharutil/util/Makefile.in -index f6b9f7c..11c44f4 100644 +index f6b9f7c..60863f4 100644 --- intl/unicharutil/util/Makefile.in +++ intl/unicharutil/util/Makefile.in @@ -21,3 +21,7 @@ ifdef _MSC_VER @@ -153,25 +171,28 @@ index f6b9f7c..11c44f4 100644 endif + +ifdef MOZ_NATIVE_HARFBUZZ -+nsUnicodePropertyData.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS) ++CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) +endif diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in -index 1cacbd7..a8cd156 100644 +index 1cacbd7..f5d72bb 100644 --- netwerk/dns/Makefile.in +++ netwerk/dns/Makefile.in -@@ -9,3 +9,7 @@ include $(topsrcdir)/config/rules.mk - # for effective TLD data. - etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat - $(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc -+ +@@ -5,6 +5,10 @@ + + include $(topsrcdir)/config/rules.mk + +ifdef MOZ_NATIVE_HARFBUZZ -+nsIDNService.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS) ++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 007f272..27f488e 100644 +index 67f0db9..d42137a 100644 --- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -103,6 +103,14 @@ ifndef MOZ_TREE_PIXMAN +@@ -89,6 +89,14 @@ ifndef MOZ_TREE_PIXMAN EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS) endif diff --git a/www/firefox/files/patch-bug878791 b/www/firefox/files/patch-bug878791 deleted file mode 100644 index abcf45d39b9c..000000000000 --- a/www/firefox/files/patch-bug878791 +++ /dev/null @@ -1,11 +0,0 @@ ---- toolkit/components/osfile/modules/osfile_unix_allthreads.jsm.orig 2013-05-11 21:19:53.000000000 +0200 -+++ toolkit/components/osfile/modules/osfile_unix_allthreads.jsm 2013-06-02 17:15:05.000000000 +0200 -@@ -41,7 +41,7 @@ let Const = SharedAll.Constants.libc; - // 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 { diff --git a/www/firefox/files/patch-bug916589 b/www/firefox/files/patch-bug916589 index 664a7b167314..5748c3316f85 100644 --- a/www/firefox/files/patch-bug916589 +++ b/www/firefox/files/patch-bug916589 @@ -2,12 +2,16 @@ diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/qu index 5b50785..7cf47d5 100644 --- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h +++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -@@ -31,11 +31,14 @@ +@@ -31,11 +31,18 @@ */ -#ifndef _SYS_QUEUE_H_ +#if (defined(BSD) && !defined(__OpenBSD__)) || defined(DARWIN) +#include_next <sys/queue.h> ++# if defined(__DragonFly__) ++#define STAILQ_FOREACH_SAFE STAILQ_FOREACH_MUTABLE ++#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE ++# endif +#elif !defined(_SYS_QUEUE_H_) #define _SYS_QUEUE_H_ diff --git a/www/firefox/files/patch-bug948946 b/www/firefox/files/patch-bug948946 deleted file mode 100644 index 531fc19f8b46..000000000000 --- a/www/firefox/files/patch-bug948946 +++ /dev/null @@ -1,45 +0,0 @@ -diff --git browser/themes/shared/devtools/common.css browser/themes/shared/devtools/common.css -index a8208dc..df70486 100644 ---- browser/themes/shared/devtools/common.css -+++ browser/themes/shared/devtools/common.css -@@ -11,13 +11,13 @@ - .devtools-monospace { - %ifdef XP_MACOSX - font-family: Menlo, monospace; --%endif --%ifdef XP_LINUX -+%elifdef XP_WIN -+ font-family: Consolas, monospace; -+%else - font-family: monospace; -- font-size: 80%; - %endif --%ifdef XP_WIN -- font-family: Consolas, monospace; -+%if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) -+ font-size: 80%; - %endif - } - -@@ -62,7 +62,7 @@ - background-image: linear-gradient(to bottom, hsla(209,18%,18%,0.9), hsl(210,11%,16%)); - border-radius: 3px; - overflow-x: hidden; --%ifdef XP_LINUX -+%if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) - max-height: 32rem; - %else - max-height: 40rem; -diff --git browser/themes/shared/devtools/highlighter.inc.css browser/themes/shared/devtools/highlighter.inc.css -index 5b881b5..050f78b 100644 ---- browser/themes/shared/devtools/highlighter.inc.css -+++ browser/themes/shared/devtools/highlighter.inc.css -@@ -54,7 +54,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes { - padding: 0; - width: 26px; - min-height: 26px; --%ifndef XP_LINUX -+%if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT) - background-color: transparent; - %endif - } diff --git a/www/firefox/files/patch-bug961264 b/www/firefox/files/patch-bug961264 index 85bc94d001ff..94fd84ce5cb6 100644 --- a/www/firefox/files/patch-bug961264 +++ b/www/firefox/files/patch-bug961264 @@ -142,9 +142,9 @@ diff --git js/src/configure.in js/src/configure.in index bddd46d..d4b522e 100644 --- js/src/configure.in +++ 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 @@ index bddd46d..d4b522e 100644 - ]) - 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 @@ index bddd46d..d4b522e 100644 - 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 diff --git a/www/firefox/files/patch-bug961816 b/www/firefox/files/patch-bug961816 deleted file mode 100644 index 2e4d147f18f6..000000000000 --- a/www/firefox/files/patch-bug961816 +++ /dev/null @@ -1,48 +0,0 @@ -diff --git config/system-headers config/system-headers -index 8803150..ae38d68 100644 ---- config/system-headers -+++ config/system-headers -@@ -1145,3 +1145,4 @@ unicode/ustring.h - unicode/utypes.h - #endif - libutil.h -+unwind.h -diff --git configure.in configure.in -index f452a5e..a1ebbcc 100644 ---- configure.in -+++ 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 ---- js/src/config/system-headers -+++ js/src/config/system-headers -@@ -1145,3 +1145,4 @@ unicode/ustring.h - unicode/utypes.h - #endif - libutil.h -+unwind.h -diff --git configure.in configure.in -index f452a5e..a1ebbcc 100644 ---- js/src/configure.in -+++ 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 ======================================================== diff --git a/www/firefox/files/patch-bug962345 b/www/firefox/files/patch-bug962345 index a606ec98d4bb..98bb02ffd8c3 100644 --- a/www/firefox/files/patch-bug962345 +++ b/www/firefox/files/patch-bug962345 @@ -7,12 +7,3 @@ index 8803150..ae38d68 100644 libutil.h unwind.h +cairo-qt.h -diff --git config/system-headers config/system-headers -index 8803150..ae38d68 100644 ---- js/src/config/system-headers -+++ js/src/config/system-headers -@@ -1144,3 +1144,4 @@ unicode/utypes.h - #endif - libutil.h - unwind.h -+cairo-qt.h diff --git a/www/firefox/files/patch-no-videoio.h b/www/firefox/files/patch-bug985848 index c20c0e039827..c20c0e039827 100644 --- a/www/firefox/files/patch-no-videoio.h +++ b/www/firefox/files/patch-bug985848 diff --git a/www/firefox/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp b/www/firefox/files/patch-bug991253 index 161feb2ca7b5..161feb2ca7b5 100644 --- a/www/firefox/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp +++ b/www/firefox/files/patch-bug991253 diff --git a/www/firefox/files/patch-config-baseconfig.mk b/www/firefox/files/patch-config-baseconfig.mk index e2564e07619c..9db69516cbcc 100644 --- a/www/firefox/files/patch-config-baseconfig.mk +++ b/www/firefox/files/patch-config-baseconfig.mk @@ -9,6 +9,6 @@ +idldir = $(datadir)/idl/%%MOZILLA%% +installdir = $(libdir)/%%MOZILLA%% +sdkdir = $(libdir)/%%MOZILLA%% - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't + ifndef TOP_DIST + TOP_DIST = dist + endif diff --git a/www/firefox/files/patch-bug791305 b/www/firefox/files/patch-ijg-libjpeg index ef75e4a17bb5..406bb1627d6e 100644 --- a/www/firefox/files/patch-bug791305 +++ b/www/firefox/files/patch-ijg-libjpeg @@ -1,19 +1,4 @@ -commit c269a16 -Author: Jeff Muizelaar <jmuizelaar@mozilla.com> -Date: Fri Sep 14 15:54:55 2012 -0400 - - Bug 791305. Use libjpeg's color conversion code instead of our own. r=joe,r=khuey - - libjpeg-turbo supports converting directly to a format compatible with cairo's - FORMAT_RGB24. Use that instead of our own handcoded function. This also gives - us SSE2 and NEON version of this function. - - --HG-- - extra : rebase_source : 18f48925f023a33ec2a097d4f4e5cc2ab40be1e9 ---- - configure.in | 6 +- - image/decoders/nsJPEGDecoder.cpp | 311 ++------------------------------------- - 2 files changed, 20 insertions(+), 297 deletions(-) +# Partially revert bug 791305 to allow building with system IJG jpeg library diff --git configure.in configure.in index f0aeb5d..1c01010 100644 diff --git a/www/firefox/files/patch-js-src-Makefile.in b/www/firefox/files/patch-js-src-Makefile.in deleted file mode 100644 index fd51943d652b..000000000000 --- a/www/firefox/files/patch-js-src-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/Makefile.in~ -+++ js/src/Makefile.in -@@ -373,7 +373,7 @@ endif - ifdef MOZ_SHARED_ICU - EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS) - else --SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS) -+SHARED_LIBRARY_LIBS += $(filter-out -L% -l%,$(MOZ_ICU_LIBS)) - endif - - # Prevent floating point errors caused by VC++ optimizations diff --git a/www/firefox/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c b/www/firefox/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c new file mode 100644 index 000000000000..69658e277b41 --- /dev/null +++ b/www/firefox/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c @@ -0,0 +1,16 @@ +--- media/mtransport/third_party/nICEr/src/util/mbslen.c~ ++++ media/mtransport/third_party/nICEr/src/util/mbslen.c +@@ -54,6 +54,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # endif + #endif + ++#ifdef __DragonFly__ ++#include <osreldate.h> ++# if __DragonFly_version > 300502 ++# define HAVE_XLOCALE ++# endif ++#endif ++ + #ifdef HAVE_XLOCALE + #include <xlocale.h> + #endif /* HAVE_XLOCALE */ diff --git a/www/firefox/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox/files/patch-security_manager_ssl_src_nsNSSComponent.cpp deleted file mode 100644 index f30d12229ccd..000000000000 --- a/www/firefox/files/patch-security_manager_ssl_src_nsNSSComponent.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422 index bc9dea891a3d..d44a30f7048e 100644 --- a/www/firefox/files/patch-z-bug517422 +++ b/www/firefox/files/patch-z-bug517422 @@ -1,21 +1,25 @@ -# Allow building against system-wide ogg/vorbis/opus. +# Allow more config/external/ libs built against system-wide version. diff --git config/Makefile.in config/Makefile.in -index 5383399..4393ae8 100644 +index 5383399..0410004 100644 --- config/Makefile.in +++ config/Makefile.in -@@ -79,6 +79,9 @@ export:: $(export-preqs) +@@ -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 config/external/moz.build config/external/moz.build -index c22a36c..740402e 100644 +index f67c5c7..eb909ce 100644 --- config/external/moz.build +++ config/external/moz.build @@ -15,13 +15,13 @@ if CONFIG['MOZ_UPDATER']: @@ -26,7 +30,8 @@ index c22a36c..740402e 100644 +if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']: external_dirs += ['media/libvorbis'] - if CONFIG['MOZ_TREMOR']: +-if CONFIG['MOZ_TREMOR']: ++if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']: external_dirs += ['media/libtremor'] -if CONFIG['MOZ_OPUS']: @@ -34,22 +39,56 @@ index c22a36c..740402e 100644 external_dirs += ['media/libopus'] if CONFIG['MOZ_WEBM']: -@@ -34,7 +34,9 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']: +@@ -34,16 +34,23 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ external_dirs += ['media/libvpx'] if CONFIG['MOZ_OGG']: - external_dirs += ['media/libogg', 'media/libtheora'] + if not CONFIG['MOZ_NATIVE_OGG']: + external_dirs += ['media/libogg'] -+ external_dirs += ['media/libtheora'] ++ if not CONFIG['MOZ_NATIVE_THEORA']: ++ external_dirs += ['media/libtheora'] 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/libspeex_resampler', +- 'media/libsoundtouch', + ] + + PARALLEL_DIRS += ['../../' + i for i in external_dirs] diff --git config/system-headers config/system-headers -index b711fc3..fd3c14f 100644 +index bef567c..9807c29 100644 --- config/system-headers +++ config/system-headers -@@ -1153,3 +1153,17 @@ graphite2/Segment.h +@@ -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 @@ -57,21 +96,33 @@ index b711fc3..fd3c14f 100644 +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 df49287..05e97ff 100644 +index 87db361..7947626 100644 --- configure.in +++ configure.in -@@ -5130,6 +5130,40 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then +@@ -5211,6 +5211,57 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then fi dnl ======================================================== @@ -81,7 +132,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-ogg, +[ --with-system-ogg Use system libogg (located with pkgconfig)], +MOZ_NATIVE_OGG=1, -+MOZ_NATIVE_OGG= ) ++MOZ_NATIVE_OGG=) + +if test -n "$MOZ_NATIVE_OGG"; then + PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1) @@ -98,7 +149,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-vorbis, +[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], +MOZ_NATIVE_VORBIS=1, -+MOZ_NATIVE_VORBIS= ) ++MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then + PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4) @@ -109,10 +160,27 @@ index df49287..05e97ff 100644 +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, -@@ -5138,6 +5172,25 @@ MOZ_ARG_DISABLE_BOOL(opus, +@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) dnl ======================================================== @@ -122,7 +190,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-opus, +[ --with-system-opus Use system libopus (located with pkgconfig)], +MOZ_NATIVE_OPUS=1, -+MOZ_NATIVE_OPUS= ) ++MOZ_NATIVE_OPUS=) + +if test -n "$MOZ_NATIVE_OPUS"; then + PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1) @@ -135,30 +203,132 @@ index df49287..05e97ff 100644 +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) ++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/AudioStream.cpp content/media/AudioStream.cpp +index 88c8aa6..6b03288 100644 +--- content/media/AudioStream.cpp ++++ content/media/AudioStream.cpp +@@ -13,7 +13,6 @@ + #include "mozilla/Mutex.h" + #include <algorithm> + #include "mozilla/Preferences.h" +-#include "soundtouch/SoundTouch.h" + #include "Latency.h" + + namespace mozilla { +diff --git content/media/AudioStream.h content/media/AudioStream.h +index 085676d..00c54fb 100644 +--- content/media/AudioStream.h ++++ content/media/AudioStream.h +@@ -15,6 +15,7 @@ + #include "mozilla/StaticMutex.h" + + #include "cubeb/cubeb.h" ++#include "soundtouch/SoundTouch.h" + + template <> + class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream> diff --git content/media/Makefile.in content/media/Makefile.in -index 68f360e..76f2d57 100644 +index fd34449..c6c42c8 100644 --- content/media/Makefile.in +++ content/media/Makefile.in -@@ -7,4 +7,16 @@ 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 + ++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 + - AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon ++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 +--- media/libcubeb/src/Makefile.in ++++ 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 diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in new file mode 100644 index 0000000..1f02dc0 @@ -205,7 +375,7 @@ index 0000000..1f02dc0 +CFLAGS += $(MOZ_OGG_CFLAGS) +endif diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in -index c5e82c4..91ef86a 100644 +index bbc971c..6ed7e41 100644 --- media/webrtc/signaling/test/Makefile.in +++ media/webrtc/signaling/test/Makefile.in @@ -48,6 +48,12 @@ LIBS += \ @@ -230,7 +400,7 @@ index 00e77e7..55f48ab 100644 ['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)', @@ -239,10 +409,10 @@ index 00e77e7..55f48ab 100644 'dependencies': [ '<(DEPTH)/third_party/opus/opus.gyp:opus' diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in -index 27f488e..cd27084 100644 +index d42137a..695e75a8 100644 --- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -91,6 +91,18 @@ ifdef MOZ_NATIVE_HUNSPELL +@@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS) endif @@ -250,14 +420,30 @@ index 27f488e..cd27084 100644 +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 diff --git a/www/firefox/pkg-message b/www/firefox/pkg-message index 90ee88f269ea..83f7cbefb79f 100644 --- a/www/firefox/pkg-message +++ b/www/firefox/pkg-message @@ -16,17 +16,7 @@ The SSH server on remote_host must allow pub key authentication. Firefox and HTML5 -H.264 or MP3 playback may fail due to ffmpeg/libav bug with one of -the following messages on the terminal - - (gst-plugin-scanner:35828): GStreamer-WARNING **: Failed to load plugin '/usr/local/lib/gstreamer-1.0/libgstlibav.so': /usr/local/lib/gstreamer-1.0/libgstlibav.so: Undefined symbol "ff_MPV_common_init_x86" - (gst-plugin-scanner:87596): GStreamer-WARNING **: Failed to load plugin '/usr/local/lib/gstreamer-1.0/libgstlibav.so': /usr/local/lib/gstreamer-1.0/libgstlibav.so: Undefined symbol "ff_deinterlace_line_mmx" - (gst-plugin-scanner:55274): GStreamer-WARNING **: Failed to load plugin '/usr/local/lib/gstreamer-1.0/libgstlibav.so': /usr/local/lib/gstreamer-1.0/libgstlibav.so: Undefined symbol "ff_vc1dsp_init_x86" - -If you happen to be affected please apply the fix in ports/181964 and -rebuild the ports. - -Also, certain functions used to display HTML5 elements need the sem(4) +Certain functions used to display HTML5 elements need the sem(4) module but only on 8.x releases (or before r201546). If your Firefox crashes with the following message while viewing a diff --git a/www/libxul/Makefile b/www/libxul/Makefile index ffd07fc388c3..e8b9681a0df9 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -16,7 +16,9 @@ BUILD_DEPENDS= nspr>=4.10.2:${PORTSDIR}/devel/nspr \ 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 \ libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ diff --git a/www/libxul/files/patch-bug916589 b/www/libxul/files/patch-bug916589 index 664a7b167314..5748c3316f85 100644 --- a/www/libxul/files/patch-bug916589 +++ b/www/libxul/files/patch-bug916589 @@ -2,12 +2,16 @@ diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/qu index 5b50785..7cf47d5 100644 --- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h +++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -@@ -31,11 +31,14 @@ +@@ -31,11 +31,18 @@ */ -#ifndef _SYS_QUEUE_H_ +#if (defined(BSD) && !defined(__OpenBSD__)) || defined(DARWIN) +#include_next <sys/queue.h> ++# if defined(__DragonFly__) ++#define STAILQ_FOREACH_SAFE STAILQ_FOREACH_MUTABLE ++#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE ++# endif +#elif !defined(_SYS_QUEUE_H_) #define _SYS_QUEUE_H_ diff --git a/www/libxul/files/patch-no-videoio.h b/www/libxul/files/patch-bug985848 index c20c0e039827..c20c0e039827 100644 --- a/www/libxul/files/patch-no-videoio.h +++ b/www/libxul/files/patch-bug985848 diff --git a/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp b/www/libxul/files/patch-bug991253 index 161feb2ca7b5..161feb2ca7b5 100644 --- a/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp +++ b/www/libxul/files/patch-bug991253 diff --git a/www/libxul/files/patch-bug791305 b/www/libxul/files/patch-ijg-libjpeg index ef75e4a17bb5..406bb1627d6e 100644 --- a/www/libxul/files/patch-bug791305 +++ b/www/libxul/files/patch-ijg-libjpeg @@ -1,19 +1,4 @@ -commit c269a16 -Author: Jeff Muizelaar <jmuizelaar@mozilla.com> -Date: Fri Sep 14 15:54:55 2012 -0400 - - Bug 791305. Use libjpeg's color conversion code instead of our own. r=joe,r=khuey - - libjpeg-turbo supports converting directly to a format compatible with cairo's - FORMAT_RGB24. Use that instead of our own handcoded function. This also gives - us SSE2 and NEON version of this function. - - --HG-- - extra : rebase_source : 18f48925f023a33ec2a097d4f4e5cc2ab40be1e9 ---- - configure.in | 6 +- - image/decoders/nsJPEGDecoder.cpp | 311 ++------------------------------------- - 2 files changed, 20 insertions(+), 297 deletions(-) +# Partially revert bug 791305 to allow building with system IJG jpeg library diff --git configure.in configure.in index f0aeb5d..1c01010 100644 diff --git a/www/libxul/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c b/www/libxul/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c new file mode 100644 index 000000000000..69658e277b41 --- /dev/null +++ b/www/libxul/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c @@ -0,0 +1,16 @@ +--- media/mtransport/third_party/nICEr/src/util/mbslen.c~ ++++ media/mtransport/third_party/nICEr/src/util/mbslen.c +@@ -54,6 +54,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # endif + #endif + ++#ifdef __DragonFly__ ++#include <osreldate.h> ++# if __DragonFly_version > 300502 ++# define HAVE_XLOCALE ++# endif ++#endif ++ + #ifdef HAVE_XLOCALE + #include <xlocale.h> + #endif /* HAVE_XLOCALE */ diff --git a/www/libxul/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/libxul/files/patch-security_manager_ssl_src_nsNSSComponent.cpp deleted file mode 100644 index f30d12229ccd..000000000000 --- a/www/libxul/files/patch-security_manager_ssl_src_nsNSSComponent.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" diff --git a/www/libxul/files/patch-z-bug847568 b/www/libxul/files/patch-z-bug847568 index 14f7e151aa94..9c8105691ab2 100644 --- a/www/libxul/files/patch-z-bug847568 +++ b/www/libxul/files/patch-z-bug847568 @@ -14,10 +14,10 @@ index 14bfc0d..5383399 100644 $(INSTALL) system_wrappers $(DIST) diff --git config/system-headers config/system-headers -index 126391e..b711fc3 100644 +index 18e8703..bdc5f82 100644 --- config/system-headers +++ config/system-headers -@@ -1144,3 +1144,11 @@ unicode/utypes.h +@@ -1145,3 +1145,11 @@ unicode/utypes.h #endif libutil.h unwind.h @@ -30,40 +30,58 @@ index 126391e..b711fc3 100644 +harfbuzz/hb.h +#endif diff --git configure.in configure.in -index bbc7b40..1747206 100644 +index ac38f40..87536b7 100644 --- configure.in +++ configure.in -@@ -7830,6 +7830,38 @@ if test "$USE_FC_FREETYPE"; then +@@ -8032,6 +8032,56 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== -+dnl Check for graphite2 and harfbuzz ++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= ) ++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= ) ++MOZ_NATIVE_GRAPHITE2=) + +if test -n "$MOZ_NATIVE_GRAPHITE2"; then -+ PKG_CHECK_MODULES(MOZ_GRAPHITE, graphite2 >= 1.2.3) -+else -+ MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' ++ 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) @@ -133,7 +151,7 @@ index 519aa46..6929751 100644 'thebes', 'ipc', diff --git gfx/skia/Makefile.in gfx/skia/Makefile.in -index 07a77a3..067f7bd 100644 +index ee0efb2..98e169d6f 100644 --- gfx/skia/Makefile.in +++ gfx/skia/Makefile.in @@ -15,6 +15,10 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) @@ -146,9 +164,9 @@ index 07a77a3..067f7bd 100644 + include $(topsrcdir)/config/rules.mk - ifneq (,$(INTEL_ARCHITECTURE)) + ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1) diff --git gfx/thebes/Makefile.in gfx/thebes/Makefile.in -index e9f6b6c..0df2d8d 100644 +index 45c36ae..79d32cf 100644 --- gfx/thebes/Makefile.in +++ gfx/thebes/Makefile.in @@ -13,6 +13,14 @@ DEFINES := $(filter-out -DUNICODE,$(DEFINES)) @@ -167,7 +185,7 @@ index e9f6b6c..0df2d8d 100644 CXXFLAGS += $(CAIRO_FT_CFLAGS) endif diff --git intl/unicharutil/util/Makefile.in intl/unicharutil/util/Makefile.in -index f6b9f7c..11c44f4 100644 +index f6b9f7c..60863f4 100644 --- intl/unicharutil/util/Makefile.in +++ intl/unicharutil/util/Makefile.in @@ -21,3 +21,7 @@ ifdef _MSC_VER @@ -176,7 +194,7 @@ index f6b9f7c..11c44f4 100644 endif + +ifdef MOZ_NATIVE_HARFBUZZ -+nsUnicodePropertyData.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS) ++CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) +endif diff --git layout/media/Makefile.in layout/media/Makefile.in index 1cacbd7..a8cd156 100644 @@ -202,22 +220,25 @@ index 1cacbd7..a8cd156 100644 SHARED_LIBRARY_LIBS += $(MOZ_CAIRO_LIBS) endif diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in -index 1cacbd7..a8cd156 100644 +index 1cacbd7..f5d72bb 100644 --- netwerk/dns/Makefile.in +++ netwerk/dns/Makefile.in -@@ -9,3 +9,7 @@ include $(topsrcdir)/config/rules.mk - # for effective TLD data. - etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat - $(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc -+ +@@ -5,6 +5,10 @@ + + include $(topsrcdir)/config/rules.mk + +ifdef MOZ_NATIVE_HARFBUZZ -+nsIDNService.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS) ++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 007f272..27f488e 100644 +index 67f0db9..d42137a 100644 --- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -103,6 +103,14 @@ ifndef MOZ_TREE_PIXMAN +@@ -89,6 +89,14 @@ ifndef MOZ_TREE_PIXMAN EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS) endif diff --git a/www/libxul/files/patch-zz-bug517422 b/www/libxul/files/patch-zz-bug517422 index 85db66a2acdc..acdd451854cd 100644 --- a/www/libxul/files/patch-zz-bug517422 +++ b/www/libxul/files/patch-zz-bug517422 @@ -1,16 +1,20 @@ -# Allow building against system-wide ogg/vorbis/opus. +# Allow more config/external/ libs built against system-wide version. diff --git config/Makefile.in config/Makefile.in -index 5383399..4393ae8 100644 +index 5383399..0410004 100644 --- config/Makefile.in +++ config/Makefile.in -@@ -79,6 +79,9 @@ export:: $(export-preqs) +@@ -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) @@ -26,7 +30,8 @@ index c22a36c..2febb45 100644 +if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']: add_tier_dir('platform', 'media/libvorbis') - if CONFIG['MOZ_TREMOR']: +-if CONFIG['MOZ_TREMOR']: ++if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']: add_tier_dir('platform', 'media/libtremor') -if CONFIG['MOZ_OPUS']: @@ -34,22 +39,54 @@ index c22a36c..2febb45 100644 add_tier_dir('platform', 'media/libopus') if CONFIG['MOZ_WEBM']: -@@ -82,7 +82,9 @@ if CONFIG['MOZ_VP8'] and not CONFIG['MOZ +@@ -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') -+ add_tier_dir('platform', 'media/libtheora') ++ 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 b711fc3..fd3c14f 100644 +index bef567c..9807c29 100644 --- config/system-headers +++ config/system-headers -@@ -1152,3 +1152,17 @@ graphite2/Segment.h +@@ -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 @@ -57,21 +94,33 @@ index b711fc3..fd3c14f 100644 +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 df49287..05e97ff 100644 +index 87db361..7947626 100644 --- configure.in +++ configure.in -@@ -5143,6 +5143,40 @@ if test -n "$MOZ_OGG"; then +@@ -5211,6 +5211,57 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then fi dnl ======================================================== @@ -81,7 +130,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-ogg, +[ --with-system-ogg Use system libogg (located with pkgconfig)], +MOZ_NATIVE_OGG=1, -+MOZ_NATIVE_OGG= ) ++MOZ_NATIVE_OGG=) + +if test -n "$MOZ_NATIVE_OGG"; then + PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1) @@ -98,7 +147,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-vorbis, +[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], +MOZ_NATIVE_VORBIS=1, -+MOZ_NATIVE_VORBIS= ) ++MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then + PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4) @@ -109,10 +158,27 @@ index df49287..05e97ff 100644 +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, -@@ -5151,6 +5185,25 @@ MOZ_ARG_DISABLE_BOOL(opus, +@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) dnl ======================================================== @@ -122,7 +188,7 @@ index df49287..05e97ff 100644 +MOZ_ARG_WITH_BOOL(system-opus, +[ --with-system-opus Use system libopus (located with pkgconfig)], +MOZ_NATIVE_OPUS=1, -+MOZ_NATIVE_OPUS= ) ++MOZ_NATIVE_OPUS=) + +if test -n "$MOZ_NATIVE_OPUS"; then + PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1) @@ -135,14 +201,66 @@ index df49287..05e97ff 100644 +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) ++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 68f360e..76f2d57 100644 +index fd34449..c6c42c8 100644 --- content/media/Makefile.in +++ content/media/Makefile.in -@@ -7,4 +7,16 @@ include $(topsrcdir)/config/rules.mk +@@ -6,4 +6,31 @@ include $(topsrcdir)/config/rules.mk + CFLAGS += $(GSTREAMER_CFLAGS) CXXFLAGS += $(GSTREAMER_CFLAGS) @@ -150,20 +268,48 @@ index 68f360e..76f2d57 100644 +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 +--- media/libcubeb/src/Makefile.in ++++ 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 --- layout/media/Makefile.in +++ layout/media/Makefile.in -@@ -30,12 +36,21 @@ ifdef MOZ_TREE_PIXMAN +@@ -36,31 +36,45 @@ ifdef MOZ_TREE_PIXMAN SHARED_LIBRARY_LIBS += $(MOZ_PIXMAN_LIBS) endif @@ -185,9 +331,21 @@ index 1cacbd7..a8cd156 100644 +endif ifdef MOZ_TREMOR ++ifndef MOZ_NATIVE_TREMOR SHARED_LIBRARY_LIBS += \ -@@ -51,10 +66,12 @@ 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 @@ -199,6 +357,27 @@ index 1cacbd7..a8cd156 100644 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 @@ -266,7 +445,7 @@ index 0000000..1f02dc0 +CFLAGS += $(MOZ_OGG_CFLAGS) +endif diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in -index c5e82c4..91ef86a 100644 +index bbc971c..6ed7e41 100644 --- media/webrtc/signaling/test/Makefile.in +++ media/webrtc/signaling/test/Makefile.in @@ -48,6 +48,12 @@ LIBS += \ @@ -300,10 +479,10 @@ index 00e77e7..55f48ab 100644 'dependencies': [ '<(DEPTH)/third_party/opus/opus.gyp:opus' diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in -index 27f488e..cd27084 100644 +index d42137a..695e75a8 100644 --- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -91,6 +91,18 @@ ifdef MOZ_NATIVE_HUNSPELL +@@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS) endif @@ -311,14 +490,30 @@ index 27f488e..cd27084 100644 +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 diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile index fb605a40cc59..61891e0f8780 100644 --- a/www/linux-firefox/Makefile +++ b/www/linux-firefox/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 28.0 +DISTVERSION= 29.0 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo index d66bbcbde0b2..be9204d07efe 100644 --- a/www/linux-firefox/distinfo +++ b/www/linux-firefox/distinfo @@ -1,5 +1,5 @@ -SHA256 (firefox-28.0.tar.bz2) = 10bc55b70e0e298ceb3613431c5a6cf36aaf1e6ace1a43616e452a7b232e7d38 -SIZE (firefox-28.0.tar.bz2) = 31203078 +SHA256 (firefox-29.0.tar.bz2) = e616abb6854480a33c47b902d1ba277717a855ead3bff560025a25a7f4b1da6d +SIZE (firefox-29.0.tar.bz2) = 36330381 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 |