diff options
| author | flo <flo@FreeBSD.org> | 2013-12-14 21:42:06 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2013-12-14 21:42:06 +0800 |
| commit | edaa25c436296059e2f53857725feebc334be006 (patch) | |
| tree | 3f75766ca5d76f6dd2367c583fb90b16519be03a /www | |
| parent | 89e537dbea71d78877124223148d8741ee1c638d (diff) | |
| download | freebsd-ports-gnome-edaa25c436296059e2f53857725feebc334be006.tar.gz freebsd-ports-gnome-edaa25c436296059e2f53857725feebc334be006.tar.zst freebsd-ports-gnome-edaa25c436296059e2f53857725feebc334be006.zip | |
Update to nspr 4.10.2
Update to nss 3.15.3.1
Update firefox-esr and thunderbird to 24.2.0
Update firefox to 26.0
Update seamonkey to 2.23
- catch up with directory renames since USES=webplugins was introduced;
fixes plugins not being automatically enabled after install
- linux-firefox and linux-seamonkey can play HTML5 audio [2][3] and
measure about:memory usage, again
- dom.ipc.plugins.enabled->true no longer crash linux-firefox which makes
some flash sites work again; as there's no nspluginwrapper in-between
the infamous "youtube issue" never occurs
- install DEBUG with symbols [3] and describe the option better [4]
- enable dumping about:memory upon kill -65, kill -66 and GC/CC log
upon kill -67 to a file under /tmp directory; linux-firefox uses
kill -34, kill -35 and kill -36 respectively
PR: ports/183861 [1]
PR: ports/184006 [2]
PR: ports/169896 [3]
PR: ports/184285 [3]
PR: ports/184286 [4]
Security: dd116b19-64b3-11e3-868f-0025905a4771
In collaboration with: Jan Beich <jbeich@tormail.org>
Diffstat (limited to 'www')
70 files changed, 1406 insertions, 3161 deletions
diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile index 181c059a0c88..f9d15ae3a0e8 100644 --- a/www/firefox-esr-i18n/Makefile +++ b/www/firefox-esr-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -PORTVERSION= 24.1.0 +PORTVERSION= 24.2.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= @@ -16,8 +16,9 @@ COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip USE_FIREFOX= 24 -USE_XPI= firefox linux-firefox +USE_XPI= firefox +NO_ARCH= yes USE_SUBMAKE= yes WDIR= langpack-*@firefox.mozilla.org diff --git a/www/firefox-esr-i18n/Makefile.lang b/www/firefox-esr-i18n/Makefile.lang index b65109e88dc9..bff3bf812771 100644 --- a/www/firefox-esr-i18n/Makefile.lang +++ b/www/firefox-esr-i18n/Makefile.lang @@ -1,16 +1,20 @@ # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp> # $FreeBSD$ -FIREFOX_I18N_ALL_= af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el \ - en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa \ - fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu hy-AM id is \ - it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO \ - nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq \ - sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu +FIREFOX_I18N_ALL_= ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb \ + cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES \ + es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he \ + hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt \ + lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR \ + pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th \ + tr uk vi zh-CN zh-TW zu .if defined(FIREFOX_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package) FIREFOX_I18N= ${FIREFOX_I18N_ALL_} .else +.if ${PORT_OPTIONS:MLANG_ACH} +FIREFOX_I18N+= ach +.endif .if ${PORT_OPTIONS:MLANG_AF} FIREFOX_I18N+= af .endif @@ -20,6 +24,9 @@ FIREFOX_I18N+= ak .if ${PORT_OPTIONS:MLANG_AR} FIREFOX_I18N+= ar .endif +.if ${PORT_OPTIONS:MLANG_AS} +FIREFOX_I18N+= as +.endif .if ${PORT_OPTIONS:MLANG_AST} FIREFOX_I18N+= ast .endif @@ -47,6 +54,9 @@ FIREFOX_I18N+= ca .if ${PORT_OPTIONS:MLANG_CS} FIREFOX_I18N+= cs .endif +.if ${PORT_OPTIONS:MLANG_CSB} +FIREFOX_I18N+= csb +.endif .if ${PORT_OPTIONS:MLANG_CY} FIREFOX_I18N+= cy .endif @@ -92,6 +102,9 @@ FIREFOX_I18N+= eu .if ${PORT_OPTIONS:MLANG_FA} FIREFOX_I18N+= fa .endif +.if ${PORT_OPTIONS:MLANG_FF} +FIREFOX_I18N+= ff +.endif .if ${PORT_OPTIONS:MLANG_FI} FIREFOX_I18N+= fi .endif @@ -104,6 +117,9 @@ FIREFOX_I18N+= fy-NL .if ${PORT_OPTIONS:MLANG_GA} FIREFOX_I18N+= ga-IE .endif +.if ${PORT_OPTIONS:MLANG_GD} +FIREFOX_I18N+= gd +.endif .if ${PORT_OPTIONS:MLANG_GL} FIREFOX_I18N+= gl .endif @@ -140,6 +156,9 @@ FIREFOX_I18N+= ja .if ${PORT_OPTIONS:MLANG_KK} FIREFOX_I18N+= kk .endif +.if ${PORT_OPTIONS:MLANG_KM} +FIREFOX_I18N+= km +.endif .if ${PORT_OPTIONS:MLANG_KN} FIREFOX_I18N+= kn .endif @@ -152,6 +171,9 @@ FIREFOX_I18N+= ku .if ${PORT_OPTIONS:MLANG_LG} FIREFOX_I18N+= lg .endif +.if ${PORT_OPTIONS:MLANG_LIJ} +FIREFOX_I18N+= lij +.endif .if ${PORT_OPTIONS:MLANG_LT} FIREFOX_I18N+= lt .endif diff --git a/www/firefox-esr-i18n/Makefile.option b/www/firefox-esr-i18n/Makefile.option index 8f6acc47cef3..34a818cabded 100644 --- a/www/firefox-esr-i18n/Makefile.option +++ b/www/firefox-esr-i18n/Makefile.option @@ -1,14 +1,17 @@ # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp> # $FreeBSD$ -OPTIONS_DEFINE= LANG_AF \ +OPTIONS_DEFINE= LANG_ACH \ + LANG_AF \ LANG_AK \ LANG_SQ \ LANG_AR \ + LANG_AS \ LANG_AM \ LANG_AST \ LANG_EU \ LANG_BN \ + LANG_BD \ LANG_BB \ LANG_BS \ LANG_BR \ @@ -17,6 +20,7 @@ OPTIONS_DEFINE= LANG_AF \ LANG_CA \ LANG_CN \ LANG_CS \ + LANG_CSB \ LANG_DA \ LANG_NL \ LANG_GB \ @@ -27,10 +31,12 @@ OPTIONS_DEFINE= LANG_AF \ LANG_DE \ LANG_EL \ LANG_GU \ + LANG_FF \ LANG_FI \ LANG_FR \ LANG_FY \ LANG_GA \ + LANG_GD \ LANG_HE \ LANG_HI \ LANG_HR \ @@ -41,11 +47,13 @@ OPTIONS_DEFINE= LANG_AF \ LANG_JA \ LANG_KN \ LANG_KK \ + LANG_KM \ LANG_KO \ LANG_KU \ LANG_LV \ LANG_LT \ LANG_LG \ + LANG_LIJ \ LANG_MK \ LANG_MAI \ LANG_ML \ @@ -89,3 +97,10 @@ OPTIONS_DEFAULT=LANG_AR LANG_BN LANG_BR LANG_CN LANG_ET LANG_DE LANG_FR \ LANG_HI LANG_ID LANG_IT LANG_JA LANG_KO LANG_MK LANG_MR \ LANG_MN LANG_PBR LANG_PA LANG_RU LANG_ES LANG_SON LANG_TE +LANG_ACH_DESC?= Acholi language support +LANG_AS_DESC?= Assamese language support +LANG_BD_DESC?= Bengali (Bangladesh) language support +LANG_CSB_DESC?= Kashubian language support +LANG_FF_DESC?= Pulaar Fulfulde language support +LANG_KM_DESC?= Khmer language support +LANG_LIJ_DESC?= Ligurian (Genoa) language support diff --git a/www/firefox-esr-i18n/distinfo b/www/firefox-esr-i18n/distinfo index 0604fe37fbdd..9992c98c09df 100644 --- a/www/firefox-esr-i18n/distinfo +++ b/www/firefox-esr-i18n/distinfo @@ -1,164 +1,178 @@ -SHA256 (xpi/firefox-24.1.0/af.xpi) = 0f364ae7ecbade66aee28d29fe4bb7884a7b575f9db4f2b7e323ac1723056542 -SIZE (xpi/firefox-24.1.0/af.xpi) = 338128 -SHA256 (xpi/firefox-24.1.0/ak.xpi) = ddc628b73fb8c10e0d6633d702fcbc3f4116f9054ef71faeda9db28ff247b558 -SIZE (xpi/firefox-24.1.0/ak.xpi) = 340940 -SHA256 (xpi/firefox-24.1.0/ar.xpi) = 37790b3d162303df5066be84a86828f8b302f496c5e2cb2b682f06ec55e09d2f -SIZE (xpi/firefox-24.1.0/ar.xpi) = 368919 -SHA256 (xpi/firefox-24.1.0/ast.xpi) = c5189b0159df725ada0a0fa826dba9765e5ea16972782b2a202b062e5d66f372 -SIZE (xpi/firefox-24.1.0/ast.xpi) = 319972 -SHA256 (xpi/firefox-24.1.0/be.xpi) = 29bca83c668a29eb326b8081481eb749ea4b1b7b7b501982a5509d97f8eb7e9e -SIZE (xpi/firefox-24.1.0/be.xpi) = 335588 -SHA256 (xpi/firefox-24.1.0/bg.xpi) = 24378cd5da5dc64f5cdbe7a53bfcba4995396544040ab67deddaf13a9679b9ab -SIZE (xpi/firefox-24.1.0/bg.xpi) = 381606 -SHA256 (xpi/firefox-24.1.0/bn-BD.xpi) = 616a2cef5002e72b7893f265c659a6cf056cfed00eed93069f4c8256026813f5 -SIZE (xpi/firefox-24.1.0/bn-BD.xpi) = 384915 -SHA256 (xpi/firefox-24.1.0/bn-IN.xpi) = 468c4e0fe5be3cb80a7f153aa93763b27426ceb9a143ec4566d40e084d27eb33 -SIZE (xpi/firefox-24.1.0/bn-IN.xpi) = 427780 -SHA256 (xpi/firefox-24.1.0/br.xpi) = 9f1b78f6533a1f5e8635b8f25f9c985b003a2f8eb7abbc299ef6a6f4e076a32d -SIZE (xpi/firefox-24.1.0/br.xpi) = 345812 -SHA256 (xpi/firefox-24.1.0/bs.xpi) = 6b41cc4009535f4a136edd4192b3bf3680bbd79c8fa5b3027880338ce3edc809 -SIZE (xpi/firefox-24.1.0/bs.xpi) = 352235 -SHA256 (xpi/firefox-24.1.0/ca.xpi) = 21a9b5f7a74c81f9db71a3ac938e1ea359d37559b288899ad0518dd5b0dc5c51 -SIZE (xpi/firefox-24.1.0/ca.xpi) = 352021 -SHA256 (xpi/firefox-24.1.0/cs.xpi) = 74a6da3ac6c585d0608bfb0e568c3028fd960635fcfbc3c1dfd2dc8fd25d3aaa -SIZE (xpi/firefox-24.1.0/cs.xpi) = 347304 -SHA256 (xpi/firefox-24.1.0/cy.xpi) = df95ad72c7912e51f27beaf7c61d6db9eaa2dfb0639bb7c467b27a2ad20bcf5a -SIZE (xpi/firefox-24.1.0/cy.xpi) = 340091 -SHA256 (xpi/firefox-24.1.0/da.xpi) = 7fcbea55403d7175d5a97d65269c1db8d7fc86b8bff5a56c137a39ec0ced55f9 -SIZE (xpi/firefox-24.1.0/da.xpi) = 337964 -SHA256 (xpi/firefox-24.1.0/de.xpi) = 8a740f182e8475f6159e7c4193bd3588ee2207a3ae504e2da4d6013d7d6b0102 -SIZE (xpi/firefox-24.1.0/de.xpi) = 326590 -SHA256 (xpi/firefox-24.1.0/el.xpi) = 0f0d045ce924d53a69209fb481c08d915bb83fde77161386ec602b980fc131c5 -SIZE (xpi/firefox-24.1.0/el.xpi) = 364303 -SHA256 (xpi/firefox-24.1.0/en-GB.xpi) = 63209a4a0e6e895d517aaa4ab070f82a90b9c8b47b87099f217b844939d5b63b -SIZE (xpi/firefox-24.1.0/en-GB.xpi) = 330026 -SHA256 (xpi/firefox-24.1.0/en-US.xpi) = 12bbd8488a53319838beccd73e9030e2b0dfb99f4b2e381b533cda1b5a67e583 -SIZE (xpi/firefox-24.1.0/en-US.xpi) = 320993 -SHA256 (xpi/firefox-24.1.0/en-ZA.xpi) = 82c503aefb6ba14ec87c453f2af5f4638d603ae285ae98fd7cef64a1cf3c717d -SIZE (xpi/firefox-24.1.0/en-ZA.xpi) = 329143 -SHA256 (xpi/firefox-24.1.0/eo.xpi) = 844d223065b8092c97ef362eeffbb60bf7aa5114cb1669a9374fa9efa794c145 -SIZE (xpi/firefox-24.1.0/eo.xpi) = 344759 -SHA256 (xpi/firefox-24.1.0/es-AR.xpi) = 08585e1775fe672d635624a56b52bc335301751d26ac80712136589420172da9 -SIZE (xpi/firefox-24.1.0/es-AR.xpi) = 346277 -SHA256 (xpi/firefox-24.1.0/es-CL.xpi) = c65c2a9fd6789ada957c3e37c9c987a5359dd7f151770af46b6d3e8fe69110b5 -SIZE (xpi/firefox-24.1.0/es-CL.xpi) = 346846 -SHA256 (xpi/firefox-24.1.0/es-ES.xpi) = 14695e40b45402797a60eacc48ba0d2c61039044a70913288e28b19b50a182af -SIZE (xpi/firefox-24.1.0/es-ES.xpi) = 304418 -SHA256 (xpi/firefox-24.1.0/es-MX.xpi) = e3b59836978c8b22d41c4a12533a0b99bdeaa21b28491e788c934b4d7602ef86 -SIZE (xpi/firefox-24.1.0/es-MX.xpi) = 302624 -SHA256 (xpi/firefox-24.1.0/et.xpi) = 31ed19a783b8d7300ae574549b0561972586bd8d65dffcd1bb4f52349a89d212 -SIZE (xpi/firefox-24.1.0/et.xpi) = 340013 -SHA256 (xpi/firefox-24.1.0/eu.xpi) = 71b3b4d8c9da64ebb156fa504e4ab054f2fbd3007b99440e0e7fa388b2f77d9f -SIZE (xpi/firefox-24.1.0/eu.xpi) = 343330 -SHA256 (xpi/firefox-24.1.0/fa.xpi) = dd4fc56f3e548d86638d6cabb56ec82af4f9dd6b449d6d7df633aa9a351078d7 -SIZE (xpi/firefox-24.1.0/fa.xpi) = 374261 -SHA256 (xpi/firefox-24.1.0/fi.xpi) = 0e48e9506ab1dfea106c46d6a9af51334e7a5ca55fb94376da9bef2b85db6eb3 -SIZE (xpi/firefox-24.1.0/fi.xpi) = 344036 -SHA256 (xpi/firefox-24.1.0/fr.xpi) = b9115359b99025e3076ad9c3fecbe4445dc76b1918ce67bd1e50efa38c37ebd4 -SIZE (xpi/firefox-24.1.0/fr.xpi) = 350255 -SHA256 (xpi/firefox-24.1.0/fy-NL.xpi) = 240cf6532b5cde4152d196de070282d24a98d2f597927f6f76653bb24938fef5 -SIZE (xpi/firefox-24.1.0/fy-NL.xpi) = 348334 -SHA256 (xpi/firefox-24.1.0/ga-IE.xpi) = d804228a230c1a38b570adfa88dbd10a799eaf4278af3433850566bc3d2c1257 -SIZE (xpi/firefox-24.1.0/ga-IE.xpi) = 355100 -SHA256 (xpi/firefox-24.1.0/gl.xpi) = 3f88939fc0a315af905c676da85f88d5c892d60ee4326a6a7904547b14e4a7c5 -SIZE (xpi/firefox-24.1.0/gl.xpi) = 341241 -SHA256 (xpi/firefox-24.1.0/gu-IN.xpi) = f75077df5b94279d84b69a0c9a475b200652311fcadd692030f6ca9656e8392d -SIZE (xpi/firefox-24.1.0/gu-IN.xpi) = 372479 -SHA256 (xpi/firefox-24.1.0/he.xpi) = 44cf908d3dabfc6aba6df9143391070c5932bf7f7144782ae855c79e2dd392d1 -SIZE (xpi/firefox-24.1.0/he.xpi) = 354629 -SHA256 (xpi/firefox-24.1.0/hi-IN.xpi) = 121857b6b7ef9c0b30c08090742dae0988b846882ac135473091e9b356e0717a -SIZE (xpi/firefox-24.1.0/hi-IN.xpi) = 384275 -SHA256 (xpi/firefox-24.1.0/hr.xpi) = 8b5aa2687665549ded030da99608cdd8659760c55a0cbe9a681904181dae7a2c -SIZE (xpi/firefox-24.1.0/hr.xpi) = 347766 -SHA256 (xpi/firefox-24.1.0/hu.xpi) = e88664da1f99b0e0e12fe511bb2b0214d24cb2f7c07fb82837322b9209a22f03 -SIZE (xpi/firefox-24.1.0/hu.xpi) = 357270 -SHA256 (xpi/firefox-24.1.0/hy-AM.xpi) = a6dbd68d6b25468133ac3eef1a77506b5b022dc85f01d77f1c45869eede4916e -SIZE (xpi/firefox-24.1.0/hy-AM.xpi) = 381832 -SHA256 (xpi/firefox-24.1.0/id.xpi) = 9ff19e80a102d0778cf1358a5216fd75f9f46f3ef0580ba9982395ff880c11fd -SIZE (xpi/firefox-24.1.0/id.xpi) = 331353 -SHA256 (xpi/firefox-24.1.0/is.xpi) = be9360bce742019e074b8f0dc4a2fb6794f38b57fc28460607abe306737db14e -SIZE (xpi/firefox-24.1.0/is.xpi) = 343490 -SHA256 (xpi/firefox-24.1.0/it.xpi) = 9db21dab8c52a2399cb5933c543c6ff1e62593b6350f80efb2ab670c31dc6289 -SIZE (xpi/firefox-24.1.0/it.xpi) = 299161 -SHA256 (xpi/firefox-24.1.0/ja.xpi) = 331b28ed1aabeab9df03b92fd3b294ec1270459c6b85714d57fd86e1be074274 -SIZE (xpi/firefox-24.1.0/ja.xpi) = 379283 -SHA256 (xpi/firefox-24.1.0/kk.xpi) = 93f16ce22e8fafca99bed1e7f4dc87e1f0ab414866ed7d2fdc3003a53e164568 -SIZE (xpi/firefox-24.1.0/kk.xpi) = 385934 -SHA256 (xpi/firefox-24.1.0/kn.xpi) = 5468fab6bc1e47c01c375d80326832ea3cc72bd71f203b50b0c93721dec9696f -SIZE (xpi/firefox-24.1.0/kn.xpi) = 407639 -SHA256 (xpi/firefox-24.1.0/ko.xpi) = 8a75c39bbf98ddc525063853becde701b88134b7a429cc44bc97f9b601980530 -SIZE (xpi/firefox-24.1.0/ko.xpi) = 353880 -SHA256 (xpi/firefox-24.1.0/ku.xpi) = 50ad5332bfbb066616cce5d27a691fd11bd75f0a8c0d2085df93fa044e764e5e -SIZE (xpi/firefox-24.1.0/ku.xpi) = 355631 -SHA256 (xpi/firefox-24.1.0/lg.xpi) = 08893ec8d93812ea9f9a65ace6783ebfcb8715d3cf8c8b0728855729237e3b36 -SIZE (xpi/firefox-24.1.0/lg.xpi) = 351110 -SHA256 (xpi/firefox-24.1.0/lt.xpi) = 50e54b8352029ad949076560f0434d3df2dc7f6b63f86c4cbb6d483b0692fe67 -SIZE (xpi/firefox-24.1.0/lt.xpi) = 403519 -SHA256 (xpi/firefox-24.1.0/lv.xpi) = a9702fe93e4fd0e3fa41d1323acf8a0e0e227db10686dbfbc32e052b04dfc2ab -SIZE (xpi/firefox-24.1.0/lv.xpi) = 346965 -SHA256 (xpi/firefox-24.1.0/mai.xpi) = c72734a97ad0d097f48a6e28f41fe2adaa9f22b1a280de0c17c2f4e942f765fb -SIZE (xpi/firefox-24.1.0/mai.xpi) = 382107 -SHA256 (xpi/firefox-24.1.0/mk.xpi) = fb67ed8b2edd820a003517e476322261c581277306124b75817163e4ff7f1adf -SIZE (xpi/firefox-24.1.0/mk.xpi) = 374644 -SHA256 (xpi/firefox-24.1.0/ml.xpi) = 9c7b2eb611e7c1bde94f356484446383c553642bce096bd23059c9af3ffbb07e -SIZE (xpi/firefox-24.1.0/ml.xpi) = 415882 -SHA256 (xpi/firefox-24.1.0/mr.xpi) = 484b21f5c9a3951d34f402cc514e2ebc49f2125a8ee24928f94c4c08e5b5b541 -SIZE (xpi/firefox-24.1.0/mr.xpi) = 383967 -SHA256 (xpi/firefox-24.1.0/nb-NO.xpi) = 3442960912b920b1f3d1cd509372ab39fdf6bffec67d6e70173e69727b405519 -SIZE (xpi/firefox-24.1.0/nb-NO.xpi) = 342543 -SHA256 (xpi/firefox-24.1.0/nl.xpi) = 3abe37f1dc17d8785f97e909c1361a03c56382ee55ff01a8d5ce6ff91842ee08 -SIZE (xpi/firefox-24.1.0/nl.xpi) = 342924 -SHA256 (xpi/firefox-24.1.0/nn-NO.xpi) = 859ceac918c217da267578241900c5a2e2624c376c74933a69e06a6c7649f3d0 -SIZE (xpi/firefox-24.1.0/nn-NO.xpi) = 343190 -SHA256 (xpi/firefox-24.1.0/nso.xpi) = 0056da8fc2165eb8c3384f11f4b58bef32b011fbceac7c7b01fac4897cd7b14e -SIZE (xpi/firefox-24.1.0/nso.xpi) = 344625 -SHA256 (xpi/firefox-24.1.0/or.xpi) = 1532b81bd401cd63fc494176983a9a358372b3c2df755aa665e6243ff9100fe0 -SIZE (xpi/firefox-24.1.0/or.xpi) = 383753 -SHA256 (xpi/firefox-24.1.0/pa-IN.xpi) = afb1c271ba186dd168cdfa3f26c397040b08e034cde8bb9dd660ae61f7cbb0a9 -SIZE (xpi/firefox-24.1.0/pa-IN.xpi) = 369479 -SHA256 (xpi/firefox-24.1.0/pl.xpi) = 9345d057f97b05b5143846186919d59b9438e8bfa45cb54367827b2c412199d8 -SIZE (xpi/firefox-24.1.0/pl.xpi) = 354652 -SHA256 (xpi/firefox-24.1.0/pt-BR.xpi) = 62012f47f8f8921fcac5155fa8de151c0c886fd4ea40de497dd855b6405f187a -SIZE (xpi/firefox-24.1.0/pt-BR.xpi) = 343533 -SHA256 (xpi/firefox-24.1.0/pt-PT.xpi) = 3941c2ace78bc79c0c6b33a1487fdb562691b79e16515163d1d46a64da058211 -SIZE (xpi/firefox-24.1.0/pt-PT.xpi) = 343648 -SHA256 (xpi/firefox-24.1.0/rm.xpi) = a3256b1b48a5bf3185e3cfeb73af6dc9a5f2dd08ed904d23bb28b0870537c170 -SIZE (xpi/firefox-24.1.0/rm.xpi) = 344011 -SHA256 (xpi/firefox-24.1.0/ro.xpi) = 55563103a1103a499557777854d464a3afdd870ccb14aae77b04c3cc7ed56e24 -SIZE (xpi/firefox-24.1.0/ro.xpi) = 366681 -SHA256 (xpi/firefox-24.1.0/ru.xpi) = 2cb6b4bc41089246543ff549e82c8982068aefc330455d39c0bcfcf82865664f -SIZE (xpi/firefox-24.1.0/ru.xpi) = 347232 -SHA256 (xpi/firefox-24.1.0/si.xpi) = 830609cc10b9d5bcb06ac0bac2c7f20adf2a3e39694d547816a42577af32ae80 -SIZE (xpi/firefox-24.1.0/si.xpi) = 372982 -SHA256 (xpi/firefox-24.1.0/sk.xpi) = f93136d10b61ec1426054aa2ca05332b2fd69f9d21e2d01f3a36c369a8c0d2ae -SIZE (xpi/firefox-24.1.0/sk.xpi) = 358822 -SHA256 (xpi/firefox-24.1.0/sl.xpi) = b2bce3a18914387605eb95f951fe7740d8033f4a43e1ac34b462a29890cbf44a -SIZE (xpi/firefox-24.1.0/sl.xpi) = 343759 -SHA256 (xpi/firefox-24.1.0/son.xpi) = af9bdd6de6226cfe4ed80905f623c3a31ccdab59d33cba6418a0fe09b1dba7e4 -SIZE (xpi/firefox-24.1.0/son.xpi) = 338756 -SHA256 (xpi/firefox-24.1.0/sq.xpi) = 7cadf868298799e6c68c1bb0fc6b0db21c03620d5bb52ff5efa5ec224d0c326f -SIZE (xpi/firefox-24.1.0/sq.xpi) = 348415 -SHA256 (xpi/firefox-24.1.0/sr.xpi) = fe61eb97076e9f7e208f464c56e861b13f478ec9a448b3ba656254c8aaacdbce -SIZE (xpi/firefox-24.1.0/sr.xpi) = 385107 -SHA256 (xpi/firefox-24.1.0/sv-SE.xpi) = 4d5840fb5d0aee23f3535c0de25af5527b899e6631a48e39120d250694a916b3 -SIZE (xpi/firefox-24.1.0/sv-SE.xpi) = 344941 -SHA256 (xpi/firefox-24.1.0/ta-LK.xpi) = ce4418e2d2cc60cd4455d97a36528c14132421d10b79fbc1da6a7bc1c80fe627 -SIZE (xpi/firefox-24.1.0/ta-LK.xpi) = 384155 -SHA256 (xpi/firefox-24.1.0/ta.xpi) = 8b0046920313c6dd4e719f694d3f647bcad0b28c38fc46d7e0cf04163992df6e -SIZE (xpi/firefox-24.1.0/ta.xpi) = 370239 -SHA256 (xpi/firefox-24.1.0/te.xpi) = a03f045a643a03654e5623f380321832ae0c70bf9288b753db2cb149d8e020bf -SIZE (xpi/firefox-24.1.0/te.xpi) = 394344 -SHA256 (xpi/firefox-24.1.0/th.xpi) = b26bc9c753787b2ac45351553718646368ed43b4f1dd3d75baec49f09e9c4e7b -SIZE (xpi/firefox-24.1.0/th.xpi) = 379387 -SHA256 (xpi/firefox-24.1.0/tr.xpi) = 13adffd0e62c1ee03a63ac849bc28bfb2c3b6bea13d562a99faf8ee412eb6a7b -SIZE (xpi/firefox-24.1.0/tr.xpi) = 350721 -SHA256 (xpi/firefox-24.1.0/uk.xpi) = 8f60718ee0fe340a8af12ffd1237cc002d3e4e067a6d3e32bd3cad472a4656df -SIZE (xpi/firefox-24.1.0/uk.xpi) = 375711 -SHA256 (xpi/firefox-24.1.0/vi.xpi) = f2bf6696e0a7fe631bfa741681127ecfab33277445333fb036ef73c036a3adc7 -SIZE (xpi/firefox-24.1.0/vi.xpi) = 363823 -SHA256 (xpi/firefox-24.1.0/zh-CN.xpi) = d379a3a7e19536a27d2c619853ec959e4a80dbb890e30815ea52abfa1f0da57c -SIZE (xpi/firefox-24.1.0/zh-CN.xpi) = 364889 -SHA256 (xpi/firefox-24.1.0/zh-TW.xpi) = eb7900101d7c6437dceff4e98b605b2b648c4905a7be6ee714832fbd617a3814 -SIZE (xpi/firefox-24.1.0/zh-TW.xpi) = 360655 -SHA256 (xpi/firefox-24.1.0/zu.xpi) = ba3a4384097675b79b52c26612be8e137c0af4dc092eeaa773621462a7943d73 -SIZE (xpi/firefox-24.1.0/zu.xpi) = 347838 +SHA256 (xpi/firefox-24.2.0/ach.xpi) = 993d7a40b67ea47832c82561e3c81d0563f8c0767a743f432b60a6a25255b708 +SIZE (xpi/firefox-24.2.0/ach.xpi) = 339946 +SHA256 (xpi/firefox-24.2.0/af.xpi) = b8cdceb7566de6ad07a2bc4bfde1bd77853c01ff256d6b4494de26e4570a0c9e +SIZE (xpi/firefox-24.2.0/af.xpi) = 333184 +SHA256 (xpi/firefox-24.2.0/ak.xpi) = b7c8f3c53e5cb95f7a683aa0a1640b24bda5607d7466cacc26e5b9816ced538b +SIZE (xpi/firefox-24.2.0/ak.xpi) = 340941 +SHA256 (xpi/firefox-24.2.0/ar.xpi) = fc56fcd1ac6ce948a6746a5996f498b561d0e661be98af69c85abc2a69021fa7 +SIZE (xpi/firefox-24.2.0/ar.xpi) = 360850 +SHA256 (xpi/firefox-24.2.0/as.xpi) = c2bdb27834ae2a2d93594eaeabe50a897e10581daf1190ade9aa49fa0d58e5e6 +SIZE (xpi/firefox-24.2.0/as.xpi) = 378085 +SHA256 (xpi/firefox-24.2.0/ast.xpi) = 128637a36e74be25446bc2de03b14875099123b019b96e290f448b177b89b965 +SIZE (xpi/firefox-24.2.0/ast.xpi) = 292876 +SHA256 (xpi/firefox-24.2.0/be.xpi) = c0496864e941a372b81aa8912400ef8dcf5cc8cc29b28d49820fbd8c7914e399 +SIZE (xpi/firefox-24.2.0/be.xpi) = 316954 +SHA256 (xpi/firefox-24.2.0/bg.xpi) = 2d2b4103e9e5e3e2ab2d0fb1ecb7209fe7e7c96f9fd056fbea097b852c86ea14 +SIZE (xpi/firefox-24.2.0/bg.xpi) = 373136 +SHA256 (xpi/firefox-24.2.0/bn-BD.xpi) = faf7175da7ba3abcae2265d94b647f36dd363eeba570977a421db6e5fa22afe6 +SIZE (xpi/firefox-24.2.0/bn-BD.xpi) = 394939 +SHA256 (xpi/firefox-24.2.0/bn-IN.xpi) = de7c177784630d227b6ab8faa484b67ecf8844dc1c5d50b34058ac48f73e226d +SIZE (xpi/firefox-24.2.0/bn-IN.xpi) = 427780 +SHA256 (xpi/firefox-24.2.0/br.xpi) = c37d85b62214b1bb2b3c936124293fa2946949f822514a95de0c831e8b2b5171 +SIZE (xpi/firefox-24.2.0/br.xpi) = 330509 +SHA256 (xpi/firefox-24.2.0/bs.xpi) = ecbaa3394d195f8c9c8602a82e5631c8e137322179e50f93111a4f31d4600bf5 +SIZE (xpi/firefox-24.2.0/bs.xpi) = 341620 +SHA256 (xpi/firefox-24.2.0/ca.xpi) = 64e25d7b909dac153a8effb8249f814a5dc3b35acc261c7e84e3b65359cf3f3d +SIZE (xpi/firefox-24.2.0/ca.xpi) = 341257 +SHA256 (xpi/firefox-24.2.0/cs.xpi) = ed208dd363a3a454bc4068b1d1a2c30711e92bd49530bdf8dda25d2dc88eeb19 +SIZE (xpi/firefox-24.2.0/cs.xpi) = 335946 +SHA256 (xpi/firefox-24.2.0/csb.xpi) = 8e87551461ffcc80ed70c6312a2f2f611a4c18ab704914fa516c0a486d464b3c +SIZE (xpi/firefox-24.2.0/csb.xpi) = 329796 +SHA256 (xpi/firefox-24.2.0/cy.xpi) = 95ca33e7cf31ab8af1147eb97542243514ee0d26a0e0bae982bf5b66807f45da +SIZE (xpi/firefox-24.2.0/cy.xpi) = 330643 +SHA256 (xpi/firefox-24.2.0/da.xpi) = 4c2c17e9103b4253f5425e58f534fc31c8b8d569de342ef77667c09b28ac44a3 +SIZE (xpi/firefox-24.2.0/da.xpi) = 326881 +SHA256 (xpi/firefox-24.2.0/de.xpi) = d6ca6d9099c1bd8716ffc35e0c362c48c407b8bc549cc09f501b21a1dccde742 +SIZE (xpi/firefox-24.2.0/de.xpi) = 323258 +SHA256 (xpi/firefox-24.2.0/el.xpi) = 49deb935a99ec1969e056bb87ec5538c5e72f5ad94b51d6cbffff08ec64e286c +SIZE (xpi/firefox-24.2.0/el.xpi) = 365320 +SHA256 (xpi/firefox-24.2.0/en-GB.xpi) = 6312422c01771ddfcec16acde6290f91c0fd148ef3101dcaa29f619844c6d786 +SIZE (xpi/firefox-24.2.0/en-GB.xpi) = 318297 +SHA256 (xpi/firefox-24.2.0/en-US.xpi) = e3638229c4f9acd5560e57c0db9cce8ddaefaa18a3efaa66cecc5957668424f7 +SIZE (xpi/firefox-24.2.0/en-US.xpi) = 320993 +SHA256 (xpi/firefox-24.2.0/en-ZA.xpi) = 93ef57fd4da9c0542ac7c7bbd38c33ab95063b619f6fe2f83fe795a5aeebf46a +SIZE (xpi/firefox-24.2.0/en-ZA.xpi) = 319321 +SHA256 (xpi/firefox-24.2.0/eo.xpi) = 6a962d009cc9f029ced3d1cc3662c3f1d4996470d452a54dcdfa45f4bf8215e8 +SIZE (xpi/firefox-24.2.0/eo.xpi) = 334940 +SHA256 (xpi/firefox-24.2.0/es-AR.xpi) = 0ff5c5c2fdc80f5e87754de4586ec4188a4b3ac5e870762c12c2670b67a0bb7b +SIZE (xpi/firefox-24.2.0/es-AR.xpi) = 334010 +SHA256 (xpi/firefox-24.2.0/es-CL.xpi) = faed301984fb4169faca728ff97ee59361098c76ead27b2c1071321a2c014909 +SIZE (xpi/firefox-24.2.0/es-CL.xpi) = 287026 +SHA256 (xpi/firefox-24.2.0/es-ES.xpi) = 4c6bd2d43f22b08d21921ec0c1a72b3ff37a7d344830700718164f282c4d6cc9 +SIZE (xpi/firefox-24.2.0/es-ES.xpi) = 277859 +SHA256 (xpi/firefox-24.2.0/es-MX.xpi) = 6c0becf4a264c18a1f41c20e1cba8264e7be938ab837a76bfef2395110c7f079 +SIZE (xpi/firefox-24.2.0/es-MX.xpi) = 302625 +SHA256 (xpi/firefox-24.2.0/et.xpi) = 7b60df1dfd6c2400405c1ba0cf612c5ea146442b18f05141e10a44a6a043ed1b +SIZE (xpi/firefox-24.2.0/et.xpi) = 327697 +SHA256 (xpi/firefox-24.2.0/eu.xpi) = cbbc0b6694374c2ce2464163cecfd792cb3133665cffe6b84d4aa32ce85f09fb +SIZE (xpi/firefox-24.2.0/eu.xpi) = 332422 +SHA256 (xpi/firefox-24.2.0/fa.xpi) = c0789c4c97b5b4d33548e27975baa865dcf18e070ccd76a921f01153dda9af9c +SIZE (xpi/firefox-24.2.0/fa.xpi) = 375633 +SHA256 (xpi/firefox-24.2.0/ff.xpi) = 0149a7ad27188ff3c2b908c828105ad6c90b6cb9780b05886e7309a912300c4d +SIZE (xpi/firefox-24.2.0/ff.xpi) = 332815 +SHA256 (xpi/firefox-24.2.0/fi.xpi) = 561c715b47493e204c69b742f8b8f4b9c496aa57e5d20a5c379c6615eecaced9 +SIZE (xpi/firefox-24.2.0/fi.xpi) = 328891 +SHA256 (xpi/firefox-24.2.0/fr.xpi) = 32613c0ebc0f5f49034dfead07fc2a15fe6fbbc75f8255f7ec400a964d5fbd24 +SIZE (xpi/firefox-24.2.0/fr.xpi) = 339178 +SHA256 (xpi/firefox-24.2.0/fy-NL.xpi) = d09f1744ab622babb76f57e8533bb3d40d8366185c8a5b5cc8af96eda414fb00 +SIZE (xpi/firefox-24.2.0/fy-NL.xpi) = 336589 +SHA256 (xpi/firefox-24.2.0/ga-IE.xpi) = e7b45b69c0fd73bd0b548478ae6a8d3727ffc9f535ce88aa2dfb671f720565f8 +SIZE (xpi/firefox-24.2.0/ga-IE.xpi) = 345294 +SHA256 (xpi/firefox-24.2.0/gd.xpi) = e1997d4c7a174f9538d1a66bd66b563383a317fafe7c3841bb35e604ee284bbc +SIZE (xpi/firefox-24.2.0/gd.xpi) = 344811 +SHA256 (xpi/firefox-24.2.0/gl.xpi) = 796f58cef729f6c8f01e35a9036e11aadb78527547ea116ba6adfd553c151791 +SIZE (xpi/firefox-24.2.0/gl.xpi) = 336919 +SHA256 (xpi/firefox-24.2.0/gu-IN.xpi) = 4874dcb3b0d0cd860dd32b7bda4caea3c222442cd65d6efaaa58fc714dbcdead +SIZE (xpi/firefox-24.2.0/gu-IN.xpi) = 359357 +SHA256 (xpi/firefox-24.2.0/he.xpi) = d3b31fc2c2813a5623af3ac7ee6ff45d18da8ac7af67286be71bc410d5eb93d0 +SIZE (xpi/firefox-24.2.0/he.xpi) = 354631 +SHA256 (xpi/firefox-24.2.0/hi-IN.xpi) = 4d3087846a8ca03630a4df722808903c04a1d5a931d850ff6b49a3211f17f49d +SIZE (xpi/firefox-24.2.0/hi-IN.xpi) = 379120 +SHA256 (xpi/firefox-24.2.0/hr.xpi) = e185c0fb3058861086761dda2e2ed67de195ff89cbb911040d84219edcf90e5d +SIZE (xpi/firefox-24.2.0/hr.xpi) = 336841 +SHA256 (xpi/firefox-24.2.0/hu.xpi) = ae3f76382b07caaa9a2c1a620f03250b6815b36619adba83d9dd5cf846845db6 +SIZE (xpi/firefox-24.2.0/hu.xpi) = 344103 +SHA256 (xpi/firefox-24.2.0/hy-AM.xpi) = 6f9747b15f2655cae3c4cd71b7ad165f799db41c705bb805e3b77b8dc83514f0 +SIZE (xpi/firefox-24.2.0/hy-AM.xpi) = 385180 +SHA256 (xpi/firefox-24.2.0/id.xpi) = 7068a9c45a6e3b01574b86229891c61fd2cd18ba4dd18408997d5eb31b67b220 +SIZE (xpi/firefox-24.2.0/id.xpi) = 319795 +SHA256 (xpi/firefox-24.2.0/is.xpi) = dda71badb72dabf74f3afb80ee3b3a5f77bb4ba8d66c6083cfc36b56f95b6b6c +SIZE (xpi/firefox-24.2.0/is.xpi) = 331826 +SHA256 (xpi/firefox-24.2.0/it.xpi) = 7763a56f9860b7271c6b093225c637ff4401ea2d57794b4c6fd7565e1d0d9ba9 +SIZE (xpi/firefox-24.2.0/it.xpi) = 271925 +SHA256 (xpi/firefox-24.2.0/ja.xpi) = 89275064ee138087a9eafcb6b8692c5e7d07f80c02f4521b1f569a8eadae28be +SIZE (xpi/firefox-24.2.0/ja.xpi) = 370903 +SHA256 (xpi/firefox-24.2.0/kk.xpi) = 913c2d075368603c310694f9871407879d30ed8bccfb45455bdaa64606a65a5d +SIZE (xpi/firefox-24.2.0/kk.xpi) = 377502 +SHA256 (xpi/firefox-24.2.0/km.xpi) = 45bac066888578e76c1f8237d873c014be7391fa2af86a45a9a8d78ae5d645aa +SIZE (xpi/firefox-24.2.0/km.xpi) = 400559 +SHA256 (xpi/firefox-24.2.0/kn.xpi) = a2c48ffc154c6f8439851c3b0280da3237438932969123d493e8fa0764dfd52b +SIZE (xpi/firefox-24.2.0/kn.xpi) = 391033 +SHA256 (xpi/firefox-24.2.0/ko.xpi) = ec2defba68a1ad546dc9466ff5ae99560027c5541eccb4100cd0bb836c89946f +SIZE (xpi/firefox-24.2.0/ko.xpi) = 346164 +SHA256 (xpi/firefox-24.2.0/ku.xpi) = 0ac6b2bbda6c48df540d96b3354c718ea6aac073b400c0524527f9ea3c1701f5 +SIZE (xpi/firefox-24.2.0/ku.xpi) = 355629 +SHA256 (xpi/firefox-24.2.0/lg.xpi) = 28bd85196bcac4f2148d90abb1eaa08c8730eeb5153eafc4ab675b03ee8abf8d +SIZE (xpi/firefox-24.2.0/lg.xpi) = 351111 +SHA256 (xpi/firefox-24.2.0/lij.xpi) = a549353795b953154b8d1bff480240ddaf37c57a0330a69452503190de8353fa +SIZE (xpi/firefox-24.2.0/lij.xpi) = 322699 +SHA256 (xpi/firefox-24.2.0/lt.xpi) = 8ff9b9f9773c4fd90cbda086c451ce455daf861b4a242853d11a7ccf91c1649e +SIZE (xpi/firefox-24.2.0/lt.xpi) = 352045 +SHA256 (xpi/firefox-24.2.0/lv.xpi) = ca27aed80de08a39e0193b0e5f95fc4bac410c8d8ccef30e5ac3e8b3362c610c +SIZE (xpi/firefox-24.2.0/lv.xpi) = 328664 +SHA256 (xpi/firefox-24.2.0/mai.xpi) = 8e72f590189f14f08cc872a6883ae2b67373451d14223f97c7f676d7fe7cfbf0 +SIZE (xpi/firefox-24.2.0/mai.xpi) = 379767 +SHA256 (xpi/firefox-24.2.0/mk.xpi) = d1f8e39108fdd8a8a55d0a3882f738ef071c01b78294c4c385a4da65b32b012d +SIZE (xpi/firefox-24.2.0/mk.xpi) = 376316 +SHA256 (xpi/firefox-24.2.0/ml.xpi) = d8c1ee440106b978cf6a853b9c33a4d58f5231ba6983a2dd9c493c11ac06dbfd +SIZE (xpi/firefox-24.2.0/ml.xpi) = 399677 +SHA256 (xpi/firefox-24.2.0/mr.xpi) = 6ae40a6be32d08730569ae1530e46ccd86744f3bcd599243f966d2ef452c2b48 +SIZE (xpi/firefox-24.2.0/mr.xpi) = 380231 +SHA256 (xpi/firefox-24.2.0/nb-NO.xpi) = 53a50dfec9c2676046a58af68a9bcc4a6b2d3654a4716b73620174e2094fe67f +SIZE (xpi/firefox-24.2.0/nb-NO.xpi) = 330965 +SHA256 (xpi/firefox-24.2.0/nl.xpi) = 20118d542a15c7f6c521d81ed47f654810e939e7c8520d7f57e40182bd42505d +SIZE (xpi/firefox-24.2.0/nl.xpi) = 331404 +SHA256 (xpi/firefox-24.2.0/nn-NO.xpi) = 0a79e6ba059bf75d4ba227e3157aa2c978619c1d7d5322cb2d4fcb26e472df87 +SIZE (xpi/firefox-24.2.0/nn-NO.xpi) = 333906 +SHA256 (xpi/firefox-24.2.0/nso.xpi) = a47b32e2d89a0647fd541763544f7f1bca056052024c9b09573d7c9580aee86d +SIZE (xpi/firefox-24.2.0/nso.xpi) = 336297 +SHA256 (xpi/firefox-24.2.0/or.xpi) = 1d09b3e1c3162001af0792176a097847dd8f576371e5ff92fb8e85183ce5bc1e +SIZE (xpi/firefox-24.2.0/or.xpi) = 364592 +SHA256 (xpi/firefox-24.2.0/pa-IN.xpi) = f3f0576e97b07c95e8782fb691e5f1a5e3c2f213fd2fb895929e1faf9fd68956 +SIZE (xpi/firefox-24.2.0/pa-IN.xpi) = 365653 +SHA256 (xpi/firefox-24.2.0/pl.xpi) = c4734dd8ab5a11fa620ba5b9c56532f3b17d92526d203c17066ae5e282e4e2be +SIZE (xpi/firefox-24.2.0/pl.xpi) = 341995 +SHA256 (xpi/firefox-24.2.0/pt-BR.xpi) = ca1af9d6e31ebd47bbc6f213fcbba21b3f86f48c08d2551d92c5f092d33f7fcc +SIZE (xpi/firefox-24.2.0/pt-BR.xpi) = 334605 +SHA256 (xpi/firefox-24.2.0/pt-PT.xpi) = 246e551f36b101202d0417480bc06ccf4d51cd4841abd57e5a95b0568faa6bf9 +SIZE (xpi/firefox-24.2.0/pt-PT.xpi) = 332739 +SHA256 (xpi/firefox-24.2.0/rm.xpi) = 39c8b1af7aa3cc4d16be4fe7a9246b867d6ad59647f8539130c55ae3708ded12 +SIZE (xpi/firefox-24.2.0/rm.xpi) = 339698 +SHA256 (xpi/firefox-24.2.0/ro.xpi) = e1eb563f0aaf766806b87e62fdf6cad1f7e3bd4f5ffdae91440188bea663219a +SIZE (xpi/firefox-24.2.0/ro.xpi) = 362236 +SHA256 (xpi/firefox-24.2.0/ru.xpi) = 049d527cc6993fa0b48ae6b9151fd18a173aa8da8c5e3c4bf722b274ffe818c8 +SIZE (xpi/firefox-24.2.0/ru.xpi) = 322761 +SHA256 (xpi/firefox-24.2.0/si.xpi) = 70991fb2cfe2ff155f79aa2919eaa1c7c40e1326b13bd7fb2ca925abaf06b409 +SIZE (xpi/firefox-24.2.0/si.xpi) = 372982 +SHA256 (xpi/firefox-24.2.0/sk.xpi) = 528d44063acff360de1bf6ea5eb0d4c4b36cb65506e874295bab2876a8ec14fd +SIZE (xpi/firefox-24.2.0/sk.xpi) = 347878 +SHA256 (xpi/firefox-24.2.0/sl.xpi) = 20a8399b2a3ad6e94325ee6e29bbdd652e500cdbcffff2d32e30f9c33f157976 +SIZE (xpi/firefox-24.2.0/sl.xpi) = 331572 +SHA256 (xpi/firefox-24.2.0/son.xpi) = 7c5d6aba47a39fa352af517e0ff1060c60776fa49da7d27ee53cfe2d8d51deba +SIZE (xpi/firefox-24.2.0/son.xpi) = 328899 +SHA256 (xpi/firefox-24.2.0/sq.xpi) = 84738b5cfd459934eaa5d00a3c28c01ca2c3a072111acb18b3a0b44a45c8428a +SIZE (xpi/firefox-24.2.0/sq.xpi) = 340676 +SHA256 (xpi/firefox-24.2.0/sr.xpi) = 5010140675f80426de39548cda7cbec56d7a0689e5627c5e432fb8b0de5aca32 +SIZE (xpi/firefox-24.2.0/sr.xpi) = 385108 +SHA256 (xpi/firefox-24.2.0/sv-SE.xpi) = 9ebb98320b684ca19ba3669db4ea93a54b3870e9c865dd0df34871d6c3123cd1 +SIZE (xpi/firefox-24.2.0/sv-SE.xpi) = 333506 +SHA256 (xpi/firefox-24.2.0/ta-LK.xpi) = 32b33e4e008fdfa4a8cdd0a41fd44962d7ca9496708c81d64859934ca90228ec +SIZE (xpi/firefox-24.2.0/ta-LK.xpi) = 384155 +SHA256 (xpi/firefox-24.2.0/ta.xpi) = d481672b5dbdd12926b79b0a8fb70308c78de8ee72ae6ea88b0b2dd65cdbe002 +SIZE (xpi/firefox-24.2.0/ta.xpi) = 381423 +SHA256 (xpi/firefox-24.2.0/te.xpi) = c17637dcb0e44daf1813bf4fdc3fc087c75262fbb8cf1ec3fc862e1660a53d7a +SIZE (xpi/firefox-24.2.0/te.xpi) = 394563 +SHA256 (xpi/firefox-24.2.0/th.xpi) = 6699a7241b1337036a92faebc454542b53afeffb450faa2f6e5bef972c46c04d +SIZE (xpi/firefox-24.2.0/th.xpi) = 379822 +SHA256 (xpi/firefox-24.2.0/tr.xpi) = 96b8dc501881659b6e97344147aff4989800d0f3744119ba340d991a368c71e9 +SIZE (xpi/firefox-24.2.0/tr.xpi) = 340387 +SHA256 (xpi/firefox-24.2.0/uk.xpi) = 9fbaa5fc680c92161dafb537bf5d245214ad6d38a8feb6f05c5daf156f7e98d4 +SIZE (xpi/firefox-24.2.0/uk.xpi) = 365699 +SHA256 (xpi/firefox-24.2.0/vi.xpi) = da71996d89854a9f389bc8a38366b8de5e0fb8eaf914916f735265a37280e784 +SIZE (xpi/firefox-24.2.0/vi.xpi) = 358430 +SHA256 (xpi/firefox-24.2.0/zh-CN.xpi) = f96ffb1fc036230358c6bfd4376f464f3fdbff42cace5a744edd5a59d8f29a9d +SIZE (xpi/firefox-24.2.0/zh-CN.xpi) = 358183 +SHA256 (xpi/firefox-24.2.0/zh-TW.xpi) = 45c71ef19183c0fa1cf770275a73914e81ade48f6093927a7b67d8ad1f1a8c46 +SIZE (xpi/firefox-24.2.0/zh-TW.xpi) = 351832 +SHA256 (xpi/firefox-24.2.0/zu.xpi) = 81c3fee501d647cdf7657f8d73e8b53492d83560a2290d5e807a05e2a9354c82 +SIZE (xpi/firefox-24.2.0/zu.xpi) = 340394 diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index fb2281c5eca8..9547e60765df 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 24.1.0 -PORTREVISION= 1 +DISTVERSION= 24.2.0 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source @@ -13,7 +12,7 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}esr.source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -BUILD_DEPENDS= nspr>=4.10:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.10.2:${PORTSDIR}/devel/nspr \ nss>=3.15:${PORTSDIR}/security/nss \ sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index fb50062e02de..1279ff0a28a8 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-24.1.0esr.source.tar.bz2) = 92dcc2bacaf00cb36004236440635613a27d1528e927d205b424a92c8f58b35e -SIZE (firefox-24.1.0esr.source.tar.bz2) = 119816789 +SHA256 (firefox-24.2.0esr.source.tar.bz2) = 5a8aa526a0250e9faf2175ef610d63b2c91a5d01de7f9633b8781905dd2b9dcf +SIZE (firefox-24.2.0esr.source.tar.bz2) = 119820009 diff --git a/www/firefox-esr/files/extra-bug780531 b/www/firefox-esr/files/extra-bug780531 deleted file mode 100644 index 26859a9bde10..000000000000 --- a/www/firefox-esr/files/extra-bug780531 +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) - - dnl Use integers over floats for audio on B2G and Android, because audio - dnl backends for those platforms don't support floats. --if test "$OS_TARGET" = "Android"; then -+case "$target" in -+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) --else -+;; -+*) - MOZ_SAMPLE_TYPE_FLOAT32=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) - AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) --fi -+;; -+esac - - dnl ======================================================== - dnl = Disable Speech API code diff --git a/www/firefox-esr/files/firefox.desktop.in b/www/firefox-esr/files/firefox.desktop.in index 27b81ce2bdd7..63e28f69768f 100644 --- a/www/firefox-esr/files/firefox.desktop.in +++ b/www/firefox-esr/files/firefox.desktop.in @@ -182,10 +182,10 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=@MOZILLA@ %u +Exec=@MOZILLA@ %U Icon=@FIREFOX_ICON@ -StartupNotify=false +StartupNotify=true Terminal=false Type=Application -Categories=Application;Network; +Categories=Network;WebBrowser; MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; diff --git a/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp b/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp index b8ff70542e0d..b3f59e4eeb6d 100644 --- a/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp +++ b/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; diff --git a/www/firefox-esr/files/patch-bug945046 b/www/firefox-esr/files/patch-bug945046 new file mode 100644 index 000000000000..2da32f78cd4c --- /dev/null +++ b/www/firefox-esr/files/patch-bug945046 @@ -0,0 +1,130 @@ +diff --git config/system-headers config/system-headers +index 432cba6..18a9627 100644 +--- config/system-headers ++++ config/system-headers +@@ -1157,3 +1157,4 @@ unicode/uenum.h + unicode/unum.h + unicode/ustring.h + #endif ++libutil.h +diff --git js/src/config/system-headers js/src/config/system-headers +index 432cba6..18a9627 100644 +--- js/src/config/system-headers ++++ js/src/config/system-headers +@@ -1157,3 +1157,4 @@ unicode/uenum.h + unicode/unum.h + unicode/ustring.h + #endif ++libutil.h +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 9975621..b4b037d 100644 +--- toolkit/library/Makefile.in ++++ toolkit/library/Makefile.in +@@ -289,6 +289,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,kvm) + EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols + endif + ++ifeq ($(OS_ARCH),FreeBSD) ++OS_LIBS += $(call EXPAND_LIBNAME,util) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet wbemuuid) + ifdef ACCESSIBILITY +diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp +index b8147c8..0ffb34e 100644 +--- xpcom/base/nsMemoryReporterManager.cpp ++++ xpcom/base/nsMemoryReporterManager.cpp +@@ -153,6 +153,43 @@ static nsresult GetResidentFast(int64_t + return GetResident(n); + } + ++#ifdef __FreeBSD__ ++#include <libutil.h> ++ ++static nsresult ++GetKinfoVmentrySelf(int64_t* prss) ++{ ++ int cnt; ++ struct kinfo_vmentry *vmmap, *kve; ++ if ((vmmap = kinfo_getvmmap(getpid(), &cnt)) == NULL) ++ return NS_ERROR_FAILURE; ++ ++ if (prss) ++ *prss = 0; ++ ++ for (int i = 0; i < cnt; i++) { ++ kve = &vmmap[i]; ++ if (prss) ++ *prss += kve->kve_private_resident; ++ } ++ ++ free(vmmap); ++ return NS_OK; ++} ++ ++#define HAVE_PRIVATE_REPORTER ++static nsresult ++GetPrivate(int64_t* aN) ++{ ++ int64_t priv; ++ nsresult rv = GetKinfoVmentrySelf(&priv); ++ if (NS_SUCCEEDED(rv)) ++ *aN = priv * getpagesize(); ++ ++ return NS_OK; ++} ++#endif // FreeBSD ++ + #elif defined(SOLARIS) + + #include <procfs.h> +@@ -327,6 +364,24 @@ static nsresult GetResidentFast(int64_t + } + + #define HAVE_PRIVATE_REPORTER ++static nsresult ++GetPrivate(int64_t* aN) ++{ ++ PROCESS_MEMORY_COUNTERS_EX pmcex; ++ pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX); ++ ++ if (!GetProcessMemoryInfo( ++ GetCurrentProcess(), ++ (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) { ++ return NS_ERROR_FAILURE; ++ } ++ ++ *aN = pmcex.PrivateUsage; ++ return NS_OK; ++} ++#endif // XP_<PLATFORM> ++ ++#ifdef HAVE_PRIVATE_REPORTER + class PrivateReporter MOZ_FINAL : public MemoryReporterBase + { + public: +@@ -339,21 +394,10 @@ public: + + NS_IMETHOD GetAmount(int64_t *aAmount) + { +- PROCESS_MEMORY_COUNTERS_EX pmcex; +- pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX); +- +- if (!GetProcessMemoryInfo( +- GetCurrentProcess(), +- (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) { +- return NS_ERROR_FAILURE; +- } +- +- *aAmount = pmcex.PrivateUsage; +- return NS_OK; ++ return GetPrivate(aAmount); + } + }; +- +-#endif // XP_<PLATFORM> ++#endif + + #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS + class VsizeReporter MOZ_FINAL : public MemoryReporterBase diff --git a/www/firefox-esr/files/patch-bug946560 b/www/firefox-esr/files/patch-bug946560 new file mode 100644 index 000000000000..e2560bd0d0c3 --- /dev/null +++ b/www/firefox-esr/files/patch-bug946560 @@ -0,0 +1,44 @@ +diff --git xpcom/base/nsMemoryInfoDumper.cpp xpcom/base/nsMemoryInfoDumper.cpp +index 0b2f78c..d857374 100644 +--- xpcom/base/nsMemoryInfoDumper.cpp ++++ xpcom/base/nsMemoryInfoDumper.cpp +@@ -30,7 +30,7 @@ + #include <unistd.h> + #endif + +-#ifdef XP_LINUX ++#if defined(XP_LINUX) || defined(__FreeBSD__) + #include <fcntl.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -109,7 +109,7 @@ private: + + } // anonymous namespace + +-#ifdef XP_LINUX // { ++#if defined(XP_LINUX) || defined(__FreeBSD__) // { + namespace { + + /* +@@ -548,7 +548,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper( + /* static */ void + nsMemoryInfoDumper::Initialize() + { +-#ifdef XP_LINUX ++#if defined(XP_LINUX) || defined(__FreeBSD__) + SignalPipeWatcher::Create(); + FifoWatcher::MaybeCreate(); + #endif +diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp +index 8c65665..8f6d0e9 100644 +--- xpcom/base/nsMemoryReporterManager.cpp ++++ xpcom/base/nsMemoryReporterManager.cpp +@@ -824,7 +824,7 @@ nsMemoryReporterManager::Init() + RegisterReporter(new mozilla::dmd::DMDReporter); + #endif + +-#if defined(XP_LINUX) ++#if defined(XP_LINUX) || defined(__FreeBSD__) + nsMemoryInfoDumper::Initialize(); + #endif + diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index 8bd5b7b1c589..a4bec58f9a0b 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 25.0 +PORTVERSION= 26.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -14,9 +14,10 @@ COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USE_FIREFOX= 25 +USE_FIREFOX= 26 USE_XPI= firefox linux-firefox +NO_ARCH= yes USE_SUBMAKE= yes WDIR= langpack-*@firefox.mozilla.org diff --git a/www/firefox-i18n/Makefile.lang b/www/firefox-i18n/Makefile.lang index b65109e88dc9..bff3bf812771 100644 --- a/www/firefox-i18n/Makefile.lang +++ b/www/firefox-i18n/Makefile.lang @@ -1,16 +1,20 @@ # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp> # $FreeBSD$ -FIREFOX_I18N_ALL_= af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el \ - en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa \ - fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu hy-AM id is \ - it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO \ - nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq \ - sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu +FIREFOX_I18N_ALL_= ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb \ + cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES \ + es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he \ + hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt \ + lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR \ + pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th \ + tr uk vi zh-CN zh-TW zu .if defined(FIREFOX_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package) FIREFOX_I18N= ${FIREFOX_I18N_ALL_} .else +.if ${PORT_OPTIONS:MLANG_ACH} +FIREFOX_I18N+= ach +.endif .if ${PORT_OPTIONS:MLANG_AF} FIREFOX_I18N+= af .endif @@ -20,6 +24,9 @@ FIREFOX_I18N+= ak .if ${PORT_OPTIONS:MLANG_AR} FIREFOX_I18N+= ar .endif +.if ${PORT_OPTIONS:MLANG_AS} +FIREFOX_I18N+= as +.endif .if ${PORT_OPTIONS:MLANG_AST} FIREFOX_I18N+= ast .endif @@ -47,6 +54,9 @@ FIREFOX_I18N+= ca .if ${PORT_OPTIONS:MLANG_CS} FIREFOX_I18N+= cs .endif +.if ${PORT_OPTIONS:MLANG_CSB} +FIREFOX_I18N+= csb +.endif .if ${PORT_OPTIONS:MLANG_CY} FIREFOX_I18N+= cy .endif @@ -92,6 +102,9 @@ FIREFOX_I18N+= eu .if ${PORT_OPTIONS:MLANG_FA} FIREFOX_I18N+= fa .endif +.if ${PORT_OPTIONS:MLANG_FF} +FIREFOX_I18N+= ff +.endif .if ${PORT_OPTIONS:MLANG_FI} FIREFOX_I18N+= fi .endif @@ -104,6 +117,9 @@ FIREFOX_I18N+= fy-NL .if ${PORT_OPTIONS:MLANG_GA} FIREFOX_I18N+= ga-IE .endif +.if ${PORT_OPTIONS:MLANG_GD} +FIREFOX_I18N+= gd +.endif .if ${PORT_OPTIONS:MLANG_GL} FIREFOX_I18N+= gl .endif @@ -140,6 +156,9 @@ FIREFOX_I18N+= ja .if ${PORT_OPTIONS:MLANG_KK} FIREFOX_I18N+= kk .endif +.if ${PORT_OPTIONS:MLANG_KM} +FIREFOX_I18N+= km +.endif .if ${PORT_OPTIONS:MLANG_KN} FIREFOX_I18N+= kn .endif @@ -152,6 +171,9 @@ FIREFOX_I18N+= ku .if ${PORT_OPTIONS:MLANG_LG} FIREFOX_I18N+= lg .endif +.if ${PORT_OPTIONS:MLANG_LIJ} +FIREFOX_I18N+= lij +.endif .if ${PORT_OPTIONS:MLANG_LT} FIREFOX_I18N+= lt .endif diff --git a/www/firefox-i18n/Makefile.option b/www/firefox-i18n/Makefile.option index 68b6b79762df..960ab3ab15c1 100644 --- a/www/firefox-i18n/Makefile.option +++ b/www/firefox-i18n/Makefile.option @@ -1,14 +1,17 @@ # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp> # $FreeBSD$ -OPTIONS_DEFINE= LANG_AF \ +OPTIONS_DEFINE= LANG_ACH \ + LANG_AF \ LANG_AK \ LANG_SQ \ LANG_AR \ + LANG_AS \ LANG_AM \ LANG_AST \ LANG_EU \ LANG_BN \ + LANG_BD \ LANG_BB \ LANG_BS \ LANG_BR \ @@ -17,6 +20,7 @@ OPTIONS_DEFINE= LANG_AF \ LANG_CA \ LANG_CN \ LANG_CS \ + LANG_CSB \ LANG_DA \ LANG_NL \ LANG_GB \ @@ -27,10 +31,12 @@ OPTIONS_DEFINE= LANG_AF \ LANG_DE \ LANG_EL \ LANG_GU \ + LANG_FF \ LANG_FI \ LANG_FR \ LANG_FY \ LANG_GA \ + LANG_GD \ LANG_HE \ LANG_HI \ LANG_HR \ @@ -41,11 +47,13 @@ OPTIONS_DEFINE= LANG_AF \ LANG_JA \ LANG_KN \ LANG_KK \ + LANG_KM \ LANG_KO \ LANG_KU \ LANG_LV \ LANG_LT \ LANG_LG \ + LANG_LIJ \ LANG_MK \ LANG_MAI \ LANG_ML \ @@ -88,3 +96,11 @@ OPTIONS_DEFINE= LANG_AF \ OPTIONS_DEFAULT=LANG_AR LANG_BN LANG_BR LANG_CN LANG_ET LANG_DE LANG_FR \ LANG_HI LANG_ID LANG_IT LANG_JA LANG_KO LANG_MK LANG_MR \ LANG_MN LANG_PBR LANG_PA LANG_RU LANG_ES LANG_SON LANG_TE + +LANG_ACH_DESC?= Acholi language support +LANG_AS_DESC?= Assamese language support +LANG_BD_DESC?= Bengali (Bangladesh) language support +LANG_CSB_DESC?= Kashubian language support +LANG_FF_DESC?= Pulaar Fulfulde language support +LANG_KM_DESC?= Khmer language support +LANG_LIJ_DESC?= Ligurian (Genoa) language support diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo index 65d5429ba4db..9a87880807a2 100644 --- a/www/firefox-i18n/distinfo +++ b/www/firefox-i18n/distinfo @@ -1,164 +1,178 @@ -SHA256 (xpi/firefox-i18n-25.0/af.xpi) = b1f6b75394b9b5531055b8aa5d43b5ea67cf90f87efc5d5b65328c947d98b701 -SIZE (xpi/firefox-i18n-25.0/af.xpi) = 337523 -SHA256 (xpi/firefox-i18n-25.0/ak.xpi) = 1040de78d4808c3a25d2c2bd6592ee21e6253db42d22b73b7391f7a9f2e74fd6 -SIZE (xpi/firefox-i18n-25.0/ak.xpi) = 340608 -SHA256 (xpi/firefox-i18n-25.0/ar.xpi) = 065f4423db512cbae9661ad44c338eff8589272dd4282d0ffcc6467b4203e110 -SIZE (xpi/firefox-i18n-25.0/ar.xpi) = 365874 -SHA256 (xpi/firefox-i18n-25.0/ast.xpi) = 9e2b9da63a0de91511a289576fbacf590d6fe8dd1580311e3a58ff03eb85ea87 -SIZE (xpi/firefox-i18n-25.0/ast.xpi) = 296145 -SHA256 (xpi/firefox-i18n-25.0/be.xpi) = 1e5c9f4e7833d931b5d65014edad5cc9f66cfdeb48a8e151ca3cdc37881cdda0 -SIZE (xpi/firefox-i18n-25.0/be.xpi) = 323733 -SHA256 (xpi/firefox-i18n-25.0/bg.xpi) = 8fa6971aa4cf479810dd07d0d4cbaf204f8a365f6a4039561c7f966b5f633f14 -SIZE (xpi/firefox-i18n-25.0/bg.xpi) = 378427 -SHA256 (xpi/firefox-i18n-25.0/bn-BD.xpi) = 4927cd69d1942ca0b5c46efbcdaf009b9e64d79006f6f9655d165d3e8ee6a437 -SIZE (xpi/firefox-i18n-25.0/bn-BD.xpi) = 399942 -SHA256 (xpi/firefox-i18n-25.0/bn-IN.xpi) = 262d58103f9b74b7c8389ab737c47e88e2a154f9bcd417adc6f0ee20e1dbd7ab -SIZE (xpi/firefox-i18n-25.0/bn-IN.xpi) = 432587 -SHA256 (xpi/firefox-i18n-25.0/br.xpi) = 833fa833d6fe1b696bd9b040973c083731d39a2c616c2ec6f83515a28c204f7b -SIZE (xpi/firefox-i18n-25.0/br.xpi) = 335564 -SHA256 (xpi/firefox-i18n-25.0/bs.xpi) = d6e9e0c7307c840e2219426482e56e7c53c761365ee43d99178dec8f8426f792 -SIZE (xpi/firefox-i18n-25.0/bs.xpi) = 342858 -SHA256 (xpi/firefox-i18n-25.0/ca.xpi) = 0edced68f08bbf8402b4657e85203c1dc29574f291ca6fab8f962812ed1e31a5 -SIZE (xpi/firefox-i18n-25.0/ca.xpi) = 345740 -SHA256 (xpi/firefox-i18n-25.0/cs.xpi) = e1975627edad3c6891a58b483f24ddbd38c343f2b9fc9ccb1fbb550b718ce727 -SIZE (xpi/firefox-i18n-25.0/cs.xpi) = 341127 -SHA256 (xpi/firefox-i18n-25.0/cy.xpi) = a8af669bed2d860d8656956c1f2bbacbc9c06d6445545578ab9a9fc76061f170 -SIZE (xpi/firefox-i18n-25.0/cy.xpi) = 335103 -SHA256 (xpi/firefox-i18n-25.0/da.xpi) = 430499259053c2d5fa49c7bebd6d5a755a727613a9e23125219d32a058181fa9 -SIZE (xpi/firefox-i18n-25.0/da.xpi) = 331218 -SHA256 (xpi/firefox-i18n-25.0/de.xpi) = cb462aa43bffd28b13305c29fccd4fc050ed3d5be470a764d8a355f6d5dfdd1e -SIZE (xpi/firefox-i18n-25.0/de.xpi) = 328227 -SHA256 (xpi/firefox-i18n-25.0/el.xpi) = e2c2dc01bef0390ece24865f279b8884d15564a01d9d1f3f5b9f0abee1e6ab42 -SIZE (xpi/firefox-i18n-25.0/el.xpi) = 366496 -SHA256 (xpi/firefox-i18n-25.0/en-GB.xpi) = 6a5b4236d789d80c77965805649de5f5a9dd563301d5701ebff488e4074836cf -SIZE (xpi/firefox-i18n-25.0/en-GB.xpi) = 322367 -SHA256 (xpi/firefox-i18n-25.0/en-US.xpi) = c641e7c4783225f75434bd04d92c5d4cd1cb8242a29cc861094fde6f2e9f193e -SIZE (xpi/firefox-i18n-25.0/en-US.xpi) = 325017 -SHA256 (xpi/firefox-i18n-25.0/en-ZA.xpi) = 5033da059dd06ad871a2d80ac8a77ea3633b50887639de250cbc4438556e83d7 -SIZE (xpi/firefox-i18n-25.0/en-ZA.xpi) = 324437 -SHA256 (xpi/firefox-i18n-25.0/eo.xpi) = 6bc7d70fc14f9f3360f35034cd41a565ae584077d7be22167c4666717b934c3f -SIZE (xpi/firefox-i18n-25.0/eo.xpi) = 339399 -SHA256 (xpi/firefox-i18n-25.0/es-AR.xpi) = 693d5209fde017a0391a66233d91b0170ad89faf86594f56ad664710dd16cd61 -SIZE (xpi/firefox-i18n-25.0/es-AR.xpi) = 338922 -SHA256 (xpi/firefox-i18n-25.0/es-CL.xpi) = e94bd8892e2838a975ae4d6dcc8618e541e1a9f617147da7539075283406327b -SIZE (xpi/firefox-i18n-25.0/es-CL.xpi) = 289383 -SHA256 (xpi/firefox-i18n-25.0/es-ES.xpi) = bc011e8154a10d9be4bc823901b1f440ed55943df0e5d1972d431b449bf795a7 -SIZE (xpi/firefox-i18n-25.0/es-ES.xpi) = 280667 -SHA256 (xpi/firefox-i18n-25.0/es-MX.xpi) = 3b6b2c3bcc4db0bdffd212918cf84eccf6e57682749b2a48aaa6962f96adadf7 -SIZE (xpi/firefox-i18n-25.0/es-MX.xpi) = 307266 -SHA256 (xpi/firefox-i18n-25.0/et.xpi) = 674c72c6276dcaa5d3d812ee8c6fb59bf9425bd65a142b62b4b1e3e3dce1d3b4 -SIZE (xpi/firefox-i18n-25.0/et.xpi) = 331904 -SHA256 (xpi/firefox-i18n-25.0/eu.xpi) = 398db9bb8672e0e5b82ecf0c5a39e19a123f101b2afbb99922d1084c012db951 -SIZE (xpi/firefox-i18n-25.0/eu.xpi) = 336890 -SHA256 (xpi/firefox-i18n-25.0/fa.xpi) = 7cf015b521d69875c6ed29e696e166359a50f4e75a9a09f27b03d5a8888693de -SIZE (xpi/firefox-i18n-25.0/fa.xpi) = 380482 -SHA256 (xpi/firefox-i18n-25.0/fi.xpi) = 6fe46784228af8faaca3ca3840e122a2d5c424199c65baaeab4953627b617282 -SIZE (xpi/firefox-i18n-25.0/fi.xpi) = 332154 -SHA256 (xpi/firefox-i18n-25.0/fr.xpi) = b6e9bfecf4a808306619f9a82b6e04a51b40fdcab9ee1672c2012cd194aba268 -SIZE (xpi/firefox-i18n-25.0/fr.xpi) = 343539 -SHA256 (xpi/firefox-i18n-25.0/fy-NL.xpi) = 78f257a1a76ba4a333b940f36b475d93387895973d0b2f8a82cba53a1815d538 -SIZE (xpi/firefox-i18n-25.0/fy-NL.xpi) = 341586 -SHA256 (xpi/firefox-i18n-25.0/ga-IE.xpi) = 2a72626e841da23baf51e50d520f96cf8f4efc6ce4f5e16c7d42a7ed6e1f3fd2 -SIZE (xpi/firefox-i18n-25.0/ga-IE.xpi) = 350376 -SHA256 (xpi/firefox-i18n-25.0/gl.xpi) = 047bbc823b604ffc553c938d1ee9360857b565603f50a7c040de4bd372b5acee -SIZE (xpi/firefox-i18n-25.0/gl.xpi) = 341940 -SHA256 (xpi/firefox-i18n-25.0/gu-IN.xpi) = 34ebebd4cfd66cc7e87bdc6e9f44fde9e66d663ee826d1144cfa10fbf9b921bb -SIZE (xpi/firefox-i18n-25.0/gu-IN.xpi) = 365746 -SHA256 (xpi/firefox-i18n-25.0/he.xpi) = 0890b59118084ec740b42da65a1f60d8649255581c7e43050a98856fe6f30309 -SIZE (xpi/firefox-i18n-25.0/he.xpi) = 359421 -SHA256 (xpi/firefox-i18n-25.0/hi-IN.xpi) = 4bf7a3b3a79e9ea9ae4565d03c118a74aaa165c70a9b517195084f3989317e44 -SIZE (xpi/firefox-i18n-25.0/hi-IN.xpi) = 384800 -SHA256 (xpi/firefox-i18n-25.0/hr.xpi) = 6ffa4adba132d5fd0a5022a0a6aa7a05f789199f89cf149d0c3da9b9b966275a -SIZE (xpi/firefox-i18n-25.0/hr.xpi) = 342099 -SHA256 (xpi/firefox-i18n-25.0/hu.xpi) = 5ea95e21f644504114ec23d26f900bf4202766cd1152f647f0758c8d70f9ed2f -SIZE (xpi/firefox-i18n-25.0/hu.xpi) = 348622 -SHA256 (xpi/firefox-i18n-25.0/hy-AM.xpi) = 49714aa81f3dd3b03c7354fc394a5b14a54534629dd868d4af804cbe9568eed0 -SIZE (xpi/firefox-i18n-25.0/hy-AM.xpi) = 390236 -SHA256 (xpi/firefox-i18n-25.0/id.xpi) = 01ea71d9f126843c50c4892f09fb3c911c2cfce3a5397d631a277781cac35ff3 -SIZE (xpi/firefox-i18n-25.0/id.xpi) = 324850 -SHA256 (xpi/firefox-i18n-25.0/is.xpi) = 203b14a18c92a50230134ce128472169860e622ea3ad63d69feaafebd81c2992 -SIZE (xpi/firefox-i18n-25.0/is.xpi) = 336094 -SHA256 (xpi/firefox-i18n-25.0/it.xpi) = ad03940bdb97f594cc132ddf9ba35acece1a2e825bba8e5fb6ba224e69130c06 -SIZE (xpi/firefox-i18n-25.0/it.xpi) = 275093 -SHA256 (xpi/firefox-i18n-25.0/ja.xpi) = 3c39f196ce153574967a392af1ab9d602cf27aa0ac4664c7d6c19831d56b0c35 -SIZE (xpi/firefox-i18n-25.0/ja.xpi) = 375773 -SHA256 (xpi/firefox-i18n-25.0/kk.xpi) = 023e33fd33ecd03193ee522a5f8b49650f5e48f2382dc34392d2da9ded07f163 -SIZE (xpi/firefox-i18n-25.0/kk.xpi) = 383175 -SHA256 (xpi/firefox-i18n-25.0/kn.xpi) = f08119f50a7b43afe22c274ac2355dc681eaa65d67b58d3e803fd4fb97533742 -SIZE (xpi/firefox-i18n-25.0/kn.xpi) = 397092 -SHA256 (xpi/firefox-i18n-25.0/ko.xpi) = 17162ac02d87075b829eae65752137e85db741f9ab2ec8e2d04c2b887d5f2bc2 -SIZE (xpi/firefox-i18n-25.0/ko.xpi) = 350905 -SHA256 (xpi/firefox-i18n-25.0/ku.xpi) = a80f19f8b1dcb864f348b07ffd1cc86031ac8794ccfe9d2e4150f45b3791f802 -SIZE (xpi/firefox-i18n-25.0/ku.xpi) = 359755 -SHA256 (xpi/firefox-i18n-25.0/lg.xpi) = e4bc0bc67d5d55103bdda18f13fb18fec221631a3c43cfaea986117d773e4d8e -SIZE (xpi/firefox-i18n-25.0/lg.xpi) = 355900 -SHA256 (xpi/firefox-i18n-25.0/lt.xpi) = 60945b6d5c7683bc8c3a99f8227250faee786fa8ba9f282527d85c3e5d36afd9 -SIZE (xpi/firefox-i18n-25.0/lt.xpi) = 357522 -SHA256 (xpi/firefox-i18n-25.0/lv.xpi) = abe18b0cf8c033549d40510e110bb4fba1614b691ad0a7c530deaaa2c3afc720 -SIZE (xpi/firefox-i18n-25.0/lv.xpi) = 333411 -SHA256 (xpi/firefox-i18n-25.0/mai.xpi) = 0e25a52ada8762a897b2f67432fa8dacfe336bc512952a7ebf359c40e80eb7a1 -SIZE (xpi/firefox-i18n-25.0/mai.xpi) = 385172 -SHA256 (xpi/firefox-i18n-25.0/mk.xpi) = 0d0ba30027a324d7af195c8af3365170098e6bcf90c87f93af6393b20878e1c9 -SIZE (xpi/firefox-i18n-25.0/mk.xpi) = 381440 -SHA256 (xpi/firefox-i18n-25.0/ml.xpi) = cc799ba508fd71cc6ffc7bf15377004c045a24ff9ca5f604554f5c778974cd47 -SIZE (xpi/firefox-i18n-25.0/ml.xpi) = 405448 -SHA256 (xpi/firefox-i18n-25.0/mr.xpi) = ce47fe75e385623bff6c5db89f973226cc28043c44485422bc1184ad7138a1bf -SIZE (xpi/firefox-i18n-25.0/mr.xpi) = 385447 -SHA256 (xpi/firefox-i18n-25.0/nb-NO.xpi) = badb166f625c48e73db67ae565415fb55ea6f1e240e9cc0647232072a19a34d0 -SIZE (xpi/firefox-i18n-25.0/nb-NO.xpi) = 331707 -SHA256 (xpi/firefox-i18n-25.0/nl.xpi) = 9673e531ee0ffd9521c9ed2b9ca3f866a18de872411408e349ace1232b61468a -SIZE (xpi/firefox-i18n-25.0/nl.xpi) = 336247 -SHA256 (xpi/firefox-i18n-25.0/nn-NO.xpi) = 8ce93d94fb7333edb9cef192a46e89174d8cc49766825472f70c3d7d42972ce6 -SIZE (xpi/firefox-i18n-25.0/nn-NO.xpi) = 332940 -SHA256 (xpi/firefox-i18n-25.0/nso.xpi) = 2a46e3bd80f79b64c30ea56a60c3e6f3a0469e5034c735962864ceef095b8d6e -SIZE (xpi/firefox-i18n-25.0/nso.xpi) = 341523 -SHA256 (xpi/firefox-i18n-25.0/or.xpi) = 4093e6a122c50148eaaf72a59d0efa315aee7ca4962585f9d0e381598f08c305 -SIZE (xpi/firefox-i18n-25.0/or.xpi) = 370901 -SHA256 (xpi/firefox-i18n-25.0/pa-IN.xpi) = e040f4a1ec159ff4705ac21ad492835f0ad87e9d0394866b2b14ccc8d21e4d80 -SIZE (xpi/firefox-i18n-25.0/pa-IN.xpi) = 370128 -SHA256 (xpi/firefox-i18n-25.0/pl.xpi) = 6770cb1e255082f78ffd2f3637693a891a61cb51c93cdc87804b88a988e3c77d -SIZE (xpi/firefox-i18n-25.0/pl.xpi) = 342013 -SHA256 (xpi/firefox-i18n-25.0/pt-BR.xpi) = 2db8e2904331b559dad102c4f4bf0444643ed162e6d6d6853802a14991df3f86 -SIZE (xpi/firefox-i18n-25.0/pt-BR.xpi) = 339035 -SHA256 (xpi/firefox-i18n-25.0/pt-PT.xpi) = 41d73bc8c90cd4c5a67359c68a042ff32825e0736b5481c7998e55720a8c3f54 -SIZE (xpi/firefox-i18n-25.0/pt-PT.xpi) = 337163 -SHA256 (xpi/firefox-i18n-25.0/rm.xpi) = 01a445dbff142201c5a26608a85614b85bbcf07b3f37432c00a5c9cdf25da3f8 -SIZE (xpi/firefox-i18n-25.0/rm.xpi) = 338411 -SHA256 (xpi/firefox-i18n-25.0/ro.xpi) = 6bf644689598a8fef7cf3b931612cd40f9f4c1904746dd959ad7e1c26a71aa89 -SIZE (xpi/firefox-i18n-25.0/ro.xpi) = 367206 -SHA256 (xpi/firefox-i18n-25.0/ru.xpi) = 472f5c889b5a52b00bb2bbefdc5faf91b7645722d8ded36b1e4723f65811ecaf -SIZE (xpi/firefox-i18n-25.0/ru.xpi) = 326389 -SHA256 (xpi/firefox-i18n-25.0/si.xpi) = d2ead64714e8108eaeacd6646e58c7c4acfcc9506c01ce3e2e9c6ad02447894e -SIZE (xpi/firefox-i18n-25.0/si.xpi) = 377197 -SHA256 (xpi/firefox-i18n-25.0/sk.xpi) = d331a9080edff70ecd6642c2e38a3bab42fdb811ec2081f6fe827cd70a5135f4 -SIZE (xpi/firefox-i18n-25.0/sk.xpi) = 352372 -SHA256 (xpi/firefox-i18n-25.0/sl.xpi) = 3c74ee0af31d2997fb6cf38a1b9953019f8d12ff3704337bf6659768b2fc6285 -SIZE (xpi/firefox-i18n-25.0/sl.xpi) = 336782 -SHA256 (xpi/firefox-i18n-25.0/son.xpi) = 6d3bdea5e77ec26cc3d087c04b536118561ef001649050788396b085e86d1147 -SIZE (xpi/firefox-i18n-25.0/son.xpi) = 334537 -SHA256 (xpi/firefox-i18n-25.0/sq.xpi) = 39518d0e9c7695447e68c695a6ef3a6687817bd0765f5d01149c61fc6a271902 -SIZE (xpi/firefox-i18n-25.0/sq.xpi) = 345881 -SHA256 (xpi/firefox-i18n-25.0/sr.xpi) = 9f41425288f70ed793333f36004a675997cbec4b61d259bab7e9547055699b88 -SIZE (xpi/firefox-i18n-25.0/sr.xpi) = 389358 -SHA256 (xpi/firefox-i18n-25.0/sv-SE.xpi) = 5ad378fadde14523763bc3a48345332b5d4d30fedbb42098b5e87fb0481ceb1d -SIZE (xpi/firefox-i18n-25.0/sv-SE.xpi) = 337972 -SHA256 (xpi/firefox-i18n-25.0/ta-LK.xpi) = 6f91f4ec09944ba1c5e75519b06be9706081d70b5ff45a0de3bf147220c8f771 -SIZE (xpi/firefox-i18n-25.0/ta-LK.xpi) = 388329 -SHA256 (xpi/firefox-i18n-25.0/ta.xpi) = d583b211e84fc1dfc595de4a30bb68ce738d396871023d1e008218d3ca8487ab -SIZE (xpi/firefox-i18n-25.0/ta.xpi) = 387412 -SHA256 (xpi/firefox-i18n-25.0/te.xpi) = f6e2bfbe3b8fe85ccb0ca9f777cb0434201e188a702a6698557769dfd56c6532 -SIZE (xpi/firefox-i18n-25.0/te.xpi) = 400288 -SHA256 (xpi/firefox-i18n-25.0/th.xpi) = 9c2d80d460efdc1e19ec1e1b4779f6f7c2a6a982fe392d3eb5792c0656ffa41b -SIZE (xpi/firefox-i18n-25.0/th.xpi) = 383265 -SHA256 (xpi/firefox-i18n-25.0/tr.xpi) = 32c38bad2c5874e3445d84f3ba9d6e56a2d013cc2e0c28e8e72d644f8d5b528c -SIZE (xpi/firefox-i18n-25.0/tr.xpi) = 345007 -SHA256 (xpi/firefox-i18n-25.0/uk.xpi) = 8759767c9456f21e3338a3be52c65cee532e760becc20903648df405ea53b8eb -SIZE (xpi/firefox-i18n-25.0/uk.xpi) = 371149 -SHA256 (xpi/firefox-i18n-25.0/vi.xpi) = 2c0f4ee5dadd19fea118d8ba5317728ea5267296656d7ba607c0216a6bd38198 -SIZE (xpi/firefox-i18n-25.0/vi.xpi) = 364103 -SHA256 (xpi/firefox-i18n-25.0/zh-CN.xpi) = 49d47c1b008cdfe1737093fb802f37de586d873e29ef6aa43f965b2e2f879b35 -SIZE (xpi/firefox-i18n-25.0/zh-CN.xpi) = 363975 -SHA256 (xpi/firefox-i18n-25.0/zh-TW.xpi) = 34f1f86cbc370f8b85a07da3170099a0fe6bce1f0b367972bb7cb6c7f390983e -SIZE (xpi/firefox-i18n-25.0/zh-TW.xpi) = 356557 -SHA256 (xpi/firefox-i18n-25.0/zu.xpi) = ca32c7e028a56c9b0f43dc479f6ec5250c5fc89a18d657a448bf282598858ba9 -SIZE (xpi/firefox-i18n-25.0/zu.xpi) = 346212 +SHA256 (xpi/firefox-i18n-26.0/ach.xpi) = a6c89af819f1dfd69a68c20727d67ee574147245791ff9441c7fa4acbb41be65 +SIZE (xpi/firefox-i18n-26.0/ach.xpi) = 350803 +SHA256 (xpi/firefox-i18n-26.0/af.xpi) = 25e6d192216d7d405bc0204f2bfeaa97f62bbd2620869620a401126cea9747cf +SIZE (xpi/firefox-i18n-26.0/af.xpi) = 343725 +SHA256 (xpi/firefox-i18n-26.0/ak.xpi) = 3c6a109955c672a2478bd8af3aa7703b91534afa0f74c2a61e5336c8967c897f +SIZE (xpi/firefox-i18n-26.0/ak.xpi) = 347001 +SHA256 (xpi/firefox-i18n-26.0/ar.xpi) = f61e5d7b6804484d1fe938856ccc067bddfe7b759f41ad5c7588f66bf25a11fc +SIZE (xpi/firefox-i18n-26.0/ar.xpi) = 372642 +SHA256 (xpi/firefox-i18n-26.0/as.xpi) = 3908057b8e319deff0b01a8421313f16b79a58719d4efbb5f53aa0f639a7e77b +SIZE (xpi/firefox-i18n-26.0/as.xpi) = 390869 +SHA256 (xpi/firefox-i18n-26.0/ast.xpi) = b9cc76d0c8c243ad9f59885a788c5a041b8f94e6d8a32c763a7fecae568cfcc8 +SIZE (xpi/firefox-i18n-26.0/ast.xpi) = 303872 +SHA256 (xpi/firefox-i18n-26.0/be.xpi) = 2fd723c1a53e48b1f4ac14753598aad304e4004560ab92a516ecdf315d76340f +SIZE (xpi/firefox-i18n-26.0/be.xpi) = 326513 +SHA256 (xpi/firefox-i18n-26.0/bg.xpi) = c28bb24000a1634e18f1c7365d86f64c42f29889ede88a235fc1ecef3d55ec0d +SIZE (xpi/firefox-i18n-26.0/bg.xpi) = 385068 +SHA256 (xpi/firefox-i18n-26.0/bn-BD.xpi) = b194cdb87a7bb89568c1167a1baf7a2c25c52fe8c46d50f98485dcef2d085da8 +SIZE (xpi/firefox-i18n-26.0/bn-BD.xpi) = 406287 +SHA256 (xpi/firefox-i18n-26.0/bn-IN.xpi) = a9de7977aeff69d475b6a28905b642552c9015b2fafffad89ac4ae515b818954 +SIZE (xpi/firefox-i18n-26.0/bn-IN.xpi) = 438700 +SHA256 (xpi/firefox-i18n-26.0/br.xpi) = 9c1660229725549fd1b28d5d8bac1a84ff09553d3092aaaaa5cbe78d5a726da4 +SIZE (xpi/firefox-i18n-26.0/br.xpi) = 342246 +SHA256 (xpi/firefox-i18n-26.0/bs.xpi) = 25eaa6bb4d5bd9679d2d735a9ca895fc53b392a0b8ace1cf3dbdecc2998d6b65 +SIZE (xpi/firefox-i18n-26.0/bs.xpi) = 349664 +SHA256 (xpi/firefox-i18n-26.0/ca.xpi) = e85689fd9d5019447b1973414e0b506a2a514a76b2d1134cb09ee643428436a2 +SIZE (xpi/firefox-i18n-26.0/ca.xpi) = 352361 +SHA256 (xpi/firefox-i18n-26.0/cs.xpi) = b3649766326ab1c8585bd5293a255c502f7c8124b9ad6a2c233203c1f66d2fb4 +SIZE (xpi/firefox-i18n-26.0/cs.xpi) = 347870 +SHA256 (xpi/firefox-i18n-26.0/csb.xpi) = 05b94a0f1929d0149bd72a4af3555ba3c8618313ba438b6bce412b7b9507490c +SIZE (xpi/firefox-i18n-26.0/csb.xpi) = 337702 +SHA256 (xpi/firefox-i18n-26.0/cy.xpi) = 2cb56f6204b363b6ffb0fb3120a60daca32600fc75b69372090c531ca2e77529 +SIZE (xpi/firefox-i18n-26.0/cy.xpi) = 341525 +SHA256 (xpi/firefox-i18n-26.0/da.xpi) = 8d1c30e48227f84ab0710ccaf8da0f4aa0c9b141a1579b51427b64b3248db293 +SIZE (xpi/firefox-i18n-26.0/da.xpi) = 337590 +SHA256 (xpi/firefox-i18n-26.0/de.xpi) = e2632e4995af36a3924139bcdf71eb23bc1aebfc03726efc353f0d30f41fcda6 +SIZE (xpi/firefox-i18n-26.0/de.xpi) = 335311 +SHA256 (xpi/firefox-i18n-26.0/el.xpi) = b251444ad42e075e8950c2e2518cd06b5c5d28fd0a3220178bb193ce99d59986 +SIZE (xpi/firefox-i18n-26.0/el.xpi) = 373291 +SHA256 (xpi/firefox-i18n-26.0/en-GB.xpi) = 8af3055ce01325905cc4772ed9f0ed1b9a99e3e25a65564d2c401a1c820ad038 +SIZE (xpi/firefox-i18n-26.0/en-GB.xpi) = 328278 +SHA256 (xpi/firefox-i18n-26.0/en-US.xpi) = 4c1b40a78cba2b806ef3410f97bb4c285365c8f80fcda76605289c5b462b0bc0 +SIZE (xpi/firefox-i18n-26.0/en-US.xpi) = 330943 +SHA256 (xpi/firefox-i18n-26.0/en-ZA.xpi) = efc06efbd10f2b01702a28891e64b89d32dab7870bde1d3943d20ae5157a166f +SIZE (xpi/firefox-i18n-26.0/en-ZA.xpi) = 327220 +SHA256 (xpi/firefox-i18n-26.0/eo.xpi) = 6bd9efe12bace7725e09b73555290c0eceb6d3530158088f03235b2883da09a7 +SIZE (xpi/firefox-i18n-26.0/eo.xpi) = 345668 +SHA256 (xpi/firefox-i18n-26.0/es-AR.xpi) = b6bbb429143b7e87c7e6fb1f2ada33eb4f53de61926fae532786bcf3d85f810d +SIZE (xpi/firefox-i18n-26.0/es-AR.xpi) = 345557 +SHA256 (xpi/firefox-i18n-26.0/es-CL.xpi) = 2712f80b4b1fa82c8775d3b49106d76d341fbb75db04320c05c41a1dbda71bf7 +SIZE (xpi/firefox-i18n-26.0/es-CL.xpi) = 294553 +SHA256 (xpi/firefox-i18n-26.0/es-ES.xpi) = 74792ddc27cf48283ad1359c8d630ae782f1a1b6ce7ed52068f70b89f94219f5 +SIZE (xpi/firefox-i18n-26.0/es-ES.xpi) = 285907 +SHA256 (xpi/firefox-i18n-26.0/es-MX.xpi) = 7376a1c39149ceec2d2c10962220e4f0fea5662e6e8cfda7e4d82a35be376047 +SIZE (xpi/firefox-i18n-26.0/es-MX.xpi) = 347931 +SHA256 (xpi/firefox-i18n-26.0/et.xpi) = c22f3ff2d1bda6488fd42969487824e89208aab3f0abe49d8c0a582483424d35 +SIZE (xpi/firefox-i18n-26.0/et.xpi) = 337488 +SHA256 (xpi/firefox-i18n-26.0/eu.xpi) = d200c43504e5d907de26846aeec531cd647b7b798252ea608c95e4c19ad3a5cf +SIZE (xpi/firefox-i18n-26.0/eu.xpi) = 343294 +SHA256 (xpi/firefox-i18n-26.0/fa.xpi) = 29318dbc6f2616b684dc9b21aacf776994c438a33c79565d40030530cdd4d1c6 +SIZE (xpi/firefox-i18n-26.0/fa.xpi) = 386622 +SHA256 (xpi/firefox-i18n-26.0/ff.xpi) = ba37fc95f1bc81476e14d87f883f117f1683c24733f7760ab09d32810642695a +SIZE (xpi/firefox-i18n-26.0/ff.xpi) = 343322 +SHA256 (xpi/firefox-i18n-26.0/fi.xpi) = 35115c338d6b6c30b4d4d1840627b1760cca4ffd7f19f4d0c457de8caa5a3b3f +SIZE (xpi/firefox-i18n-26.0/fi.xpi) = 338046 +SHA256 (xpi/firefox-i18n-26.0/fr.xpi) = b1a645131aa4e7ab704dda6248f8dbc8daceb7f69c3d70d53ca83daec5805141 +SIZE (xpi/firefox-i18n-26.0/fr.xpi) = 350284 +SHA256 (xpi/firefox-i18n-26.0/fy-NL.xpi) = e2dbf4db2c5b31904c239e6c69077c256d16596d708485e7628064c76d017914 +SIZE (xpi/firefox-i18n-26.0/fy-NL.xpi) = 348196 +SHA256 (xpi/firefox-i18n-26.0/ga-IE.xpi) = d409ae6283b514df453fc821a1a80f32f6f80ce4d084a67a9c86ff7f4b54b63f +SIZE (xpi/firefox-i18n-26.0/ga-IE.xpi) = 356855 +SHA256 (xpi/firefox-i18n-26.0/gd.xpi) = 3cbb8cbf7a14c2530da3bd1430237ad9926bde6f2112fced682f93a3d093ad37 +SIZE (xpi/firefox-i18n-26.0/gd.xpi) = 353070 +SHA256 (xpi/firefox-i18n-26.0/gl.xpi) = 17a2e0feab5ce0646631931d1fe37e417c90e3b0c76e68118182e4999ab90402 +SIZE (xpi/firefox-i18n-26.0/gl.xpi) = 348430 +SHA256 (xpi/firefox-i18n-26.0/gu-IN.xpi) = 637c064656e41dcb22bb62abc18564289b26ccf7ce17a593da337a13031df6f7 +SIZE (xpi/firefox-i18n-26.0/gu-IN.xpi) = 372578 +SHA256 (xpi/firefox-i18n-26.0/he.xpi) = 229bf3b4de4978f0b3cd4fc580cb1983f5514c405f5841cd7b1610f5aee461d2 +SIZE (xpi/firefox-i18n-26.0/he.xpi) = 365479 +SHA256 (xpi/firefox-i18n-26.0/hi-IN.xpi) = de5c5009e1f411955e769a8876e3969618f5d7e7da8f8a410481319fd0d9de49 +SIZE (xpi/firefox-i18n-26.0/hi-IN.xpi) = 391507 +SHA256 (xpi/firefox-i18n-26.0/hr.xpi) = 9d6d890bd61967f0294e9f7fffd9305876a5db2ac139f1d0de671de8ac76cdd7 +SIZE (xpi/firefox-i18n-26.0/hr.xpi) = 350681 +SHA256 (xpi/firefox-i18n-26.0/hu.xpi) = df633a28bbfced9686d1e550076383dd3988232e3e0f41b8c0f844f461b4e548 +SIZE (xpi/firefox-i18n-26.0/hu.xpi) = 355421 +SHA256 (xpi/firefox-i18n-26.0/hy-AM.xpi) = 1e53c6f01b5d352c68fe433fc57cf139dbd29a9427ffee87f65925647f26e298 +SIZE (xpi/firefox-i18n-26.0/hy-AM.xpi) = 397155 +SHA256 (xpi/firefox-i18n-26.0/id.xpi) = dee6f980ec1246b779187f304bd0f843e77b83b3852251f97ce2565e2a63ef35 +SIZE (xpi/firefox-i18n-26.0/id.xpi) = 331123 +SHA256 (xpi/firefox-i18n-26.0/is.xpi) = 518c7b95882159f2b3570aaa8172a0e458af77f983fb26a71ff988e31e3153a1 +SIZE (xpi/firefox-i18n-26.0/is.xpi) = 342133 +SHA256 (xpi/firefox-i18n-26.0/it.xpi) = 56349995c309ba3dba1a3e5112fb18f43dd0bd2a401847dd6b5e66d1493d05fc +SIZE (xpi/firefox-i18n-26.0/it.xpi) = 280114 +SHA256 (xpi/firefox-i18n-26.0/ja.xpi) = 99c6c78432da9055b5a699b1453efa9ea461494d3590565f9dc24137708c25f5 +SIZE (xpi/firefox-i18n-26.0/ja.xpi) = 382989 +SHA256 (xpi/firefox-i18n-26.0/kk.xpi) = 324a4188049543639dd9912ffdc1700cfabdaed2528bd4a8ca2ec02b4d062cca +SIZE (xpi/firefox-i18n-26.0/kk.xpi) = 391154 +SHA256 (xpi/firefox-i18n-26.0/km.xpi) = 537cdd5ba4f2a72a0564e9d99c2e43d385f2f7ed6a5298322bd65c439b0ad38c +SIZE (xpi/firefox-i18n-26.0/km.xpi) = 412619 +SHA256 (xpi/firefox-i18n-26.0/kn.xpi) = 0478a9a09fefe1ced442bf331e8d5870520eb435726558b53950e9af0f412715 +SIZE (xpi/firefox-i18n-26.0/kn.xpi) = 403626 +SHA256 (xpi/firefox-i18n-26.0/ko.xpi) = 5a63ccbd6931b9841d457e8f230616b71fb32e97df482c1873a93c03d7b1869e +SIZE (xpi/firefox-i18n-26.0/ko.xpi) = 357900 +SHA256 (xpi/firefox-i18n-26.0/ku.xpi) = 7d49ff8324f486eb3fe8a07a0a73491c78d8de3d4abca0be0a09ecdd6f038aa5 +SIZE (xpi/firefox-i18n-26.0/ku.xpi) = 365772 +SHA256 (xpi/firefox-i18n-26.0/lg.xpi) = ad2dd81a5147313a6ea7626f468b4f3acde9f3927a7164bc5f8608ea02e86086 +SIZE (xpi/firefox-i18n-26.0/lg.xpi) = 361960 +SHA256 (xpi/firefox-i18n-26.0/lij.xpi) = 0833eef7c9376e45f241e851e0264a4b15fb4e6351e6798e793b95e82d36cfd0 +SIZE (xpi/firefox-i18n-26.0/lij.xpi) = 331532 +SHA256 (xpi/firefox-i18n-26.0/lt.xpi) = 4f72bdbd2cf1ec5896ba419981bc58eddec964957d6d4bb28f11020525329d1c +SIZE (xpi/firefox-i18n-26.0/lt.xpi) = 364267 +SHA256 (xpi/firefox-i18n-26.0/lv.xpi) = 8bc2ee9b9d3d0707d07bff155785f9e4b243f1aa78ffa9cd3e3f21e033b3ab83 +SIZE (xpi/firefox-i18n-26.0/lv.xpi) = 338750 +SHA256 (xpi/firefox-i18n-26.0/mai.xpi) = 6bc96f2809d84643a545c7d62dc15a118e2489c9af6dfa1258fc7e41e28016bd +SIZE (xpi/firefox-i18n-26.0/mai.xpi) = 391823 +SHA256 (xpi/firefox-i18n-26.0/mk.xpi) = 3f0011ce6900313bfe700a3a34934864fe266071bb65434b88558ef6f6d9da82 +SIZE (xpi/firefox-i18n-26.0/mk.xpi) = 387902 +SHA256 (xpi/firefox-i18n-26.0/ml.xpi) = 78157d3d4ab69f962f894620b03880ec514524db558b341a6145e7d5c6dac874 +SIZE (xpi/firefox-i18n-26.0/ml.xpi) = 412164 +SHA256 (xpi/firefox-i18n-26.0/mr.xpi) = 79796e41b640c6788e0904b2ef6c01ae20288276577d40f474917ba9b45ec3c9 +SIZE (xpi/firefox-i18n-26.0/mr.xpi) = 392361 +SHA256 (xpi/firefox-i18n-26.0/nb-NO.xpi) = fc564ba405199efeb1a541ed83b2a65c10cf4538549989788d1e0d4351b0e817 +SIZE (xpi/firefox-i18n-26.0/nb-NO.xpi) = 337761 +SHA256 (xpi/firefox-i18n-26.0/nl.xpi) = 4c71a87df44f7764c9d9fe024b495d34b4a577d2d32c4e032a46e37eca43487d +SIZE (xpi/firefox-i18n-26.0/nl.xpi) = 342744 +SHA256 (xpi/firefox-i18n-26.0/nn-NO.xpi) = 208b7cd20c8642248769af65df1d584daff475afed226a75b775eba7bd3643e3 +SIZE (xpi/firefox-i18n-26.0/nn-NO.xpi) = 339254 +SHA256 (xpi/firefox-i18n-26.0/nso.xpi) = 73dba2ee69273054db9ff7c4a14c20baca0e0f6a4c9e8614c8d83a5ebe4085a9 +SIZE (xpi/firefox-i18n-26.0/nso.xpi) = 348133 +SHA256 (xpi/firefox-i18n-26.0/or.xpi) = 10b207d06f6e7441aabdd3244b3bf82745ca08bf031b7d261d796b556e50dd09 +SIZE (xpi/firefox-i18n-26.0/or.xpi) = 377698 +SHA256 (xpi/firefox-i18n-26.0/pa-IN.xpi) = 05637129b7cf1ee6bee31ddf8dcb3b29e2dcbfb62d316e7e366d162758ff105a +SIZE (xpi/firefox-i18n-26.0/pa-IN.xpi) = 376121 +SHA256 (xpi/firefox-i18n-26.0/pl.xpi) = a3f0598549625919621bfe2fd7fb2024368708520af0b7f77783ec0916aa1711 +SIZE (xpi/firefox-i18n-26.0/pl.xpi) = 346564 +SHA256 (xpi/firefox-i18n-26.0/pt-BR.xpi) = aaaabec2af2db0afc14960e7b66b972994eb60b93352f0296452b7707e48798d +SIZE (xpi/firefox-i18n-26.0/pt-BR.xpi) = 345553 +SHA256 (xpi/firefox-i18n-26.0/pt-PT.xpi) = b08ebe3d7c097002a6636d1818c34a0a2dabc304fead34b470c7b5653aa174fc +SIZE (xpi/firefox-i18n-26.0/pt-PT.xpi) = 344092 +SHA256 (xpi/firefox-i18n-26.0/rm.xpi) = d7c105dedba73a540aa6ec08ee006354d45fe926fc4b032a1cc5c74554d78536 +SIZE (xpi/firefox-i18n-26.0/rm.xpi) = 344673 +SHA256 (xpi/firefox-i18n-26.0/ro.xpi) = 41992041606d7671716748fa00f096ada79528ff8c7a84ad1a351924e9a09fe5 +SIZE (xpi/firefox-i18n-26.0/ro.xpi) = 373971 +SHA256 (xpi/firefox-i18n-26.0/ru.xpi) = ca9fc08cd1fbb9afb2b416094abdc01153e05616e069fd6230605f3a8d8080ca +SIZE (xpi/firefox-i18n-26.0/ru.xpi) = 333550 +SHA256 (xpi/firefox-i18n-26.0/si.xpi) = d082d3cf297a66e2812967b92b55cf8358451c89f3d9c286c3fed1267addc365 +SIZE (xpi/firefox-i18n-26.0/si.xpi) = 383146 +SHA256 (xpi/firefox-i18n-26.0/sk.xpi) = 0929457331bb84b4036014f0b5ac95eeb115f06d674f8c1e236685a4769c936f +SIZE (xpi/firefox-i18n-26.0/sk.xpi) = 359276 +SHA256 (xpi/firefox-i18n-26.0/sl.xpi) = 57faf587bc0b0401d0a8a9d39981117ed2a5fa8a1de6fa348e08a5ac75575ed1 +SIZE (xpi/firefox-i18n-26.0/sl.xpi) = 343141 +SHA256 (xpi/firefox-i18n-26.0/son.xpi) = f7e8f23ba080279998975a62aa435c73999ff850e347c12d64c51d53dface6e4 +SIZE (xpi/firefox-i18n-26.0/son.xpi) = 341191 +SHA256 (xpi/firefox-i18n-26.0/sq.xpi) = 16311ac1158a3f4f4f45814d7630a4c03b337e57a40eab87044108c03a93c555 +SIZE (xpi/firefox-i18n-26.0/sq.xpi) = 352387 +SHA256 (xpi/firefox-i18n-26.0/sr.xpi) = 56abf0ddac02ed7b197e45562354f918b5f281813be79ae414a7e31945f8e1aa +SIZE (xpi/firefox-i18n-26.0/sr.xpi) = 395418 +SHA256 (xpi/firefox-i18n-26.0/sv-SE.xpi) = 93a21e9ba52e48ac4f98f0216113f03e8adeefb8b851822d3026a01c862e3b34 +SIZE (xpi/firefox-i18n-26.0/sv-SE.xpi) = 344201 +SHA256 (xpi/firefox-i18n-26.0/ta-LK.xpi) = 07e1e941211208e07c85ce4c0960a2167d5a2a240a38973851f07a6fdddea074 +SIZE (xpi/firefox-i18n-26.0/ta-LK.xpi) = 394391 +SHA256 (xpi/firefox-i18n-26.0/ta.xpi) = 382d61638f1052dc75080c2e17d99805500b73b132f25d04ff94a8aae7df3595 +SIZE (xpi/firefox-i18n-26.0/ta.xpi) = 395120 +SHA256 (xpi/firefox-i18n-26.0/te.xpi) = 1b2cdaf4711ba4e4ce109d617e0da3c7b45919707c2489215290ec0b0a29dde6 +SIZE (xpi/firefox-i18n-26.0/te.xpi) = 406992 +SHA256 (xpi/firefox-i18n-26.0/th.xpi) = 9cf0880308c904e527ab9edb8a845bb039af5f53d74e8cd5a3c7523abfe20a84 +SIZE (xpi/firefox-i18n-26.0/th.xpi) = 390074 +SHA256 (xpi/firefox-i18n-26.0/tr.xpi) = 0246b7ee9d4c9046848b4654cf942004825fbff674af4dd48d431f8f04d3f1b4 +SIZE (xpi/firefox-i18n-26.0/tr.xpi) = 351577 +SHA256 (xpi/firefox-i18n-26.0/uk.xpi) = 6bef961c0ee8f934526004ba41f13dc73dcfb211523d0cd45ea858f17b80ddeb +SIZE (xpi/firefox-i18n-26.0/uk.xpi) = 377743 +SHA256 (xpi/firefox-i18n-26.0/vi.xpi) = 04a1684294c816a21acb22902aedd440d8092984712b1fa6cb73543db8b48bcd +SIZE (xpi/firefox-i18n-26.0/vi.xpi) = 370611 +SHA256 (xpi/firefox-i18n-26.0/zh-CN.xpi) = b7896836ea8d2bc7bd41cbac96db0885aa8bef27ed55495dd829cd4938508e71 +SIZE (xpi/firefox-i18n-26.0/zh-CN.xpi) = 369733 +SHA256 (xpi/firefox-i18n-26.0/zh-TW.xpi) = d50e4ac0dcb49fce618fdf0d4a4c0dadca6d3d27841b004c1fc4252743137934 +SIZE (xpi/firefox-i18n-26.0/zh-TW.xpi) = 363386 +SHA256 (xpi/firefox-i18n-26.0/zu.xpi) = f70181b609695f6d16ce109d1c907978881a0252cf45dddefc179a3a7b446a37 +SIZE (xpi/firefox-i18n-26.0/zu.xpi) = 352576 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 85156ec1fd6b..2b705e7f08aa 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,24 +2,22 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 25.0 -PORTREVISION= 1 +DISTVERSION= 26.0 PORTEPOCH= 1 CATEGORIES= www ipv6 -MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ +MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -BUILD_DEPENDS= nspr>=4.10:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.10.2:${PORTSDIR}/devel/nspr \ + nss>=3.15:${PORTSDIR}/security/nss \ sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ unzip:${PORTSDIR}/archivers/unzip -# nss>=3.15:${PORTSDIR}/security/nss \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -29,7 +27,7 @@ OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko CONFLICTS= firefox-esr-24.* firefox-esr-17.* firefox-1[07].* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss # bug713933 +USE_MOZILLA= # empty MOZILLA_NAME= Firefox WANT_GNOME= yes diff --git a/www/firefox/Makefile.webplugins b/www/firefox/Makefile.webplugins deleted file mode 100644 index 9cd5effdee01..000000000000 --- a/www/firefox/Makefile.webplugins +++ /dev/null @@ -1,222 +0,0 @@ -# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# $FreeBSD$ - -# MAINTAINER= gecko@FreeBSD.org -# -# Documentation and examples: -# -# Makefile.webplugins will create symlinks automatically for each supported -# application that supports the webplugins framework. Also, it will remove -# these symlinks when the plug-in port is uninstalled. -# -# USE_WEBPLUGINS - Specify a list of applications that this plug-in -# port supports. For each of these applications, a -# symlink will be created in -# lib/browser_plugins/symlinks. See -# WEBPLUGINS_APPS_ALL_* below for the list of -# supported applications. -# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all -# applications) -# -# WEBPLUGINS_NAME - If your port installs files in ${WEBPLUGINS_DIR}, -# then you can tweak WEBPLUGINS_NAME to change the -# name of the directory -# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). -# Default: WEBPLUGINS_NAME=${PKGBASE} -# -# WEBPLUGINS_FILES - The plug-in files that are going to be linked -# in lib/browser_plugins/symlinks/*/. It cannot -# be empty or the port will set IGNORE. -# -# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be -# found. Each plug-in file in WEBPLUGINS_FILES -# must be found in WEBPLUGINS_DIR. If your port -# does not install in WEBPLUGINS_DIR, but in its own -# path, you will need to specify that here or -# symlinks will be created to non-existent files. -# Default: WEBPLUGINS_DIR=${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME} -# -# -# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any -# of the following: -# -# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.) -# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2) -# USE_WEBPLUGINS=linux (Supports linux-*) -# USE_WEBPLUGINS=opera webkit-gtk2 -# -# Example to add in Makefile and pkg-plist if the plug-in files are installled -# to WEBPLUGINS_DIR, and if your port does this manually: -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include <bsd.port.pre.mk> -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# post-install: -# ${MKDIR} ${WEBPLUGINS_DIR} -# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \ -# ${WEBPLUGINS_DIR} -# -# .include <bsd.port.post.mk> -# ------------------------------------------------------ -# -# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks -# in pkg-plist, because they will be removed automatically. -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# %%WEBPLUGINS_DIR%%/fooplugin.so -# %%WEBPLUGINS_DIR%%/fooplugin.xpi -# @dirrmtry %%WEBPLUGINS_DIR%% -# ------------------------------------------------------ -# -# Here is what it will look like when it creates the symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# ------------------------------------------------------ -# -# If your port uses libtool, and installs any *.a and *.la files, do not add -# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and -# *.xpi ONLY. -# -# Example to add in Makefile and pkg-plist if your port installs plug-ins in -# its own directory, and you need to set WEBPLUGINS_DIR. -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_DIR=${PREFIX}/lib/application -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include <bsd.port.pre.mk> -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# [...] -# -# .include <bsd.port.post.mk> -# ------------------------------------------------------ -# -# As for the pkg-plist, it should only include the actual files your -# port installs: -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# lib/application/fooplugin.a -# lib/application/fooplugin.la -# lib/application/fooplugin.so -# lib/application/fooplugin.xpi -# @dirrm lib/application -# ------------------------------------------------------ -# -# Here is what it will look like when it creates symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# ------------------------------------------------------ - -WEBPLUGINS_NAME?= ${PKGBASE} -WEBPLUGINS_FILES?= empty -WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \ - linux-flock-devel linux-mozilla \ - linux-nvu linux-opera linux-opera-devel \ - linux-seamonkey linux-seamonkey-devel \ - linux-sunbird linux-sunbird-devel -WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2 -WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \ - ${WEBPLUGINS_APPS_ALL_NATIVE} - -.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \ - ${USE_WEBPLUGINS} == "*" -USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} -.endif - -.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ - ${WEBPLUGINS_FILES} == "" -IGNORE= can't be installed: WEBPLUGINS_FILES is empty. Please, add plug-in files to it and check www/firefox/Makefile.webplugins for documentation -.endif - -.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} -_TEMP_APP_=${_TEMP_APP__} -_TEMP_FLAG_=0 -. for _TEMP_USE__ in ${USE_WEBPLUGINS} -_TEMP_USE_=${_TEMP_USE__} -. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ - ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ - ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) -_TEMP_FLAG_=1 -. endif -. endfor -. if ${_TEMP_FLAG_} -USE_WEBPLUGINS_EXP+= ${_TEMP_APP__} -. endif -.endfor - -WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} -WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} -WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} - -WEBPLUGINS_LIBDIR= ${LOCALBASE}/lib/browser_plugins -WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks -WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME} - -PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" - -_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} -_Q= 2>/dev/null || true -_WLD= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE},%D,} -_WLF= ${WEBPLUGINS_LINKFARMS:S,${LOCALBASE},%D,} -_WSD= ${WEBPLUGINS_SLDIR:S,^${LOCALBASE},%D,} - -webplugins-post-install: - @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - else \ - for _f in ${WEBPLUGINS_FILES}; do \ - if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - fi; \ - done; \ - fi; \ - for _d in ${WEBPLUGINS_LINKFARMS}; do \ - ${INSTALL} -d $${_d}; \ - for _l in ${_LNWF}; do \ - ${LN} -sf $${_l} $${_d}/ ${_Q}; \ - done; \ - done; \ - if [ "${PREFIX}" != "${LOCALBASE}" ]; then \ - ${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST}; \ - fi; \ - ${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}; \ - for _d in ${_WLF}; do \ - ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ - for _l in ${_LNWF}; do \ - ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \ - done; \ - for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \ - ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \ - done; \ - ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \ - done - @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST} - -post-install: webplugins-post-install diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 339366d9f9cf..94ab619b29d5 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-25.0.source.tar.bz2) = 5463cc625ac2a06d4d33b43dfb6365da830eef11f3ef5c0512714baaded59272 -SIZE (firefox-25.0.source.tar.bz2) = 127524815 +SHA256 (firefox-26.0.source.tar.bz2) = 31c4fb2792df63ae450e350380a5e18cf1c51487011a9da0b6cc4bffb69d9812 +SIZE (firefox-26.0.source.tar.bz2) = 127526380 diff --git a/www/firefox/files/extra-bug780531 b/www/firefox/files/extra-bug780531 deleted file mode 100644 index 26859a9bde10..000000000000 --- a/www/firefox/files/extra-bug780531 +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) - - dnl Use integers over floats for audio on B2G and Android, because audio - dnl backends for those platforms don't support floats. --if test "$OS_TARGET" = "Android"; then -+case "$target" in -+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) --else -+;; -+*) - MOZ_SAMPLE_TYPE_FLOAT32=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) - AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) --fi -+;; -+esac - - dnl ======================================================== - dnl = Disable Speech API code diff --git a/www/firefox/files/firefox.desktop.in b/www/firefox/files/firefox.desktop.in index 27b81ce2bdd7..63e28f69768f 100644 --- a/www/firefox/files/firefox.desktop.in +++ b/www/firefox/files/firefox.desktop.in @@ -182,10 +182,10 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=@MOZILLA@ %u +Exec=@MOZILLA@ %U Icon=@FIREFOX_ICON@ -StartupNotify=false +StartupNotify=true Terminal=false Type=Application -Categories=Application;Network; +Categories=Network;WebBrowser; MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; diff --git a/www/firefox/files/patch-browser-app-nsBrowserApp.cpp b/www/firefox/files/patch-browser-app-nsBrowserApp.cpp index b8ff70542e0d..b3f59e4eeb6d 100644 --- a/www/firefox/files/patch-browser-app-nsBrowserApp.cpp +++ b/www/firefox/files/patch-browser-app-nsBrowserApp.cpp @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; diff --git a/www/firefox/files/patch-bug807492 b/www/firefox/files/patch-bug807492 deleted file mode 100644 index fbe838d3369d..000000000000 --- a/www/firefox/files/patch-bug807492 +++ /dev/null @@ -1,628 +0,0 @@ -JJdiff --git configure.in configure.in -index c167461..8346c11 100644 ---- configure.in -+++ configure.in -@@ -5246,17 +5246,17 @@ if test "$NS_PRINTING"; then - AC_DEFINE(NS_PRINT_PREVIEW) - fi - - dnl Turn off webrtc for OS's we don't handle yet, but allow - dnl --enable-webrtc to override. Can disable for everything in - dnl the master list above. - if test -n "$MOZ_WEBRTC"; then - case "$target" in -- *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*) -+ *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - dnl Leave enabled - ;; - *) - dnl default to disabled for all others - MOZ_WEBRTC= - ;; - esac - fi -diff --git media/mtransport/objs.mk media/mtransport/objs.mk -index f1fc85f..141e8ca 100644 ---- media/mtransport/objs.mk -+++ media/mtransport/objs.mk -@@ -18,22 +18,26 @@ LOCAL_INCLUDES += \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/util/libekr \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/log \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/registry \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/stats \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/plugin \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/event \ - $(NULL) - --ifeq ($(OS_TARGET), Darwin) -+ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) - LOCAL_INCLUDES += \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \ - $(NULL) -+ifeq ($(OS_TARGET), Darwin) - DEFINES += -DDARWIN -+else -+DEFINES += -DBSD -+endif - endif - - ifeq ($(OS_TARGET), Linux) - LOCAL_INCLUDES += \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \ - $(NULL) - DEFINES += -DLINUX -diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in -index c1d5bf4..2ecf2c7 100644 ---- media/mtransport/test/Makefile.in -+++ media/mtransport/test/Makefile.in -@@ -73,22 +73,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1 - else - #default_fallback; probably doesn't work - DEFINES += -D__Userspace_os_$(OS_TARGET)=1 - endif - endif - endif - endif - --ifeq ($(OS_TARGET), Darwin) -+ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) - LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include -+ifeq ($(OS_TARGET), Darwin) - DEFINES += \ - -DGTEST_USE_OWN_TR1_TUPLE=1 \ - $(NULL) - endif -+endif - - ifeq ($(OS_TARGET), Linux) - LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include - endif - - ifeq ($(OS_TARGET), Android) - LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/android/include - -diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp -index 0e1f8b4..9a4b995 100644 ---- media/mtransport/third_party/nICEr/nicer.gyp -+++ media/mtransport/third_party/nICEr/nicer.gyp -@@ -126,26 +126,36 @@ - 'R_DEFINED_UINT2=uint16_t', - 'R_DEFINED_INT4=int32_t', - 'R_DEFINED_UINT4=uint32_t', - 'R_DEFINED_INT8=int64_t', - 'R_DEFINED_UINT8=uint64_t', - ], - - 'conditions' : [ -- ## Mac -+ ## Mac and BSDs - [ 'OS == "mac"', { -+ 'defines' : [ -+ 'DARWIN', -+ 'HAVE_XLOCALE', -+ ], -+ }], -+ [ 'os_bsd == 1', { -+ 'defines' : [ -+ 'BSD', -+ ], -+ }], -+ [ 'OS == "mac" or os_bsd == 1', { - 'cflags_mozilla': [ - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', - '-Wmissing-prototypes', - ], - 'defines' : [ -- 'DARWIN', - 'HAVE_LIBM=1', - 'HAVE_STRDUP=1', - 'HAVE_STRLCPY=1', - 'HAVE_SYS_TIME_H=1', - 'HAVE_VFPRINTF=1', - 'NEW_STDIO' - 'RETSIGTYPE=void', - 'TIME_WITH_SYS_TIME_H=1', -diff --git media/mtransport/third_party/nICEr/src/stun/addrs.c media/mtransport/third_party/nICEr/src/stun/addrs.c -index b0b66b2..04fea94 100644 ---- media/mtransport/third_party/nICEr/src/stun/addrs.c -+++ media/mtransport/third_party/nICEr/src/stun/addrs.c -@@ -50,17 +50,19 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex - #else - #include <syslog.h> - /* Work around an Android NDK < r8c bug */ - #undef __unused - #include <linux/sysctl.h> - #endif - #include <net/if.h> - #ifndef LINUX -+#if !defined(__OpenBSD__) && !defined(__NetBSD__) - #include <net/if_var.h> -+#endif - #include <net/if_dl.h> - #include <net/if_types.h> - #include <sys/sockio.h> - #else - #include <linux/if.h> - #endif - #include <net/route.h> - -@@ -75,17 +77,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex - #include <netdb.h> - #endif /* UNIX */ - - #include "stun.h" - #include "addrs.h" - - - --#ifdef DARWIN -+#if defined(BSD) || defined(DARWIN) - /* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright -@@ -685,17 +687,17 @@ nr_stun_remove_duplicate_addrs(nr_transport_addr addrs[], int remove_loopback, i - } - - int - nr_stun_get_addrs(nr_transport_addr addrs[], int maxaddrs, int drop_loopback, int *count) - { - int _status=0; - int i; - --#ifdef DARWIN -+#if defined(BSD) || defined(DARWIN) - _status = stun_get_mib_addrs(addrs, maxaddrs, count); - #elif defined(WIN32) - _status = stun_get_win32_addrs(addrs, maxaddrs, count); - #elif defined(__sparc__) - _status = stun_get_sparc_addrs(addrs, maxaddrs, count); - #else - _status = stun_get_siocgifconf_addrs(addrs, maxaddrs, count); - #endif -diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h -index a3c51f9..eb65ac8 100644 ---- media/mtransport/third_party/nICEr/src/stun/stun.h -+++ media/mtransport/third_party/nICEr/src/stun/stun.h -@@ -36,21 +36,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #ifdef WIN32 - #include <winsock2.h> - #else - #include <sys/param.h> - #include <sys/socket.h> - #include <net/if.h> - #ifndef LINUX -+#if !defined(__OpenBSD__) && !defined(__NetBSD__) - #include <net/if_var.h> -+#endif - #include <net/if_dl.h> - #include <net/if_types.h> - #endif -+#ifndef BSD - #include <net/route.h> -+#endif - #include <netinet/in.h> - #ifndef LINUX - #include <netinet/in_var.h> - #endif - #include <arpa/inet.h> - #include <netdb.h> - #endif - #include <time.h> -diff --git media/mtransport/third_party/nICEr/src/util/mbslen.c media/mtransport/third_party/nICEr/src/util/mbslen.c -index cc260b7..66af2d7 100644 ---- media/mtransport/third_party/nICEr/src/util/mbslen.c -+++ media/mtransport/third_party/nICEr/src/util/mbslen.c -@@ -38,50 +38,58 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #include <errno.h> - #include <csi_platform.h> - - #include <assert.h> - #include <locale.h> - #include <stdlib.h> - #include <wchar.h> --#ifdef DARWIN -+ -+#ifdef __FreeBSD__ -+#include <osreldate.h> -+# if __FreeBSD_version > 900505 -+# define HAVE_XLOCALE -+# endif -+#endif -+ -+#ifdef HAVE_XLOCALE - #include <xlocale.h> --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - - #include "nr_api.h" - #include "mbslen.h" - - /* get number of characters in a mult-byte character string */ - int - mbslen(const char *s, size_t *ncharsp) - { --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - static locale_t loc = 0; - static int initialized = 0; --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - #ifdef WIN32 - char *my_locale=0; - unsigned int i; - #endif /* WIN32 */ - int _status; - size_t nbytes; - int nchars; - mbstate_t mbs; - --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - if (! initialized) { - initialized = 1; - loc = newlocale(LC_CTYPE_MASK, "UTF-8", LC_GLOBAL_LOCALE); - } - - if (loc == 0) { - /* unable to create the UTF-8 locale */ - assert(loc != 0); /* should never happen */ --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - - #ifdef WIN32 - if (!setlocale(LC_CTYPE, 0)) - ABORT(R_INTERNAL); - - if (!(my_locale = r_strdup(setlocale(LC_CTYPE, 0)))) - ABORT(R_NO_MEMORY); - -@@ -94,28 +102,28 @@ mbslen(const char *s, size_t *ncharsp) - /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */ - /* null-checking setlocale is required because Android */ - char *locale = setlocale(LC_CTYPE, 0); - /* some systems use "utf8" instead of "UTF-8" like Fedora 17 */ - if (!locale || (!strcasestr(locale, "UTF-8") && !strcasestr(locale, "UTF8"))) - ABORT(R_NOT_FOUND); - #endif - --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - } --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - - memset(&mbs, 0, sizeof(mbs)); - nchars = 0; - --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - while (*s != '\0' && (nbytes = mbrlen_l(s, strlen(s), &mbs, loc)) != 0) - #else - while (*s != '\0' && (nbytes = mbrlen(s, strlen(s), &mbs)) != 0) --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - { - if (nbytes == (size_t)-1) /* should never happen */ { - ABORT(R_INTERNAL); - } - if (nbytes == (size_t)-2) /* encoding error */ { - ABORT(R_BAD_DATA); - } - -diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp -index 3cc8e1c..74016c6 100644 ---- media/mtransport/third_party/nrappkit/nrappkit.gyp -+++ media/mtransport/third_party/nrappkit/nrappkit.gyp -@@ -142,26 +142,35 @@ - 'R_DEFINED_UINT2=uint16_t', - 'R_DEFINED_INT4=int32_t', - 'R_DEFINED_UINT4=uint32_t', - 'R_DEFINED_INT8=int64_t', - 'R_DEFINED_UINT8=uint64_t', - ], - - 'conditions' : [ -- ## Mac -+ ## Mac and BSDs - [ 'OS == "mac"', { -+ 'defines' : [ -+ 'DARWIN', -+ ], -+ }], -+ [ 'os_bsd == 1', { -+ 'defines' : [ -+ 'BSD', -+ ], -+ }], -+ [ 'OS == "mac" or os_bsd == 1', { - 'cflags_mozilla': [ - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', - '-Wmissing-prototypes', - ], - 'defines' : [ -- 'DARWIN', - 'HAVE_LIBM=1', - 'HAVE_STRDUP=1', - 'HAVE_STRLCPY=1', - 'HAVE_SYS_TIME_H=1', - 'HAVE_VFPRINTF=1', - 'NEW_STDIO' - 'RETSIGTYPE=void', - 'TIME_WITH_SYS_TIME_H=1', -diff --git media/mtransport/third_party/nrappkit/src/log/r_log.c media/mtransport/third_party/nrappkit/src/log/r_log.c -index efb7ef2..aebf578 100644 ---- media/mtransport/third_party/nrappkit/src/log/r_log.c -+++ media/mtransport/third_party/nrappkit/src/log/r_log.c -@@ -43,16 +43,17 @@ static char *RCSSTRING __UNUSED__ ="$Id: r_log.c,v 1.10 2008/11/25 22:25:18 adam - #ifdef LINUX - #define _BSD_SOURCE - #endif - - #include "r_log.h" - #include "hex.h" - - #include <string.h> -+#include <errno.h> - #ifndef _MSC_VER - #include <strings.h> - #include <syslog.h> - #endif - #include <registry.h> - #include <time.h> - - -diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -index bcb1ec0..bb73591 100644 ---- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -+++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -@@ -33,7 +33,7 @@ - #ifndef _SYS_QUEUE_H_ - #define _SYS_QUEUE_H_ - --#ifndef DARWIN -+#if !defined(__FreeBSD__) && !defined(DARWIN) - #include <stddef.h> - #define __offsetof offsetof - #endif -diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c -index a7d4ff1..ff11a60 100644 ---- media/mtransport/third_party/nrappkit/src/util/util.c -+++ media/mtransport/third_party/nrappkit/src/util/util.c -@@ -40,16 +40,17 @@ - static char *RCSSTRING __UNUSED__ ="$Id: util.c,v 1.5 2007/11/21 00:09:13 adamcain Exp $"; - - #ifndef WIN32 - #include <sys/uio.h> - #include <pwd.h> - #include <dirent.h> - #endif - #include <string.h> -+#include <errno.h> - #include <ctype.h> - #include <sys/stat.h> - #ifdef OPENSSL - #include <openssl/evp.h> - #endif - #include "nr_common.h" - #include "r_common.h" - #include "registry.h" -diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp -index 2a91e3d..31de641 100644 ---- media/webrtc/signaling/signaling.gyp -+++ media/webrtc/signaling/signaling.gyp -@@ -223,16 +223,29 @@ - 'GIPS_VER=3480', - 'SIPCC_BUILD', - 'HAVE_WINSOCK2_H' - ], - - 'cflags_mozilla': [ - ], - }], -+ ['os_bsd==1', { -+ 'include_dirs': [ -+ ], -+ 'defines': [ -+ # avoiding pointless ifdef churn -+ 'SIP_OS_OSX', -+ 'OSX', -+ 'SECLIB_OPENSSL', -+ ], -+ -+ 'cflags_mozilla': [ -+ ], -+ }], - ['OS=="mac"', { - 'include_dirs': [ - ], - 'defines': [ - 'SIP_OS_OSX', - 'OSX', - '_FORTIFY_SOURCE=2', - ], -@@ -747,17 +760,17 @@ - 'EXTERNAL_TICK_REQUIRED', - 'GIPS_VER=3480', - ], - - 'cflags_mozilla': [ - ], - - }], -- ['OS=="mac"', { -+ ['OS=="mac" or os_bsd==1', { - - 'include_dirs': [ - ], - - 'sources': [ - # SIPSTACK - './src/sipcc/core/sipstack/sip_platform_task.c', - -@@ -792,24 +805,23 @@ - './src/sipcc/cpr/darwin/cpr_darwin_timers_using_select.c', - './src/sipcc/cpr/darwin/cpr_darwin_tst.h', - './src/sipcc/cpr/darwin/cpr_darwin_types.h', - ], - - - 'defines' : [ - 'SIP_OS_OSX', -- '_POSIX_SOURCE', -+ # using BSD extensions, leave _POSIX_SOURCE undefined - 'CPR_MEMORY_LITTLE_ENDIAN', - 'NO_SOCKET_POLLING', - 'USE_TIMER_SELECT_BASED', - 'FULL_BUILD', - 'STUBBED_OUT', - 'USE_PRINTF', -- '_DARWIN_C_SOURCE', - 'NO_NSPR_10_SUPPORT', - ], - - 'cflags_mozilla': [ - ], - }], - ], - -diff --git media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -index a7c47e1..4f191de 100644 ---- media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -+++ media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData) - { - static const char fname[] = "cprGetMessage"; - - void *buffer = 0; - cpr_msg_queue_t *msgq; - cpr_msgq_node_t *node; - struct timespec timeout; - struct timeval tv; -+#ifndef __APPLE__ -+ struct timezone tz; -+#else - // On the iPhone, there is a DarwinAlias problem with "timezone" - struct _timezone { - int tz_minuteswest; /* of Greenwich */ - int tz_dsttime; /* type of dst correction to apply */ - } tz; -+#endif - - /* Initialize ppUserData */ - if (ppUserData) { - *ppUserData = NULL; - } - - msgq = (cpr_msg_queue_t *) msgQueue; - if (msgq == NULL) { -diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in -index a30e330..cfbd8a3 100644 ---- media/webrtc/signaling/test/Makefile.in -+++ media/webrtc/signaling/test/Makefile.in -@@ -81,17 +81,17 @@ endif - ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) - LIBS += \ - $(XLIBS) \ - $(TK_LIBS) \ - $(MOZ_PANGO_LIBS) \ - $(NULL) - endif - --ifeq ($(OS_TARGET),Linux) -+ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) - LIBS += \ - $(MOZ_CAIRO_OSLIBS) \ - $(NULL) - endif - - ifeq ($(OS_TARGET),Darwin) - LIBS += \ - -framework AudioToolbox \ -diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -index 338d0b7..2241d41 100644 ---- media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -+++ media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -@@ -1,16 +1,17 @@ - # Copyright (c) 2012 Mozilla Foundation. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - - import collections - import gyp - import gyp.common - import sys -+import platform - import os - import re - import shlex - - generator_wants_sorted_dependencies = True - - generator_default_variables = { - } -@@ -107,30 +108,44 @@ endif - - def ensure_directory_exists(path): - dir = os.path.dirname(path) - if dir and not os.path.exists(dir): - os.makedirs(dir) - - def GetFlavor(params): - """Returns |params.flavor| if it's set, the system's default flavor else.""" -+ system = platform.system().lower() - flavors = { -- 'win32': 'win', -- 'darwin': 'mac', -- 'sunos5': 'solaris', -- 'freebsd7': 'freebsd', -- 'freebsd8': 'freebsd', -+ 'microsoft': 'win', -+ 'windows' : 'win', -+ 'darwin' : 'mac', -+ 'sunos' : 'solaris', -+ 'dragonfly': 'bsd', -+ 'freebsd' : 'bsd', -+ 'netbsd' : 'bsd', -+ 'openbsd' : 'bsd', - } -- flavor = flavors.get(sys.platform, 'linux') -- return params.get('flavor', flavor) -+ -+ if 'flavor' in params: -+ return params['flavor'] -+ if system.startswith('cygwin'): -+ return 'win' -+ if system in flavors: -+ return flavors[system] -+ -+ return 'linux' - - - def CalculateVariables(default_variables, params): -+ flavor = GetFlavor(params) -+ if flavor == 'bsd': -+ flavor = platform.system().lower() - generator_flags = params.get('generator_flags', {}) -- default_variables['OS'] = generator_flags.get('os', GetFlavor(params)) -+ default_variables['OS'] = generator_flags.get('os', flavor) - - - def CalculateGeneratorInputInfo(params): - """Calculate the generator specific info that gets fed to input (called by - gyp).""" - generator_flags = params.get('generator_flags', {}) - if generator_flags.get('adjust_static_libraries', False): - global generator_wants_static_library_dependencies_adjusted diff --git a/www/firefox/files/patch-bug851992 b/www/firefox/files/patch-bug851992 deleted file mode 100644 index e20d8174136d..000000000000 --- a/www/firefox/files/patch-bug851992 +++ /dev/null @@ -1,331 +0,0 @@ -diff --git a/config/Makefile.in b/config/Makefile.in ---- config/Makefile.in -+++ config/Makefile.in -@@ -97,16 +97,17 @@ export:: $(export-preqs) - -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ - -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \ - -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \ - -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \ - -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \ - -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \ - -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \ - -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \ -+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ - $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers - $(INSTALL) system_wrappers $(DIST) - - GARBAGE_DIRS += system_wrappers - endif - - ifdef WRAP_STL_INCLUDES - ifdef GNU_CXX -diff --git a/config/system-headers b/config/system-headers ---- config/system-headers -+++ config/system-headers -@@ -1125,8 +1125,19 @@ gst/video/video.h - sys/msg.h - sys/ipc.h - sys/thr.h - sys/user.h - kvm.h - spawn.h - err.h - xlocale.h -+#if MOZ_NATIVE_ICU==1 -+unicode/locid.h -+unicode/numsys.h -+unicode/ucal.h -+unicode/ucol.h -+unicode/udat.h -+unicode/udatpg.h -+unicode/uenum.h -+unicode/unum.h -+unicode/ustring.h -+#endif -diff --git a/configure.in b/configure.in ---- configure.in -+++ configure.in -@@ -4134,16 +4134,32 @@ if test -n "$MOZ_NATIVE_FFI"; then - PKG_CHECK_MODULES(MOZ_FFI, libffi > 3.0.9) - else - PKG_CHECK_MODULES(MOZ_FFI, libffi >= 3.0.9) - fi - MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_FFI_LIBS" - fi - - dnl ======================================================== -+dnl system icu support -+dnl ======================================================== -+MOZ_NATIVE_ICU= -+MOZ_ARG_WITH_BOOL(system-icu, -+[ --with-system-icu -+ Use system icu (located with pkgconfig)], -+ MOZ_NATIVE_ICU=1) -+ -+if test -n "$MOZ_NATIVE_ICU"; then -+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) -+ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS" -+fi -+ -+AC_SUBST(MOZ_NATIVE_ICU) -+ -+dnl ======================================================== - dnl Java SDK support - dnl ======================================================== - - JAVA_BIN_PATH= - MOZ_ARG_WITH_STRING(java-bin-path, - [ --with-java-bin-path=dir - Location of Java binaries (java, javac, jar)], - JAVA_BIN_PATH=$withval) -diff --git a/js/src/Makefile.in b/js/src/Makefile.in ---- js/src/Makefile.in.orig 2013-10-26 00:19:30.000000000 +0200 -+++ js/src/Makefile.in 2013-10-26 12:51:24.469902638 +0200 -@@ -232,12 +232,17 @@ - # ICU headers need to be available whether we build with the complete - # Internationalization API or not - ICU stubs rely on them. - -+ifdef MOZ_NATIVE_ICU -+LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS) -+else - LOCAL_INCLUDES += \ - -I$(topsrcdir)/../../intl/icu/source/common \ - -I$(topsrcdir)/../../intl/icu/source/i18n \ - $(NULL) -+endif - - ifdef ENABLE_INTL_API -+ifndef MOZ_NATIVE_ICU - - ifeq ($(OS_ARCH),WINNT) - # Library names: On Windows, ICU uses modified library names for static -@@ -271,6 +276,7 @@ - $(call SUBMAKE,$@,intl/icu) - - endif -+endif - - # - # END ECMAScript Internationalization API -@@ -394,7 +400,11 @@ - DEFINES += -DUSE_ZLIB - endif - --SHARED_LIBRARY_LIBS += $(ICU_LIBS) -+ifdef MOZ_NATIVE_ICU -+EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS) -+else -+SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS) -+endif - - # Prevent floating point errors caused by VC++ optimizations - ifdef _MSC_VER -diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in ---- js/src/config/Makefile.in -+++ js/src/config/Makefile.in -@@ -54,16 +54,17 @@ include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DUNICODE -D_UNICODE - - ifdef WRAP_SYSTEM_INCLUDES - export:: \ - $(call mkdir_deps,system_wrappers_js) \ - $(NULL) - $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \ -+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ - $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js - $(INSTALL) system_wrappers_js $(DIST) - - GARBAGE_DIRS += system_wrappers_js - endif - - GARBAGE += $(srcdir)/*.pyc *.pyc - -diff --git a/js/src/config/system-headers b/js/src/config/system-headers ---- js/src/config/system-headers -+++ js/src/config/system-headers -@@ -1125,8 +1125,19 @@ gst/video/video.h - sys/msg.h - sys/ipc.h - sys/thr.h - sys/user.h - kvm.h - spawn.h - err.h - xlocale.h -+#if MOZ_NATIVE_ICU==1 -+unicode/locid.h -+unicode/numsys.h -+unicode/ucal.h -+unicode/ucol.h -+unicode/udat.h -+unicode/udatpg.h -+unicode/uenum.h -+unicode/unum.h -+unicode/ustring.h -+#endif -diff --git a/js/src/configure.in b/js/src/configure.in ---- js/src/configure.in -+++ js/src/configure.in -@@ -4406,56 +4406,65 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE - AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION) - AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION) - fi - - - dnl ======================================================== - dnl ECMAScript Internationalization API Support (uses ICU) - dnl ======================================================== -+ICU_LIB_NAMES= -+MOZ_NATIVE_ICU= -+MOZ_ARG_WITH_BOOL(system-icu, -+[ --with-system-icu -+ Use system icu (located with pkgconfig)], -+ MOZ_NATIVE_ICU=1) -+ -+if test -n "$MOZ_NATIVE_ICU"; then -+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) -+fi - - ENABLE_INTL_API=1 - MOZ_ARG_DISABLE_BOOL(intl-api, - [ --disable-intl-api Disable the ECMAScript Internationalization API], - ENABLE_INTL_API= ) - - dnl Settings for the implementation of the ECMAScript Internationalization API - if test -n "$ENABLE_INTL_API"; then - AC_DEFINE(ENABLE_INTL_API) -- # We build ICU as a static library. -- AC_DEFINE(U_STATIC_IMPLEMENTATION) -- -- case "$OS_TARGET" in -- WINNT) -- ICU_LIB_NAMES="icuin icuuc icudt" -- ;; -- Darwin|Linux) -- ICU_LIB_NAMES="icui18n icuuc icudata" -- ;; -- *) -- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) -- esac -- -- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' --else -- ICU_LIB_NAMES= -- ICU_LIBS= -+ -+ if test -z "$MOZ_NATIVE_ICU"; then -+ case "$OS_TARGET" in -+ WINNT) -+ ICU_LIB_NAMES="icuin icuuc icudt" -+ ;; -+ Darwin|Linux) -+ ICU_LIB_NAMES="icui18n icuuc icudata" -+ ;; -+ *) -+ AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) -+ esac -+ MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' -+ fi - fi - - AC_SUBST(ENABLE_INTL_API) - AC_SUBST(ICU_LIB_NAMES) --AC_SUBST(ICU_LIBS) -- --dnl Source files that use ICU should have control over which parts of the ICU --dnl namespace they want to use. --AC_DEFINE(U_USING_ICU_NAMESPACE,0) -- -+AC_SUBST(MOZ_ICU_LIBS) -+AC_SUBST(MOZ_NATIVE_ICU) - - dnl Settings for ICU --if test -n "$ENABLE_INTL_API" ; then -+if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then -+ dnl We build ICU as a static library. -+ AC_DEFINE(U_STATIC_IMPLEMENTATION) -+ -+ dnl Source files that use ICU should have control over which parts of the ICU -+ dnl namespace they want to use. -+ AC_DEFINE(U_USING_ICU_NAMESPACE,0) -+ - # Set ICU compile options - ICU_CPPFLAGS="" - # don't use icu namespace automatically in client code - ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0" - # don't include obsolete header files - ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" - # remove chunks of the library that we don't need (yet) - ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_LEGACY_CONVERSION" -diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in ---- js/src/gdb/Makefile.in -+++ js/src/gdb/Makefile.in -@@ -14,16 +14,20 @@ include $(DEPTH)/config/autoconf.mk - # Building against js_static requires that we declare mfbt sybols "exported" - # on its behalf. - DEFINES += -DEXPORT_JS_API -DIMPL_MFBT - - LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif -+ - EXTRA_LIBS += $(MOZ_FFI_LIBS) - - # Place a GDB Python auto-load file next to the gdb-tests executable, both - # in the build directory and in the dist/bin directory. - PP_TARGETS += GDB_AUTOLOAD - GDB_AUTOLOAD := gdb-tests-gdb.py.in - GDB_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir)) - -diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in ---- js/src/jsapi-tests/Makefile.in -+++ js/src/jsapi-tests/Makefile.in -@@ -15,16 +15,20 @@ DEFINES += -DEXPORT_JS_API - # Building against js_static requires that we declare mfbt sybols "exported" - # on its behalf. - DEFINES += -DIMPL_MFBT - - LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif -+ - EXTRA_LIBS += $(MOZ_FFI_LIBS) - - ifdef QEMU_EXE - MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB) - endif - - # Place a GDB Python auto-load file next to the jsapi-tests executable in - # the build directory. -diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in ---- js/src/shell/Makefile.in -+++ js/src/shell/Makefile.in -@@ -22,16 +22,19 @@ DEFINES += -DEXPORT_JS_API - # Building against js_static requires that we declare mfbt sybols "exported" - # on its behalf. - DEFINES += -DIMPL_MFBT - - LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(MOZ_ZLIB_LIBS) - ifdef MOZ_NATIVE_FFI - EXTRA_LIBS += $(MOZ_FFI_LIBS) - endif -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - - ifeq ($(OS_ARCH),Darwin) - ifeq ($(TARGET_CPU),x86_64) - DARWIN_EXE_LDFLAGS += -pagezero_size 10000 -image_base 100000000 - endif - endif diff --git a/www/firefox/files/patch-bug853301 b/www/firefox/files/patch-bug853301 deleted file mode 100644 index 09b503e35a6f..000000000000 --- a/www/firefox/files/patch-bug853301 +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -9454,7 +9454,6 @@ if test "A" = "A"; then - # Desktop: bug 853301 - # Android: bug 864843 - # B2G: bug 866301 -- ac_configure_args="$ac_configure_args --disable-intl-api" - fi - if test "$BUILD_CTYPES"; then - # Build js-ctypes on the platforms we can. diff --git a/www/firefox/files/patch-bug876156 b/www/firefox/files/patch-bug876156 deleted file mode 100644 index 84ecf6170671..000000000000 --- a/www/firefox/files/patch-bug876156 +++ /dev/null @@ -1,13 +0,0 @@ -diff --git mfbt/Atomics.h mfbt/Atomics.h -index d79af6c..40b9336 100644 ---- mfbt/Atomics.h -+++ mfbt/Atomics.h -@@ -35,7 +35,7 @@ - */ - # if !defined(__linux__) && !defined(__OpenBSD__) && \ - (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && \ -- __has_include(<atomic>) -+ __has_include_next(<atomic>) - # define MOZ_HAVE_CXX11_ATOMICS - # endif - /* diff --git a/www/firefox/files/patch-bug886181 b/www/firefox/files/patch-bug886181 deleted file mode 100644 index ed1c4df8348b..000000000000 --- a/www/firefox/files/patch-bug886181 +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/libpref/src/init/all.js~ -+++ modules/libpref/src/init/all.js -@@ -193,7 +193,7 @@ pref("media.webm.enabled", true); - pref("media.dash.enabled", false); - #endif - #ifdef MOZ_GSTREAMER --pref("media.gstreamer.enabled", false); -+pref("media.gstreamer.enabled", true); - #endif - #ifdef MOZ_WEBRTC - pref("media.navigator.enabled", true); diff --git a/www/firefox/files/patch-bug910875 b/www/firefox/files/patch-bug910875 deleted file mode 100644 index 4f1d5a521e84..000000000000 --- a/www/firefox/files/patch-bug910875 +++ /dev/null @@ -1,102 +0,0 @@ -diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -index f231b1e..6087696 100644 ---- media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -+++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -@@ -16,7 +16,9 @@ - #include <assert.h> - #include <string.h> - --#if defined(_WIN32) -+#if defined(WEBRTC_DUMMY_AUDIO_BUILD) -+// do not include platform specific headers -+#elif defined(_WIN32) - #include "audio_device_utility_win.h" - #include "audio_device_wave_win.h" - #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) -@@ -32,14 +34,8 @@ - #include <stdlib.h> - #include "audio_device_utility_android.h" - #include "audio_device_jni_android.h" --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - #include "audio_device_utility_linux.h" -- #if defined(LINUX_ALSA) -- #include "audio_device_alsa_linux.h" -- #endif -- #if defined(LINUX_PULSE) -- #include "audio_device_pulse_linux.h" -- #endif - #elif defined(WEBRTC_IOS) - #include "audio_device_utility_ios.h" - #include "audio_device_ios.h" -@@ -47,6 +43,12 @@ - #include "audio_device_utility_mac.h" - #include "audio_device_mac.h" - #endif -+#if defined(LINUX_ALSA) -+ #include "audio_device_alsa_linux.h" -+#endif -+#if defined(LINUX_PULSE) -+ #include "audio_device_pulse_linux.h" -+#endif - #include "audio_device_dummy.h" - #include "audio_device_utility_dummy.h" - #include "critical_section_wrapper.h" -@@ -161,7 +163,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Che - #elif defined(WEBRTC_ANDROID) - platform = kPlatformAndroid; - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is ANDROID"); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - platform = kPlatformLinux; - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is LINUX"); - #elif defined(WEBRTC_IOS) -@@ -309,7 +311,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() - - // Create the *Linux* implementation of the Audio Device - // --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - if ((audioLayer == kLinuxPulseAudio) || (audioLayer == kPlatformDefaultAudio)) - { - #if defined(LINUX_PULSE) -@@ -355,7 +357,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() - // - ptrAudioDeviceUtility = new AudioDeviceUtilityLinux(Id()); - } --#endif // #if defined(WEBRTC_LINUX) -+#endif // #if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - - // Create the *iPhone* implementation of the Audio Device - // -diff --git media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -index defd7f8..906c4a2 100644 ---- media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -+++ media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -@@ -197,7 +197,7 @@ class AudioDeviceAPITest: public testing::Test { - // Create default implementation instance - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( - kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( - kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL); - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( -@@ -1690,7 +1690,7 @@ TEST_F(AudioDeviceAPITest, CPULoad) { - - // TODO(kjellander): Fix flakiness causing failures on Windows. - // TODO(phoglund): Fix flakiness causing failures on Linux. --#if !defined(_WIN32) && !defined(WEBRTC_LINUX) -+#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - TEST_F(AudioDeviceAPITest, StartAndStopRawOutputFileRecording) { - // NOTE: this API is better tested in a functional test - CheckInitialPlayoutStates(); -@@ -1759,7 +1759,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRawInputFileRecording) { - // - size of raw_input_not_recording.pcm shall be 0 - // - size of raw_input_not_recording.pcm shall be > 0 - } --#endif // !WIN32 && !WEBRTC_LINUX -+#endif // !WIN32 && !WEBRTC_LINUX && !defined(WEBRTC_BSD) - - TEST_F(AudioDeviceAPITest, RecordingSampleRate) { - uint32_t sampleRate(0); diff --git a/www/firefox/files/patch-bug916216 b/www/firefox/files/patch-bug916216 deleted file mode 100644 index ca82967fa78c..000000000000 --- a/www/firefox/files/patch-bug916216 +++ /dev/null @@ -1,39 +0,0 @@ ---- media/webrtc/trunk/build/build_config.h~ -+++ media/webrtc/trunk/build/build_config.h -@@ -37,9 +37,15 @@ - #elif defined(_WIN32) - #define OS_WIN 1 - #define TOOLKIT_VIEWS 1 --#elif defined(__FreeBSD__) -+#elif defined(__DragonFly__) -+#define OS_DRAGONFLY 1 -+#define TOOLKIT_GTK -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #define OS_FREEBSD 1 - #define TOOLKIT_GTK -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 -+#define TOOLKIT_GTK - #elif defined(__OpenBSD__) - #define OS_OPENBSD 1 - #define TOOLKIT_GTK -@@ -56,15 +62,15 @@ - - // For access to standard BSD features, use OS_BSD instead of a - // more specific macro. --#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ -+ || defined(OS_NETBSD) || defined(OS_OPENBSD) - #define OS_BSD 1 - #endif - - // For access to standard POSIXish features, use OS_POSIX instead of a - // more specific macro. --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ -- defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \ -- defined(OS_NACL) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ -+ defined(OS_SOLARIS) || defined(OS_ANDROID) || defined(OS_NACL) - #define OS_POSIX 1 - #endif - diff --git a/www/firefox/files/patch-bug918177 b/www/firefox/files/patch-bug918177 deleted file mode 100644 index 76dd34ca040a..000000000000 --- a/www/firefox/files/patch-bug918177 +++ /dev/null @@ -1,36 +0,0 @@ -diff --git config/stl-headers config/stl-headers -index c057d8e..dc7f6f0 100644 ---- config/stl-headers -+++ config/stl-headers -@@ -21,6 +21,7 @@ algorithm - atomic - deque - ios -+iosfwd - iostream - iterator - limits -diff --git config/system-headers config/system-headers -index d31c94e..570c82a 100644 ---- config/system-headers -+++ config/system-headers -@@ -469,6 +469,7 @@ IOKit/IOMessage.h - IOKit/pwr_mgt/IOPMLib.h - iomanip - ios -+iosfwd - iostream - iostream.h - iterator -diff --git js/src/config/system-headers js/src/config/system-headers -index d31c94e..570c82a 100644 ---- js/src/config/system-headers -+++ js/src/config/system-headers -@@ -469,6 +469,7 @@ IOKit/IOMessage.h - IOKit/pwr_mgt/IOPMLib.h - iomanip - ios -+iosfwd - iostream - iostream.h - iterator diff --git a/www/firefox/files/patch-bug945046 b/www/firefox/files/patch-bug945046 new file mode 100644 index 000000000000..b532383860a9 --- /dev/null +++ b/www/firefox/files/patch-bug945046 @@ -0,0 +1,130 @@ +diff --git config/system-headers config/system-headers +index 432cba6..18a9627 100644 +--- config/system-headers ++++ config/system-headers +@@ -1131,3 +1131,4 @@ unicode/unum.h + unicode/ustring.h + unicode/utypes.h + #endif ++libutil.h +diff --git js/src/config/system-headers js/src/config/system-headers +index 432cba6..18a9627 100644 +--- js/src/config/system-headers ++++ js/src/config/system-headers +@@ -1131,3 +1131,4 @@ unicode/unum.h + unicode/ustring.h + unicode/utypes.h + #endif ++libutil.h +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 9975621..b4b037d 100644 +--- toolkit/library/Makefile.in ++++ toolkit/library/Makefile.in +@@ -289,6 +289,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,kvm) + EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols + endif + ++ifeq ($(OS_ARCH),FreeBSD) ++OS_LIBS += $(call EXPAND_LIBNAME,util) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet wbemuuid) + ifdef ACCESSIBILITY +diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp +index b8147c8..0ffb34e 100644 +--- xpcom/base/nsMemoryReporterManager.cpp ++++ xpcom/base/nsMemoryReporterManager.cpp +@@ -196,6 +196,43 @@ static nsresult GetResidentFast(int64_t* + return GetResident(aN); + } + ++#ifdef __FreeBSD__ ++#include <libutil.h> ++ ++static nsresult ++GetKinfoVmentrySelf(int64_t* prss) ++{ ++ int cnt; ++ struct kinfo_vmentry *vmmap, *kve; ++ if ((vmmap = kinfo_getvmmap(getpid(), &cnt)) == NULL) ++ return NS_ERROR_FAILURE; ++ ++ if (prss) ++ *prss = 0; ++ ++ for (int i = 0; i < cnt; i++) { ++ kve = &vmmap[i]; ++ if (prss) ++ *prss += kve->kve_private_resident; ++ } ++ ++ free(vmmap); ++ return NS_OK; ++} ++ ++#define HAVE_PRIVATE_REPORTER ++static nsresult ++GetPrivate(int64_t* aN) ++{ ++ int64_t priv; ++ nsresult rv = GetKinfoVmentrySelf(&priv); ++ if (NS_SUCCEEDED(rv)) ++ *aN = priv * getpagesize(); ++ ++ return NS_OK; ++} ++#endif // FreeBSD ++ + #elif defined(SOLARIS) + + #include <procfs.h> +@@ -370,6 +407,24 @@ static nsresult GetResidentFast(int64_t* + } + + #define HAVE_PRIVATE_REPORTER ++static nsresult ++GetPrivate(int64_t* aN) ++{ ++ PROCESS_MEMORY_COUNTERS_EX pmcex; ++ pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX); ++ ++ if (!GetProcessMemoryInfo( ++ GetCurrentProcess(), ++ (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) { ++ return NS_ERROR_FAILURE; ++ } ++ ++ *aN = pmcex.PrivateUsage; ++ return NS_OK; ++} ++#endif // XP_<PLATFORM> ++ ++#ifdef HAVE_PRIVATE_REPORTER + class PrivateReporter MOZ_FINAL : public MemoryUniReporter + { + public: +@@ -382,21 +437,10 @@ public: + + NS_IMETHOD GetAmount(int64_t* aAmount) + { +- PROCESS_MEMORY_COUNTERS_EX pmcex; +- pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX); +- +- if (!GetProcessMemoryInfo( +- GetCurrentProcess(), +- (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) { +- return NS_ERROR_FAILURE; +- } +- +- *aAmount = pmcex.PrivateUsage; +- return NS_OK; ++ return GetPrivate(aAmount); + } + }; +- +-#endif // XP_<PLATFORM> ++#endif + + #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS + class VsizeReporter MOZ_FINAL : public MemoryUniReporter diff --git a/www/firefox/files/patch-bug946560 b/www/firefox/files/patch-bug946560 new file mode 100644 index 000000000000..e2560bd0d0c3 --- /dev/null +++ b/www/firefox/files/patch-bug946560 @@ -0,0 +1,44 @@ +diff --git xpcom/base/nsMemoryInfoDumper.cpp xpcom/base/nsMemoryInfoDumper.cpp +index 0b2f78c..d857374 100644 +--- xpcom/base/nsMemoryInfoDumper.cpp ++++ xpcom/base/nsMemoryInfoDumper.cpp +@@ -30,7 +30,7 @@ + #include <unistd.h> + #endif + +-#ifdef XP_LINUX ++#if defined(XP_LINUX) || defined(__FreeBSD__) + #include <fcntl.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -109,7 +109,7 @@ private: + + } // anonymous namespace + +-#ifdef XP_LINUX // { ++#if defined(XP_LINUX) || defined(__FreeBSD__) // { + namespace { + + /* +@@ -548,7 +548,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper( + /* static */ void + nsMemoryInfoDumper::Initialize() + { +-#ifdef XP_LINUX ++#if defined(XP_LINUX) || defined(__FreeBSD__) + SignalPipeWatcher::Create(); + FifoWatcher::MaybeCreate(); + #endif +diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp +index 8c65665..8f6d0e9 100644 +--- xpcom/base/nsMemoryReporterManager.cpp ++++ xpcom/base/nsMemoryReporterManager.cpp +@@ -824,7 +824,7 @@ nsMemoryReporterManager::Init() + RegisterReporter(new mozilla::dmd::DMDReporter); + #endif + +-#if defined(XP_LINUX) ++#if defined(XP_LINUX) || defined(__FreeBSD__) + nsMemoryInfoDumper::Initialize(); + #endif + diff --git a/www/firefox/files/patch-bug947862 b/www/firefox/files/patch-bug947862 new file mode 100644 index 000000000000..8cbb79453d13 --- /dev/null +++ b/www/firefox/files/patch-bug947862 @@ -0,0 +1,31 @@ +diff --git media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc +index 7ef6c66..6ae1e97 100644 +--- media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc ++++ media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc +@@ -15,7 +15,7 @@ + #include <Windows.h> + #include <WinSock.h> + #include <MMSystem.h> +-#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) ++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) + #include <sys/time.h> + #include <time.h> + #endif +@@ -209,7 +209,7 @@ class WindowsRealTimeClock : public RealTimeClock { + WindowsHelpTimer* _helpTimer; + }; + +-#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) ++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) + class UnixRealTimeClock : public RealTimeClock { + public: + UnixRealTimeClock() {} +@@ -240,7 +240,7 @@ Clock* Clock::GetRealTimeClock() { + #if defined(_WIN32) + static WindowsRealTimeClock clock(&global_help_timer); + return &clock; +-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) ++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) + static UnixRealTimeClock clock; + return &clock; + #else diff --git a/www/firefox/files/patch-config-baseconfig.mk b/www/firefox/files/patch-config-baseconfig.mk index e6fd78f35e7b..e2564e07619c 100644 --- a/www/firefox/files/patch-config-baseconfig.mk +++ b/www/firefox/files/patch-config-baseconfig.mk @@ -1,8 +1,6 @@ --- config/baseconfig.mk~ +++ config/baseconfig.mk -@@ -1,9 +1,9 @@ - INCLUDED_AUTOCONF_MK = 1 - +@@ -1,7 +1,7 @@ -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) diff --git a/www/libxul/Makefile b/www/libxul/Makefile index 52758113a085..a0101ee98957 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libxul -DISTVERSION= 24.1.0 +DISTVERSION= 24.2.0 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${DISTVERSION}esr-candidates/build1/source/ @@ -11,7 +11,7 @@ DISTNAME= firefox-${DISTVERSION}esr.source MAINTAINER?= gecko@FreeBSD.org COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps -BUILD_DEPENDS= nspr>=4.10:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.10.2:${PORTSDIR}/devel/nspr \ nss>=3.15:${PORTSDIR}/security/nss \ sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ diff --git a/www/libxul/distinfo b/www/libxul/distinfo index fb50062e02de..1279ff0a28a8 100644 --- a/www/libxul/distinfo +++ b/www/libxul/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-24.1.0esr.source.tar.bz2) = 92dcc2bacaf00cb36004236440635613a27d1528e927d205b424a92c8f58b35e -SIZE (firefox-24.1.0esr.source.tar.bz2) = 119816789 +SHA256 (firefox-24.2.0esr.source.tar.bz2) = 5a8aa526a0250e9faf2175ef610d63b2c91a5d01de7f9633b8781905dd2b9dcf +SIZE (firefox-24.2.0esr.source.tar.bz2) = 119820009 diff --git a/www/libxul/files/extra-bug780531 b/www/libxul/files/extra-bug780531 deleted file mode 100644 index 26859a9bde10..000000000000 --- a/www/libxul/files/extra-bug780531 +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) - - dnl Use integers over floats for audio on B2G and Android, because audio - dnl backends for those platforms don't support floats. --if test "$OS_TARGET" = "Android"; then -+case "$target" in -+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) --else -+;; -+*) - MOZ_SAMPLE_TYPE_FLOAT32=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) - AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) --fi -+;; -+esac - - dnl ======================================================== - dnl = Disable Speech API code diff --git a/www/libxul/files/patch-bug945046 b/www/libxul/files/patch-bug945046 new file mode 100644 index 000000000000..2da32f78cd4c --- /dev/null +++ b/www/libxul/files/patch-bug945046 @@ -0,0 +1,130 @@ +diff --git config/system-headers config/system-headers +index 432cba6..18a9627 100644 +--- config/system-headers ++++ config/system-headers +@@ -1157,3 +1157,4 @@ unicode/uenum.h + unicode/unum.h + unicode/ustring.h + #endif ++libutil.h +diff --git js/src/config/system-headers js/src/config/system-headers +index 432cba6..18a9627 100644 +--- js/src/config/system-headers ++++ js/src/config/system-headers +@@ -1157,3 +1157,4 @@ unicode/uenum.h + unicode/unum.h + unicode/ustring.h + #endif ++libutil.h +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 9975621..b4b037d 100644 +--- toolkit/library/Makefile.in ++++ toolkit/library/Makefile.in +@@ -289,6 +289,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,kvm) + EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols + endif + ++ifeq ($(OS_ARCH),FreeBSD) ++OS_LIBS += $(call EXPAND_LIBNAME,util) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet wbemuuid) + ifdef ACCESSIBILITY +diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp +index b8147c8..0ffb34e 100644 +--- xpcom/base/nsMemoryReporterManager.cpp ++++ xpcom/base/nsMemoryReporterManager.cpp +@@ -153,6 +153,43 @@ static nsresult GetResidentFast(int64_t + return GetResident(n); + } + ++#ifdef __FreeBSD__ ++#include <libutil.h> ++ ++static nsresult ++GetKinfoVmentrySelf(int64_t* prss) ++{ ++ int cnt; ++ struct kinfo_vmentry *vmmap, *kve; ++ if ((vmmap = kinfo_getvmmap(getpid(), &cnt)) == NULL) ++ return NS_ERROR_FAILURE; ++ ++ if (prss) ++ *prss = 0; ++ ++ for (int i = 0; i < cnt; i++) { ++ kve = &vmmap[i]; ++ if (prss) ++ *prss += kve->kve_private_resident; ++ } ++ ++ free(vmmap); ++ return NS_OK; ++} ++ ++#define HAVE_PRIVATE_REPORTER ++static nsresult ++GetPrivate(int64_t* aN) ++{ ++ int64_t priv; ++ nsresult rv = GetKinfoVmentrySelf(&priv); ++ if (NS_SUCCEEDED(rv)) ++ *aN = priv * getpagesize(); ++ ++ return NS_OK; ++} ++#endif // FreeBSD ++ + #elif defined(SOLARIS) + + #include <procfs.h> +@@ -327,6 +364,24 @@ static nsresult GetResidentFast(int64_t + } + + #define HAVE_PRIVATE_REPORTER ++static nsresult ++GetPrivate(int64_t* aN) ++{ ++ PROCESS_MEMORY_COUNTERS_EX pmcex; ++ pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX); ++ ++ if (!GetProcessMemoryInfo( ++ GetCurrentProcess(), ++ (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) { ++ return NS_ERROR_FAILURE; ++ } ++ ++ *aN = pmcex.PrivateUsage; ++ return NS_OK; ++} ++#endif // XP_<PLATFORM> ++ ++#ifdef HAVE_PRIVATE_REPORTER + class PrivateReporter MOZ_FINAL : public MemoryReporterBase + { + public: +@@ -339,21 +394,10 @@ public: + + NS_IMETHOD GetAmount(int64_t *aAmount) + { +- PROCESS_MEMORY_COUNTERS_EX pmcex; +- pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX); +- +- if (!GetProcessMemoryInfo( +- GetCurrentProcess(), +- (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) { +- return NS_ERROR_FAILURE; +- } +- +- *aAmount = pmcex.PrivateUsage; +- return NS_OK; ++ return GetPrivate(aAmount); + } + }; +- +-#endif // XP_<PLATFORM> ++#endif + + #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS + class VsizeReporter MOZ_FINAL : public MemoryReporterBase diff --git a/www/libxul/files/patch-bug946560 b/www/libxul/files/patch-bug946560 new file mode 100644 index 000000000000..e2560bd0d0c3 --- /dev/null +++ b/www/libxul/files/patch-bug946560 @@ -0,0 +1,44 @@ +diff --git xpcom/base/nsMemoryInfoDumper.cpp xpcom/base/nsMemoryInfoDumper.cpp +index 0b2f78c..d857374 100644 +--- xpcom/base/nsMemoryInfoDumper.cpp ++++ xpcom/base/nsMemoryInfoDumper.cpp +@@ -30,7 +30,7 @@ + #include <unistd.h> + #endif + +-#ifdef XP_LINUX ++#if defined(XP_LINUX) || defined(__FreeBSD__) + #include <fcntl.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -109,7 +109,7 @@ private: + + } // anonymous namespace + +-#ifdef XP_LINUX // { ++#if defined(XP_LINUX) || defined(__FreeBSD__) // { + namespace { + + /* +@@ -548,7 +548,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper( + /* static */ void + nsMemoryInfoDumper::Initialize() + { +-#ifdef XP_LINUX ++#if defined(XP_LINUX) || defined(__FreeBSD__) + SignalPipeWatcher::Create(); + FifoWatcher::MaybeCreate(); + #endif +diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp +index 8c65665..8f6d0e9 100644 +--- xpcom/base/nsMemoryReporterManager.cpp ++++ xpcom/base/nsMemoryReporterManager.cpp +@@ -824,7 +824,7 @@ nsMemoryReporterManager::Init() + RegisterReporter(new mozilla::dmd::DMDReporter); + #endif + +-#if defined(XP_LINUX) ++#if defined(XP_LINUX) || defined(__FreeBSD__) + nsMemoryInfoDumper::Initialize(); + #endif + diff --git a/www/libxul/files/patch-build_unix_run-mozilla.sh b/www/libxul/files/patch-build_unix_run-mozilla.sh index aae079e55456..604f14df29d4 100644 --- a/www/libxul/files/patch-build_unix_run-mozilla.sh +++ b/www/libxul/files/patch-build_unix_run-mozilla.sh @@ -4,7 +4,7 @@ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox ++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox +export MOZ_PLUGIN_PATH + if [ $moz_debug -eq 1 ] diff --git a/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp b/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp index 83bda6c59b89..cb0e7f7b9abd 100644 --- a/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp +++ b/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp @@ -4,7 +4,7 @@ char greDir[MAXPATHLEN]; bool greFound = false; -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/xulrunner", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + #if defined(XP_MACOSX) CFBundleRef appBundle = CFBundleGetMainBundle(); diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile index 16cb1e195d75..71c225ecd2be 100644 --- a/www/linux-firefox/Makefile +++ b/www/linux-firefox/Makefile @@ -2,24 +2,22 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 24.0 +DISTVERSION= 26.0 PORTEPOCH= 1 -CATEGORIES= www -MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/linux-i686/en-US -DISTNAME= ${PORTNAME}-${DISTVERSION}esr +CATEGORIES= www ipv6 +MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US +DISTNAME= ${PORTNAME}-${DISTVERSION} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla USE_BZIP2= yes -REPLACE_GRE= yes +WANT_GTK218= yes USE_LINUX_APPS= dbusglib dbuslibs alsalib alsa-plugins-oss PREFS_FILE= ${WRKSRC}/${APP_SUBDIR}defaults/preferences/browser-prefs.js APP_SUBDIR= browser/ # plugins, extensions -NO_STAGE= yes .include "${.CURDIR}/../linux-seamonkey/Makefile.common" - .include <bsd.port.mk> diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo index 1b175b553ef9..286f8f07ca04 100644 --- a/www/linux-firefox/distinfo +++ b/www/linux-firefox/distinfo @@ -1,2 +1,6 @@ -SHA256 (firefox-24.0esr.tar.bz2) = 5c5b38252dc95df688f20b8acea952211fce61803e99a56e3bb23623cf856f5a -SIZE (firefox-24.0esr.tar.bz2) = 29023319 +SHA256 (firefox-26.0.tar.bz2) = 861ac55031a40ab03d462b720746c29a346c70409316b46a0e7f7d886ea4b2a8 +SIZE (firefox-26.0.tar.bz2) = 30245127 +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 +SIZE (gtk2-2.18.3-19.fc12.i686.rpm) = 3198708 diff --git a/www/linux-firefox/files/linux-firefox.desktop.in b/www/linux-firefox/files/linux-firefox.desktop.in index f022f2e98178..e5ef4664b4c1 100644 --- a/www/linux-firefox/files/linux-firefox.desktop.in +++ b/www/linux-firefox/files/linux-firefox.desktop.in @@ -187,5 +187,5 @@ Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm StartupNotify=false Terminal=false Type=Application -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml; +Categories=Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist index beb35a7aa970..dda500c89460 100644 --- a/www/linux-firefox/pkg-plist +++ b/www/linux-firefox/pkg-plist @@ -15,6 +15,7 @@ lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon. lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf lib/%%APP_NAME%%/browser/icons/mozicon128.png lib/%%APP_NAME%%/browser/omni.ja +lib/%%APP_NAME%%/browser/plugins lib/%%APP_NAME%%/browser/searchplugins/amazondotcom.xml lib/%%APP_NAME%%/browser/searchplugins/bing.xml lib/%%APP_NAME%%/browser/searchplugins/eBay.xml @@ -37,8 +38,10 @@ lib/%%APP_NAME%%/firefox-bin lib/%%APP_NAME%%/icons/updater.png lib/%%APP_NAME%%/libfreebl3.chk lib/%%APP_NAME%%/libfreebl3.so -lib/%%APP_NAME%%/libldap60.so -lib/%%APP_NAME%%/libldif60.so +%%GTK218%%lib/%%APP_NAME%%/libgdk-x11-2.0.so.0 +%%GTK218%%lib/%%APP_NAME%%/libgio-2.0.so.0 +%%GTK218%%lib/%%APP_NAME%%/libglib-2.0.so.0 +%%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0 lib/%%APP_NAME%%/libmozalloc.so lib/%%APP_NAME%%/libmozsqlite3.so lib/%%APP_NAME%%/libnspr4.so @@ -49,7 +52,6 @@ lib/%%APP_NAME%%/libnssdbm3.so lib/%%APP_NAME%%/libnssutil3.so lib/%%APP_NAME%%/libplc4.so lib/%%APP_NAME%%/libplds4.so -lib/%%APP_NAME%%/libprldap60.so lib/%%APP_NAME%%/libsmime3.so lib/%%APP_NAME%%/libsoftokn3.chk lib/%%APP_NAME%%/libsoftokn3.so @@ -68,9 +70,7 @@ lib/%%APP_NAME%%/updater.ini lib/%%APP_NAME%%/webapprt-stub lib/%%APP_NAME%%/webapprt/omni.ja lib/%%APP_NAME%%/webapprt/webapprt.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/extensions/ 2>/dev/null || true -@unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/extensions/ -depth 1 -type l -delete 2>/dev/null || true @dirrm lib/%%APP_NAME%%/browser/chrome/icons/default @dirrm lib/%%APP_NAME%%/browser/chrome/icons @@ -81,7 +81,6 @@ lib/%%APP_NAME%%/webapprt/webapprt.ini @dirrm lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} @dirrm lib/%%APP_NAME%%/browser/extensions @dirrm lib/%%APP_NAME%%/browser/icons -@dirrm lib/%%APP_NAME%%/browser/plugins @dirrm lib/%%APP_NAME%%/browser/searchplugins @dirrm lib/%%APP_NAME%%/browser @dirrm lib/%%APP_NAME%%/components diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile index 5b785f11d770..355a5545adb2 100644 --- a/www/linux-seamonkey/Makefile +++ b/www/linux-seamonkey/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.21 -CATEGORIES= www +DISTVERSION= 2.23 +CATEGORIES= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org @@ -13,6 +13,5 @@ USE_BZIP2= yes USE_LINUX_APPS= dbusglib dbuslibs alsalib alsa-plugins-oss -NO_STAGE= yes .include "${.CURDIR}/Makefile.common" .include <bsd.port.mk> diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common index 878ec0c7653c..0321ece9cdea 100644 --- a/www/linux-seamonkey/Makefile.common +++ b/www/linux-seamonkey/Makefile.common @@ -1,12 +1,24 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> # $FreeBSD$ +.if defined(OVERRIDE_LINUX_NONBASE_PORTS) && \ + ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10" +.undef WANT_GTK218 +.endif + CATEGORIES+= linux MASTER_SITES?= MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US PKGNAMEPREFIX?= linux- -.if defined(REPLACE_GRE) -EXTRACT_DEPENDS+=${NONEXISTENT}:${PORTSDIR}/www/linux-seamonkey:extract +.if defined(WANT_GTK218) +MASTER_SITES+= https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/12/Everything/i386/os/Packages/:f12 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + glib2-2.22.2-2.fc12.i686.rpm:f12 \ + gtk2-2.18.3-19.fc12.i686.rpm:f12 +GTK218_FILES= lib/libgio-2.0.so.0 \ + lib/libglib-2.0.so.0 \ + usr/lib/libgdk-x11-2.0.so.0 \ + usr/lib/libgtk-x11-2.0.so.0 .endif NO_BUILD= yes @@ -16,9 +28,11 @@ BIN_NAME?= ${PORTNAME} USE_LINUX= yes USE_LINUX_APPS+= atk fontconfig gtk2 hicontheme pango WRKSRC?= ${WRKDIR}/${BIN_NAME} -FDIR= ${PREFIX}/lib/${APP_NAME} +FDIR= ${STAGEDIR}${PREFIX}/lib/${APP_NAME} COMMON_DIR= ${.CURDIR}/../../www/linux-seamonkey +APP_ENV+= MOZ_CRASHREPORTER_DISABLE=1 + PLIST_SUB+= APP_NAME=${APP_NAME} SUB_LIST+= APP_NAME=${APP_NAME} SUB_FILES= ${APP_NAME}.desktop @@ -28,54 +42,56 @@ DESKTOP_SUFFIX?= (Linux, devel) .endif DESKTOP_SUFFIX?= (Linux) +.if defined(WANT_GTK218) +PLIST_SUB+= GTK218="" +.else +PLIST_SUB+= GTK218="@comment " +.endif + _A= >> ${TMPPLIST} _Q= 2>/dev/null || true .if !target(post-extract) post-extract: @${RM} -rf ${WRKSRC}/updates - @${MKDIR} ${WRKSRC}/${APP_SUBDIR}plugins @${MKDIR} ${WRKSRC}/${APP_SUBDIR}extensions + @${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME} \ + ${WRKSRC}/${APP_SUBDIR}plugins +. if defined(WANT_GTK218) +. for f in ${GTK218_FILES} + @${CP} -p ${WRKDIR}/${f} ${WRKSRC} + @${ECHO_CMD} ${f:T} >>${WRKSRC}/dependentlibs.list +. endfor + @${REINPLACE_CMD} -i '' '/libxul/ { h; d; }; $$G' \ + ${WRKSRC}/dependentlibs.list +. endif .endif -.if defined(REPLACE_GRE) -# XXX remove after linux_base-c6 and linux-c6-gtk2 become default -# using seamonkey gre for linux_base-f10 compat -post-extract: replace-gre -replace-gre: version-compat-check - @${ECHO_MSG} "===> GRE versions are compatible, replacing with" \ - "$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../../www/linux-seamonkey)" - cd $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../../www/linux-seamonkey); \ - ${CP} lib* dependentlibs.list ${WRKSRC} - -version-compat-check: - @${ECHO_MSG} "===> Checking GRE version is compatible with" \ - "$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../../www/linux-seamonkey)" - @ff_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' ${WRKSRC}/platform.ini); \ - sm_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../../www/linux-seamonkey)/platform.ini); \ - if [ $$ff_gre_version != $$sm_gre_version ]; then \ - ${ECHO_MSG} "===> GRE versions aren't compatible, aborting"; \ - exit 1; \ - fi -.endif .if !target(post-patch) post-patch: @${MKDIR} ${PREFS_FILE:H} - # out-of-process plugins don't work with linuxulator (ports/170402) - ${ECHO} 'pref("dom.ipc.plugins.enabled", false);' >> ${PREFS_FILE} + # empty port preferences + @${DO_NADA} >>${PREFS_FILE} + +. if (${DISTVERSION:R:R} < 28 && ${PORTNAME} != "seamonkey") || \ + (${PORTNAME} == "seamonkey" && ${DISTVERSION:C/[0-9]*\.//:C/b.*//} < 25) + # dummy resident-unique for make about:memory's "measure" + @${REINPLACE_CMD} -i '' \ + 's,/proc/self/smaps\(.Private\),////////dev/null\1,' \ + ${WRKSRC}/libxul.so +. endif .endif .if !target(do-install) do-install: - @${INSTALL} -d ${FDIR} ${PREFIX}/share/applications - @${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${PREFIX}/share/applications/ + @${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ @${CP} -pR ${WRKSRC}/ ${FDIR}/ - @${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/ - @${LN} -sf ${FDIR}/${BIN_NAME} ${PREFIX}/bin/${APP_NAME} - @${CP} -R ${LOCALBASE}/lib/npapi/symlinks/${APP_NAME}/ \ - ${FDIR}/${APP_SUBDIR}plugins/ ${_Q} + @${PRINTF} '#! /bin/sh\n${APP_ENV} \ + ${PREFIX}/lib/${APP_NAME}/${BIN_NAME} "$$@"\n' \ + >>${STAGEDIR}${PREFIX}/bin/${APP_NAME} + @${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${APP_NAME} @${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \ ${FDIR}/${APP_SUBDIR}extensions/ ${_Q} .endif @@ -106,19 +122,22 @@ create-plist: build ${ECHO_CMD} share/applications/%%APP_NAME%%.desktop >> ${PLIST} cd ${WRKSRC} && ${FIND} -s . -type f -or -type l | \ ${SED} -e "s#^\.#lib/%%APP_NAME%%#" | ${SORT} >> ${PLIST} - ${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ \ - %D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ ${_Q}' >> ${PLIST} ${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ \ %D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ ${_Q}' >> ${PLIST} - ${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ \ - -depth 1 -type l -delete ${_Q}' >> ${PLIST} ${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ \ -depth 1 -type l -delete ${_Q}' >> ${PLIST} cd ${WRKSRC} && ${FIND} -sd . -type d | \ ${SED} -e "s#^\.#@dirrm lib/%%APP_NAME%%#" >> ${PLIST} +.if defined(WANT_GTK218) +. for f in ${GTK218_FILES} + ${REINPLACE_CMD} -i '' '/${f:T}/s/^/%%GTK218%%/' ${PLIST} +. endfor +.endif snatch-desktop: ${SED} -E -e 's/${PORTNAME}/${APP_NAME}/' \ + -e "s,@MOZILLA_NAME@,$$(echo ${PORTNAME} | ${SED} 's/\b./\u&/g')," \ + -e 's/@MOZILLA@|%%MOZILLA%%/${APP_NAME}/' \ -e 's/^(Name.*=.+)$$/\1 ${DESKTOP_SUFFIX}/' \ -e 's/^(GenericName.*=.+)$$/\1 ${DESKTOP_SUFFIX}/' \ -e 's!^Icon=.*$$!Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm!' \ diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo index a786f2181101..87bff9dadc93 100644 --- a/www/linux-seamonkey/distinfo +++ b/www/linux-seamonkey/distinfo @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.21.tar.bz2) = ff6f361e1db0add6d4c38e5594a8b99c31f11992ae56dc2981329f66439161e2 -SIZE (seamonkey-2.21.tar.bz2) = 29490026 +SHA256 (seamonkey-2.23.tar.bz2) = 7c848d214233dfbc4543f9d76f9c8ec8afc5a21062dfe09acf137ec2be145199 +SIZE (seamonkey-2.23.tar.bz2) = 29492800 diff --git a/www/linux-seamonkey/files/linux-seamonkey.desktop.in b/www/linux-seamonkey/files/linux-seamonkey.desktop.in index 212d753da2e7..57d2d4a4da65 100644 --- a/www/linux-seamonkey/files/linux-seamonkey.desktop.in +++ b/www/linux-seamonkey/files/linux-seamonkey.desktop.in @@ -160,10 +160,10 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=linux-seamonkey %U -StartupNotify=true +Exec=linux-seamonkey %u +StartupNotify=false Terminal=false Type=Application Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm -Categories=Application;Network; +Categories=Network;WebBrowser;Email;News;TextEditor;IRCClient; MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist index b1e1d8169138..a0afe7ca5e55 100644 --- a/www/linux-seamonkey/pkg-plist +++ b/www/linux-seamonkey/pkg-plist @@ -107,6 +107,7 @@ lib/%%APP_NAME%%/mozilla-xremote-client lib/%%APP_NAME%%/omni.ja lib/%%APP_NAME%%/platform.ini lib/%%APP_NAME%%/plugin-container +lib/%%APP_NAME%%/plugins lib/%%APP_NAME%%/precomplete lib/%%APP_NAME%%/removed-files lib/%%APP_NAME%%/run-mozilla.sh @@ -119,9 +120,7 @@ lib/%%APP_NAME%%/searchplugins/yahoo.xml lib/%%APP_NAME%%/update-settings.ini lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true -@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true @dirrm lib/%%APP_NAME%%/chrome/icons/default @dirrm lib/%%APP_NAME%%/chrome/icons @@ -137,6 +136,5 @@ lib/%%APP_NAME%%/updater.ini @dirrm lib/%%APP_NAME%%/extensions @dirrm lib/%%APP_NAME%%/icons @dirrm lib/%%APP_NAME%%/isp -@dirrm lib/%%APP_NAME%%/plugins @dirrm lib/%%APP_NAME%%/searchplugins @dirrm lib/%%APP_NAME%% diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile index 796cb30225fb..65e082ebefea 100644 --- a/www/seamonkey-i18n/Makefile +++ b/www/seamonkey-i18n/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.22 -CATEGORIES= www +PORTVERSION= 2.23 +CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./} @@ -21,6 +21,7 @@ PLISTF?= ${WRKDIR}/plist_files USE_SEAMONKEY= yes USE_XPI= seamonkey linux-seamonkey +NO_ARCH= yes USE_SUBMAKE= yes WDIR= langpack-*@seamonkey.mozilla.org diff --git a/www/seamonkey-i18n/Makefile.lang b/www/seamonkey-i18n/Makefile.lang index a14341a48f91..e3ab0a444d65 100644 --- a/www/seamonkey-i18n/Makefile.lang +++ b/www/seamonkey-i18n/Makefile.lang @@ -1,13 +1,16 @@ # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp> # $FreeBSD$ -SEAMONKEY_I18N_ALL_= ca cs de en-GB en-US es-AR es-ES \ - fi fr hu it ja-JP-mac ja lt nb-NO nl pl \ - pt-PT ru sk sv-SE tr uk +SEAMONKEY_I18N_ALL_= be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it \ + ja-JP-mac ja lt nb-NO nl pl pt-PT ru sk sv-SE tr uk \ + zh-CN zh-TW .if defined(SEAMONKEY_I18N_ALL) || (defined(PACKAGE_BUILDING) && !exists(${OPTIONSFILE})) || make(makesum) SEAMONKEY_I18N= ${SEAMONKEY_I18N_ALL_} .else +.if ${PORT_OPTIONS:MLANG_BE} +SEAMONKEY_I18N+= be +.endif .if ${PORT_OPTIONS:MLANG_CA} SEAMONKEY_I18N+= ca .endif @@ -35,6 +38,9 @@ SEAMONKEY_I18N+= fi .if ${PORT_OPTIONS:MLANG_FR} SEAMONKEY_I18N+= fr .endif +.if ${PORT_OPTIONS:MLANG_GL} +SEAMONKEY_I18N+= gl +.endif .if ${PORT_OPTIONS:MLANG_HU} SEAMONKEY_I18N+= hu .endif @@ -77,4 +83,10 @@ SEAMONKEY_I18N+= tr .if ${PORT_OPTIONS:MLANG_UA} SEAMONKEY_I18N+= uk .endif +.if ${PORT_OPTIONS:MLANG_CN} +SEAMONKEY_I18N+= zh-CN +.endif +.if ${PORT_OPTIONS:MLANG_TW} +SEAMONKEY_I18N+= zh-TW +.endif .endif diff --git a/www/seamonkey-i18n/Makefile.option b/www/seamonkey-i18n/Makefile.option index d3ae226acb83..09342cd5d851 100644 --- a/www/seamonkey-i18n/Makefile.option +++ b/www/seamonkey-i18n/Makefile.option @@ -1,7 +1,9 @@ # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp> # $FreeBSD$ -OPTIONS_DEFINE= LANG_CA \ +OPTIONS_DEFINE= LANG_BE \ + LANG_CA \ + LANG_CN \ LANG_CS \ LANG_NL \ LANG_DE \ @@ -9,6 +11,7 @@ OPTIONS_DEFINE= LANG_CA \ LANG_US \ LANG_FI \ LANG_FR \ + LANG_GL \ LANG_HU \ LANG_IT \ LANG_JA \ @@ -23,6 +26,7 @@ OPTIONS_DEFINE= LANG_CA \ LANG_SE \ LANG_SK \ LANG_TR \ + LANG_TW \ LANG_UA -OPTIONS_DEFAULT=LANG_DE LANG_FR LANG_HU LANG_IT LANG_RU LANG_ES +OPTIONS_DEFAULT=LANG_CN LANG_DE LANG_FR LANG_HU LANG_IT LANG_RU LANG_ES diff --git a/www/seamonkey-i18n/distinfo b/www/seamonkey-i18n/distinfo index 8505553be3eb..5bec6ffc22d4 100644 --- a/www/seamonkey-i18n/distinfo +++ b/www/seamonkey-i18n/distinfo @@ -1,46 +1,54 @@ -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.ca.langpack.xpi) = a0b0f9bc29e1f29c8ca988a39f0738f3e83cbcc660b1fdf2d4c5ec9800fb8215 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.ca.langpack.xpi) = 785462 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.cs.langpack.xpi) = 2600e3b4954145541490a432eab45d7b0c9f487fbcb535ae46c41afe3a8ca28f -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.cs.langpack.xpi) = 806065 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.de.langpack.xpi) = 6dcebe905507b0420d64102628040ad4f72cbacee9ab47404be503e34e85d3d5 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.de.langpack.xpi) = 812799 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.en-GB.langpack.xpi) = 36c75155974d50b4c1483313c82c4406c68ee33a38b6fe3cb928049ace31cb01 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.en-GB.langpack.xpi) = 776573 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.en-US.langpack.xpi) = c27a179349e24c42fdcba94dd87fed71c0203e22d9a8b8980c534f1f49588a6a -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.en-US.langpack.xpi) = 777488 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.es-AR.langpack.xpi) = 25ad07bc68a55048da5bfe45f21f6bcaa49a4b3aabd40c5f94b6e12d1639bc90 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.es-AR.langpack.xpi) = 834851 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.es-ES.langpack.xpi) = 4ec91900d8e3dacd4bf19704eed7800290df96c79a7694a7d08b603d029bb1c6 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.es-ES.langpack.xpi) = 807300 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.fi.langpack.xpi) = 1c705ecf2f62727f85caf43edc9163d8dd38ea6a66199a536b70b17c6c94d2b0 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.fi.langpack.xpi) = 776861 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.fr.langpack.xpi) = d3f93042bf4b518e381d41b2db4dc374d242d28785cd10fdc361682783e22c26 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.fr.langpack.xpi) = 787273 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.hu.langpack.xpi) = ee85cd6ae058f0145909cfe735fb1a8240f2e5b7b4f2e56e227bd78b9a9db0af -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.hu.langpack.xpi) = 823101 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.it.langpack.xpi) = 8210408deb5bfa70e67d96fda2dcb54f1e1b8a6eaa3f55a35593713123d28e10 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.it.langpack.xpi) = 723328 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.ja-JP-mac.langpack.xpi) = 99e3ec19138a935424c674aacab1c31e7139552ad4c724a419100a87fd77baa8 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.ja-JP-mac.langpack.xpi) = 882396 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.ja.langpack.xpi) = 9e74f847b03f16a7ac55944e3230da072a8c35036c28699456656d42a40b592a -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.ja.langpack.xpi) = 857167 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.lt.langpack.xpi) = 03b1d41dc31b8b37105d84ce6403577a638d0fa95f6b1b2c4c4ab98a75b901a1 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.lt.langpack.xpi) = 822086 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.nb-NO.langpack.xpi) = cc225da9453cca0a0bc6f2c10983c6ff87f16678062ee791cf62b850f0a355a6 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.nb-NO.langpack.xpi) = 798849 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.nl.langpack.xpi) = 13ca46fbaef0c23cd10f81c423d0a09014c2d9092fb2687774a71a922546eac8 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.nl.langpack.xpi) = 773163 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.pl.langpack.xpi) = de69ba9b4298be70d41c3b313dfedd33aae662cc9cbffbd6a3d688c1af03ef50 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.pl.langpack.xpi) = 831387 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.pt-PT.langpack.xpi) = 3eeaf48bf3fb11b347c654e2f3563840d5b47832cc5533cd289ec7f486b9da68 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.pt-PT.langpack.xpi) = 808757 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.ru.langpack.xpi) = d5d8c56edaa83df2e1f0a73808e76012a1f87c3d38129ea034e08e634058d71d -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.ru.langpack.xpi) = 880201 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.sk.langpack.xpi) = 6fe1e9be9686d39be19ac48b957e602d8bc893b7786f662caf2ab2923dbef183 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.sk.langpack.xpi) = 833375 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.sv-SE.langpack.xpi) = 7a829581f56e66699379a0d4d10a7fa6f30423b46447905f6728c54aa18508b5 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.sv-SE.langpack.xpi) = 802057 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.tr.langpack.xpi) = 85ef503dc00ee0e31f054516b379da5c8885d6ffccf2cd5004e2b0fb2e1ff0c4 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.tr.langpack.xpi) = 846995 -SHA256 (xpi/seamonkey-i18n-2.22/seamonkey-2.22.uk.langpack.xpi) = d513706b86804cf9ee63c99181ae9f30b3fc0efb052271e3b95932734c6a51e0 -SIZE (xpi/seamonkey-i18n-2.22/seamonkey-2.22.uk.langpack.xpi) = 849603 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.be.langpack.xpi) = b2535be7b8722a66551f2e8c8a3ebbf694b2c3f9edac3d8c6b900ab7cfc9ca02 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.be.langpack.xpi) = 813117 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ca.langpack.xpi) = 75c998f91f894e12a920688e7dd6086fd57aff7c301f82f624e092e5e8043251 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ca.langpack.xpi) = 808769 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.cs.langpack.xpi) = eecf04f9c1d92ec0c3acec23b813a84e3ce32ad68a7b200a39e58ca0207ef7fe +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.cs.langpack.xpi) = 808200 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.de.langpack.xpi) = 938c5be269be4c302dde7f955a927d207e0f3c11502ac97aac81266a850824fb +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.de.langpack.xpi) = 815005 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.en-GB.langpack.xpi) = ac432f3f3290939c52376cd1d5072bc51de2c94d09a3e75cd7cbc100acd15e85 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.en-GB.langpack.xpi) = 778468 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.en-US.langpack.xpi) = 0d27744b5647944083f10bb097ac89b5933ca7bec8d102ffc27dea33d4c4d533 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.en-US.langpack.xpi) = 779456 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.es-AR.langpack.xpi) = 9c2e76b64c13e54d3c7d2380516786fbbcca50c8f5e17d4d4977b3c61594f107 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.es-AR.langpack.xpi) = 837251 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.es-ES.langpack.xpi) = 5b7dc80e425580f3b9b40b8658454ac0d426cd8ed10a1ea77f3f57c84dd9339c +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.es-ES.langpack.xpi) = 808859 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.fi.langpack.xpi) = 5d609c8ebb1385ee8575ae0ac229cb07ef1cbc0a0179bd12ef23a08a970d966f +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.fi.langpack.xpi) = 779342 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.fr.langpack.xpi) = bdf26493ce8d8709e4a6d42ed21a983de6bb7cfa6e693e62d76ab52cca987fc9 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.fr.langpack.xpi) = 789400 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.gl.langpack.xpi) = 419e0f16e870194a721d1e5761a8e4e55cbbf76bdbf445aa20f8caedd1606071 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.gl.langpack.xpi) = 788124 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.hu.langpack.xpi) = 5d4d8af93375d3fdd579c5f0abc7a6a2845c2d1db3ef6d4de92bc1bebdffe284 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.hu.langpack.xpi) = 822606 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.it.langpack.xpi) = 12fc5f170c24aa17671bcaf6ed7d0b68850107892352d738d24bb763430588ce +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.it.langpack.xpi) = 724843 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ja-JP-mac.langpack.xpi) = cdcdaefb6c4327c0267661164e64e25c3cff1287cbcbf141bc62090ef0634f98 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ja-JP-mac.langpack.xpi) = 884592 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ja.langpack.xpi) = 31796aaffc1aa058bb1ffa2fa802c8f7422b5008594024c26c5f645de065402c +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ja.langpack.xpi) = 859315 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.lt.langpack.xpi) = 51be5c56793348c2f411dacdd5412c39aa8f5e3bbeda356111af70c5180335dd +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.lt.langpack.xpi) = 824245 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.nb-NO.langpack.xpi) = 5cf084b2f692dd0d17aa5f69dc8dff5a5be880f76aa23ba66b757a7d5492ebb4 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.nb-NO.langpack.xpi) = 801346 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.nl.langpack.xpi) = ede8ca4771256adb7bd615f573c97e061714816fa013fec274891093e1fc6cbc +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.nl.langpack.xpi) = 775394 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.pl.langpack.xpi) = e46ae87d8f4910efc8a22486d560333f9b15785526cc13bd9cd7f5607be022d0 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.pl.langpack.xpi) = 849833 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.pt-PT.langpack.xpi) = 100233b5e2ec6545eca11115bfedee218ba636682bdb40f79b9dea943d0a38e1 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.pt-PT.langpack.xpi) = 811279 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ru.langpack.xpi) = d550283530cbceb1e6a6a246742da3f7e5d194c44d4a8112a4a323b0cb235efc +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ru.langpack.xpi) = 881980 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.sk.langpack.xpi) = bbec5ef62ae14c8ff5d3e887af4ad4ee067bebb482d5fc2a8102fbf4b9980335 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.sk.langpack.xpi) = 835661 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.sv-SE.langpack.xpi) = 7179ab458c337bb668a99394b2a64984bc841d7e653e43315295fc1b53fa121b +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.sv-SE.langpack.xpi) = 804082 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.tr.langpack.xpi) = bb6396f3dea2704687f5932d53eed3e61c0b931142d4423e79242f2bf2394db3 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.tr.langpack.xpi) = 849214 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.uk.langpack.xpi) = 625c7a135bef8170e649bf8ce8822dea652adf3b21d26b014e4fc33291ea279c +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.uk.langpack.xpi) = 851915 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.zh-CN.langpack.xpi) = 3e0fde7598a7d1235aa90afc906fb15476ae917ad97bf39b51124a670b31258a +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.zh-CN.langpack.xpi) = 812656 +SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.zh-TW.langpack.xpi) = 29cf5d2e5ed79f1b1c4e974da17bd24f8d4432ead064f75661738b6633c80289 +SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.zh-TW.langpack.xpi) = 835163 diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index b1594b5f587c..5b32fb6d0e05 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.22 -PORTREVISION= 1 -CATEGORIES?= www ipv6 +DISTVERSION= 2.23 +CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} @@ -13,7 +12,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -BUILD_DEPENDS= nspr>=4.10:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.10.2:${PORTSDIR}/devel/nspr \ nss>=3.15:${PORTSDIR}/security/nss \ sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ @@ -22,7 +21,7 @@ BUILD_DEPENDS= nspr>=4.10:${PORTSDIR}/devel/nspr \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l EM_VERSION= 1.6 -L_VERSION= 2.7b1 +L_VERSION= 2.8b1 SSP_UNSAFE= yes USE_AUTOTOOLS= autoconf213:env @@ -49,7 +48,7 @@ MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS -OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS +OPTIONS_DEFAULT=CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS CHATZILLA_DESC?=Chatzilla IRC module COMPOSER_DESC?= HTML Composer module @@ -83,10 +82,6 @@ MOZ_OPTIONS+= --disable-ldap --disable-mailnews .if ! ${PORT_OPTIONS:MLDAP} MOZ_OPTIONS+= --disable-ldap --enable-mailnews .else -# libprldap60.so: Undefined symbol "PR_GetCurrentThread" -. if ${ARCH} == i386 -USE_GCC?= yes -. endif MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif .if ${PORT_OPTIONS:MENIGMAIL} diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 26f51dd07355..5498fae97a96 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.22.source.tar.bz2) = c0c487449f2c3893dfb0e2665e550ce6464055497132eaed0964606d72132535 -SIZE (seamonkey-2.22.source.tar.bz2) = 148026129 +SHA256 (seamonkey-2.23.source.tar.bz2) = 45f8fd527981148ad96bc5d90eea6eb76d83f1e1b87262122ec4928127f01de1 +SIZE (seamonkey-2.23.source.tar.bz2) = 148268011 SHA256 (enigmail-1.6.tar.gz) = 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d SIZE (enigmail-1.6.tar.gz) = 1231111 diff --git a/www/seamonkey/files/extra-bug780531 b/www/seamonkey/files/extra-bug780531 deleted file mode 100644 index 5468f16c3be7..000000000000 --- a/www/seamonkey/files/extra-bug780531 +++ /dev/null @@ -1,24 +0,0 @@ ---- mozilla/configure.in~ -+++ mozilla/configure.in -@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) - - dnl Use integers over floats for audio on B2G and Android, because audio - dnl backends for those platforms don't support floats. --if test "$OS_TARGET" = "Android"; then -+case "$target" in -+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) --else -+;; -+*) - MOZ_SAMPLE_TYPE_FLOAT32=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) - AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) --fi -+;; -+esac - - dnl ======================================================== - dnl = Disable Speech API code diff --git a/www/seamonkey/files/patch-bug807492 b/www/seamonkey/files/patch-bug807492 deleted file mode 100644 index afd1539f358f..000000000000 --- a/www/seamonkey/files/patch-bug807492 +++ /dev/null @@ -1,628 +0,0 @@ -JJdiff --git configure.in configure.in -index c167461..8346c11 100644 ---- mozilla/configure.in -+++ mozilla/configure.in -@@ -5246,17 +5246,17 @@ if test "$NS_PRINTING"; then - AC_DEFINE(NS_PRINT_PREVIEW) - fi - - dnl Turn off webrtc for OS's we don't handle yet, but allow - dnl --enable-webrtc to override. Can disable for everything in - dnl the master list above. - if test -n "$MOZ_WEBRTC"; then - case "$target" in -- *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*) -+ *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - dnl Leave enabled - ;; - *) - dnl default to disabled for all others - MOZ_WEBRTC= - ;; - esac - fi -diff --git media/mtransport/objs.mk media/mtransport/objs.mk -index f1fc85f..141e8ca 100644 ---- mozilla/media/mtransport/objs.mk -+++ mozilla/media/mtransport/objs.mk -@@ -18,22 +18,26 @@ LOCAL_INCLUDES += \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/util/libekr \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/log \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/registry \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/stats \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/plugin \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/event \ - $(NULL) - --ifeq ($(OS_TARGET), Darwin) -+ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) - LOCAL_INCLUDES += \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \ - $(NULL) -+ifeq ($(OS_TARGET), Darwin) - DEFINES += -DDARWIN -+else -+DEFINES += -DBSD -+endif - endif - - ifeq ($(OS_TARGET), Linux) - LOCAL_INCLUDES += \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \ - $(NULL) - DEFINES += -DLINUX -diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in -index c1d5bf4..2ecf2c7 100644 ---- mozilla/media/mtransport/test/Makefile.in -+++ mozilla/media/mtransport/test/Makefile.in -@@ -73,22 +73,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1 - else - #default_fallback; probably doesn't work - DEFINES += -D__Userspace_os_$(OS_TARGET)=1 - endif - endif - endif - endif - --ifeq ($(OS_TARGET), Darwin) -+ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) - LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include -+ifeq ($(OS_TARGET), Darwin) - DEFINES += \ - -DGTEST_USE_OWN_TR1_TUPLE=1 \ - $(NULL) - endif -+endif - - ifeq ($(OS_TARGET), Linux) - LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include - endif - - ifeq ($(OS_TARGET), Android) - LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/android/include - -diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp -index 0e1f8b4..9a4b995 100644 ---- mozilla/media/mtransport/third_party/nICEr/nicer.gyp -+++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp -@@ -126,26 +126,36 @@ - 'R_DEFINED_UINT2=uint16_t', - 'R_DEFINED_INT4=int32_t', - 'R_DEFINED_UINT4=uint32_t', - 'R_DEFINED_INT8=int64_t', - 'R_DEFINED_UINT8=uint64_t', - ], - - 'conditions' : [ -- ## Mac -+ ## Mac and BSDs - [ 'OS == "mac"', { -+ 'defines' : [ -+ 'DARWIN', -+ 'HAVE_XLOCALE', -+ ], -+ }], -+ [ 'os_bsd == 1', { -+ 'defines' : [ -+ 'BSD', -+ ], -+ }], -+ [ 'OS == "mac" or os_bsd == 1', { - 'cflags_mozilla': [ - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', - '-Wmissing-prototypes', - ], - 'defines' : [ -- 'DARWIN', - 'HAVE_LIBM=1', - 'HAVE_STRDUP=1', - 'HAVE_STRLCPY=1', - 'HAVE_SYS_TIME_H=1', - 'HAVE_VFPRINTF=1', - 'NEW_STDIO' - 'RETSIGTYPE=void', - 'TIME_WITH_SYS_TIME_H=1', -diff --git media/mtransport/third_party/nICEr/src/stun/addrs.c media/mtransport/third_party/nICEr/src/stun/addrs.c -index b0b66b2..04fea94 100644 ---- mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c -+++ mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c -@@ -50,17 +50,19 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex - #else - #include <syslog.h> - /* Work around an Android NDK < r8c bug */ - #undef __unused - #include <linux/sysctl.h> - #endif - #include <net/if.h> - #ifndef LINUX -+#if !defined(__OpenBSD__) && !defined(__NetBSD__) - #include <net/if_var.h> -+#endif - #include <net/if_dl.h> - #include <net/if_types.h> - #include <sys/sockio.h> - #else - #include <linux/if.h> - #endif - #include <net/route.h> - -@@ -75,17 +77,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex - #include <netdb.h> - #endif /* UNIX */ - - #include "stun.h" - #include "addrs.h" - - - --#ifdef DARWIN -+#if defined(BSD) || defined(DARWIN) - /* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright -@@ -685,17 +687,17 @@ nr_stun_remove_duplicate_addrs(nr_transport_addr addrs[], int remove_loopback, i - } - - int - nr_stun_get_addrs(nr_transport_addr addrs[], int maxaddrs, int drop_loopback, int *count) - { - int _status=0; - int i; - --#ifdef DARWIN -+#if defined(BSD) || defined(DARWIN) - _status = stun_get_mib_addrs(addrs, maxaddrs, count); - #elif defined(WIN32) - _status = stun_get_win32_addrs(addrs, maxaddrs, count); - #elif defined(__sparc__) - _status = stun_get_sparc_addrs(addrs, maxaddrs, count); - #else - _status = stun_get_siocgifconf_addrs(addrs, maxaddrs, count); - #endif -diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h -index a3c51f9..eb65ac8 100644 ---- mozilla/media/mtransport/third_party/nICEr/src/stun/stun.h -+++ mozilla/media/mtransport/third_party/nICEr/src/stun/stun.h -@@ -36,21 +36,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #ifdef WIN32 - #include <winsock2.h> - #else - #include <sys/param.h> - #include <sys/socket.h> - #include <net/if.h> - #ifndef LINUX -+#if !defined(__OpenBSD__) && !defined(__NetBSD__) - #include <net/if_var.h> -+#endif - #include <net/if_dl.h> - #include <net/if_types.h> - #endif -+#ifndef BSD - #include <net/route.h> -+#endif - #include <netinet/in.h> - #ifndef LINUX - #include <netinet/in_var.h> - #endif - #include <arpa/inet.h> - #include <netdb.h> - #endif - #include <time.h> -diff --git media/mtransport/third_party/nICEr/src/util/mbslen.c media/mtransport/third_party/nICEr/src/util/mbslen.c -index cc260b7..66af2d7 100644 ---- mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c -+++ mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c -@@ -38,50 +38,58 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #include <errno.h> - #include <csi_platform.h> - - #include <assert.h> - #include <locale.h> - #include <stdlib.h> - #include <wchar.h> --#ifdef DARWIN -+ -+#ifdef __FreeBSD__ -+#include <osreldate.h> -+# if __FreeBSD_version > 900505 -+# define HAVE_XLOCALE -+# endif -+#endif -+ -+#ifdef HAVE_XLOCALE - #include <xlocale.h> --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - - #include "nr_api.h" - #include "mbslen.h" - - /* get number of characters in a mult-byte character string */ - int - mbslen(const char *s, size_t *ncharsp) - { --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - static locale_t loc = 0; - static int initialized = 0; --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - #ifdef WIN32 - char *my_locale=0; - unsigned int i; - #endif /* WIN32 */ - int _status; - size_t nbytes; - int nchars; - mbstate_t mbs; - --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - if (! initialized) { - initialized = 1; - loc = newlocale(LC_CTYPE_MASK, "UTF-8", LC_GLOBAL_LOCALE); - } - - if (loc == 0) { - /* unable to create the UTF-8 locale */ - assert(loc != 0); /* should never happen */ --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - - #ifdef WIN32 - if (!setlocale(LC_CTYPE, 0)) - ABORT(R_INTERNAL); - - if (!(my_locale = r_strdup(setlocale(LC_CTYPE, 0)))) - ABORT(R_NO_MEMORY); - -@@ -94,28 +102,28 @@ mbslen(const char *s, size_t *ncharsp) - /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */ - /* null-checking setlocale is required because Android */ - char *locale = setlocale(LC_CTYPE, 0); - /* some systems use "utf8" instead of "UTF-8" like Fedora 17 */ - if (!locale || (!strcasestr(locale, "UTF-8") && !strcasestr(locale, "UTF8"))) - ABORT(R_NOT_FOUND); - #endif - --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - } --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - - memset(&mbs, 0, sizeof(mbs)); - nchars = 0; - --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - while (*s != '\0' && (nbytes = mbrlen_l(s, strlen(s), &mbs, loc)) != 0) - #else - while (*s != '\0' && (nbytes = mbrlen(s, strlen(s), &mbs)) != 0) --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - { - if (nbytes == (size_t)-1) /* should never happen */ { - ABORT(R_INTERNAL); - } - if (nbytes == (size_t)-2) /* encoding error */ { - ABORT(R_BAD_DATA); - } - -diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp -index 3cc8e1c..74016c6 100644 ---- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp -+++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp -@@ -142,26 +142,35 @@ - 'R_DEFINED_UINT2=uint16_t', - 'R_DEFINED_INT4=int32_t', - 'R_DEFINED_UINT4=uint32_t', - 'R_DEFINED_INT8=int64_t', - 'R_DEFINED_UINT8=uint64_t', - ], - - 'conditions' : [ -- ## Mac -+ ## Mac and BSDs - [ 'OS == "mac"', { -+ 'defines' : [ -+ 'DARWIN', -+ ], -+ }], -+ [ 'os_bsd == 1', { -+ 'defines' : [ -+ 'BSD', -+ ], -+ }], -+ [ 'OS == "mac" or os_bsd == 1', { - 'cflags_mozilla': [ - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', - '-Wmissing-prototypes', - ], - 'defines' : [ -- 'DARWIN', - 'HAVE_LIBM=1', - 'HAVE_STRDUP=1', - 'HAVE_STRLCPY=1', - 'HAVE_SYS_TIME_H=1', - 'HAVE_VFPRINTF=1', - 'NEW_STDIO' - 'RETSIGTYPE=void', - 'TIME_WITH_SYS_TIME_H=1', -diff --git media/mtransport/third_party/nrappkit/src/log/r_log.c media/mtransport/third_party/nrappkit/src/log/r_log.c -index efb7ef2..aebf578 100644 ---- mozilla/media/mtransport/third_party/nrappkit/src/log/r_log.c -+++ mozilla/media/mtransport/third_party/nrappkit/src/log/r_log.c -@@ -43,16 +43,17 @@ static char *RCSSTRING __UNUSED__ ="$Id: r_log.c,v 1.10 2008/11/25 22:25:18 adam - #ifdef LINUX - #define _BSD_SOURCE - #endif - - #include "r_log.h" - #include "hex.h" - - #include <string.h> -+#include <errno.h> - #ifndef _MSC_VER - #include <strings.h> - #include <syslog.h> - #endif - #include <registry.h> - #include <time.h> - - -diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -index bcb1ec0..bb73591 100644 ---- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -+++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -@@ -33,7 +33,7 @@ - #ifndef _SYS_QUEUE_H_ - #define _SYS_QUEUE_H_ - --#ifndef DARWIN -+#if !defined(__FreeBSD__) && !defined(DARWIN) - #include <stddef.h> - #define __offsetof offsetof - #endif -diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c -index a7d4ff1..ff11a60 100644 ---- mozilla/media/mtransport/third_party/nrappkit/src/util/util.c -+++ mozilla/media/mtransport/third_party/nrappkit/src/util/util.c -@@ -40,16 +40,17 @@ - static char *RCSSTRING __UNUSED__ ="$Id: util.c,v 1.5 2007/11/21 00:09:13 adamcain Exp $"; - - #ifndef WIN32 - #include <sys/uio.h> - #include <pwd.h> - #include <dirent.h> - #endif - #include <string.h> -+#include <errno.h> - #include <ctype.h> - #include <sys/stat.h> - #ifdef OPENSSL - #include <openssl/evp.h> - #endif - #include "nr_common.h" - #include "r_common.h" - #include "registry.h" -diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp -index 2a91e3d..31de641 100644 ---- mozilla/media/webrtc/signaling/signaling.gyp -+++ mozilla/media/webrtc/signaling/signaling.gyp -@@ -223,16 +223,29 @@ - 'GIPS_VER=3480', - 'SIPCC_BUILD', - 'HAVE_WINSOCK2_H' - ], - - 'cflags_mozilla': [ - ], - }], -+ ['os_bsd==1', { -+ 'include_dirs': [ -+ ], -+ 'defines': [ -+ # avoiding pointless ifdef churn -+ 'SIP_OS_OSX', -+ 'OSX', -+ 'SECLIB_OPENSSL', -+ ], -+ -+ 'cflags_mozilla': [ -+ ], -+ }], - ['OS=="mac"', { - 'include_dirs': [ - ], - 'defines': [ - 'SIP_OS_OSX', - 'OSX', - '_FORTIFY_SOURCE=2', - ], -@@ -747,17 +760,17 @@ - 'EXTERNAL_TICK_REQUIRED', - 'GIPS_VER=3480', - ], - - 'cflags_mozilla': [ - ], - - }], -- ['OS=="mac"', { -+ ['OS=="mac" or os_bsd==1', { - - 'include_dirs': [ - ], - - 'sources': [ - # SIPSTACK - './src/sipcc/core/sipstack/sip_platform_task.c', - -@@ -792,24 +805,23 @@ - './src/sipcc/cpr/darwin/cpr_darwin_timers_using_select.c', - './src/sipcc/cpr/darwin/cpr_darwin_tst.h', - './src/sipcc/cpr/darwin/cpr_darwin_types.h', - ], - - - 'defines' : [ - 'SIP_OS_OSX', -- '_POSIX_SOURCE', -+ # using BSD extensions, leave _POSIX_SOURCE undefined - 'CPR_MEMORY_LITTLE_ENDIAN', - 'NO_SOCKET_POLLING', - 'USE_TIMER_SELECT_BASED', - 'FULL_BUILD', - 'STUBBED_OUT', - 'USE_PRINTF', -- '_DARWIN_C_SOURCE', - 'NO_NSPR_10_SUPPORT', - ], - - 'cflags_mozilla': [ - ], - }], - ], - -diff --git media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -index a7c47e1..4f191de 100644 ---- mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -+++ mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData) - { - static const char fname[] = "cprGetMessage"; - - void *buffer = 0; - cpr_msg_queue_t *msgq; - cpr_msgq_node_t *node; - struct timespec timeout; - struct timeval tv; -+#ifndef __APPLE__ -+ struct timezone tz; -+#else - // On the iPhone, there is a DarwinAlias problem with "timezone" - struct _timezone { - int tz_minuteswest; /* of Greenwich */ - int tz_dsttime; /* type of dst correction to apply */ - } tz; -+#endif - - /* Initialize ppUserData */ - if (ppUserData) { - *ppUserData = NULL; - } - - msgq = (cpr_msg_queue_t *) msgQueue; - if (msgq == NULL) { -diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in -index a30e330..cfbd8a3 100644 ---- mozilla/media/webrtc/signaling/test/Makefile.in -+++ mozilla/media/webrtc/signaling/test/Makefile.in -@@ -81,17 +81,17 @@ endif - ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) - LIBS += \ - $(XLIBS) \ - $(TK_LIBS) \ - $(MOZ_PANGO_LIBS) \ - $(NULL) - endif - --ifeq ($(OS_TARGET),Linux) -+ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) - LIBS += \ - $(MOZ_CAIRO_OSLIBS) \ - $(NULL) - endif - - ifeq ($(OS_TARGET),Darwin) - LIBS += \ - -framework AudioToolbox \ -diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -index 338d0b7..2241d41 100644 ---- mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -+++ mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -@@ -1,16 +1,17 @@ - # Copyright (c) 2012 Mozilla Foundation. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - - import collections - import gyp - import gyp.common - import sys -+import platform - import os - import re - import shlex - - generator_wants_sorted_dependencies = True - - generator_default_variables = { - } -@@ -107,30 +108,44 @@ endif - - def ensure_directory_exists(path): - dir = os.path.dirname(path) - if dir and not os.path.exists(dir): - os.makedirs(dir) - - def GetFlavor(params): - """Returns |params.flavor| if it's set, the system's default flavor else.""" -+ system = platform.system().lower() - flavors = { -- 'win32': 'win', -- 'darwin': 'mac', -- 'sunos5': 'solaris', -- 'freebsd7': 'freebsd', -- 'freebsd8': 'freebsd', -+ 'microsoft': 'win', -+ 'windows' : 'win', -+ 'darwin' : 'mac', -+ 'sunos' : 'solaris', -+ 'dragonfly': 'bsd', -+ 'freebsd' : 'bsd', -+ 'netbsd' : 'bsd', -+ 'openbsd' : 'bsd', - } -- flavor = flavors.get(sys.platform, 'linux') -- return params.get('flavor', flavor) -+ -+ if 'flavor' in params: -+ return params['flavor'] -+ if system.startswith('cygwin'): -+ return 'win' -+ if system in flavors: -+ return flavors[system] -+ -+ return 'linux' - - - def CalculateVariables(default_variables, params): -+ flavor = GetFlavor(params) -+ if flavor == 'bsd': -+ flavor = platform.system().lower() - generator_flags = params.get('generator_flags', {}) -- default_variables['OS'] = generator_flags.get('os', GetFlavor(params)) -+ default_variables['OS'] = generator_flags.get('os', flavor) - - - def CalculateGeneratorInputInfo(params): - """Calculate the generator specific info that gets fed to input (called by - gyp).""" - generator_flags = params.get('generator_flags', {}) - if generator_flags.get('adjust_static_libraries', False): - global generator_wants_static_library_dependencies_adjusted diff --git a/www/seamonkey/files/patch-bug851992 b/www/seamonkey/files/patch-bug851992 deleted file mode 100644 index ab61f07f1825..000000000000 --- a/www/seamonkey/files/patch-bug851992 +++ /dev/null @@ -1,331 +0,0 @@ -diff --git a/config/Makefile.in b/config/Makefile.in ---- mozilla/config/Makefile.in -+++ mozilla/config/Makefile.in -@@ -97,16 +97,17 @@ export:: $(export-preqs) - -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ - -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \ - -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \ - -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \ - -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \ - -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \ - -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \ - -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \ -+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ - $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers - $(INSTALL) system_wrappers $(DIST) - - GARBAGE_DIRS += system_wrappers - endif - - ifdef WRAP_STL_INCLUDES - ifdef GNU_CXX -diff --git a/config/system-headers b/config/system-headers ---- mozilla/config/system-headers -+++ mozilla/config/system-headers -@@ -1125,8 +1125,19 @@ gst/video/video.h - sys/msg.h - sys/ipc.h - sys/thr.h - sys/user.h - kvm.h - spawn.h - err.h - xlocale.h -+#if MOZ_NATIVE_ICU==1 -+unicode/locid.h -+unicode/numsys.h -+unicode/ucal.h -+unicode/ucol.h -+unicode/udat.h -+unicode/udatpg.h -+unicode/uenum.h -+unicode/unum.h -+unicode/ustring.h -+#endif -diff --git a/configure.in b/configure.in ---- mozilla/configure.in -+++ mozilla/configure.in -@@ -4134,16 +4134,32 @@ if test -n "$MOZ_NATIVE_FFI"; then - PKG_CHECK_MODULES(MOZ_FFI, libffi > 3.0.9) - else - PKG_CHECK_MODULES(MOZ_FFI, libffi >= 3.0.9) - fi - MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_FFI_LIBS" - fi - - dnl ======================================================== -+dnl system icu support -+dnl ======================================================== -+MOZ_NATIVE_ICU= -+MOZ_ARG_WITH_BOOL(system-icu, -+[ --with-system-icu -+ Use system icu (located with pkgconfig)], -+ MOZ_NATIVE_ICU=1) -+ -+if test -n "$MOZ_NATIVE_ICU"; then -+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) -+ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS" -+fi -+ -+AC_SUBST(MOZ_NATIVE_ICU) -+ -+dnl ======================================================== - dnl Java SDK support - dnl ======================================================== - - JAVA_BIN_PATH= - MOZ_ARG_WITH_STRING(java-bin-path, - [ --with-java-bin-path=dir - Location of Java binaries (java, javac, jar)], - JAVA_BIN_PATH=$withval) -diff --git a/js/src/Makefile.in b/js/src/Makefile.in ---- mozilla/js/src/Makefile.in.orig 2013-10-26 00:19:30.000000000 +0200 -+++ mozilla/js/src/Makefile.in 2013-10-26 12:51:24.469902638 +0200 -@@ -232,12 +232,17 @@ - # ICU headers need to be available whether we build with the complete - # Internationalization API or not - ICU stubs rely on them. - -+ifdef MOZ_NATIVE_ICU -+LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS) -+else - LOCAL_INCLUDES += \ - -I$(topsrcdir)/../../intl/icu/source/common \ - -I$(topsrcdir)/../../intl/icu/source/i18n \ - $(NULL) -+endif - - ifdef ENABLE_INTL_API -+ifndef MOZ_NATIVE_ICU - - ifeq ($(OS_ARCH),WINNT) - # Library names: On Windows, ICU uses modified library names for static -@@ -271,6 +276,7 @@ - $(call SUBMAKE,$@,intl/icu) - - endif -+endif - - # - # END ECMAScript Internationalization API -@@ -394,7 +400,11 @@ - DEFINES += -DUSE_ZLIB - endif - --SHARED_LIBRARY_LIBS += $(ICU_LIBS) -+ifdef MOZ_NATIVE_ICU -+EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS) -+else -+SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS) -+endif - - # Prevent floating point errors caused by VC++ optimizations - ifdef _MSC_VER -diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in ---- mozilla/js/src/config/Makefile.in -+++ mozilla/js/src/config/Makefile.in -@@ -54,16 +54,17 @@ include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DUNICODE -D_UNICODE - - ifdef WRAP_SYSTEM_INCLUDES - export:: \ - $(call mkdir_deps,system_wrappers_js) \ - $(NULL) - $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \ -+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ - $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js - $(INSTALL) system_wrappers_js $(DIST) - - GARBAGE_DIRS += system_wrappers_js - endif - - GARBAGE += $(srcdir)/*.pyc *.pyc - -diff --git a/js/src/config/system-headers b/js/src/config/system-headers ---- mozilla/js/src/config/system-headers -+++ mozilla/js/src/config/system-headers -@@ -1125,8 +1125,19 @@ gst/video/video.h - sys/msg.h - sys/ipc.h - sys/thr.h - sys/user.h - kvm.h - spawn.h - err.h - xlocale.h -+#if MOZ_NATIVE_ICU==1 -+unicode/locid.h -+unicode/numsys.h -+unicode/ucal.h -+unicode/ucol.h -+unicode/udat.h -+unicode/udatpg.h -+unicode/uenum.h -+unicode/unum.h -+unicode/ustring.h -+#endif -diff --git a/js/src/configure.in b/js/src/configure.in ---- mozilla/js/src/configure.in -+++ mozilla/js/src/configure.in -@@ -4406,56 +4406,65 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE - AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION) - AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION) - fi - - - dnl ======================================================== - dnl ECMAScript Internationalization API Support (uses ICU) - dnl ======================================================== -+ICU_LIB_NAMES= -+MOZ_NATIVE_ICU= -+MOZ_ARG_WITH_BOOL(system-icu, -+[ --with-system-icu -+ Use system icu (located with pkgconfig)], -+ MOZ_NATIVE_ICU=1) -+ -+if test -n "$MOZ_NATIVE_ICU"; then -+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) -+fi - - ENABLE_INTL_API=1 - MOZ_ARG_DISABLE_BOOL(intl-api, - [ --disable-intl-api Disable the ECMAScript Internationalization API], - ENABLE_INTL_API= ) - - dnl Settings for the implementation of the ECMAScript Internationalization API - if test -n "$ENABLE_INTL_API"; then - AC_DEFINE(ENABLE_INTL_API) -- # We build ICU as a static library. -- AC_DEFINE(U_STATIC_IMPLEMENTATION) -- -- case "$OS_TARGET" in -- WINNT) -- ICU_LIB_NAMES="icuin icuuc icudt" -- ;; -- Darwin|Linux) -- ICU_LIB_NAMES="icui18n icuuc icudata" -- ;; -- *) -- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) -- esac -- -- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' --else -- ICU_LIB_NAMES= -- ICU_LIBS= -+ -+ if test -z "$MOZ_NATIVE_ICU"; then -+ case "$OS_TARGET" in -+ WINNT) -+ ICU_LIB_NAMES="icuin icuuc icudt" -+ ;; -+ Darwin|Linux) -+ ICU_LIB_NAMES="icui18n icuuc icudata" -+ ;; -+ *) -+ AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) -+ esac -+ MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' -+ fi - fi - - AC_SUBST(ENABLE_INTL_API) - AC_SUBST(ICU_LIB_NAMES) --AC_SUBST(ICU_LIBS) -- --dnl Source files that use ICU should have control over which parts of the ICU --dnl namespace they want to use. --AC_DEFINE(U_USING_ICU_NAMESPACE,0) -- -+AC_SUBST(MOZ_ICU_LIBS) -+AC_SUBST(MOZ_NATIVE_ICU) - - dnl Settings for ICU --if test -n "$ENABLE_INTL_API" ; then -+if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then -+ dnl We build ICU as a static library. -+ AC_DEFINE(U_STATIC_IMPLEMENTATION) -+ -+ dnl Source files that use ICU should have control over which parts of the ICU -+ dnl namespace they want to use. -+ AC_DEFINE(U_USING_ICU_NAMESPACE,0) -+ - # Set ICU compile options - ICU_CPPFLAGS="" - # don't use icu namespace automatically in client code - ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0" - # don't include obsolete header files - ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" - # remove chunks of the library that we don't need (yet) - ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_LEGACY_CONVERSION" -diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in ---- mozilla/js/src/gdb/Makefile.in -+++ mozilla/js/src/gdb/Makefile.in -@@ -14,16 +14,20 @@ include $(DEPTH)/config/autoconf.mk - # Building against js_static requires that we declare mfbt sybols "exported" - # on its behalf. - DEFINES += -DEXPORT_JS_API -DIMPL_MFBT - - LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif -+ - EXTRA_LIBS += $(MOZ_FFI_LIBS) - - # Place a GDB Python auto-load file next to the gdb-tests executable, both - # in the build directory and in the dist/bin directory. - PP_TARGETS += GDB_AUTOLOAD - GDB_AUTOLOAD := gdb-tests-gdb.py.in - GDB_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir)) - -diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in ---- mozilla/js/src/jsapi-tests/Makefile.in -+++ mozilla/js/src/jsapi-tests/Makefile.in -@@ -15,16 +15,20 @@ DEFINES += -DEXPORT_JS_API - # Building against js_static requires that we declare mfbt sybols "exported" - # on its behalf. - DEFINES += -DIMPL_MFBT - - LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif -+ - EXTRA_LIBS += $(MOZ_FFI_LIBS) - - ifdef QEMU_EXE - MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB) - endif - - # Place a GDB Python auto-load file next to the jsapi-tests executable in - # the build directory. -diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in ---- mozilla/js/src/shell/Makefile.in -+++ mozilla/js/src/shell/Makefile.in -@@ -22,16 +22,19 @@ DEFINES += -DEXPORT_JS_API - # Building against js_static requires that we declare mfbt sybols "exported" - # on its behalf. - DEFINES += -DIMPL_MFBT - - LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(MOZ_ZLIB_LIBS) - ifdef MOZ_NATIVE_FFI - EXTRA_LIBS += $(MOZ_FFI_LIBS) - endif -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - - ifeq ($(OS_ARCH),Darwin) - ifeq ($(TARGET_CPU),x86_64) - DARWIN_EXE_LDFLAGS += -pagezero_size 10000 -image_base 100000000 - endif - endif diff --git a/www/seamonkey/files/patch-bug876156 b/www/seamonkey/files/patch-bug876156 deleted file mode 100644 index 91e93b9b4cae..000000000000 --- a/www/seamonkey/files/patch-bug876156 +++ /dev/null @@ -1,13 +0,0 @@ -diff --git mfbt/Atomics.h mfbt/Atomics.h -index d79af6c..40b9336 100644 ---- mozilla/mfbt/Atomics.h -+++ mozilla/mfbt/Atomics.h -@@ -35,7 +35,7 @@ - */ - # if !defined(__linux__) && !defined(__OpenBSD__) && \ - (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && \ -- __has_include(<atomic>) -+ __has_include_next(<atomic>) - # define MOZ_HAVE_CXX11_ATOMICS - # endif - /* diff --git a/www/seamonkey/files/patch-bug886181 b/www/seamonkey/files/patch-bug886181 deleted file mode 100644 index 892f123b4a52..000000000000 --- a/www/seamonkey/files/patch-bug886181 +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/modules/libpref/src/init/all.js~ -+++ mozilla/modules/libpref/src/init/all.js -@@ -193,7 +193,7 @@ pref("media.webm.enabled", true); - pref("media.dash.enabled", false); - #endif - #ifdef MOZ_GSTREAMER --pref("media.gstreamer.enabled", false); -+pref("media.gstreamer.enabled", true); - #endif - #ifdef MOZ_WEBRTC - pref("media.navigator.enabled", true); diff --git a/www/seamonkey/files/patch-bug910875 b/www/seamonkey/files/patch-bug910875 deleted file mode 100644 index 41fc23b3653d..000000000000 --- a/www/seamonkey/files/patch-bug910875 +++ /dev/null @@ -1,102 +0,0 @@ -diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -index f231b1e..6087696 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -@@ -16,7 +16,9 @@ - #include <assert.h> - #include <string.h> - --#if defined(_WIN32) -+#if defined(WEBRTC_DUMMY_AUDIO_BUILD) -+// do not include platform specific headers -+#elif defined(_WIN32) - #include "audio_device_utility_win.h" - #include "audio_device_wave_win.h" - #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) -@@ -32,14 +34,8 @@ - #include <stdlib.h> - #include "audio_device_utility_android.h" - #include "audio_device_jni_android.h" --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - #include "audio_device_utility_linux.h" -- #if defined(LINUX_ALSA) -- #include "audio_device_alsa_linux.h" -- #endif -- #if defined(LINUX_PULSE) -- #include "audio_device_pulse_linux.h" -- #endif - #elif defined(WEBRTC_IOS) - #include "audio_device_utility_ios.h" - #include "audio_device_ios.h" -@@ -47,6 +43,12 @@ - #include "audio_device_utility_mac.h" - #include "audio_device_mac.h" - #endif -+#if defined(LINUX_ALSA) -+ #include "audio_device_alsa_linux.h" -+#endif -+#if defined(LINUX_PULSE) -+ #include "audio_device_pulse_linux.h" -+#endif - #include "audio_device_dummy.h" - #include "audio_device_utility_dummy.h" - #include "critical_section_wrapper.h" -@@ -161,7 +163,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Che - #elif defined(WEBRTC_ANDROID) - platform = kPlatformAndroid; - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is ANDROID"); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - platform = kPlatformLinux; - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is LINUX"); - #elif defined(WEBRTC_IOS) -@@ -309,7 +311,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() - - // Create the *Linux* implementation of the Audio Device - // --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - if ((audioLayer == kLinuxPulseAudio) || (audioLayer == kPlatformDefaultAudio)) - { - #if defined(LINUX_PULSE) -@@ -355,7 +357,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() - // - ptrAudioDeviceUtility = new AudioDeviceUtilityLinux(Id()); - } --#endif // #if defined(WEBRTC_LINUX) -+#endif // #if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - - // Create the *iPhone* implementation of the Audio Device - // -diff --git media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -index defd7f8..906c4a2 100644 ---- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -@@ -197,7 +197,7 @@ class AudioDeviceAPITest: public testing::Test { - // Create default implementation instance - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( - kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( - kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL); - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( -@@ -1690,7 +1690,7 @@ TEST_F(AudioDeviceAPITest, CPULoad) { - - // TODO(kjellander): Fix flakiness causing failures on Windows. - // TODO(phoglund): Fix flakiness causing failures on Linux. --#if !defined(_WIN32) && !defined(WEBRTC_LINUX) -+#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - TEST_F(AudioDeviceAPITest, StartAndStopRawOutputFileRecording) { - // NOTE: this API is better tested in a functional test - CheckInitialPlayoutStates(); -@@ -1759,7 +1759,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRawInputFileRecording) { - // - size of raw_input_not_recording.pcm shall be 0 - // - size of raw_input_not_recording.pcm shall be > 0 - } --#endif // !WIN32 && !WEBRTC_LINUX -+#endif // !WIN32 && !WEBRTC_LINUX && !defined(WEBRTC_BSD) - - TEST_F(AudioDeviceAPITest, RecordingSampleRate) { - uint32_t sampleRate(0); diff --git a/www/seamonkey/files/patch-bug916216 b/www/seamonkey/files/patch-bug916216 deleted file mode 100644 index 2dd125855cb9..000000000000 --- a/www/seamonkey/files/patch-bug916216 +++ /dev/null @@ -1,39 +0,0 @@ ---- mozilla/media/webrtc/trunk/build/build_config.h~ -+++ mozilla/media/webrtc/trunk/build/build_config.h -@@ -37,9 +37,15 @@ - #elif defined(_WIN32) - #define OS_WIN 1 - #define TOOLKIT_VIEWS 1 --#elif defined(__FreeBSD__) -+#elif defined(__DragonFly__) -+#define OS_DRAGONFLY 1 -+#define TOOLKIT_GTK -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #define OS_FREEBSD 1 - #define TOOLKIT_GTK -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 -+#define TOOLKIT_GTK - #elif defined(__OpenBSD__) - #define OS_OPENBSD 1 - #define TOOLKIT_GTK -@@ -56,15 +62,15 @@ - - // For access to standard BSD features, use OS_BSD instead of a - // more specific macro. --#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ -+ || defined(OS_NETBSD) || defined(OS_OPENBSD) - #define OS_BSD 1 - #endif - - // For access to standard POSIXish features, use OS_POSIX instead of a - // more specific macro. --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ -- defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \ -- defined(OS_NACL) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ -+ defined(OS_SOLARIS) || defined(OS_ANDROID) || defined(OS_NACL) - #define OS_POSIX 1 - #endif - diff --git a/www/seamonkey/files/patch-bug918177 b/www/seamonkey/files/patch-bug918177 deleted file mode 100644 index 96ce225c25a8..000000000000 --- a/www/seamonkey/files/patch-bug918177 +++ /dev/null @@ -1,36 +0,0 @@ -diff --git config/stl-headers config/stl-headers -index c057d8e..dc7f6f0 100644 ---- mozilla/config/stl-headers -+++ mozilla/config/stl-headers -@@ -21,6 +21,7 @@ algorithm - atomic - deque - ios -+iosfwd - iostream - iterator - limits -diff --git config/system-headers config/system-headers -index d31c94e..570c82a 100644 ---- mozilla/config/system-headers -+++ mozilla/config/system-headers -@@ -469,6 +469,7 @@ IOKit/IOMessage.h - IOKit/pwr_mgt/IOPMLib.h - iomanip - ios -+iosfwd - iostream - iostream.h - iterator -diff --git js/src/config/system-headers js/src/config/system-headers -index d31c94e..570c82a 100644 ---- mozilla/js/src/config/system-headers -+++ mozilla/js/src/config/system-headers -@@ -469,6 +469,7 @@ IOKit/IOMessage.h - IOKit/pwr_mgt/IOPMLib.h - iomanip - ios -+iosfwd - iostream - iostream.h - iterator diff --git a/www/seamonkey/files/patch-bug945046 b/www/seamonkey/files/patch-bug945046 new file mode 100644 index 000000000000..134c06e1590b --- /dev/null +++ b/www/seamonkey/files/patch-bug945046 @@ -0,0 +1,130 @@ +diff --git config/system-headers config/system-headers +index 432cba6..18a9627 100644 +--- mozilla/config/system-headers ++++ mozilla/config/system-headers +@@ -1131,3 +1131,4 @@ unicode/unum.h + unicode/ustring.h + unicode/utypes.h + #endif ++libutil.h +diff --git js/src/config/system-headers js/src/config/system-headers +index 432cba6..18a9627 100644 +--- mozilla/js/src/config/system-headers ++++ mozilla/js/src/config/system-headers +@@ -1131,3 +1131,4 @@ unicode/unum.h + unicode/ustring.h + unicode/utypes.h + #endif ++libutil.h +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 9975621..b4b037d 100644 +--- mozilla/toolkit/library/Makefile.in ++++ mozilla/toolkit/library/Makefile.in +@@ -289,6 +289,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,kvm) + EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols + endif + ++ifeq ($(OS_ARCH),FreeBSD) ++OS_LIBS += $(call EXPAND_LIBNAME,util) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet wbemuuid) + ifdef ACCESSIBILITY +diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp +index b8147c8..0ffb34e 100644 +--- mozilla/xpcom/base/nsMemoryReporterManager.cpp ++++ mozilla/xpcom/base/nsMemoryReporterManager.cpp +@@ -196,6 +196,43 @@ static nsresult GetResidentFast(int64_t* + return GetResident(aN); + } + ++#ifdef __FreeBSD__ ++#include <libutil.h> ++ ++static nsresult ++GetKinfoVmentrySelf(int64_t* prss) ++{ ++ int cnt; ++ struct kinfo_vmentry *vmmap, *kve; ++ if ((vmmap = kinfo_getvmmap(getpid(), &cnt)) == NULL) ++ return NS_ERROR_FAILURE; ++ ++ if (prss) ++ *prss = 0; ++ ++ for (int i = 0; i < cnt; i++) { ++ kve = &vmmap[i]; ++ if (prss) ++ *prss += kve->kve_private_resident; ++ } ++ ++ free(vmmap); ++ return NS_OK; ++} ++ ++#define HAVE_PRIVATE_REPORTER ++static nsresult ++GetPrivate(int64_t* aN) ++{ ++ int64_t priv; ++ nsresult rv = GetKinfoVmentrySelf(&priv); ++ if (NS_SUCCEEDED(rv)) ++ *aN = priv * getpagesize(); ++ ++ return NS_OK; ++} ++#endif // FreeBSD ++ + #elif defined(SOLARIS) + + #include <procfs.h> +@@ -370,6 +407,24 @@ static nsresult GetResidentFast(int64_t* + } + + #define HAVE_PRIVATE_REPORTER ++static nsresult ++GetPrivate(int64_t* aN) ++{ ++ PROCESS_MEMORY_COUNTERS_EX pmcex; ++ pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX); ++ ++ if (!GetProcessMemoryInfo( ++ GetCurrentProcess(), ++ (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) { ++ return NS_ERROR_FAILURE; ++ } ++ ++ *aN = pmcex.PrivateUsage; ++ return NS_OK; ++} ++#endif // XP_<PLATFORM> ++ ++#ifdef HAVE_PRIVATE_REPORTER + class PrivateReporter MOZ_FINAL : public MemoryUniReporter + { + public: +@@ -382,21 +437,10 @@ public: + + NS_IMETHOD GetAmount(int64_t* aAmount) + { +- PROCESS_MEMORY_COUNTERS_EX pmcex; +- pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX); +- +- if (!GetProcessMemoryInfo( +- GetCurrentProcess(), +- (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) { +- return NS_ERROR_FAILURE; +- } +- +- *aAmount = pmcex.PrivateUsage; +- return NS_OK; ++ return GetPrivate(aAmount); + } + }; +- +-#endif // XP_<PLATFORM> ++#endif + + #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS + class VsizeReporter MOZ_FINAL : public MemoryUniReporter diff --git a/www/seamonkey/files/patch-bug946560 b/www/seamonkey/files/patch-bug946560 new file mode 100644 index 000000000000..f1ab78af9cce --- /dev/null +++ b/www/seamonkey/files/patch-bug946560 @@ -0,0 +1,44 @@ +diff --git xpcom/base/nsMemoryInfoDumper.cpp xpcom/base/nsMemoryInfoDumper.cpp +index 0b2f78c..d857374 100644 +--- mozilla/xpcom/base/nsMemoryInfoDumper.cpp ++++ mozilla/xpcom/base/nsMemoryInfoDumper.cpp +@@ -30,7 +30,7 @@ + #include <unistd.h> + #endif + +-#ifdef XP_LINUX ++#if defined(XP_LINUX) || defined(__FreeBSD__) + #include <fcntl.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -109,7 +109,7 @@ private: + + } // anonymous namespace + +-#ifdef XP_LINUX // { ++#if defined(XP_LINUX) || defined(__FreeBSD__) // { + namespace { + + /* +@@ -548,7 +548,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper( + /* static */ void + nsMemoryInfoDumper::Initialize() + { +-#ifdef XP_LINUX ++#if defined(XP_LINUX) || defined(__FreeBSD__) + SignalPipeWatcher::Create(); + FifoWatcher::MaybeCreate(); + #endif +diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp +index 8c65665..8f6d0e9 100644 +--- mozilla/xpcom/base/nsMemoryReporterManager.cpp ++++ mozilla/xpcom/base/nsMemoryReporterManager.cpp +@@ -824,7 +824,7 @@ nsMemoryReporterManager::Init() + RegisterReporter(new mozilla::dmd::DMDReporter); + #endif + +-#if defined(XP_LINUX) ++#if defined(XP_LINUX) || defined(__FreeBSD__) + nsMemoryInfoDumper::Initialize(); + #endif + diff --git a/www/seamonkey/files/patch-bug947862 b/www/seamonkey/files/patch-bug947862 new file mode 100644 index 000000000000..3dcb47036a2f --- /dev/null +++ b/www/seamonkey/files/patch-bug947862 @@ -0,0 +1,31 @@ +diff --git media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc +index 7ef6c66..6ae1e97 100644 +--- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc ++++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc +@@ -15,7 +15,7 @@ + #include <Windows.h> + #include <WinSock.h> + #include <MMSystem.h> +-#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) ++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) + #include <sys/time.h> + #include <time.h> + #endif +@@ -209,7 +209,7 @@ class WindowsRealTimeClock : public RealTimeClock { + WindowsHelpTimer* _helpTimer; + }; + +-#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) ++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) + class UnixRealTimeClock : public RealTimeClock { + public: + UnixRealTimeClock() {} +@@ -240,7 +240,7 @@ Clock* Clock::GetRealTimeClock() { + #if defined(_WIN32) + static WindowsRealTimeClock clock(&global_help_timer); + return &clock; +-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) ++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) + static UnixRealTimeClock clock; + return &clock; + #else diff --git a/www/seamonkey/files/patch-config-baseconfig.mk b/www/seamonkey/files/patch-config-baseconfig.mk index 20a51fe6ac1b..fedf7c5d8a8e 100644 --- a/www/seamonkey/files/patch-config-baseconfig.mk +++ b/www/seamonkey/files/patch-config-baseconfig.mk @@ -1,8 +1,6 @@ --- config/baseconfig.mk~ +++ config/baseconfig.mk -@@ -1,9 +1,9 @@ - INCLUDED_AUTOCONF_MK = 1 - +@@ -1,7 +1,7 @@ -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) diff --git a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in index d22a1c412cac..5495298ae3d1 100644 --- a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in +++ b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in @@ -4,7 +4,7 @@ CUSTOM_LIBS=1 endif -+ifeq ($(OS_ARCH), FreeBSD) ++ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH))) +EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread +EXTRA_LIBS+= $(filter -L% -l%,${NSPRLINK}) +CUSTOM_LIBS=1 diff --git a/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp b/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp index b477bd2aa922..6809693a20ce 100644 --- a/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp +++ b/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp @@ -5,7 +5,7 @@ TriggerQuirks(); #endif + -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); if (NS_FAILED(rv)) { diff --git a/www/seamonkey/files/seamonkey.desktop.in b/www/seamonkey/files/seamonkey.desktop.in index db8bb613e9c7..1c948dbc0803 100644 --- a/www/seamonkey/files/seamonkey.desktop.in +++ b/www/seamonkey/files/seamonkey.desktop.in @@ -160,10 +160,10 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=%%MOZILLA%% %U +Exec=%%MOZILLA%% %u StartupNotify=true Terminal=false Type=Application Icon=%%MOZILLA%%.png -Categories=Application;Network; +Categories=Network;WebBrowser;Email;News;TextEditor;IRCClient; MimeType=text/html;text/xml;application/xhtml+xml; |