From owner-freebsd-gecko@FreeBSD.ORG Mon Feb 18 11:07:01 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1845E267 for ; Mon, 18 Feb 2013 11:07:01 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E6C63E53 for ; Mon, 18 Feb 2013 11:07:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1IB70Fw061868 for ; Mon, 18 Feb 2013 11:07:00 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1IB70it061866 for gecko@FreeBSD.org; Mon, 18 Feb 2013 11:07:00 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 18 Feb 2013 11:07:00 GMT Message-Id: <201302181107.r1IB70it061866@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: gecko@FreeBSD.org Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2013 11:07:01 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/175421 gecko workaround: www/firefox is MAKE_JOBS_SAFE but never us o ports/174096 gecko mail/thunderbird 17 and 16 crashes when try write a ne o ports/173937 gecko mail/thunderbird core dumps when using enigmail to gen p ports/171255 gecko Fix www/firefox on FreeBSD 7.4/amd64 o ports/171219 gecko www/firefox-i18n russian language pack don't translate o ports/170402 gecko www/linux-firefox: crash with flashplugin o ports/170310 gecko mail/thunderbird: coredump/crash when used with OpenLD o ports/169729 gecko www/firefox-esr "make package" produces package with z o ports/169366 gecko www/xpi-* ports need re-install after each Firefox upd o ports/169241 gecko www/firefox Right mouse buttom click freeze screen o ports/168091 gecko Mk/bsd.gecko.mk error: USE_FIREFOX doesn't work correc o ports/167397 gecko mail/thunderbird-i18n Version 12.0 and freebsd 9.0: ca f ports/165263 gecko mail/thunderbird: core dumping most time when users ar o ports/164239 gecko [PATCH] mail/thunderbird: crash with nss_ldap o ports/164013 gecko www/firefox: Firefox-9 Icons & xpi-addons from ports o ports/162939 gecko www/firefox crashes with Zotero add-on o ports/162075 gecko www/firefox >= 7.0.1_2 bug with respect to pentadactyl o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local o ports/156335 gecko www/firefox: Repeatable firefox-4.0_1,1 crash f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 21 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Feb 18 22:01:00 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1060) id 88E5D7CF; Mon, 18 Feb 2013 22:01:00 +0000 (UTC) Date: Mon, 18 Feb 2013 14:01:00 -0800 From: Craig Rodrigues To: gecko@freebsd.org Subject: Build error with firefix 18.0.2 Message-ID: <20130218220100.GA71554@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2013 22:01:00 -0000 Hi, I tried to build firefox on amd64 inside a 9-STABLE jail using poudriere. I got the following build error: The full build log is here: http://people.freebsd.org/~rodrigc/ports/firefox-18.0.2%2c1.log.txt The part that is causing the error is some C++ error related to partial template specialization (see below). Any ideas what the problem is? Thanks. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D c++ -o nsDocElementBoxFrame.o -c -I../../../../dist/stl_wrappers -I../../..= /../dist/system_wrappers -include ../../../../../config/gcc_hidden.h -DMOZ_= GLUE_IN_PROGRAM -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEX= PORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET -DIMPL_XREAPI -DIMPL_NS_NET = -DIMPL_THEBES -DSTATIC_EXPORTABLE_JS_API -D_IMPL_NS_LAYOUT -I../../../../.= =2E/layout/xul/base/src -I../../../../../layout/xul/base/src/../../../base = -I../../../../../layout/xul/base/src/../../../../content/base/src -I../../.= =2E/../../layout/xul/base/src/../../../../content/events/src -I../../../../= =2E./layout/xul/base/src/../../../generic -I../../../../../layout/xul/base/= src/../../../style -I../../../../../layout/xul/base/src -I. -I../../../../= dist/include -I/usr/local/include/nspr -I/usr/local/include/nss -I/usr/loc= al/include/nss/nss -I/usr/local/include -I/usr/local/include -fPIC -isys= tem/usr/local/include -I/usr/local/include -Wall -Wpointer-arith -Woverloa= ded-virtual -Werror=3Dreturn-type -Wno-ctor-dtor-privacy -Wno-overlength-st= rings -Wno-invalid-offsetof -Wno-variadic-macros -Wcast-align -O2 -pipe -fn= o-strict-aliasing -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction= -sections -fdata-sections -fno-exceptions -fshort-wchar -pipe -DNDEBUG -DT= RIMMED -fno-omit-frame-pointer -isystem/usr/local/include -I/usr/local/i= nclude -DMOZILLA_CLIENT -include ../../../../mozilla-config.h -MD -MF .deps= /nsDocElementBoxFrame.o.pp /wrkdirs/usr/ports/www/firefox/work/mozilla-rel= ease/layout/xul/base/src/nsDocElementBoxFrame.cpp nsLeafBoxFrame.cpp c++ -o nsLeafBoxFrame.o -c -I../../../../dist/stl_wrappers -I../../../../di= st/system_wrappers -include ../../../../../config/gcc_hidden.h -DMOZ_GLUE_I= N_PROGRAM -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEXPORT_X= PTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET -DIMPL_XREAPI -DIMPL_NS_NET -DIMPL= _THEBES -DSTATIC_EXPORTABLE_JS_API -D_IMPL_NS_LAYOUT -I../../../../../layo= ut/xul/base/src -I../../../../../layout/xul/base/src/../../../base -I../../= =2E./../../layout/xul/base/src/../../../../content/base/src -I../../../../.= =2E/layout/xul/base/src/../../../../content/events/src -I../../../../../lay= out/xul/base/src/../../../generic -I../../../../../layout/xul/base/src/../.= =2E/../style -I../../../../../layout/xul/base/src -I. -I../../../../dist/i= nclude -I/usr/local/include/nspr -I/usr/local/include/nss -I/usr/local/inc= lude/nss/nss -I/usr/local/include -I/usr/local/include -fPIC -isystem/us= r/local/include -I/usr/local/include -Wall -Wpointer-arith -Woverloaded-vi= rtual -Werror=3Dreturn-type -Wno-ctor-dtor-privacy -Wno-overlength-strings = -Wno-invalid-offsetof -Wno-variadic-macros -Wcast-align -O2 -pipe -fno-stri= ct-aliasing -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-secti= ons -fdata-sections -fno-exceptions -fshort-wchar -pipe -DNDEBUG -DTRIMMED= -fno-omit-frame-pointer -isystem/usr/local/include -I/usr/local/include= -DMOZILLA_CLIENT -include ../../../../mozilla-config.h -MD -MF .deps/nsLea= fBoxFrame.o.pp /wrkdirs/usr/ports/www/firefox/work/mozilla-release/layout/= xul/base/src/nsLeafBoxFrame.cpp In file included from ../../../../../layout/xul/base/src/../../../base/nsPr= esContext.h:26, from ../../../../../layout/xul/base/src/../../../style/nsR= uleNode.h:14, from ../../../../../layout/xul/base/src/../../../style/nsS= tyleContext.h:11, from ../../../../../layout/xul/base/src/../../../generic/n= sIFrame.h:25, from ../../../../../layout/xul/base/src/nsBox.h:9, from ../../../../../layout/xul/base/src/../../../generic/n= sFrame.h:12, from ../../../../../layout/xul/base/src/../../../generic/n= sLeafFrame.h:12, from /wrkdirs/usr/ports/www/firefox/work/mozilla-release/l= ayout/xul/base/src/nsLeafBoxFrame.h:9, from /wrkdirs/usr/ports/www/firefox/work/mozilla-release/l= ayout/xul/base/src/nsLeafBoxFrame.cpp:13: =2E./../../../dist/include/nsCycleCollectionParticipant.h:194: error: templ= ate parameters not used in partial specialization: =2E./../../../dist/include/nsCycleCollectionParticipant.h:194: error: = 'T' In file included from ../../../../dist/include/nsINode.h:15, from ../../../../dist/include/nsIDocument.h:20, from ../../../../dist/include/nsIContent.h:10, from ../../../../../layout/xul/base/src/../../../generic/n= sIFrame.h:30, from ../../../../../layout/xul/base/src/nsBox.h:9, from ../../../../../layout/xul/base/src/../../../generic/n= sFrame.h:12, from ../../../../../layout/xul/base/src/../../../generic/n= sLeafFrame.h:12, from /wrkdirs/usr/ports/www/firefox/work/mozilla-release/l= ayout/xul/base/src/nsLeafBoxFrame.h:9, from /wrkdirs/usr/ports/www/firefox/work/mozilla-release/l= ayout/xul/base/src/nsLeafBoxFrame.cpp:13: =2E./../../../dist/include/nsNodeInfoManager.h: In member function 'nsrefcn= t nsNodeInfoManager::Release()': =2E./../../../dist/include/nsNodeInfoManager.h:38: error: 'const struct CCP= articipantVTableImpl' has no member named 'GetParticipant' In file included from ../../../../dist/include/nsBindingManager.h:15, from ../../../../../layout/xul/base/src/../../../style/nsS= tyleSet.h:19, from ../../../../../layout/xul/base/src/../../../base/nsLa= youtUtils.h:29, from ../../../../../layout/xul/base/src/../../../base/nsDi= splayList.h:27, from ../../../../../layout/xul/base/src/../../../generic/n= sLeafFrame.h:13, from /wrkdirs/usr/ports/www/firefox/work/mozilla-release/l= ayout/xul/base/src/nsLeafBoxFrame.h:9, from /wrkdirs/usr/ports/www/firefox/work/mozilla-release/l= ayout/xul/base/src/nsLeafBoxFrame.cpp:13: =2E./../../../dist/include/nsXBLBinding.h: In member function 'nsrefcnt nsX= BLBinding::Release()': =2E./../../../dist/include/nsXBLBinding.h:48: error: 'const struct CCPartic= ipantVTableImpl= ' has no member named 'GetParticipant' gmake[4]: *** [nsLeafBoxFrame.o] Error 1 gmake[4]: Leaving directory `/wrkdirs/usr/ports/www/firefox/work/mozilla-re= lease/obj-x86_64-portbld-freebsd9.1/layout/xul/base/src' gmake[3]: *** [xul/base/src_libs] Error 2 gmake[3]: Leaving directory `/wrkdirs/usr/ports/www/firefox/work/mozilla-re= lease/obj-x86_64-portbld-freebsd9.1/layout' gmake[2]: *** [libs_tier_platform] Error 2 gmake[2]: Leaving directory `/wrkdirs/usr/ports/www/firefox/work/mozilla-re= lease/obj-x86_64-portbld-freebsd9.1' gmake[1]: *** [tier_platform] Error 2 gmake[1]: Leaving directory `/wrkdirs/usr/ports/www/firefox/work/mozilla-re= lease/obj-x86_64-portbld-freebsd9.1' gmake: *** [default] Error 2 *** [do-build] Error code 1 Stop in /usr/ports/www/firefox. =3D=3D=3D> Cleaning for firefox-18.0.2,1 build of /usr/ports/www/firefox ended at Mon Feb 18 13:02:25 PST 2013 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D From owner-freebsd-gecko@FreeBSD.ORG Mon Feb 18 22:53:48 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5BC736C7 for ; Mon, 18 Feb 2013 22:53:48 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id CE7CEBED for ; Mon, 18 Feb 2013 22:53:47 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1IMrerA017961 for ; Mon, 18 Feb 2013 22:53:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1IMrZYc017619 for freebsd-gecko@freebsd.org; Mon, 18 Feb 2013 22:53:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Feb 2013 22:53:35 GMT Message-Id: <201302182253.r1IMrZYc017619@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1173 - trunk/security/nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2013 22:53:48 -0000 Author: jbeich Date: Mon Feb 18 22:53:35 2013 New Revision: 1173 Log: avoid trivial regexp Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Sat Feb 16 15:46:29 2013 (r1172) +++ trunk/security/nss/Makefile Mon Feb 18 22:53:35 2013 (r1173) @@ -29,7 +29,7 @@ CFLAGS+= -I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib SUB_FILES= nss-config nss.pc -SUB_LIST= MAJOR_VERSION=${PORTVERSION:C/\..*//} \ +SUB_LIST= MAJOR_VERSION=${PORTVERSION:R:R} \ PORTVERSION=${PORTVERSION} DIST= ${WRKSRC:H:H}/dist From owner-freebsd-gecko@FreeBSD.ORG Mon Feb 18 23:10:30 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 80AD3A84 for ; Mon, 18 Feb 2013 23:10:30 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 0DF91CE7 for ; Mon, 18 Feb 2013 23:10:29 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1INAT3S090129 for ; Mon, 18 Feb 2013 23:10:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1INAO0f089872 for freebsd-gecko@freebsd.org; Mon, 18 Feb 2013 23:10:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Feb 2013 23:10:24 GMT Message-Id: <201302182310.r1INAO0f089872@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1174 - trunk/security/nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2013 23:10:30 -0000 Author: jbeich Date: Mon Feb 18 23:10:23 2013 New Revision: 1174 Log: pretend people live in vanilla world and rather set CC Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Mon Feb 18 22:53:35 2013 (r1173) +++ trunk/security/nss/Makefile Mon Feb 18 23:10:23 2013 (r1174) @@ -57,7 +57,7 @@ CFLAGS+= -B${LOCALBASE}/${CONFIGURE_TARGET:S/amd64/x86_64/}/bin .endif -.if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 +.if ${CC:T:M*clang*} || ${CC:Mcc} && ${OSVERSION} > 1000023 EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 .endif From owner-freebsd-gecko@FreeBSD.ORG Tue Feb 19 05:20:50 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C54A1801 for ; Tue, 19 Feb 2013 05:20:50 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 601EFCE3 for ; Tue, 19 Feb 2013 05:20:49 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1J5KmmW022516 for ; Tue, 19 Feb 2013 05:20:48 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1J5Khxq022259 for freebsd-gecko@freebsd.org; Tue, 19 Feb 2013 05:20:43 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 19 Feb 2013 05:20:43 GMT Message-Id: <201302190520.r1J5Khxq022259@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1175 - in trunk/www: linux-seamonkey seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 05:20:50 -0000 Author: jbeich Date: Tue Feb 19 05:20:43 2013 New Revision: 1175 Log: http://releases.mozilla.org is down Modified: trunk/www/linux-seamonkey/Makefile.common trunk/www/seamonkey/Makefile Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Mon Feb 18 23:10:23 2013 (r1174) +++ trunk/www/linux-seamonkey/Makefile.common Tue Feb 19 05:20:43 2013 (r1175) @@ -7,7 +7,7 @@ CATEGORIES+= linux .ifndef MASTER_SITES -MASTER_SITES= MOZILLA_EXTENDED +MASTER_SITES= MOZILLA MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${DISTVERSION} .endif PKGNAMEPREFIX?= linux- Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Mon Feb 18 23:10:23 2013 (r1174) +++ trunk/www/seamonkey/Makefile Tue Feb 19 05:20:43 2013 (r1175) @@ -4,7 +4,7 @@ PORTNAME= seamonkey DISTVERSION= 2.16b4 CATEGORIES?= www ipv6 -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} +MASTER_SITES= ${MASTER_SITE_MOZILLA} #MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} From owner-freebsd-gecko@FreeBSD.ORG Tue Feb 19 05:21:06 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2D9E681C for ; Tue, 19 Feb 2013 05:21:06 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 8515BCE4 for ; Tue, 19 Feb 2013 05:21:05 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1J5L4Ju027106 for ; Tue, 19 Feb 2013 05:21:04 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1J5KxCQ023746 for freebsd-gecko@freebsd.org; Tue, 19 Feb 2013 05:20:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 19 Feb 2013 05:20:59 GMT Message-Id: <201302190520.r1J5KxCQ023746@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1176 - in trunk: mail/linux-thunderbird mail/thunderbird-esr www/firefox www/firefox-esr www/firefox-nightly www/linux-firefox www/linux-seamonkey www/seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 05:21:06 -0000 Author: jbeich Date: Tue Feb 19 05:20:59 2013 New Revision: 1176 Log: update (mostly build1 candidates) Modified: trunk/mail/linux-thunderbird/Makefile trunk/mail/linux-thunderbird/distinfo trunk/mail/thunderbird-esr/Makefile trunk/mail/thunderbird-esr/distinfo trunk/www/firefox-esr/Makefile trunk/www/firefox-esr/distinfo trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/linux-firefox/Makefile trunk/www/linux-firefox/distinfo trunk/www/linux-seamonkey/Makefile trunk/www/linux-seamonkey/distinfo trunk/www/linux-seamonkey/pkg-plist trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo Modified: trunk/mail/linux-thunderbird/Makefile ============================================================================== --- trunk/mail/linux-thunderbird/Makefile Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/mail/linux-thunderbird/Makefile Tue Feb 19 05:20:59 2013 (r1176) @@ -2,9 +2,10 @@ # $FreeBSD: head/mail/linux-thunderbird/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= thunderbird -PORTVERSION= 17.0.2 +PORTVERSION= 17.0.3 CATEGORIES= mail -MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US +#MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US +MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/linux-i686/en-US DISTNAME= ${PORTNAME}-${DISTVERSION}esr MAINTAINER= gecko@FreeBSD.org Modified: trunk/mail/linux-thunderbird/distinfo ============================================================================== --- trunk/mail/linux-thunderbird/distinfo Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/mail/linux-thunderbird/distinfo Tue Feb 19 05:20:59 2013 (r1176) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-17.0.2esr.tar.bz2) = 23757b745ab185bcded749377f727e5f0df75daf9df6ea2a1884d26e528aad01 -SIZE (thunderbird-17.0.2esr.tar.bz2) = 21453920 +SHA256 (thunderbird-17.0.3esr.tar.bz2) = d8e599043304b615fd91d8089fcb2e97734db7f324dc507e02706a80c3ed8fd3 +SIZE (thunderbird-17.0.3esr.tar.bz2) = 21453810 Modified: trunk/mail/thunderbird-esr/Makefile ============================================================================== --- trunk/mail/thunderbird-esr/Makefile Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/mail/thunderbird-esr/Makefile Tue Feb 19 05:20:59 2013 (r1176) @@ -2,10 +2,11 @@ # $FreeBSD: head/mail/thunderbird/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= thunderbird -DISTVERSION= 17.0.2 +DISTVERSION= 17.0.3 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source +#MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source +MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source DISTFILES= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} @@ -19,7 +20,7 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -EM_VERSION= 1.5.0 +EM_VERSION= 1.5.1 USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 Modified: trunk/mail/thunderbird-esr/distinfo ============================================================================== --- trunk/mail/thunderbird-esr/distinfo Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/mail/thunderbird-esr/distinfo Tue Feb 19 05:20:59 2013 (r1176) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-17.0.2esr.source.tar.bz2) = 8f177097eabc5f73002a8c0021e6720df489ab9a47a0cd8188be6be259706011 -SIZE (thunderbird-17.0.2esr.source.tar.bz2) = 113340839 -SHA256 (enigmail-1.5.0.tar.gz) = 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71 -SIZE (enigmail-1.5.0.tar.gz) = 1216071 +SHA256 (thunderbird-17.0.3esr.source.tar.bz2) = 96669acfaeaf3c591fbfe1ebe2ea41635e29f25074877148fb1fc7112df0c91c +SIZE (thunderbird-17.0.3esr.source.tar.bz2) = 113057252 +SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0 +SIZE (enigmail-1.5.1.tar.gz) = 1213954 Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/firefox-esr/Makefile Tue Feb 19 05:20:59 2013 (r1176) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox-esr/Makefile 310207 2013-01-10 22:29:23Z flo $ PORTNAME= firefox -DISTVERSION= 17.0.2 +DISTVERSION= 17.0.3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: trunk/www/firefox-esr/distinfo ============================================================================== --- trunk/www/firefox-esr/distinfo Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/firefox-esr/distinfo Tue Feb 19 05:20:59 2013 (r1176) @@ -1,2 +1,2 @@ -SHA256 (firefox-17.0.2esr.source.tar.bz2) = 92bf717b3e3933b84fd37b0e5c5026868e139be828637cfcf4acdc83f7ccd886 -SIZE (firefox-17.0.2esr.source.tar.bz2) = 90828234 +SHA256 (firefox-17.0.3esr.source.tar.bz2) = 027acbbafd682644ef44cbeea3d886498e7cac9d3af769a90c9beebc3fdc61d1 +SIZE (firefox-17.0.3esr.source.tar.bz2) = 90795536 Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/firefox-nightly/Makefile.hgrev Tue Feb 19 05:20:59 2013 (r1176) @@ -1 +1 @@ -HGREV= 122046:fdc78cc42ca3 +HGREV= 122184:de56ae61946d Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/firefox-nightly/distinfo Tue Feb 19 05:20:59 2013 (r1176) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/fdc78cc42ca3.tar.bz2) = f8343aa922ade20feda19b38faede51d6b2ac16e8d5fa2dd918955a0699e55cb -SIZE (firefox-nightly/fdc78cc42ca3.tar.bz2) = 103276807 +SHA256 (firefox-nightly/de56ae61946d.tar.bz2) = 7b178be3ecd4a385db29cf0eb606cddf8ecc1bf3d093459ec8895520f899a3b3 +SIZE (firefox-nightly/de56ae61946d.tar.bz2) = 103303193 Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/firefox/Makefile Tue Feb 19 05:20:59 2013 (r1176) @@ -2,12 +2,12 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 19.0b6 +DISTVERSION= 19.0 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} -#MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source +#MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org @@ -55,7 +55,7 @@ .include -WRKSRC:= ${WRKDIR}/mozilla-beta +WRKSRC:= ${WRKDIR}/mozilla-release .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/firefox/distinfo Tue Feb 19 05:20:59 2013 (r1176) @@ -1,2 +1,2 @@ -SHA256 (firefox-19.0b6.source.tar.bz2) = 36889bdc66eb4318784beb28941bfd56d6b4dc24216059ea74792e86f898d554 -SIZE (firefox-19.0b6.source.tar.bz2) = 98945707 +SHA256 (firefox-19.0.source.tar.bz2) = 645eaba5ee9a2728799822f6f79d91bfd4c3dade5141db2e0a606c85eec589f4 +SIZE (firefox-19.0.source.tar.bz2) = 98837382 Modified: trunk/www/linux-firefox/Makefile ============================================================================== --- trunk/www/linux-firefox/Makefile Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/linux-firefox/Makefile Tue Feb 19 05:20:59 2013 (r1176) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/linux-firefox/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= firefox -PORTVERSION= 17.0.2 +PORTVERSION= 17.0.3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITE_SUBDIR?= firefox/releases/${PORTVERSION}esr/linux-i686/en-US Modified: trunk/www/linux-firefox/distinfo ============================================================================== --- trunk/www/linux-firefox/distinfo Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/linux-firefox/distinfo Tue Feb 19 05:20:59 2013 (r1176) @@ -1,2 +1,2 @@ -SHA256 (firefox-17.0.2esr.tar.bz2) = aaf51e4027337bfe30ba26362bfbd25ee115b989cc20fda1aa40fb201496249a -SIZE (firefox-17.0.2esr.tar.bz2) = 21274620 +SHA256 (firefox-17.0.3esr.tar.bz2) = 84f03a82973c5923c8614f10b3c23220897ab1d230cd001c15b57d32ef39a0ae +SIZE (firefox-17.0.3esr.tar.bz2) = 21292330 Modified: trunk/www/linux-seamonkey/Makefile ============================================================================== --- trunk/www/linux-seamonkey/Makefile Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/linux-seamonkey/Makefile Tue Feb 19 05:20:59 2013 (r1176) @@ -2,9 +2,10 @@ # $FreeBSD: head/www/linux-seamonkey/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= seamonkey -PORTVERSION= 2.15 +PORTVERSION= 2.16 CATEGORIES= www -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US +#MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US +MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser Modified: trunk/www/linux-seamonkey/distinfo ============================================================================== --- trunk/www/linux-seamonkey/distinfo Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/linux-seamonkey/distinfo Tue Feb 19 05:20:59 2013 (r1176) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.15.tar.bz2) = 3dc92d91230399f16e966c7b4c8b36d0870979394339f357ef2c9989575fd204 -SIZE (seamonkey-2.15.tar.bz2) = 25993787 +SHA256 (seamonkey-2.16.tar.bz2) = 71748b27d4c27245b8497a9757331d3dba44762f6551b3eb5f26a82575cbe751 +SIZE (seamonkey-2.16.tar.bz2) = 26182862 Modified: trunk/www/linux-seamonkey/pkg-plist ============================================================================== --- trunk/www/linux-seamonkey/pkg-plist Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/linux-seamonkey/pkg-plist Tue Feb 19 05:20:59 2013 (r1176) @@ -142,11 +142,13 @@ @dirrm lib/%%APP_NAME%%/modules/services-common @dirrm lib/%%APP_NAME%%/modules/services-crypto @dirrm lib/%%APP_NAME%%/modules/services-notifications +@dirrm lib/%%APP_NAME%%/modules/services-sync/stages @dirrm lib/%%APP_NAME%%/modules/services-sync/engines @dirrm lib/%%APP_NAME%%/modules/services-sync @dirrm lib/%%APP_NAME%%/modules/identity @dirrm lib/%%APP_NAME%%/modules/commonjs/promise @dirrm lib/%%APP_NAME%%/modules/commonjs +@dirrm lib/%%APP_NAME%%/modules/accessibility @dirrm lib/%%APP_NAME%%/modules @dirrm lib/%%APP_NAME%%/plugins @dirrm lib/%%APP_NAME%%/searchplugins Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/seamonkey/Makefile Tue Feb 19 05:20:59 2013 (r1176) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/seamonkey/Makefile 310240 2013-01-11 16:48:10Z flo $ PORTNAME= seamonkey -DISTVERSION= 2.16b4 +DISTVERSION= 2.16 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} #MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -19,7 +19,7 @@ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip -EM_VERSION= 1.5.0 +EM_VERSION= 1.5.1 L_VERSION= 2.1b1 USE_AUTOTOOLS= autoconf213:env @@ -67,7 +67,7 @@ .include -WRKSRC= ${WRKDIR}/comm-beta +WRKSRC= ${WRKDIR}/comm-release MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Tue Feb 19 05:20:43 2013 (r1175) +++ trunk/www/seamonkey/distinfo Tue Feb 19 05:20:59 2013 (r1176) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.16b4.source.tar.bz2) = 505a6f3179d13416dc499081f2021b82c00c1f7d6317acfb99a37cd943f01338 -SIZE (seamonkey-2.16b4.source.tar.bz2) = 122384837 -SHA256 (enigmail-1.5.0.tar.gz) = 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71 -SIZE (enigmail-1.5.0.tar.gz) = 1216071 +SHA256 (seamonkey-2.16.source.tar.bz2) = eb694309d3186737c30b745db650de89de4b4aebb49bf609ed9eb89e3fb9b8a3 +SIZE (seamonkey-2.16.source.tar.bz2) = 121957357 +SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0 +SIZE (enigmail-1.5.1.tar.gz) = 1213954 From owner-freebsd-gecko@FreeBSD.ORG Tue Feb 19 05:48:34 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 28BEEB92 for ; Tue, 19 Feb 2013 05:48:34 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id B6A25DA9 for ; Tue, 19 Feb 2013 05:48:33 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1J5mWbe020150 for ; Tue, 19 Feb 2013 05:48:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1J5mRwG019968 for freebsd-gecko@freebsd.org; Tue, 19 Feb 2013 05:48:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 19 Feb 2013 05:48:27 GMT Message-Id: <201302190548.r1J5mRwG019968@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1177 - trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 05:48:34 -0000 Author: jbeich Date: Tue Feb 19 05:48:27 2013 New Revision: 1177 Log: changelog catchup Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Tue Feb 19 05:20:59 2013 (r1176) +++ trunk/Gecko_ChangeLog Tue Feb 19 05:48:27 2013 (r1177) @@ -1,2 +1,3 @@ 19.0: -- make firefox/seamonkey use gcc47 when CXX is unset and "c++" isn't clang +- gcc42 is dead, long live gcc46: dropped upstream for firefox/seamonkey +- add DuckDuckGo search plugin following Debian-based distros From owner-freebsd-gecko@FreeBSD.ORG Tue Feb 19 11:59:03 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 78B878C9 for ; Tue, 19 Feb 2013 11:59:03 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 12954832 for ; Tue, 19 Feb 2013 11:59:02 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1JBx19L058474 for ; Tue, 19 Feb 2013 11:59:01 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1JBwuMW058204 for freebsd-gecko@freebsd.org; Tue, 19 Feb 2013 11:58:56 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 19 Feb 2013 11:58:56 GMT Message-Id: <201302191158.r1JBwuMW058204@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1178 - trunk/security/nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 11:59:03 -0000 Author: jbeich Date: Tue Feb 19 11:58:55 2013 New Revision: 1178 Log: - backout r1174, it's no issue with CC=clang - limit workaround to an arch where it's used Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Tue Feb 19 05:48:27 2013 (r1177) +++ trunk/security/nss/Makefile Tue Feb 19 11:58:55 2013 (r1178) @@ -55,11 +55,10 @@ .if ${ARCH} == amd64 USE_BINUTILS= # intel-gcm.s CFLAGS+= -B${LOCALBASE}/${CONFIGURE_TARGET:S/amd64/x86_64/}/bin -.endif - -.if ${CC:T:M*clang*} || ${CC:Mcc} && ${OSVERSION} > 1000023 +.if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 .endif +.endif check regression-test test: cd ${WRKSRC}/tests; \ From owner-freebsd-gecko@FreeBSD.ORG Tue Feb 19 14:22:23 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F2647F02 for ; Tue, 19 Feb 2013 14:22:23 +0000 (UTC) (envelope-from portscout@portscout.freebsd.org) Received: from null.zi0r.com (null.zi0r.com [71.245.171.204]) by mx1.freebsd.org (Postfix) with ESMTP id B7F2B8B3 for ; Tue, 19 Feb 2013 14:22:23 +0000 (UTC) Received: from null.zi0r.com (localhost [127.0.0.1]) by null.zi0r.com (8.14.5/8.14.5) with ESMTP id r1JEMNjW057865 for ; Tue, 19 Feb 2013 09:22:23 -0500 (EST) (envelope-from portscout@null.zi0r.com) Received: (from portscout@localhost) by null.zi0r.com (8.14.5/8.14.5/Submit) id r1JEMNb6057693; Tue, 19 Feb 2013 09:22:23 -0500 (EST) (envelope-from portscout) Message-Id: <201302191422.r1JEMNb6057693@null.zi0r.com> MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain Date: Tue, 19 Feb 2013 09:22:23 -0500 From: portscout@portscout.freebsd.org To: gecko@freebsd.org Subject: FreeBSD ports you maintain which are out of date X-Mailer: portscout/0.8.1 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 14:22:24 -0000 Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/gecko@freebsd.org.html Port | Current version | New version ------------------------------------------------+-----------------+------------ www/xpi-noscript | 2.6.4.3 | 2.6.5.7 ------------------------------------------------+-----------------+------------ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt If wish to stop receiving portscout reminders, please contact portscout@portscout.freebsd.org Thanks. From owner-freebsd-gecko@FreeBSD.ORG Wed Feb 20 08:40:09 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DAD7F7AF; Wed, 20 Feb 2013 08:40:09 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id B61EFB6F; Wed, 20 Feb 2013 08:40:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1K8e93X019773; Wed, 20 Feb 2013 08:40:09 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1K8e9uP019769; Wed, 20 Feb 2013 08:40:09 GMT (envelope-from edwin) Date: Wed, 20 Feb 2013 08:40:09 GMT Message-Id: <201302200840.r1K8e9uP019769@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Subject: Re: ports/176285: [ERROR] cannot upgrade www/firefox to version 19.0, 1 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2013 08:40:09 -0000 Synopsis: [ERROR] cannot upgrade www/firefox to version 19.0,1 Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Wed Feb 20 08:40:09 UTC 2013 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=176285 From owner-freebsd-gecko@FreeBSD.ORG Wed Feb 20 18:14:14 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7D713D5E for ; Wed, 20 Feb 2013 18:14:14 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (m209-73.dsl.rawbw.com [198.144.209.73]) by mx1.freebsd.org (Postfix) with ESMTP id 313D8965 for ; Wed, 20 Feb 2013 18:14:13 +0000 (UTC) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.14.6/8.14.6) with ESMTP id r1KIE7Ut027468; Wed, 20 Feb 2013 10:14:07 -0800 (PST) (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.14.6/8.14.6/Submit) id r1KIE7Nk027467; Wed, 20 Feb 2013 10:14:07 -0800 (PST) (envelope-from david) Date: Wed, 20 Feb 2013 10:14:07 -0800 From: David Wolfskill To: gecko@freebsd.org Subject: Newly-upgraded firefox-19.0,1 segfaults just after startup Message-ID: <20130220181407.GY1704@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="V/5pStbHlGfNIMG1" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Cc: David Wolfskill X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: David Wolfskill , gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2013 18:14:14 -0000 --V/5pStbHlGfNIMG1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I'm in the habit of tracking stable/9 daily, and once I boot the new kernel (& world), I update the inistalled ports on my laptop usinig portmaster. The past several updates for firefox have been uneventful (though a bit time-consuming) ... until today. Today, the updates seemed to be OK, but when I start firefox, I get a segmentation fault. I tried creating a new ("vanilla") profile and starting with that; the segfault remains. In , one may find: [TXT] debug_session.txt 20-Feb-2013 09:57 11K =20 [TXT] dmesg.boot.txt 20-Feb-2013 06:48 10K =20 [TXT] portmaster_run.txt 20-Feb-2013 06:48 11M =20 * debug_session.txt is a cut/paste showing what I see when I try running gdb against the firefox.core. (Not much, as I don't normally build everything with debugging symbols.) * dmesg.boot.txt is a copy of /var/run/dmesg.boot on the affected system. Here's "uname -a" output: FreeBSD g1-227.catwhisker.org 9.1-STABLE FreeBSD 9.1-STABLE #380 r247019M/= 247030: Wed Feb 20 05:54:53 PST 2013 root@g1-227.catwhisker.org:/usr/ob= j/usr/src/sys/CANARY i386 I note, too, that this is a dual-core machine. * portmaster_run.tx is a copy of the typescript from the portmaster run. (I tend to do these updates within script(1).) I'm rather at a loss to know what else would be useful or helpful, so if I've overlooked something, please let me know. I've included my address on the Reply-To hint, as I'm not subscribed to gecko@. Thanks! Peace, david --=20 David H. Wolfskill david@catwhisker.org Taliban: Evil men with guns afraid of truth from a 14-year old girl. See http://www.catwhisker.org/~david/publickey.gpg for my public key. --V/5pStbHlGfNIMG1 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlElEm4ACgkQmprOCmdXAD2qKwCfSXXzsdWqUOg3YazqI4J04NmH in8An02u6517TEFBM9QKkoNrZIXOE6EN =suEY -----END PGP SIGNATURE----- --V/5pStbHlGfNIMG1-- From owner-freebsd-gecko@FreeBSD.ORG Wed Feb 20 18:40:17 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D9A5B986; Wed, 20 Feb 2013 18:40:17 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id AE8E0ACB; Wed, 20 Feb 2013 18:40:17 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1KIeHFh031482; Wed, 20 Feb 2013 18:40:17 GMT (envelope-from rm@freefall.freebsd.org) Received: (from rm@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1KIeHaN031445; Wed, 20 Feb 2013 18:40:17 GMT (envelope-from rm) Date: Wed, 20 Feb 2013 18:40:17 GMT Message-Id: <201302201840.r1KIeHaN031445@freefall.freebsd.org> To: andy.lavr@gmail.com, rm@FreeBSD.org, gecko@FreeBSD.org From: rm@FreeBSD.org Subject: Re: ports/176285: [ERROR] cannot upgrade www/firefox to version 19.0, 1 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2013 18:40:17 -0000 Synopsis: [ERROR] cannot upgrade www/firefox to version 19.0,1 State-Changed-From-To: open->closed State-Changed-By: rm State-Changed-When: Wed Feb 20 18:40:17 UTC 2013 State-Changed-Why: Fixed in r312612, please update your ports tree and try again. Andrei, it was failing at merging an svn properties and was fixed shortly, so please don't be sarcastic. Thanks for your report. http://www.freebsd.org/cgi/query-pr.cgi?pr=176285 From owner-freebsd-gecko@FreeBSD.ORG Wed Feb 20 19:55:28 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1CF561A8 for ; Wed, 20 Feb 2013 19:55:28 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id A8EDF1000 for ; Wed, 20 Feb 2013 19:55:27 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1KJtJEv060598 for ; Wed, 20 Feb 2013 19:55:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1KJtEa7060330 for freebsd-gecko@freebsd.org; Wed, 20 Feb 2013 19:55:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 20 Feb 2013 19:55:14 GMT Message-Id: <201302201955.r1KJtEa7060330@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1179 - trunk/security/nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2013 19:55:28 -0000 Author: jbeich Date: Wed Feb 20 19:55:14 2013 New Revision: 1179 Log: avoid breakage on FreeBSD version bumps Reported by: flo Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Tue Feb 19 11:58:55 2013 (r1178) +++ trunk/security/nss/Makefile Wed Feb 20 19:55:14 2013 (r1179) @@ -54,7 +54,7 @@ .if ${ARCH} == amd64 USE_BINUTILS= # intel-gcm.s -CFLAGS+= -B${LOCALBASE}/${CONFIGURE_TARGET:S/amd64/x86_64/}/bin +CFLAGS+= -B${LOCALBASE}/bin .if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 .endif From owner-freebsd-gecko@FreeBSD.ORG Wed Feb 20 22:28:58 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4314EBCF for ; Wed, 20 Feb 2013 22:28:58 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id C713ED97 for ; Wed, 20 Feb 2013 22:28:57 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1KMSuBn060522 for ; Wed, 20 Feb 2013 22:28:56 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1KMSpox059958 for freebsd-gecko@freebsd.org; Wed, 20 Feb 2013 22:28:51 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 20 Feb 2013 22:28:51 GMT Message-Id: <201302202228.r1KMSpox059958@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1180 - trunk/security/nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2013 22:28:58 -0000 Author: jbeich Date: Wed Feb 20 22:28:51 2013 New Revision: 1180 Log: pull in lang/gcc as well for old/unsupported releases 7.4 is still a supported release, 8.[0-2] are not but added for convenience. As -stable packages are usually built for oldest supported release of the branch this can be backed out shortly after RELEASE_7_EOL is tagged. Reported by: ale Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Wed Feb 20 19:55:14 2013 (r1179) +++ trunk/security/nss/Makefile Wed Feb 20 22:28:51 2013 (r1180) @@ -58,6 +58,10 @@ .if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 .endif +.if ${CC:Mcc} && (${OSVERSION} >= 800000 && ${OSVERSION} < 802503 \ + || ${OSVERSION} < 704101) +USE_GCC?= yes # -mssse3 +.endif .endif check regression-test test: From owner-freebsd-gecko@FreeBSD.ORG Thu Feb 21 12:16:37 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BF4CC1A4D; Thu, 21 Feb 2013 12:16:37 +0000 (UTC) (envelope-from ml@netfence.it) Received: from smtp.eutelia.it (mp1-smtp-5.eutelia.it [62.94.10.165]) by mx1.freebsd.org (Postfix) with ESMTP id 7BCF9635; Thu, 21 Feb 2013 12:16:37 +0000 (UTC) Received: from ns2.biolchim.it (ip-188-188.sn2.eutelia.it [83.211.188.188]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.eutelia.it (Eutelia) with ESMTP id 254B6173BB; Thu, 21 Feb 2013 12:44:34 +0100 (CET) Received: from soth.ventu (adsl-ull-238-253.41-151.net24.it [151.41.253.238]) (authenticated bits=0) by ns2.biolchim.it (8.14.6/8.14.6) with ESMTP id r1LBiTHJ073307 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Thu, 21 Feb 2013 12:44:30 +0100 (CET) (envelope-from ml@netfence.it) Received: from alamar.ventu (alamar.ventu [10.1.2.18]) by soth.ventu (8.14.6/8.14.5) with ESMTP id r1LBiGg4092047; Thu, 21 Feb 2013 12:44:16 +0100 (CET) (envelope-from ml@netfence.it) Message-ID: <51260890.6030807@netfence.it> Date: Thu, 21 Feb 2013 12:44:16 +0100 From: Andrea Venturoli User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:17.0) Gecko/20130221 Thunderbird/17.0.3 MIME-Version: 1.0 To: gecko@FreeBSD.org Subject: Firefox upgrade fails Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.73 X-Scanned-By: MIMEDefang 2.73 on 10.1.2.13 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (ns2.biolchim.it [192.168.2.203]); Thu, 21 Feb 2013 12:44:30 +0100 (CET) Cc: ports@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2013 12:16:37 -0000 Hello. > # uname -a > FreeBSD xxxxxx.xxxxx 9.0-RELEASE-p5 FreeBSD 9.0-RELEASE-p5 #2: Sat Dec 1 14:43:22 CET 2012 root@xxxxxx.xxxxx:/usr/obj/usr/src/sys/XXXXXX i386 > portupgrade -R firefox > ... > /usr/local/local/storage/alamartmp/usr/ports/www/firefox/work/mozilla-release/obj-i386-portbld-fla-release/config/pythonpath.py -I../../config /usr/local/local/storage/alamartmp/usr/ports/www/mozalloc.so --uselist -- clang++ -Qunused-arguments -isystem/usr/local/include -Qunused-argumetor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros -Wno-c++0x-ech=athlon-mp -fno-strict-aliasing -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sectfomit-frame-pointer -fPIC -shared -Wl,-z,defs -Wl,-h,libmozalloc.so -o libmozalloc.so mozalloc.GIN -Wl,-z,noexecstack -fprofile-generate -Wl,-rpath-link,/usr/local/local/storage/alamartmp/usocal/local/storage/alamartmp/usr/ports/www/firefox/work/fake/lib > /usr/bin/ld: /usr/bin/../lib/libprofile_rt.a: No such file: No such file or directory > clang++: error: linker command failed with exit code 1 (use -v to see invocation) > gmake[5]: *** [libmozalloc.so] Error 1 > ... Any hint? bye & Thanks av. From owner-freebsd-gecko@FreeBSD.ORG Thu Feb 21 12:23:39 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7A37A5E9 for ; Thu, 21 Feb 2013 12:23:39 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from portsmonj.FreeBSD.org (portsmonj.freebsd.org [69.147.83.46]) by mx1.freebsd.org (Postfix) with ESMTP id 6EB778D7 for ; Thu, 21 Feb 2013 12:23:39 +0000 (UTC) Received: from portsmonj.freebsd.org (portsmonj.freebsd.org [69.147.83.46]) by portsmonj.FreeBSD.org (8.14.5/8.14.4) with ESMTP id r1L8TIjj085609 for ; Thu, 21 Feb 2013 08:29:18 GMT (envelope-from linimon@FreeBSD.org) Date: Thu, 21 Feb 2013 08:29:18 GMT Message-Id: <201302210829.r1L8TIjj085609@portsmonj.FreeBSD.org> From: linimon@FreeBSD.org To: gecko@FreeBSD.org Subject: FreeBSD ports that you maintain which are currently scheduled for deletion X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: portmgr-feedback@FreeBSD.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2013 12:23:39 -0000 Dear FreeBSD port maintainer: As part of an ongoing effort to reduce the number of problems in the FreeBSD ports system, we periodically schedule removal of ports that have been judged to have outlived their usefulness. Often, this is due to a better alternative having become available and/or the cessation of development on the existing port. In some cases, ports are marked for removal because they fail to build and install correctly from their sources, or otherwise fail in operation. The ports, and the reason and date that they have been scheduled for removal, are listed below. If no one has stepped forward before that time to propose a way to fix the problems (such as via a PR), the ports will be deleted. portname: www/kompozer description: Complete Web Authoring Suite maintainer: gecko@FreeBSD.org deprecated because: Dead upstream expiration date: 2013-03-20 build errors: http://pointyhat.FreeBSD.org/errorlogs/sparc64-errorlogs/e.8.20120812220927/kompozer-0.8.b3_3.log (_Aug_19_08:44:40_UTC_2012) http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.10.20120608131052/kompozer-0.8.b3_3.log (_Jun_13_10:31:50_UTC_2012) overview: http://portsmon.FreeBSD.org/portoverview.py?category=www&portname=kompozer If this problem is one that you are already aware of, please accept our apologies and ignore this message. On the other hand, if you no longer wish to maintain this port (or ports), please reply with a message stating that, and accept our thanks for your efforts in the past. Thanks for your efforts to help improve FreeBSD. From owner-freebsd-gecko@FreeBSD.ORG Thu Feb 21 14:40:08 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BC51A1C1 for ; Thu, 21 Feb 2013 14:40:08 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from outgoing.tormail.org (outgoing.tormail.org [82.221.96.22]) by mx1.freebsd.org (Postfix) with ESMTP id 7AE6D95E for ; Thu, 21 Feb 2013 14:40:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=internal.tormail.org) by outgoing.tormail.org with esmtp (Exim 4.72) (envelope-from ) id 1U8XJV-0000KT-8e; Thu, 21 Feb 2013 17:39:57 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:In-Reply-To:Subject:Cc:To:From; bh=DYfJ52G+IJ0SdVZ3MOpk/5dy+Sa6BY+d8evtWXJ9xMg=; b=v9laGkqgklSu8JCT0YMyXrwiXADGkGt3wXaJz5mfSq61oOuBib7vY34pUZV34g0PzxkrtSw3/bGM/chLKt6HiOmKkD/DKyddlhRc5So0Oos4XdtayzSVBkfCTLQDgNTl1mVX21jcNSp7viAttgDl31zrkWT7eAV8EVGi6irzv0U=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1U8XHX-000IXk-Mj; Thu, 21 Feb 2013 14:37:58 +0000 From: Jan Beich To: David Wolfskill Subject: Re: Newly-upgraded firefox-19.0,1 segfaults just after startup In-Reply-To: <20130220181407.GY1704@albert.catwhisker.org> (David Wolfskill's message of "Wed, 20 Feb 2013 10:14:07 -0800") Date: Thu, 21 Feb 2013 15:38:42 +0100 References: <20130220181407.GY1704@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1U8XHX-000IXk-Mj@internal.tormail.org> Cc: gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2013 14:40:08 -0000 David Wolfskill writes: > FreeBSD g1-227.catwhisker.org 9.1-STABLE FreeBSD 9.1-STABLE #380 > r247019M/247030: Wed Feb 20 05:54:53 PST 2013 > root@g1-227.catwhisker.org:/usr/obj/usr/src/sys/CANARY i386 http://svnweb.freebsd.org/changeset/base/246858 As the bug only affects /stable/9 but not any of releases I don't think gecko@ needs to take any action. From owner-freebsd-gecko@FreeBSD.ORG Fri Feb 22 10:50:13 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9E9739E; Fri, 22 Feb 2013 10:50:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) by mx1.freebsd.org (Postfix) with ESMTP id 6757F6C8; Fri, 22 Feb 2013 10:50:13 +0000 (UTC) Received: from [192.168.0.6] (spaceball.home.andric.com [192.168.0.6]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 269305C43; Fri, 22 Feb 2013 11:50:11 +0100 (CET) Message-ID: <51274D65.3060900@FreeBSD.org> Date: Fri, 22 Feb 2013 11:50:13 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:19.0) Gecko/20130117 Thunderbird/19.0 MIME-Version: 1.0 To: Andrea Venturoli , gecko@FreeBSD.org Subject: Re: Firefox upgrade fails References: <51260890.6030807@netfence.it> In-Reply-To: <51260890.6030807@netfence.it> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: ports@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Feb 2013 10:50:13 -0000 On 2013-02-21 12:44, Andrea Venturoli wrote: >> # uname -a >> FreeBSD xxxxxx.xxxxx 9.0-RELEASE-p5 FreeBSD 9.0-RELEASE-p5 #2: Sat Dec 1 14:43:22 CET 2012 root@xxxxxx.xxxxx:/usr/obj/usr/src/sys/XXXXXX i386 > > > portupgrade -R firefox > > ... >> /usr/local/local/storage/alamartmp/usr/ports/www/firefox/work/mozilla-release/obj-i386-portbld-fla-release/config/pythonpath.py -I../../config /usr/local/local/storage/alamartmp/usr/ports/www/mozalloc.so --uselist -- clang++ -Qunused-arguments -isystem/usr/local/include -Qunused-argumetor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros -Wno-c++0x-ech=athlon-mp -fno-strict-aliasing -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sectfomit-frame-pointer -fPIC -shared -Wl,-z,defs -Wl,-h,libmozalloc.so -o libmozalloc.so mozalloc.GIN -Wl,-z,noexecstack -fprofile-generate -Wl,-rpath-link,/usr/local/local/storage/alamartmp/usocal/local/storage/alamartmp/usr/ports/www/firefox/work/fake/lib >> /usr/bin/ld: /usr/bin/../lib/libprofile_rt.a: No such file: No such file or directory >> clang++: error: linker command failed with exit code 1 (use -v to see invocation) >> gmake[5]: *** [libmozalloc.so] Error 1 > > ... The commands in your log seem to be strangely corrupted, maybe something went wrong with saving the log? In any case, this looks like Firefox is attempting to use profile guided optimization (via -fprofile-generate, etc), which is currently not supported. Try turning it off. -Dimitry From owner-freebsd-gecko@FreeBSD.ORG Fri Feb 22 10:51:19 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 73E8116F; Fri, 22 Feb 2013 10:51:19 +0000 (UTC) (envelope-from tmueller@sysgo.com) Received: from mail1.sysgo.com (mail1.sysgo.com [176.9.26.183]) by mx1.freebsd.org (Postfix) with ESMTP id 2CA336E2; Fri, 22 Feb 2013 10:51:18 +0000 (UTC) Received: from lantia.sysgo.com (unknown [172.22.2.7]) by mail1.sysgo.com (Postfix) with ESMTP id A3C9E46343; Fri, 22 Feb 2013 11:43:55 +0100 (CET) Received: by lantia.sysgo.com (Postfix, from userid 113) id 28D9C506095; Fri, 22 Feb 2013 11:42:43 +0100 (CET) Received: from tmu.ulm.sysgo.com (tmu.ulm.sysgo.com [172.30.3.10]) by lantia.sysgo.com (Postfix) with ESMTP id A3D2F5060C5; Fri, 22 Feb 2013 11:42:37 +0100 (CET) Date: Fri, 22 Feb 2013 11:42:34 +0100 From: Thomas Mueller To: Andrea Venturoli Subject: Re: Firefox upgrade fails Message-ID: <20130222114234.04d48456@tmu.ulm.sysgo.com> In-Reply-To: <51260890.6030807@netfence.it> References: <51260890.6030807@netfence.it> Organization: SYSGO AG X-Mailer: Claws Mail 3.9.0 (GTK+ 2.24.6; amd64-portbld-freebsd9.1) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: ports@freebsd.org, gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Feb 2013 10:51:19 -0000 On Thu, 21 Feb 2013 12:44:16 +0100, Andrea Venturoli wrote: > > # uname -a > > FreeBSD xxxxxx.xxxxx 9.0-RELEASE-p5 FreeBSD 9.0-RELEASE-p5 #2: Sat Dec 1 14:43:22 CET 2012 root@xxxxxx.xxxxx:/usr/obj/usr/src/sys/XXXXXX i386 > > > portupgrade -R firefox > > ... > > /usr/local/local/storage/alamartmp/usr/ports/www/firefox/work/mozilla-release/obj-i386-portbld-fla-release/config/pythonpath.py -I../../config /usr/local/local/storage/alamartmp/usr/ports/www/mozalloc.so --uselist -- clang++ -Qunused-arguments -isystem/usr/local/include -Qunused-argumetor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros -Wno-c++0x-ech=athlon-mp -fno-strict-aliasing -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sectfomit-frame-pointer -fPIC -shared -Wl,-z,defs -Wl,-h,libmozalloc.so -o libmozalloc.so mozalloc.GIN -Wl,-z,noexecstack -fprofile-generate -Wl,-rpath-link,/usr/local/local/storage/alamartmp/usocal/local/storage/alamartmp/usr/ports/www/firefox/work/fake/lib > > /usr/bin/ld: /usr/bin/../lib/libprofile_rt.a: No such file: No such file or directory > > clang++: error: linker command failed with exit code 1 (use -v to see invocation) > > gmake[5]: *** [libmozalloc.so] Error 1 > > ... > > Any hint? Disable PGO or build with GCC (I used "make USE_GCC=4.6+"). -- Thomas Mueller From owner-freebsd-gecko@FreeBSD.ORG Fri Feb 22 13:43:13 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1089A31C for ; Fri, 22 Feb 2013 13:43:13 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9CC75CA for ; Fri, 22 Feb 2013 13:43:12 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1MDhBUc026962 for ; Fri, 22 Feb 2013 13:43:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1MDh63s026513 for freebsd-gecko@freebsd.org; Fri, 22 Feb 2013 13:43:06 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 22 Feb 2013 13:43:06 GMT Message-Id: <201302221343.r1MDh63s026513@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1181 - in trunk/www: firefox firefox-esr firefox-nightly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Feb 2013 13:43:13 -0000 Author: jbeich Date: Fri Feb 22 13:43:06 2013 New Revision: 1181 Log: clang doesn't support profile-guided optimization yet Reported by: dim Modified: trunk/www/firefox-esr/Makefile trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Wed Feb 20 22:28:51 2013 (r1180) +++ trunk/www/firefox-esr/Makefile Fri Feb 22 13:43:06 2013 (r1181) @@ -68,6 +68,7 @@ .endif .if ${PORT_OPTIONS:MPGO} +USE_GCC?= any USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Wed Feb 20 22:28:51 2013 (r1180) +++ trunk/www/firefox-nightly/Makefile Fri Feb 22 13:43:06 2013 (r1181) @@ -70,6 +70,7 @@ .endif .if ${PORT_OPTIONS:MPGO} +USE_GCC?= yes USE_DISPLAY= yes .undef GNU_CONFIGURE Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Wed Feb 20 22:28:51 2013 (r1180) +++ trunk/www/firefox/Makefile Fri Feb 22 13:43:06 2013 (r1181) @@ -69,6 +69,7 @@ .endif .if ${PORT_OPTIONS:MPGO} +USE_GCC?= yes USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 14:13:37 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from chateau.d.if (localhost [IPv6:::1]) by hub.freebsd.org (Postfix) with ESMTP id EA9AB3DE for ; Sat, 23 Feb 2013 14:13:35 +0000 (UTC) (envelope-from ashish@freebsd.org) Received: from chateau.d.if (localhost [IPv6:::1]); by chateau.d.if (OpenSMTPD) with ESMTP id 4601660e; for ; Sat, 23 Feb 2013 19:42:46 +0530 (IST) X-Hashcash: 1:20:130223:gecko@freebsd.org::GE4EnnK5Skdb0wZs:000000000000000000000000000000000000000000002xxP From: ashish@FreeBSD.org (Ashish SHUKLA) To: gecko@FreeBSD.org Subject: www/firefox failing to compile on 9.0-RELEASE (amd64) with system clang Organization: The FreeBSD Project X-Face: )vGQ9yK7Y$Flebu1C>(B\gYBm)[$zfKM+p&TT[[JWl6:]S>cc$%-z7-`46Zf0B*syL.C]oCq[upTG~zuS0.$"_%)|Q@$hA=9{3l{%u^h3jJ^Zl; t7 X-Uptime: 7:37PM up 2:43, 7 users, load averages: 0.05, 0.09, 0.04 X-Operating-System: FreeBSD/FreeBSD 9.1-RC3/amd64 X-OpenPGP-Fingerprint: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0 X-Attribution: =?utf-8?B?4KSG4KS24KWA4KS3?= Organisation: The FreeBSD Project Date: Sat, 23 Feb 2013 19:42:40 +0530 Message-ID: <86r4k7p19j.fsf@chateau.d.if> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (amd64-portbld-freebsd9.1) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJ1BMVEWpqal/f39tbW1jY2Md HR2goKCenp6UlJROTk7////9/f35+fnT09ORJdieAAACVklEQVQ4jXXUP2vbQBQA8AvUTkgz5OzY Z0iGWhpS6BSrkECn0mvx0MEJ6AjtYrfoBCVDlD8naJYmNlRfwZq8+mkKlIZaGpJSYmP7Q/XkJDrJ Td8i/H68u3vHPaPufwLdf32AMA4A6GcAgvAamY1pOJiDIFqicTwLswDhfr3uxfFtkAY/GFHPMwzD 8zpnACmIOnE6js7rQb+v4NJrG9od0C+QgpHMy5jBewV+UDSMWiw1Y4fWfyV7+NGFzDsYa3pth9LJ Q4XvXxFHcJRvHOmygn5NAEabnDcQQguarnfoiwSCJ99jmKKcphsZONmWsDK9Ro7cvZOCtQdg8nje egLhc2LNlkLmsezzTFUUy5w18ocox/f0LaLgJy0zO75zk+9pp85GAj36xjqhdI0y3tq2m4dqqcWX zQWBTz8L1irvolXV4J+3q7eCDgVnttjNq6X8H+9KOZsuNk1uCzx8pSp+E9HImfJOTLdcGqo+YKnG EIovizkEn48V7BO+ch2DXcD4ENSpWiU+q8hjjbgTBZCXnZtyj0Ws4Q1Q0B2WXFtYZo65Bbyeeldw RS6qFueM80LlLA29YlVwGRYvFD+kwI/0O+A2PlpOP9GwslUVciHuYGechuBTp922YiDZCrghTknm XSyOM+D3aoRZlo0Jb42zY7DN4p2x4AeZ+QAYutx1sHwTHzMT5cMNduQ9yW3GczN4KZ86kb0c9O8T yXDeFqpl2fryPEAYGXIlezAPXYh2NgVr/gvdoHIuDwuPwOhcWE8f8mmICq41eATkn8x0kuRTIKcB wE9+/QUtiiAnYcaN7wAAAABJRU5ErkJggg== MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 14:13:37 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, I'm getting following compiler error when trying to compile www/firefox port (under poudriere) on 9.0-RELEASE amd64 host: #v+ clang++ -o JARSignatureVerification.o -c -I../../../../dist/stl_wrappers -I= ../../../../dist/system_wrappers -include ../../../../../config/gcc_hidden.= h -DNSS_ENABLE_ECC -DDLL_PREFIX=3D\"l ib\" -DDLL_SUFFIX=3D\".so\" -DMOZ_GLUE_IN_PROGRAM -DXPCOM_TRANSLATE_NSGM_E= NTRY_POINT=3D1 -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEXP= ORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_ WIDGET -DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES -DSTATIC_EXPORTABLE_JS_AP= I -DNO_NSPR_10_SUPPORT -I../../../../../security/manager/ssl/src -I. -I../= ../../../dist/include -I/usr/local /include/nspr -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/= local/include -I/usr/local/include -fPIC -Qunused-arguments -isystem/usr= /local/include -I/usr/local/include -Qunused-arguments -Wall -Wpointer-ari= th -Woverloaded-virtual -Werror=3Dreturn-type -Wtype-limits -Wempty-body -W= no-ctor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-var= iadic-macros -Wno-c++0x-extensions -Wno-unknown-warning-option -Wno-return-= type-c-linkage -Wno-mismatched-tags -g -fno-exceptions -fno-strict-aliasing= -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -std=3Dgnu++= 0x -pipe -DDEBUG -D_DEBUG -DTRACING -g -O -fno-omit-frame-pointer -Qunus= ed-arguments -isystem/usr/local/include -I/usr/local/include -DMOZILLA_CLI= ENT -include ../../../../mozilla-config.h -MD -MF .deps/JARSignatureVerific= ation.o.pp /wrkdirs/usr/ports/www/firefox/work/mozilla-release/security/ma= nager/ssl/src/JARSignatureVerification.cpp /wrkdirs/usr/ports/www/firefox/work/mozilla-release/security/manager/ssl/sr= c/JARSignatureVerification.cpp:573:12: error: use of undeclared identifier = 'gPIPNSSLog' PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Failed to decode PKCS#7 item: %s", ^ /usr/local/include/nspr/prlog.h:177:23: note: expanded from: if (PR_LOG_TEST(_module,_level)) { \ ^ /usr/local/include/nspr/prlog.h:166:7: note: expanded from: ((_module)->level >=3D (_level)) ^ /wrkdirs/usr/ports/www/firefox/work/mozilla-release/security/manager/ssl/sr= c/JARSignatureVerification.cpp:594:12: error: use of undeclared identifier = 'gPIPNSSLog' PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Failed to verify detached signature:= %s", ^ /usr/local/include/nspr/prlog.h:177:23: note: expanded from: if (PR_LOG_TEST(_module,_level)) { \ ^ /usr/local/include/nspr/prlog.h:166:7: note: expanded from: ((_module)->level >=3D (_level)) ^ /wrkdirs/usr/ports/www/firefox/work/mozilla-release/security/manager/ssl/sr= c/JARSignatureVerification.cpp:656:12: error: use of undeclared identifier = 'gPIPNSSLog' PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Verifying digests for %s", ^ /usr/local/include/nspr/prlog.h:177:23: note: expanded from: if (PR_LOG_TEST(_module,_level)) { \ ^ /usr/local/include/nspr/prlog.h:166:7: note: expanded from: ((_module)->level >=3D (_level)) ^ 3 errors generated. gmake[5]: *** [JARSignatureVerification.o] Error 1 gmake[5]: Leaving directory `/wrkdirs/usr/ports/www/firefox/work/mozilla-re= lease/obj-x86_64-portbld-freebsd9.0/security/manager/ssl/src' #v- I've uploaded complete log at http://people.freebsd.org/~ashish/logs/firefo= x-19.0%2c1.log.xz Any ideas what's wrong with it ? Thanks =2D-=20 Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0 Sent from my Emacs --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQIcBAEBCgAGBQJRKM5dAAoJEMdGz6nnT6SwBHAQALbrzEuw7NhAVuNcRawCRqAn ntChXuUi2gvAuaDCbxLBxFFsouQe9bVTLfap5a+Drl245C4QRHyo7AFgFUnkqw/h 5g2uZy6hlZay1rFtjqXpKEKizb3SwVTn1TN1ZHC7W/sMXbywcoTRnGpEXGLZJ3Tn GP+KeKiaRBMeyhqZ+fRe365VQjYmsF8mNHoThZlSp82waQDSycaP4bCLA42hKzxf 2hD9x1UMYHShj0Uwi4nNQGrVNQzGPd5noGGUnS56dsR+Vy03vF2V6j9LINqrjPKb ITv5FtoxS+pNqcyRc8iY76fTQ5NKpbnuXJkfgNVeapPtplJrGZ7mwP9gMPZ8j0Mk USWkT+9npkRzkrJHdR3m8eHw9WF9Q12g950YZlddcVA/SNi5TCMHoV5eTtDuw2i2 aSvjLxMl1tTuYAGEHeyOS7QesVDrm9B9ShudysILACrsniQ5VZ+2l1ObNxl3XjZX /zjTQZ/HZ9d/jdLEKuvO8DATdqljobgFiThHUsdRSNa7d2HDd+38FyzZZDz3UdTs UB57s/2UEm/lGAMLU2WuzvVgLudX8HFjnJK7ObjvCCiPnmRWvmhzx5itWV74euNW O8TS2Wbi/0ZJ5AflMxYioJd9sso6P3VHngesnniSwYUIA0KiN/masaMmYzU2UIAF K7zmuhA78LLWsjuIlqn4 =O1Qd -----END PGP SIGNATURE----- --=-=-=-- From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 16:09:20 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0C514DE9 for ; Sat, 23 Feb 2013 16:09:20 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9A9BC320 for ; Sat, 23 Feb 2013 16:09:19 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1NG9Ct6070637 for ; Sat, 23 Feb 2013 16:09:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1NG960i070242 for freebsd-gecko@freebsd.org; Sat, 23 Feb 2013 16:09:06 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Feb 2013 16:09:06 GMT Message-Id: <201302231609.r1NG960i070242@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1182 - trunk/Mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 16:09:20 -0000 Author: jbeich Date: Sat Feb 23 16:09:06 2013 New Revision: 1182 Log: make sure logging is enabled with debug Reported by: ashish Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Fri Feb 22 13:43:06 2013 (r1181) +++ trunk/Mk/bsd.gecko.mk Sat Feb 23 16:09:06 2013 (r1182) @@ -790,12 +790,11 @@ .if ${PORT_OPTIONS:MDEBUG} MOZ_OPTIONS+= --enable-debug -WITH_LOGGING= yes .else MOZ_OPTIONS+= --disable-debug .endif -.if ${PORT_OPTIONS:MLOGGING} +.if ${PORT_OPTIONS:MLOGGING} || ${PORT_OPTIONS:MDEBUG} MOZ_OPTIONS+= --enable-logging .else MOZ_OPTIONS+= --disable-logging From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 20:47:34 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C7BCED14; Sat, 23 Feb 2013 20:47:34 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id A3214289; Sat, 23 Feb 2013 20:47:34 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NKlY9u090884; Sat, 23 Feb 2013 20:47:34 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NKlYOi090880; Sat, 23 Feb 2013 20:47:34 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 20:47:34 GMT Message-Id: <201302232047.r1NKlYOi090880@freefall.freebsd.org> To: flo@FreeBSD.org, freebsd-bugs@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/176376: seamonkey-2.16 is crashin on page load (i386) X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 20:47:34 -0000 Synopsis: seamonkey-2.16 is crashin on page load (i386) Responsible-Changed-From-To: freebsd-bugs->gecko Responsible-Changed-By: flo Responsible-Changed-When: Sat Feb 23 20:46:41 UTC 2013 Responsible-Changed-Why: This one is for gecko@ http://www.freebsd.org/cgi/query-pr.cgi?pr=176376 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 21:08:20 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 71173191 for ; Sat, 23 Feb 2013 21:08:20 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 5C8FC35A for ; Sat, 23 Feb 2013 21:08:18 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1NL8HY2087174 for ; Sat, 23 Feb 2013 21:08:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1NL8Bgn083896 for freebsd-gecko@freebsd.org; Sat, 23 Feb 2013 21:08:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Feb 2013 21:08:11 GMT Message-Id: <201302232108.r1NL8Bgn083896@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1183 - in trunk/www: firefox firefox-nightly firefox-nightly/files firefox/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 21:08:20 -0000 Author: jbeich Date: Sat Feb 23 21:08:10 2013 New Revision: 1183 Log: update Added: trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp trunk/www/firefox/files/patch-bug780432 trunk/www/firefox/files/patch-bug824317 trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Deleted: trunk/www/firefox/files/patch-alsapulse trunk/www/firefox/files/patch-bug787804 trunk/www/firefox/files/patch-bug817267 Modified: trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox-nightly/files/patch-build-pgo-profileserver.py trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp trunk/www/firefox/files/patch-bug807492 trunk/www/firefox/files/patch-bug826985 Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sat Feb 23 16:09:06 2013 (r1182) +++ trunk/www/firefox-nightly/Makefile Sat Feb 23 21:08:10 2013 (r1183) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -PORTVERSION= 21.0.${HGREV:C/:.*//} +PORTVERSION= 22.0.${HGREV:C/:.*//} PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= http://hg.mozilla.org/mozilla-central/archive/ Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Sat Feb 23 16:09:06 2013 (r1182) +++ trunk/www/firefox-nightly/Makefile.hgrev Sat Feb 23 21:08:10 2013 (r1183) @@ -1 +1 @@ -HGREV= 122184:de56ae61946d +HGREV= 122639:cd4402b41864 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Sat Feb 23 16:09:06 2013 (r1182) +++ trunk/www/firefox-nightly/distinfo Sat Feb 23 21:08:10 2013 (r1183) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/de56ae61946d.tar.bz2) = 7b178be3ecd4a385db29cf0eb606cddf8ecc1bf3d093459ec8895520f899a3b3 -SIZE (firefox-nightly/de56ae61946d.tar.bz2) = 103303193 +SHA256 (firefox-nightly/cd4402b41864.tar.bz2) = 27894e997a794a57eb8817dc56aa8c7d08613ecd7ff8812aef8eca0eb77ebdec +SIZE (firefox-nightly/cd4402b41864.tar.bz2) = 103575925 Modified: trunk/www/firefox-nightly/files/patch-build-pgo-profileserver.py ============================================================================== --- trunk/www/firefox-nightly/files/patch-build-pgo-profileserver.py Sat Feb 23 16:09:06 2013 (r1182) +++ trunk/www/firefox-nightly/files/patch-build-pgo-profileserver.py Sat Feb 23 21:08:10 2013 (r1183) @@ -1,6 +1,6 @@ --- build/pgo/profileserver.py.orig 2011-02-24 21:49:47.000000000 +0100 +++ build/pgo/profileserver.py 2011-02-24 21:50:30.000000000 +0100 -@@ -77,13 +77,13 @@ +@@ -43,13 +43,13 @@ if __name__ == '__main__': t.setDaemon(True) # don't hang on exit t.start() @@ -9,7 +9,7 @@ automation.initializeProfile(PROFILE_DIRECTORY) browserEnv = automation.environment() browserEnv["XPCOM_DEBUG_BREAK"] = "warn" - browserEnv["MOZ_JAR_LOG_DIR"] = MOZ_JAR_LOG_DIR + browserEnv["MOZ_JAR_LOG_FILE"] = MOZ_JAR_LOG_FILE - url = "http://localhost:%d/index.html" % PORT + url = "http://127.0.0.1:%d/index.html" % PORT Added: trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Sat Feb 23 21:08:10 2013 (r1183) @@ -0,0 +1,14 @@ +--- media/libsoundtouch/src/cpu_detect_x86.cpp~ ++++ media/libsoundtouch/src/cpu_detect_x86.cpp +@@ -101,7 +101,10 @@ uint detectCPUextensions(void) + + uint res = 0; + +-#if defined(__GNUC__) ++#if defined(__clang__) && __clang_minor__ == 0 ++ // No __get_cpuid() on FreeBSD 9.0 with Clang 3.0 ++ return 0; ++#elif defined(__GNUC__) + // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support. + uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable. + Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sat Feb 23 16:09:06 2013 (r1182) +++ trunk/www/firefox/Makefile Sat Feb 23 21:08:10 2013 (r1183) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 19.0 +DISTVERSION= 20.0b1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -14,7 +14,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \ - nss>=3.14.1:${PORTSDIR}/security/nss \ + nss>=3.14.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ @@ -55,7 +55,7 @@ .include -WRKSRC:= ${WRKDIR}/mozilla-release +WRKSRC:= ${WRKDIR}/mozilla-beta .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} @@ -102,6 +102,7 @@ post-patch: @${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \ + -e '/^SQLITE_VERSION/s/=.*/=3.7.14.1/' \ ${WRKSRC}/configure.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Sat Feb 23 16:09:06 2013 (r1182) +++ trunk/www/firefox/distinfo Sat Feb 23 21:08:10 2013 (r1183) @@ -1,2 +1,2 @@ -SHA256 (firefox-19.0.source.tar.bz2) = 645eaba5ee9a2728799822f6f79d91bfd4c3dade5141db2e0a606c85eec589f4 -SIZE (firefox-19.0.source.tar.bz2) = 98837382 +SHA256 (firefox-20.0b1.source.tar.bz2) = 53c83d8127c8af5a3c19e2b04f8241d1fa373f702ee1c7d38743d8281a843880 +SIZE (firefox-20.0b1.source.tar.bz2) = 99995547 Deleted: trunk/www/firefox/files/patch-alsapulse ============================================================================== --- trunk/www/firefox/files/patch-alsapulse Sat Feb 23 21:08:10 2013 (r1182) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,122 +0,0 @@ -diff --git configure.in configure.in -index 5980b76..11f5f77 100644 ---- configure.in -+++ configure.in -@@ -5618,11 +5618,25 @@ dnl ======================================================== - - dnl If using sydneyaudio with Linux, ensure that the alsa library is available - if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then -+ MOZ_ALSA=1 -+fi -+ -+MOZ_ARG_ENABLE_BOOL(alsa, -+[ --enable-alsa Enable Alsa support (default on Linux)], -+MOZ_ALSA=1, -+MOZ_ALSA=) -+ -+if test -n "$MOZ_ALSA"; then -+ AC_DEFINE(MOZ_CUBEB) - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , - [echo "$MOZ_ALSA_PKG_ERRORS" - AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) - fi - -+AC_SUBST(MOZ_ALSA) -+AC_SUBST(MOZ_ALSA_CFLAGS) -+AC_SUBST(MOZ_ALSA_LIBS) -+ - dnl ======================================================== - dnl = Enable PulseAudio - dnl ======================================================== -@@ -8633,8 +8647,6 @@ AC_SUBST(MOZ_VP8_ERROR_CONCEALMENT) - AC_SUBST(MOZ_VP8_ENCODER) - AC_SUBST(MOZ_VP8) - AC_SUBST(MOZ_OGG) --AC_SUBST(MOZ_ALSA_LIBS) --AC_SUBST(MOZ_ALSA_CFLAGS) - AC_SUBST(VPX_AS) - AC_SUBST(VPX_ASFLAGS) - AC_SUBST(VPX_DASH_C_FLAG) -diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in -index 5ab4dd8..c8df26f 100644 ---- media/libcubeb/src/Makefile.in -+++ media/libcubeb/src/Makefile.in -@@ -24,10 +24,6 @@ endif - - ifeq ($(OS_TARGET),Android) - # No Android implementation of libcubeb yet. --else ifeq ($(OS_TARGET),Linux) --CSRCS = \ -- cubeb_alsa.c \ -- $(NULL) - endif - - ifeq ($(OS_TARGET),Darwin) -@@ -42,6 +38,12 @@ CSRCS = \ - $(NULL) - endif - -+ifdef MOZ_ALSA -+CSRCS = \ -+ cubeb_alsa.c \ -+ $(NULL) -+endif -+ - ifdef MOZ_PULSEAUDIO - CSRCS = \ - cubeb_pulse.c \ -diff --git media/libsydneyaudio/src/Makefile.in media/libsydneyaudio/src/Makefile.in -index 8dda8ce..b19641d 100644 ---- media/libsydneyaudio/src/Makefile.in -+++ media/libsydneyaudio/src/Makefile.in -@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) - CSRCS = \ - sydney_audio_android.c \ - $(NULL) --else ifeq ($(OS_ARCH),Linux) --CSRCS = \ -- sydney_audio_alsa.c \ -- $(NULL) - endif - - ifeq ($(OS_ARCH),WINNT) -@@ -68,6 +64,18 @@ CSRCS = \ - $(NULL) - endif - -+ifdef MOZ_ALSA -+CSRCS = \ -+ sydney_audio_alsa.c \ -+ $(NULL) -+endif -+ -+ifdef MOZ_PULSEAUDIO -+CSRCS = \ -+ sydney_audio_pulseaudio.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),WINNT) - OS_LIBS += winmm.lib - endif -diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in -index 43384e9..e46a6e3 100644 ---- toolkit/library/Makefile.in -+++ toolkit/library/Makefile.in -@@ -370,14 +370,11 @@ endif - - EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) - --ifdef MOZ_SYDNEYAUDIO --ifeq ($(OS_ARCH),Linux) -+ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) -+ifdef MOZ_ALSA - EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) - endif --endif -- - ifdef MOZ_PULSEAUDIO --ifdef MOZ_CUBEB - EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) - endif - endif Modified: trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Sat Feb 23 16:09:06 2013 (r1182) +++ trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Sat Feb 23 21:08:10 2013 (r1183) @@ -1,10 +1,10 @@ --- browser/app/nsBrowserApp.cpp~ +++ browser/app/nsBrowserApp.cpp -@@ -197,6 +197,7 @@ int main(int argc, char* argv[]) +@@ -334,6 +334,7 @@ int main(int argc, char* argv[]) TriggerQuirks(); #endif + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); - nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); - if (NS_FAILED(rv)) { - Output("Couldn't calculate the application directory.\n"); + int gotCounters; + #if defined(XP_UNIX) + struct rusage initialRUsage; Added: trunk/www/firefox/files/patch-bug780432 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug780432 Sat Feb 23 21:08:10 2013 (r1183) @@ -0,0 +1,17 @@ +diff --git media/libsydneyaudio/src/Makefile.in media/libsydneyaudio/src/Makefile.in +index 8dda8ce..b19641d 100644 +--- media/libsydneyaudio/src/Makefile.in ++++ media/libsydneyaudio/src/Makefile.in +@@ -68,6 +68,12 @@ ifdef MOZ_ALSA + $(NULL) + endif + ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif Deleted: trunk/www/firefox/files/patch-bug787804 ============================================================================== --- trunk/www/firefox/files/patch-bug787804 Sat Feb 23 21:08:10 2013 (r1182) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,3557 +0,0 @@ -commit 74997f1 -Author: Jan Varga -Date: Mon Dec 17 20:25:10 2012 +0100 - - Bug 787804 - Rewrite quota handling (eliminate test_quota.c). r=bent,asuth,vladan ---- - db/sqlite3/README.MOZILLA | 4 +- - db/sqlite3/src/sqlite.def | 1 + - db/sqlite3/src/test_quota.c | 2001 -------------------- - db/sqlite3/src/test_quota.h | 274 --- - dom/Makefile.in | 1 + - dom/dom-config.mk | 1 + - dom/file/FileStreamWrappers.cpp | 11 - - dom/file/LockedFile.cpp | 8 +- - dom/file/nsIFileStorage.h | 40 +- - dom/indexedDB/FileManager.cpp | 33 +- - dom/indexedDB/FileManager.h | 20 +- - dom/indexedDB/FileStream.cpp | 321 ---- - dom/indexedDB/FileStream.h | 140 -- - dom/indexedDB/IDBDatabase.cpp | 6 + - dom/indexedDB/IDBFactory.cpp | 28 +- - dom/indexedDB/IDBFactory.h | 8 +- - dom/indexedDB/IDBFileHandle.cpp | 25 +- - dom/indexedDB/IDBObjectStore.cpp | 10 +- - dom/indexedDB/IDBTransaction.cpp | 3 +- - dom/indexedDB/IndexedDatabaseInlines.h | 13 + - dom/indexedDB/IndexedDatabaseManager.cpp | 162 +- - dom/indexedDB/IndexedDatabaseManager.h | 11 +- - dom/indexedDB/Makefile.in | 2 - - dom/indexedDB/OpenDatabaseHelper.cpp | 104 +- - dom/indexedDB/OpenDatabaseHelper.h | 12 +- - dom/indexedDB/nsIStandardFileStream.idl | 60 - - dom/indexedDB/test/Makefile.in | 2 + - dom/indexedDB/test/file.js | 21 +- - dom/indexedDB/test/test_file_quota.html | 14 +- - dom/indexedDB/test/test_filehandle_quota.html | 5 +- - dom/quota/FileStreams.cpp | 123 ++ - dom/quota/FileStreams.h | 115 ++ - dom/quota/Makefile.in | 33 + - dom/quota/QuotaCommon.h | 23 + - dom/quota/QuotaManager.cpp | 294 +++ - dom/quota/QuotaManager.h | 147 ++ - layout/build/Makefile.in | 1 + - netwerk/base/src/Makefile.in | 1 + - netwerk/base/src/nsFileStreams.cpp | 103 +- - netwerk/base/src/nsFileStreams.h | 12 +- - storage/public/Makefile.in | 1 - - storage/public/mozIStorageService.idl | 13 +- - .../public/mozIStorageServiceQuotaManagement.idl | 99 - - storage/public/storage.h | 1 - - storage/src/TelemetryVFS.cpp | 35 +- - storage/src/mozStorageConnection.cpp | 85 +- - storage/src/mozStorageConnection.h | 27 +- - storage/src/mozStorageService.cpp | 168 +- - storage/src/mozStorageService.h | 3 - - toolkit/toolkit-makefiles.sh | 1 + - 50 files changed, 1239 insertions(+), 3387 deletions(-) - -diff --git dom/Makefile.in dom/Makefile.in -index 672e065..47cd253 100644 ---- dom/Makefile.in -+++ dom/Makefile.in -@@ -58,6 +58,7 @@ PARALLEL_DIRS += \ - media \ - messages \ - power \ -+ quota \ - settings \ - sms \ - mms \ -diff --git dom/dom-config.mk dom/dom-config.mk -index d0f46cc..1cf57ed 100644 ---- dom/dom-config.mk -+++ dom/dom-config.mk -@@ -8,6 +8,7 @@ DOM_SRCDIRS = \ - dom/encoding \ - dom/file \ - dom/power \ -+ dom/quota \ - dom/media \ - dom/network/src \ - dom/settings \ -diff --git dom/file/FileStreamWrappers.cpp dom/file/FileStreamWrappers.cpp -index 2283266..c4cf102 100644 ---- dom/file/FileStreamWrappers.cpp -+++ dom/file/FileStreamWrappers.cpp -@@ -8,7 +8,6 @@ - - #include "nsIFileStorage.h" - #include "nsISeekableStream.h" --#include "nsIStandardFileStream.h" - #include "mozilla/Attributes.h" - - #include "FileHelper.h" -@@ -246,16 +245,6 @@ FileOutputStreamWrapper::Close() - nsresult rv = NS_OK; - - if (!mFirstTime) { -- // We must flush buffers of the stream on the same thread on which we wrote -- // some data. -- nsCOMPtr sstream = do_QueryInterface(mFileStream); -- if (sstream) { -- rv = sstream->FlushBuffers(); -- if (NS_FAILED(rv)) { -- NS_WARNING("Failed to flush buffers of the stream!"); -- } -- } -- - NS_ASSERTION(PR_GetCurrentThread() == mWriteThread, - "Unsetting thread locals on wrong thread!"); - mFileHelper->mFileStorage->UnsetThreadLocals(); -diff --git dom/file/LockedFile.cpp dom/file/LockedFile.cpp -index 0fca730..926df91 100644 ---- dom/file/LockedFile.cpp -+++ dom/file/LockedFile.cpp -@@ -953,10 +953,10 @@ FinishHelper::Run() - } - - for (uint32_t index = 0; index < mParallelStreams.Length(); index++) { -- nsCOMPtr ostream = -+ nsCOMPtr stream = - do_QueryInterface(mParallelStreams[index]); - -- if (NS_FAILED(ostream->Close())) { -+ if (NS_FAILED(stream->Close())) { - NS_WARNING("Failed to close stream!"); - } - -@@ -964,9 +964,9 @@ FinishHelper::Run() - } - - if (mStream) { -- nsCOMPtr ostream = do_QueryInterface(mStream); -+ nsCOMPtr stream = do_QueryInterface(mStream); - -- if (NS_FAILED(ostream->Close())) { -+ if (NS_FAILED(stream->Close())) { - NS_WARNING("Failed to close stream!"); - } - -diff --git dom/file/nsIFileStorage.h dom/file/nsIFileStorage.h -index 92bb608..e985f0a 100644 ---- dom/file/nsIFileStorage.h -+++ dom/file/nsIFileStorage.h -@@ -10,14 +10,17 @@ - #include "nsISupports.h" - - #define NS_FILESTORAGE_IID \ -- {0xbba9c2ff, 0x85c9, 0x47c1, \ -- { 0xaf, 0xce, 0x0a, 0x7e, 0x6f, 0x21, 0x50, 0x95 } } -+ {0xa0801944, 0x2f1c, 0x4203, \ -+ { 0x9c, 0xaa, 0xaa, 0x47, 0xe0, 0x0c, 0x67, 0x92 } } - - class nsIFileStorage : public nsISupports - { - public: - NS_DECLARE_STATIC_IID_ACCESSOR(NS_FILESTORAGE_IID) - -+ virtual const nsACString& -+ StorageOrigin() = 0; -+ - virtual nsISupports* - StorageId() = 0; - -@@ -36,20 +39,23 @@ public: - - NS_DEFINE_STATIC_IID_ACCESSOR(nsIFileStorage, NS_FILESTORAGE_IID) - --#define NS_DECL_NSIFILESTORAGE \ -- virtual nsISupports* \ -- StorageId(); \ -- \ -- virtual bool \ -- IsStorageInvalidated(); \ -- \ -- virtual bool \ -- IsStorageShuttingDown(); \ -- \ -- virtual void \ -- SetThreadLocals(); \ -- \ -- virtual void \ -- UnsetThreadLocals(); -+#define NS_DECL_NSIFILESTORAGE \ -+ virtual const nsACString& \ -+ StorageOrigin() MOZ_OVERRIDE; \ -+ \ -+ virtual nsISupports* \ -+ StorageId() MOZ_OVERRIDE; \ -+ \ -+ virtual bool \ -+ IsStorageInvalidated() MOZ_OVERRIDE; \ -+ \ -+ virtual bool \ -+ IsStorageShuttingDown() MOZ_OVERRIDE; \ -+ \ -+ virtual void \ -+ SetThreadLocals() MOZ_OVERRIDE; \ -+ \ -+ virtual void \ -+ UnsetThreadLocals() MOZ_OVERRIDE; - - #endif // nsIFileStorage_h__ -diff --git dom/indexedDB/FileManager.cpp dom/indexedDB/FileManager.cpp -index 9db56e8..4ed6e9e 100644 ---- dom/indexedDB/FileManager.cpp -+++ dom/indexedDB/FileManager.cpp -@@ -7,8 +7,8 @@ - #include "FileManager.h" - - #include "mozIStorageConnection.h" --#include "mozIStorageServiceQuotaManagement.h" - #include "mozIStorageStatement.h" -+#include "nsIInputStream.h" - #include "nsISimpleEnumerator.h" - - #include "mozStorageCID.h" -@@ -18,6 +18,8 @@ - #include "IndexedDatabaseManager.h" - #include "OpenDatabaseHelper.h" - -+#include "IndexedDatabaseInlines.h" -+ - #define JOURNAL_DIRECTORY_NAME "journals" - - USING_INDEXEDDB_NAMESPACE -@@ -262,13 +264,11 @@ FileManager::GetFileForId(nsIFile* aDirectory, int64_t aId) - - // static - nsresult --FileManager::InitDirectory(mozIStorageServiceQuotaManagement* aService, -- nsIFile* aDirectory, -+FileManager::InitDirectory(nsIFile* aDirectory, - nsIFile* aDatabaseFile, -- FactoryPrivilege aPrivilege) -+ const nsACString& aOrigin) - { - NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!"); -- NS_ASSERTION(aService, "Null service!"); - NS_ASSERTION(aDirectory, "Null directory!"); - NS_ASSERTION(aDatabaseFile, "Null database file!"); - -@@ -310,8 +310,8 @@ FileManager::InitDirectory(mozIStorageServiceQuotaManagement* aService, - - if (hasElements) { - nsCOMPtr connection; -- rv = OpenDatabaseHelper::CreateDatabaseConnection( -- NullString(), aDatabaseFile, aDirectory, getter_AddRefs(connection)); -+ rv = OpenDatabaseHelper::CreateDatabaseConnection(aDatabaseFile, -+ aDirectory, NullString(), aOrigin, getter_AddRefs(connection)); - NS_ENSURE_SUCCESS(rv, rv); - - mozStorageTransaction transaction(connection, false); -@@ -377,12 +377,17 @@ FileManager::InitDirectory(mozIStorageServiceQuotaManagement* aService, - } - } - -- if (aPrivilege == Chrome) { -- return NS_OK; -- } -+ return NS_OK; -+} -+ -+// static -+nsresult -+FileManager::GetUsage(nsIFile* aDirectory, uint64_t* aUsage) -+{ -+ uint64_t usage = 0; - - nsCOMPtr entries; -- rv = aDirectory->GetDirectoryEntries(getter_AddRefs(entries)); -+ nsresult rv = aDirectory->GetDirectoryEntries(getter_AddRefs(entries)); - NS_ENSURE_SUCCESS(rv, rv); - - bool hasMore; -@@ -402,9 +407,13 @@ FileManager::InitDirectory(mozIStorageServiceQuotaManagement* aService, - continue; - } - -- rv = aService->UpdateQuotaInformationForFile(file); -+ int64_t fileSize; -+ rv = file->GetFileSize(&fileSize); - NS_ENSURE_SUCCESS(rv, rv); -+ -+ IncrementUsage(&usage, uint64_t(fileSize)); - } - -+ *aUsage = usage; - return NS_OK; - } -diff --git dom/indexedDB/FileManager.h dom/indexedDB/FileManager.h -index 2c72d0a..370d4a8 100644 ---- dom/indexedDB/FileManager.h -+++ dom/indexedDB/FileManager.h -@@ -24,10 +24,10 @@ class FileManager - friend class FileInfo; - - public: -- FileManager(const nsACString& aOrigin, -+ FileManager(const nsACString& aOrigin, FactoryPrivilege aPrivilege, - const nsAString& aDatabaseName) -- : mOrigin(aOrigin), mDatabaseName(aDatabaseName), mLastFileId(0), -- mInvalidated(false) -+ : mOrigin(aOrigin), mPrivilege(aPrivilege), mDatabaseName(aDatabaseName), -+ mLastFileId(0), mInvalidated(false) - { } - - ~FileManager() -@@ -40,6 +40,11 @@ public: - return mOrigin; - } - -+ const FactoryPrivilege& Privilege() const -+ { -+ return mPrivilege; -+ } -+ - const nsAString& DatabaseName() const - { - return mDatabaseName; -@@ -68,12 +73,15 @@ public: - static already_AddRefed GetFileForId(nsIFile* aDirectory, - int64_t aId); - -- static nsresult InitDirectory(mozIStorageServiceQuotaManagement* aService, -- nsIFile* aDirectory, nsIFile* aDatabaseFile, -- FactoryPrivilege aPrivilege); -+ static nsresult InitDirectory(nsIFile* aDirectory, -+ nsIFile* aDatabaseFile, -+ const nsACString& aOrigin); -+ -+ static nsresult GetUsage(nsIFile* aDirectory, uint64_t* aUsage); - - private: - nsCString mOrigin; -+ FactoryPrivilege mPrivilege; - nsString mDatabaseName; - - nsString mDirectoryPath; -diff --git dom/indexedDB/FileStream.cpp dom/indexedDB/FileStream.cpp -deleted file mode 100644 -index dddf5d5..0000000 ---- dom/indexedDB/FileStream.cpp -+++ /dev/null -@@ -1,321 +0,0 @@ --/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* vim: set ts=2 et sw=2 tw=80: */ --/* This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this file, -- * You can obtain one at http://mozilla.org/MPL/2.0/. */ -- --#include "FileStream.h" -- --#include "nsIFile.h" -- --#include "nsThreadUtils.h" --#include "test_quota.h" -- --USING_INDEXEDDB_NAMESPACE -- --NS_IMPL_THREADSAFE_ADDREF(FileStream) --NS_IMPL_THREADSAFE_RELEASE(FileStream) -- --NS_INTERFACE_MAP_BEGIN(FileStream) -- NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStandardFileStream) -- NS_INTERFACE_MAP_ENTRY(nsISeekableStream) -- NS_INTERFACE_MAP_ENTRY(nsIInputStream) -- NS_INTERFACE_MAP_ENTRY(nsIOutputStream) -- NS_INTERFACE_MAP_ENTRY(nsIStandardFileStream) -- NS_INTERFACE_MAP_ENTRY(nsIFileMetadata) --NS_INTERFACE_MAP_END -- --NS_IMETHODIMP --FileStream::Seek(int32_t aWhence, int64_t aOffset) --{ -- // TODO: Add support for 64 bit file sizes, bug 752431 -- NS_ENSURE_TRUE(aOffset <= INT32_MAX, NS_ERROR_INVALID_ARG); -- -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mQuotaFile) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- int whence; -- switch (aWhence) { -- case nsISeekableStream::NS_SEEK_SET: -- whence = SEEK_SET; -- break; -- case nsISeekableStream::NS_SEEK_CUR: -- whence = SEEK_CUR; -- break; -- case nsISeekableStream::NS_SEEK_END: -- whence = SEEK_END; -- break; -- default: -- return NS_ERROR_INVALID_ARG; -- } -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- int rc = sqlite3_quota_fseek(mQuotaFile, aOffset, whence); -- NS_ENSURE_TRUE(rc == 0, NS_BASE_STREAM_OSERROR); -- -- return NS_OK; --} -- --NS_IMETHODIMP --FileStream::Tell(int64_t* aResult) --{ -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mQuotaFile) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- long rc = sqlite3_quota_ftell(mQuotaFile); -- NS_ENSURE_TRUE(rc >= 0, NS_BASE_STREAM_OSERROR); -- -- *aResult = rc; -- return NS_OK; --} -- --NS_IMETHODIMP --FileStream::SetEOF() --{ -- int64_t pos; -- nsresult rv = Tell(&pos); -- NS_ENSURE_SUCCESS(rv, rv); -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- int rc = sqlite3_quota_ftruncate(mQuotaFile, pos); -- NS_ENSURE_TRUE(rc == 0, NS_BASE_STREAM_OSERROR); -- -- return NS_OK; --} -- -- --NS_IMETHODIMP --FileStream::Close() --{ -- CleanUpOpen(); -- -- if (mQuotaFile) { -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- int rc = sqlite3_quota_fclose(mQuotaFile); -- mQuotaFile = nullptr; -- -- NS_ENSURE_TRUE(rc == 0, NS_BASE_STREAM_OSERROR); -- } -- -- return NS_OK; --} -- --NS_IMETHODIMP --FileStream::Available(uint64_t* aResult) --{ -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mQuotaFile) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- long rc = sqlite3_quota_file_available(mQuotaFile); -- NS_ENSURE_TRUE(rc >= 0, NS_BASE_STREAM_OSERROR); -- -- *aResult = rc; -- return NS_OK; --} -- --NS_IMETHODIMP --FileStream::Read(char* aBuf, uint32_t aCount, uint32_t* aResult) --{ -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mQuotaFile) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- size_t bytesRead = sqlite3_quota_fread(aBuf, 1, aCount, mQuotaFile); -- if (bytesRead < aCount && sqlite3_quota_ferror(mQuotaFile)) { -- return NS_BASE_STREAM_OSERROR; -- } -- -- *aResult = bytesRead; -- return NS_OK; --} -- --NS_IMETHODIMP --FileStream::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure, -- uint32_t aCount, uint32_t* aResult) --{ -- NS_NOTREACHED("Don't call me!"); -- return NS_ERROR_NOT_IMPLEMENTED; --} -- --NS_IMETHODIMP --FileStream::IsNonBlocking(bool *aNonBlocking) --{ -- *aNonBlocking = false; -- return NS_OK; --} -- --NS_IMETHODIMP --FileStream::Write(const char* aBuf, uint32_t aCount, uint32_t *aResult) --{ -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mQuotaFile) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- size_t bytesWritten = sqlite3_quota_fwrite(aBuf, 1, aCount, mQuotaFile); -- if (bytesWritten < aCount) { -- return NS_BASE_STREAM_OSERROR; -- } -- -- *aResult = bytesWritten; -- return NS_OK; --} -- --NS_IMETHODIMP --FileStream::Flush() --{ -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mQuotaFile) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- int rc = sqlite3_quota_fflush(mQuotaFile, 1); -- NS_ENSURE_TRUE(rc == 0, NS_BASE_STREAM_OSERROR); -- -- return NS_OK; --} -- --NS_IMETHODIMP --FileStream::WriteFrom(nsIInputStream *inStr, uint32_t count, uint32_t *_retval) --{ -- return NS_ERROR_NOT_IMPLEMENTED; --} -- --NS_IMETHODIMP --FileStream::WriteSegments(nsReadSegmentFun reader, void * closure, uint32_t count, uint32_t *_retval) --{ -- NS_NOTREACHED("Don't call me!"); -- return NS_ERROR_NOT_IMPLEMENTED; --} -- --NS_IMETHODIMP --FileStream::Init(nsIFile* aFile, const nsAString& aMode, int32_t aFlags) --{ -- NS_ASSERTION(!mQuotaFile && !mDeferredOpen, "Already initialized!"); -- -- nsresult rv = aFile->GetPath(mFilePath); -- NS_ENSURE_SUCCESS(rv, rv); -- -- mMode = aMode; -- mFlags = aFlags; -- -- if (mFlags & nsIStandardFileStream::FLAGS_DEFER_OPEN) { -- mDeferredOpen = true; -- return NS_OK; -- } -- -- return DoOpen(); --} -- --NS_IMETHODIMP --FileStream::GetSize(int64_t* _retval) --{ -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mQuotaFile) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- // TODO: Use sqlite3_quota_file_size() here, bug 760783 -- int64_t rc = sqlite3_quota_file_truesize(mQuotaFile); -- -- NS_ASSERTION(rc >= 0, "The file is not under quota management!"); -- -- *_retval = rc; -- return NS_OK; --} -- --NS_IMETHODIMP --FileStream::GetLastModified(int64_t* _retval) --{ -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mQuotaFile) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- time_t mtime; -- int rc = sqlite3_quota_file_mtime(mQuotaFile, &mtime); -- NS_ENSURE_TRUE(rc == 0, NS_BASE_STREAM_OSERROR); -- -- *_retval = mtime * PR_MSEC_PER_SEC; -- return NS_OK; --} -- --NS_IMETHODIMP --FileStream::FlushBuffers() --{ -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mQuotaFile) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- int rc = sqlite3_quota_fflush(mQuotaFile, 0); -- NS_ENSURE_TRUE(rc == 0, NS_BASE_STREAM_OSERROR); -- -- return NS_OK; --} -- --nsresult --FileStream::DoOpen() --{ -- NS_ASSERTION(!mFilePath.IsEmpty(), "Must have a file path"); -- -- NS_ASSERTION(!NS_IsMainThread(), "Performing sync IO on the main thread!"); -- -- quota_FILE* quotaFile = -- sqlite3_quota_fopen(NS_ConvertUTF16toUTF8(mFilePath).get(), -- NS_ConvertUTF16toUTF8(mMode).get()); -- -- CleanUpOpen(); -- -- if (!quotaFile) { -- return NS_BASE_STREAM_OSERROR; -- } -- -- mQuotaFile = quotaFile; -- -- return NS_OK; --} -diff --git dom/indexedDB/FileStream.h dom/indexedDB/FileStream.h -deleted file mode 100644 -index 09648b1..0000000 ---- dom/indexedDB/FileStream.h -+++ /dev/null -@@ -1,140 +0,0 @@ --/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* vim: set ts=2 et sw=2 tw=80: */ --/* This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this file, -- * You can obtain one at http://mozilla.org/MPL/2.0/. */ -- --#ifndef mozilla_dom_indexeddb_filestream_h__ --#define mozilla_dom_indexeddb_filestream_h__ -- --#include "IndexedDatabase.h" -- --#include "nsIFileStreams.h" --#include "nsIInputStream.h" --#include "nsIOutputStream.h" --#include "nsISeekableStream.h" --#include "nsIStandardFileStream.h" -- --class nsIFile; --struct quota_FILE; -- --BEGIN_INDEXEDDB_NAMESPACE -- --class FileStream : public nsISeekableStream, -- public nsIInputStream, -- public nsIOutputStream, -- public nsIStandardFileStream, -- public nsIFileMetadata --{ --public: -- FileStream() -- : mFlags(0), -- mDeferredOpen(false), -- mQuotaFile(nullptr) -- { } -- -- virtual ~FileStream() -- { -- Close(); -- } -- -- NS_DECL_ISUPPORTS -- NS_DECL_NSISEEKABLESTREAM -- NS_DECL_NSISTANDARDFILESTREAM -- NS_DECL_NSIFILEMETADATA -- -- // nsIInputStream -- NS_IMETHOD -- Close(); -- -- NS_IMETHOD -- Available(uint64_t* _retval); -- -- NS_IMETHOD -- Read(char* aBuf, uint32_t aCount, uint32_t* _retval); -- -- NS_IMETHOD -- ReadSegments(nsWriteSegmentFun aWriter, void* aClosure, uint32_t aCount, -- uint32_t* _retval); -- -- NS_IMETHOD -- IsNonBlocking(bool* _retval); -- -- // nsIOutputStream -- -- // Close() already declared -- -- NS_IMETHOD -- Flush(); -- -- NS_IMETHOD -- Write(const char* aBuf, uint32_t aCount, uint32_t* _retval); -- -- NS_IMETHOD -- WriteFrom(nsIInputStream* aFromStream, uint32_t aCount, uint32_t* _retval); -- -- NS_IMETHOD -- WriteSegments(nsReadSegmentFun aReader, void* aClosure, uint32_t aCount, -- uint32_t* _retval); -- -- // IsNonBlocking() already declared -- --protected: -- /** -- * Cleans up data prepared in Init. -- */ -- void -- CleanUpOpen() -- { -- mFilePath.Truncate(); -- mDeferredOpen = false; -- } -- -- /** -- * Open the file. This is called either from Init -- * or from DoPendingOpen (if FLAGS_DEFER_OPEN is used when initializing this -- * stream). The default behavior of DoOpen is to open the file and save the -- * file descriptor. -- */ -- virtual nsresult -- DoOpen(); -- -- /** -- * If there is a pending open, do it now. It's important for this to be -- * inlined since we do it in almost every stream API call. -- */ -- nsresult -- DoPendingOpen() -- { -- if (!mDeferredOpen) { -- return NS_OK; -- } -- -- return DoOpen(); -- } -- -- /** -- * Data we need to do an open. -- */ -- nsString mFilePath; -- nsString mMode; -- -- /** -- * Flags describing our behavior. See the IDL file for possible values. -- */ -- int32_t mFlags; -- -- /** -- * Whether we have a pending open (see FLAGS_DEFER_OPEN in the IDL file). -- */ -- bool mDeferredOpen; -- -- /** -- * File descriptor for opened file. -- */ -- quota_FILE* mQuotaFile; --}; -- --END_INDEXEDDB_NAMESPACE -- --#endif // mozilla_dom_indexeddb_filestream_h__ -diff --git dom/indexedDB/IDBDatabase.cpp dom/indexedDB/IDBDatabase.cpp -index 63500b0..8842daf 100644 ---- dom/indexedDB/IDBDatabase.cpp -+++ dom/indexedDB/IDBDatabase.cpp -@@ -779,6 +779,12 @@ IDBDatabase::Close() - return NS_OK; - } - -+const nsACString& -+IDBDatabase::StorageOrigin() -+{ -+ return Origin(); -+} -+ - nsISupports* - IDBDatabase::StorageId() - { -diff --git dom/indexedDB/IDBFactory.cpp dom/indexedDB/IDBFactory.cpp -index 1007df1..c1f573e 100644 ---- dom/indexedDB/IDBFactory.cpp -+++ dom/indexedDB/IDBFactory.cpp -@@ -253,8 +253,26 @@ IDBFactory::Create(ContentParent* aContentParent, - } - - // static -+already_AddRefed -+IDBFactory::GetDatabaseFileURL(nsIFile* aDatabaseFile, const nsACString& aOrigin) -+{ -+ nsCOMPtr uri; -+ nsresult rv = NS_NewFileURI(getter_AddRefs(uri), aDatabaseFile); -+ NS_ENSURE_SUCCESS(rv, nullptr); -+ -+ nsCOMPtr fileUrl = do_QueryInterface(uri); -+ NS_ASSERTION(fileUrl, "This should always succeed!"); -+ -+ rv = fileUrl->SetQuery(NS_LITERAL_CSTRING("origin=") + aOrigin); -+ NS_ENSURE_SUCCESS(rv, nullptr); -+ -+ return fileUrl.forget(); -+} -+ -+// static - already_AddRefed --IDBFactory::GetConnection(const nsAString& aDatabaseFilePath) -+IDBFactory::GetConnection(const nsAString& aDatabaseFilePath, -+ const nsACString& aOrigin) - { - NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!"); - NS_ASSERTION(StringEndsWith(aDatabaseFilePath, NS_LITERAL_STRING(".sqlite")), -@@ -271,13 +289,15 @@ IDBFactory::GetConnection(const nsAString& aDatabaseFilePath) - NS_ENSURE_SUCCESS(rv, nullptr); - NS_ENSURE_TRUE(exists, nullptr); - -- nsCOMPtr ss = -+ nsCOMPtr dbFileUrl = GetDatabaseFileURL(dbFile, aOrigin); -+ NS_ENSURE_TRUE(dbFileUrl, nullptr); -+ -+ nsCOMPtr ss = - do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID); - NS_ENSURE_TRUE(ss, nullptr); - - nsCOMPtr connection; -- rv = ss->OpenDatabaseWithVFS(dbFile, NS_LITERAL_CSTRING("quota"), -- getter_AddRefs(connection)); -+ rv = ss->OpenDatabaseWithFileURL(dbFileUrl, getter_AddRefs(connection)); - NS_ENSURE_SUCCESS(rv, nullptr); - - // Turn on foreign key constraints and recursive triggers. -diff --git dom/indexedDB/IDBFactory.h dom/indexedDB/IDBFactory.h -index d5461f7..49dad42 100644 ---- dom/indexedDB/IDBFactory.h -+++ dom/indexedDB/IDBFactory.h -@@ -15,6 +15,8 @@ - #include "nsCycleCollectionParticipant.h" - - class nsIAtom; -+class nsIFile; -+class nsIFileURL; - class nsPIDOMWindow; - - namespace mozilla { -@@ -75,8 +77,12 @@ public: - static nsresult Create(ContentParent* aContentParent, - IDBFactory** aFactory); - -+ static already_AddRefed -+ GetDatabaseFileURL(nsIFile* aDatabaseFile, const nsACString& aOrigin); -+ - static already_AddRefed -- GetConnection(const nsAString& aDatabaseFilePath); -+ GetConnection(const nsAString& aDatabaseFilePath, -+ const nsACString& aOrigin); - - static nsresult - LoadDatabaseInformation(mozIStorageConnection* aConnection, -diff --git dom/indexedDB/IDBFileHandle.cpp dom/indexedDB/IDBFileHandle.cpp -index e0340ff..f71fd56 100644 ---- dom/indexedDB/IDBFileHandle.cpp -+++ dom/indexedDB/IDBFileHandle.cpp -@@ -6,15 +6,14 @@ - - #include "IDBFileHandle.h" - --#include "nsIStandardFileStream.h" -- - #include "mozilla/dom/file/File.h" -+#include "mozilla/dom/quota/FileStreams.h" - #include "nsDOMClassInfoID.h" - --#include "FileStream.h" - #include "IDBDatabase.h" - - USING_INDEXEDDB_NAMESPACE -+USING_QUOTA_NAMESPACE - - namespace { - -@@ -68,22 +67,22 @@ IDBFileHandle::Create(IDBDatabase* aDatabase, - already_AddRefed - IDBFileHandle::CreateStream(nsIFile* aFile, bool aReadOnly) - { -- nsRefPtr stream = new FileStream(); -+ const nsACString& origin = mFileStorage->StorageOrigin(); -+ -+ nsCOMPtr result; - -- nsString streamMode; - if (aReadOnly) { -- streamMode.AssignLiteral("rb"); -+ nsRefPtr stream = FileInputStream::Create( -+ origin, aFile, -1, -1, nsIFileInputStream::DEFER_OPEN); -+ result = NS_ISUPPORTS_CAST(nsIFileInputStream*, stream); - } - else { -- streamMode.AssignLiteral("r+b"); -+ nsRefPtr stream = FileStream::Create( -+ origin, aFile, -1, -1, nsIFileStream::DEFER_OPEN); -+ result = NS_ISUPPORTS_CAST(nsIFileStream*, stream); - } -+ NS_ENSURE_TRUE(result, nullptr); - -- nsresult rv = stream->Init(aFile, streamMode, -- nsIStandardFileStream::FLAGS_DEFER_OPEN); -- NS_ENSURE_SUCCESS(rv, nullptr); -- -- nsCOMPtr result = -- NS_ISUPPORTS_CAST(nsIStandardFileStream*, stream); - return result.forget(); - } - -diff --git dom/indexedDB/IDBObjectStore.cpp dom/indexedDB/IDBObjectStore.cpp -index 746d473..1f16d26 100644 ---- dom/indexedDB/IDBObjectStore.cpp -+++ dom/indexedDB/IDBObjectStore.cpp -@@ -17,6 +17,7 @@ - #include "mozilla/dom/ContentParent.h" - #include "mozilla/dom/StructuredCloneTags.h" - #include "mozilla/dom/ipc/Blob.h" -+#include "mozilla/dom/quota/FileStreams.h" - #include "mozilla/storage.h" - #include "nsContentUtils.h" - #include "nsDOMClassInfo.h" -@@ -27,10 +28,8 @@ - #include "nsServiceManagerUtils.h" - #include "nsThreadUtils.h" - #include "snappy/snappy.h" --#include "test_quota.h" - - #include "AsyncConnectionHelper.h" --#include "FileStream.h" - #include "IDBCursor.h" - #include "IDBEvents.h" - #include "IDBFileHandle.h" -@@ -51,6 +50,7 @@ - USING_INDEXEDDB_NAMESPACE - using namespace mozilla::dom; - using namespace mozilla::dom::indexedDB::ipc; -+using mozilla::dom::quota::FileOutputStream; - - namespace { - -@@ -2734,9 +2734,9 @@ AddHelper::DoDatabaseWork(mozIStorageConnection* aConnection) - nativeFile = fileManager->GetFileForId(directory, id); - NS_ENSURE_TRUE(nativeFile, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - -- nsRefPtr outputStream = new FileStream(); -- rv = outputStream->Init(nativeFile, NS_LITERAL_STRING("wb"), 0); -- NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); -+ nsRefPtr outputStream = FileOutputStream::Create( -+ mObjectStore->Transaction()->Database()->Origin(), nativeFile); -+ NS_ENSURE_TRUE(outputStream, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - - rv = CopyData(inputStream, outputStream); - NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); -diff --git dom/indexedDB/IDBTransaction.cpp dom/indexedDB/IDBTransaction.cpp -index fcef7cc..a5345e2 100644 ---- dom/indexedDB/IDBTransaction.cpp -+++ dom/indexedDB/IDBTransaction.cpp -@@ -352,7 +352,8 @@ IDBTransaction::GetOrCreateConnection(mozIStorageConnection** aResult) - - if (!mConnection) { - nsCOMPtr connection = -- IDBFactory::GetConnection(mDatabase->FilePath()); -+ IDBFactory::GetConnection(mDatabase->FilePath(), -+ mDatabase->Origin()); - NS_ENSURE_TRUE(connection, NS_ERROR_FAILURE); - - nsresult rv; -diff --git dom/indexedDB/IndexedDatabaseInlines.h dom/indexedDB/IndexedDatabaseInlines.h -index 62e65d6..f27d60c 100644 ---- dom/indexedDB/IndexedDatabaseInlines.h -+++ dom/indexedDB/IndexedDatabaseInlines.h -@@ -79,4 +79,17 @@ AppendConditionClause(const nsACString& aColumnName, - aResult += NS_LITERAL_CSTRING(" :") + aArgName; - } - -+inline void -+IncrementUsage(uint64_t* aUsage, uint64_t aDelta) -+{ -+ // Watch for overflow! -+ if ((UINT64_MAX - *aUsage) < aDelta) { -+ NS_WARNING("Usage exceeds the maximum!"); -+ *aUsage = UINT64_MAX; -+ } -+ else { -+ *aUsage += aDelta; -+ } -+} -+ - END_INDEXEDDB_NAMESPACE -diff --git dom/indexedDB/IndexedDatabaseManager.cpp dom/indexedDB/IndexedDatabaseManager.cpp -index e4ad647..88f09da 100644 ---- dom/indexedDB/IndexedDatabaseManager.cpp -+++ dom/indexedDB/IndexedDatabaseManager.cpp -@@ -22,6 +22,7 @@ - #include "nsITimer.h" - - #include "mozilla/dom/file/FileService.h" -+#include "mozilla/dom/quota/QuotaManager.h" - #include "mozilla/dom/TabContext.h" - #include "mozilla/LazyIdleThread.h" - #include "mozilla/Preferences.h" -@@ -36,7 +37,6 @@ - #include "nsThreadUtils.h" - #include "nsXPCOM.h" - #include "nsXPCOMPrivate.h" --#include "test_quota.h" - #include "xpcpublic.h" - - #include "AsyncConnectionHelper.h" -@@ -48,6 +48,8 @@ - #include "OpenDatabaseHelper.h" - #include "TransactionThreadPool.h" - -+#include "IndexedDatabaseInlines.h" -+ - // The amount of time, in milliseconds, that our IO thread will stay alive - // after the last event it processes. - #define DEFAULT_THREAD_TIMEOUT_MS 30000 -@@ -70,6 +72,7 @@ using namespace mozilla::services; - using namespace mozilla::dom; - using mozilla::Preferences; - using mozilla::dom::file::FileService; -+using mozilla::dom::quota::QuotaManager; - - static NS_DEFINE_CID(kDOMSOF_CID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID); - -@@ -103,29 +106,6 @@ GetDatabaseBaseFilename(const nsAString& aFilename, - return true; - } - --class QuotaCallback MOZ_FINAL : public mozIStorageQuotaCallback --{ --public: -- NS_DECL_ISUPPORTS -- -- NS_IMETHOD -- QuotaExceeded(const nsACString& aFilename, -- int64_t aCurrentSizeLimit, -- int64_t aCurrentTotalSize, -- nsISupports* aUserData, -- int64_t* _retval) -- { -- if (IndexedDatabaseManager::QuotaIsLifted()) { -- *_retval = 0; -- return NS_OK; -- } -- -- return NS_ERROR_FAILURE; -- } --}; -- --NS_IMPL_THREADSAFE_ISUPPORTS1(QuotaCallback, mozIStorageQuotaCallback) -- - // Adds all databases in the hash to the given array. - template - PLDHashOperator -@@ -440,8 +420,8 @@ IndexedDatabaseManager::GetOrCreate() - NS_LITERAL_CSTRING("IndexedDB I/O"), - LazyIdleThread::ManualShutdown); - -- // We need one quota callback object to hand to SQLite. -- instance->mQuotaCallbackSingleton = new QuotaCallback(); -+ // Make sure that the quota manager is up. -+ NS_ENSURE_TRUE(QuotaManager::GetOrCreate(), nullptr); - - // Make a timer here to avoid potential failures later. We don't actually - // initialize the timer until shutdown. -@@ -996,37 +976,15 @@ IndexedDatabaseManager::EnsureOriginIsInitialized(const nsACString& aOrigin, - return NS_OK; - } - -- // First figure out the filename pattern we'll use. -- nsCOMPtr patternFile; -- rv = directory->Clone(getter_AddRefs(patternFile)); -- NS_ENSURE_SUCCESS(rv, rv); -- -- rv = patternFile->Append(NS_LITERAL_STRING("*")); -- NS_ENSURE_SUCCESS(rv, rv); -- -- nsString pattern; -- rv = patternFile->GetPath(pattern); -- NS_ENSURE_SUCCESS(rv, rv); -- -- // Now tell SQLite to start tracking this pattern for content. -- nsCOMPtr ss = -- do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID); -- NS_ENSURE_TRUE(ss, NS_ERROR_FAILURE); -- -- if (aPrivilege != Chrome) { -- rv = ss->SetQuotaForFilenamePattern(NS_ConvertUTF16toUTF8(pattern), -- GetIndexedDBQuotaMB() * 1024 * 1024, -- mQuotaCallbackSingleton, nullptr); -- NS_ENSURE_SUCCESS(rv, rv); -- } -- - // We need to see if there are any files in the directory already. If they - // are database files then we need to cleanup stored files (if it's needed) -- // and also tell SQLite about all of them. -+ // and also initialize the quota. - - nsAutoTArray subdirsToProcess; - nsAutoTArray , 20> unknownFiles; - -+ uint64_t usage = 0; -+ - nsTHashtable validSubdirs; - validSubdirs.Init(20); - -@@ -1068,20 +1026,28 @@ IndexedDatabaseManager::EnsureOriginIsInitialized(const nsACString& aOrigin, - continue; - } - -- nsCOMPtr fileManagerDirectory; -- rv = directory->Clone(getter_AddRefs(fileManagerDirectory)); -+ nsCOMPtr fmDirectory; -+ rv = directory->Clone(getter_AddRefs(fmDirectory)); - NS_ENSURE_SUCCESS(rv, rv); - -- rv = fileManagerDirectory->Append(dbBaseFilename); -+ rv = fmDirectory->Append(dbBaseFilename); - NS_ENSURE_SUCCESS(rv, rv); - -- rv = FileManager::InitDirectory(ss, fileManagerDirectory, file, -- aPrivilege); -+ rv = FileManager::InitDirectory(fmDirectory, file, aOrigin); - NS_ENSURE_SUCCESS(rv, rv); - - if (aPrivilege != Chrome) { -- rv = ss->UpdateQuotaInformationForFile(file); -+ uint64_t fileUsage; -+ rv = FileManager::GetUsage(fmDirectory, &fileUsage); - NS_ENSURE_SUCCESS(rv, rv); -+ -+ IncrementUsage(&usage, fileUsage); -+ -+ int64_t fileSize; -+ rv = file->GetFileSize(&fileSize); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ IncrementUsage(&usage, uint64_t(fileSize)); - } - - validSubdirs.PutEntry(dbBaseFilename); -@@ -1117,12 +1083,39 @@ IndexedDatabaseManager::EnsureOriginIsInitialized(const nsACString& aOrigin, - } - } - -+ if (aPrivilege != Chrome) { -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ NS_ASSERTION(quotaManager, "Shouldn't be null!"); -+ -+ quotaManager->InitQuotaForOrigin(aOrigin, GetIndexedDBQuotaMB(), usage); -+ } -+ - mInitializedOrigins.AppendElement(aOrigin); - - NS_ADDREF(*aDirectory = directory); - return NS_OK; - } - -+void -+IndexedDatabaseManager::UninitializeOriginsByPattern( -+ const nsACString& aPattern) -+{ -+#ifdef DEBUG -+ { -+ bool correctThread; -+ NS_ASSERTION(NS_SUCCEEDED(mIOThread->IsOnCurrentThread(&correctThread)) && -+ correctThread, -+ "Running on the wrong thread!"); -+ } -+#endif -+ -+ for (int32_t i = mInitializedOrigins.Length() - 1; i >= 0; i--) { -+ if (PatternMatchesOrigin(aPattern, mInitializedOrigins[i])) { -+ mInitializedOrigins.RemoveElementAt(i); -+ } -+ } -+} -+ - bool - IndexedDatabaseManager::QuotaIsLiftedInternal() - { -@@ -1250,16 +1243,14 @@ IndexedDatabaseManager::GetFileManager(const nsACString& aOrigin, - } - - void --IndexedDatabaseManager::AddFileManager(const nsACString& aOrigin, -- const nsAString& aDatabaseName, -- FileManager* aFileManager) -+IndexedDatabaseManager::AddFileManager(FileManager* aFileManager) - { - NS_ASSERTION(aFileManager, "Null file manager!"); - - nsTArray >* array; -- if (!mFileManagers.Get(aOrigin, &array)) { -+ if (!mFileManagers.Get(aFileManager->Origin(), &array)) { - array = new nsTArray >(); -- mFileManagers.Put(aOrigin, array); -+ mFileManagers.Put(aFileManager->Origin(), array); - } - - array->AppendElement(aFileManager); -@@ -1783,6 +1774,13 @@ OriginClearRunnable::DeleteFiles(IndexedDatabaseManager* aManager) - // correctly... - NS_ERROR("Failed to remove directory!"); - } -+ -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ NS_ASSERTION(quotaManager, "Shouldn't be null!"); -+ -+ quotaManager->RemoveQuotaForPattern(mOriginOrPattern); -+ -+ aManager->UninitializeOriginsByPattern(mOriginOrPattern); - } - } - -@@ -1880,19 +1878,6 @@ IndexedDatabaseManager::AsyncUsageRunnable::Cancel() - } - } - --inline void --IncrementUsage(uint64_t* aUsage, uint64_t aDelta) --{ -- // Watch for overflow! -- if ((INT64_MAX - *aUsage) <= aDelta) { -- NS_WARNING("Database sizes exceed max we can report!"); -- *aUsage = INT64_MAX; -- } -- else { -- *aUsage += aDelta; -- } --} -- - nsresult - IndexedDatabaseManager::AsyncUsageRunnable::TakeShortcut() - { -@@ -2295,25 +2280,22 @@ IndexedDatabaseManager::AsyncDeleteFileRunnable::Run() - nsCOMPtr file = mFileManager->GetFileForId(directory, mFileId); - NS_ENSURE_TRUE(file, NS_ERROR_FAILURE); - -- nsString filePath; -- nsresult rv = file->GetPath(filePath); -- NS_ENSURE_SUCCESS(rv, rv); -+ nsresult rv; -+ int64_t fileSize; - -- int rc = sqlite3_quota_remove(NS_ConvertUTF16toUTF8(filePath).get()); -- if (rc != SQLITE_OK) { -- NS_WARNING("Failed to delete stored file!"); -- return NS_ERROR_FAILURE; -+ if (mFileManager->Privilege() != Chrome) { -+ rv = file->GetFileSize(&fileSize); -+ NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); - } - -- // sqlite3_quota_remove won't actually remove anything if we're not tracking -- // the quota here. Manually remove the file if it exists. -- bool exists; -- rv = file->Exists(&exists); -- NS_ENSURE_SUCCESS(rv, rv); -+ rv = file->Remove(false); -+ NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); - -- if (exists) { -- rv = file->Remove(false); -- NS_ENSURE_SUCCESS(rv, rv); -+ if (mFileManager->Privilege() != Chrome) { -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ NS_ASSERTION(quotaManager, "Shouldn't be null!"); -+ -+ quotaManager->DecreaseUsageForOrigin(mFileManager->Origin(), fileSize); - } - - directory = mFileManager->GetJournalDirectory(); -diff --git dom/indexedDB/IndexedDatabaseManager.h dom/indexedDB/IndexedDatabaseManager.h -index f9fbbf2..1ea5425 100644 ---- dom/indexedDB/IndexedDatabaseManager.h -+++ dom/indexedDB/IndexedDatabaseManager.h -@@ -23,7 +23,6 @@ - - #define INDEXEDDB_MANAGER_CONTRACTID "@mozilla.org/dom/indexeddb/manager;1" - --class mozIStorageQuotaCallback; - class nsIAtom; - class nsIFile; - class nsITimer; -@@ -134,6 +133,8 @@ public: - FactoryPrivilege aPrivilege, - nsIFile** aDirectory); - -+ void UninitializeOriginsByPattern(const nsACString& aPattern); -+ - // Determine if the quota is lifted for the Window the current thread is - // using. - static inline bool -@@ -172,9 +173,7 @@ public: - const nsAString& aDatabaseName); - - void -- AddFileManager(const nsACString& aOrigin, -- const nsAString& aDatabaseName, -- FileManager* aFileManager); -+ AddFileManager(FileManager* aFileManager); - - void InvalidateFileManagersForPattern(const nsACString& aPattern); - -@@ -502,10 +501,6 @@ private: - // A timer that gets activated at shutdown to ensure we close all databases. - nsCOMPtr mShutdownTimer; - -- // A single threadsafe instance of our quota callback. Created on the main -- // thread during GetOrCreate(). -- nsCOMPtr mQuotaCallbackSingleton; -- - // A list of all successfully initialized origins. This list isn't protected - // by any mutex but it is only ever touched on the IO thread. - nsTArray mInitializedOrigins; -diff --git dom/indexedDB/Makefile.in dom/indexedDB/Makefile.in -index fef0858..09d4853 100644 ---- dom/indexedDB/Makefile.in -+++ dom/indexedDB/Makefile.in -@@ -25,7 +25,6 @@ CPPSRCS = \ - DatabaseInfo.cpp \ - FileInfo.cpp \ - FileManager.cpp \ -- FileStream.cpp \ - IDBCursor.cpp \ - IDBDatabase.cpp \ - IDBEvents.cpp \ -@@ -93,7 +92,6 @@ XPIDLSRCS = \ - nsIIDBVersionChangeEvent.idl \ - nsIIDBOpenDBRequest.idl \ - nsIIndexedDatabaseManager.idl \ -- nsIStandardFileStream.idl \ - $(NULL) - - DIRS += ipc -diff --git dom/indexedDB/OpenDatabaseHelper.cpp dom/indexedDB/OpenDatabaseHelper.cpp -index e71cad4..4cd7f61 100644 ---- dom/indexedDB/OpenDatabaseHelper.cpp -+++ dom/indexedDB/OpenDatabaseHelper.cpp -@@ -8,11 +8,12 @@ - - #include "nsIFile.h" - -+#include "mozilla/dom/quota/QuotaManager.h" - #include "mozilla/storage.h" - #include "nsEscape.h" -+#include "nsNetUtil.h" - #include "nsThreadUtils.h" - #include "snappy/snappy.h" --#include "test_quota.h" - - #include "nsIBFCacheEntry.h" - #include "IDBEvents.h" -@@ -21,6 +22,7 @@ - - using namespace mozilla; - USING_INDEXEDDB_NAMESPACE -+USING_QUOTA_NAMESPACE - - namespace { - -@@ -1632,15 +1634,15 @@ OpenDatabaseHelper::DoDatabaseWork() - rv = dbFile->GetPath(mDatabaseFilePath); - NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - -- nsCOMPtr fileManagerDirectory; -- rv = dbDirectory->Clone(getter_AddRefs(fileManagerDirectory)); -+ nsCOMPtr fmDirectory; -+ rv = dbDirectory->Clone(getter_AddRefs(fmDirectory)); - NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - -- rv = fileManagerDirectory->Append(filename); -+ rv = fmDirectory->Append(filename); - NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - - nsCOMPtr connection; -- rv = CreateDatabaseConnection(mName, dbFile, fileManagerDirectory, -+ rv = CreateDatabaseConnection(dbFile, fmDirectory, mName, mASCIIOrigin, - getter_AddRefs(connection)); - if (NS_FAILED(rv) && - NS_ERROR_GET_MODULE(rv) != NS_ERROR_MODULE_DOM_INDEXEDDB) { -@@ -1691,12 +1693,12 @@ OpenDatabaseHelper::DoDatabaseWork() - - nsRefPtr fileManager = mgr->GetFileManager(mASCIIOrigin, mName); - if (!fileManager) { -- fileManager = new FileManager(mASCIIOrigin, mName); -+ fileManager = new FileManager(mASCIIOrigin, mPrivilege, mName); - -- rv = fileManager->Init(fileManagerDirectory, connection); -+ rv = fileManager->Init(fmDirectory, connection); - NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - -- mgr->AddFileManager(mASCIIOrigin, mName, fileManager); -+ mgr->AddFileManager(fileManager); - } - - mFileManager = fileManager.forget(); -@@ -1707,23 +1709,26 @@ OpenDatabaseHelper::DoDatabaseWork() - // static - nsresult - OpenDatabaseHelper::CreateDatabaseConnection( -- const nsAString& aName, - nsIFile* aDBFile, -- nsIFile* aFileManagerDirectory, -+ nsIFile* aFMDirectory, -+ const nsAString& aName, -+ const nsACString& aOrigin, - mozIStorageConnection** aConnection) - { - NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!"); - NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!"); - -- NS_NAMED_LITERAL_CSTRING(quotaVFSName, "quota"); -+ nsCOMPtr dbFileUrl = -+ IDBFactory::GetDatabaseFileURL(aDBFile, aOrigin); -+ NS_ENSURE_TRUE(dbFileUrl, NS_ERROR_FAILURE); - -- nsCOMPtr ss = -+ nsCOMPtr ss = - do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID); - NS_ENSURE_TRUE(ss, NS_ERROR_FAILURE); - - nsCOMPtr connection; -- nsresult rv = ss->OpenDatabaseWithVFS(aDBFile, quotaVFSName, -- getter_AddRefs(connection)); -+ nsresult rv = -+ ss->OpenDatabaseWithFileURL(dbFileUrl, getter_AddRefs(connection)); - if (rv == NS_ERROR_FILE_CORRUPTED) { - // If we're just opening the database during origin initialization, then - // we don't want to erase any files. The failure here will fail origin -@@ -1737,21 +1742,20 @@ OpenDatabaseHelper::CreateDatabaseConnection( - NS_ENSURE_SUCCESS(rv, rv); - - bool exists; -- rv = aFileManagerDirectory->Exists(&exists); -+ rv = aFMDirectory->Exists(&exists); - NS_ENSURE_SUCCESS(rv, rv); - - if (exists) { - bool isDirectory; -- rv = aFileManagerDirectory->IsDirectory(&isDirectory); -+ rv = aFMDirectory->IsDirectory(&isDirectory); - NS_ENSURE_SUCCESS(rv, rv); - NS_ENSURE_TRUE(isDirectory, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - -- rv = aFileManagerDirectory->Remove(true); -+ rv = aFMDirectory->Remove(true); - NS_ENSURE_SUCCESS(rv, rv); - } - -- rv = ss->OpenDatabaseWithVFS(aDBFile, quotaVFSName, -- getter_AddRefs(connection)); -+ rv = ss->OpenDatabaseWithFileURL(dbFileUrl, getter_AddRefs(connection)); - } - NS_ENSURE_SUCCESS(rv, rv); - -@@ -2347,6 +2351,8 @@ DeleteDatabaseHelper::DoDatabaseWork(mozIStorageConnection* aConnection) - { - NS_ASSERTION(!aConnection, "How did we get a connection here?"); - -+ const FactoryPrivilege& privilege = mOpenHelper->Privilege(); -+ - IndexedDatabaseManager* mgr = IndexedDatabaseManager::Get(); - NS_ASSERTION(mgr, "This should never fail!"); - -@@ -2372,59 +2378,57 @@ DeleteDatabaseHelper::DoDatabaseWork(mozIStorageConnection* aConnection) - rv = dbFile->Exists(&exists); - NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - -- int rc; -- - if (exists) { -- nsString dbFilePath; -- rv = dbFile->GetPath(dbFilePath); -- NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); -+ int64_t fileSize; - -- rc = sqlite3_quota_remove(NS_ConvertUTF16toUTF8(dbFilePath).get()); -- if (rc != SQLITE_OK) { -- NS_WARNING("Failed to delete db file!"); -- return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR; -+ if (privilege != Chrome) { -+ rv = dbFile->GetFileSize(&fileSize); -+ NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - } - -- // sqlite3_quota_remove won't actually remove anything if we're not tracking -- // the quota here. Manually remove the file if it exists. -- rv = dbFile->Exists(&exists); -+ rv = dbFile->Remove(false); - NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - -- if (exists) { -- rv = dbFile->Remove(false); -- NS_ENSURE_SUCCESS(rv, rv); -+ if (privilege != Chrome) { -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ NS_ASSERTION(quotaManager, "Shouldn't be null!"); -+ -+ quotaManager->DecreaseUsageForOrigin(mASCIIOrigin, fileSize); - } - } - -- nsCOMPtr fileManagerDirectory; -- rv = directory->Clone(getter_AddRefs(fileManagerDirectory)); -- NS_ENSURE_SUCCESS(rv, rv); -+ nsCOMPtr fmDirectory; -+ rv = directory->Clone(getter_AddRefs(fmDirectory)); -+ NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - -- rv = fileManagerDirectory->Append(filename); -+ rv = fmDirectory->Append(filename); - NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - -- rv = fileManagerDirectory->Exists(&exists); -+ rv = fmDirectory->Exists(&exists); - NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - - if (exists) { - bool isDirectory; -- rv = fileManagerDirectory->IsDirectory(&isDirectory); -+ rv = fmDirectory->IsDirectory(&isDirectory); - NS_ENSURE_SUCCESS(rv, rv); - NS_ENSURE_TRUE(isDirectory, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - -- nsString fileManagerDirectoryPath; -- rv = fileManagerDirectory->GetPath(fileManagerDirectoryPath); -- NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); -+ uint64_t usage = 0; - -- rc = sqlite3_quota_remove( -- NS_ConvertUTF16toUTF8(fileManagerDirectoryPath).get()); -- if (rc != SQLITE_OK) { -- NS_WARNING("Failed to delete file directory!"); -- return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR; -+ if (privilege != Chrome) { -+ rv = FileManager::GetUsage(fmDirectory, &usage); -+ NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); - } - -- rv = fileManagerDirectory->Remove(true); -- NS_ENSURE_SUCCESS(rv, rv); -+ rv = fmDirectory->Remove(true); -+ NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR); -+ -+ if (privilege != Chrome) { -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ NS_ASSERTION(quotaManager, "Shouldn't be null!"); -+ -+ quotaManager->DecreaseUsageForOrigin(mASCIIOrigin, usage); -+ } - } - - return NS_OK; -diff --git dom/indexedDB/OpenDatabaseHelper.h dom/indexedDB/OpenDatabaseHelper.h -index 587301b..5a3d987 100644 ---- dom/indexedDB/OpenDatabaseHelper.h -+++ dom/indexedDB/OpenDatabaseHelper.h -@@ -77,10 +77,16 @@ public: - return mDatabase; - } - -+ const FactoryPrivilege& Privilege() const -+ { -+ return mPrivilege; -+ } -+ - static -- nsresult CreateDatabaseConnection(const nsAString& aName, -- nsIFile* aDBFile, -- nsIFile* aFileManagerDirectory, -+ nsresult CreateDatabaseConnection(nsIFile* aDBFile, -+ nsIFile* aFMDirectory, -+ const nsAString& aName, -+ const nsACString& aOrigin, - mozIStorageConnection** aConnection); - - protected: -diff --git dom/indexedDB/nsIStandardFileStream.idl dom/indexedDB/nsIStandardFileStream.idl -deleted file mode 100644 -index 265c3ed..0000000 ---- dom/indexedDB/nsIStandardFileStream.idl -+++ /dev/null -@@ -1,60 +0,0 @@ --/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* vim: set ts=2 et sw=2 tw=80: */ --/* This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this file, -- * You can obtain one at http://mozilla.org/MPL/2.0/. */ -- --#include "nsISupports.idl" -- --interface nsIFile; -- --/** -- * A stream that allows you to read from a file or stream to a file -- * using standard file APIs. -- */ --[scriptable, uuid(ebbbb779-92a3-4b2a-b7cf-6efbe904c453)] --interface nsIStandardFileStream : nsISupports --{ -- /** -- * If this is set, the file will be opened (i.e., a call to -- * fopen done) only when we do an actual operation on the stream, -- * or more specifically, when one of the following is called: -- * - Seek -- * - Tell -- * - SetEOF -- * - Available -- * - Read -- * - Write -- * - Flush -- * - GetSize -- * - GetLastModified -- * - Sync -- * -- * FLAGS_DEFER_OPEN is useful if we use the stream on a background -- * thread, so that the opening and possible |stat|ing of the file -- * happens there as well. -- * -- * @note Using this flag results in the file not being opened -- * during the call to Init. This means that any errors that might -- * happen when this flag is not set would happen during the -- * first read. Also, the file is not locked when Init is called, -- * so it might be deleted before we try to read from it. -- */ -- const long FLAGS_DEFER_OPEN = 1 << 0; -- -- /** -- * @param file file to read from or stream to -- * @param mode file open mode (see fopen documentation) -- * @param flags flags specifying various behaviors of the class -- * (see enumerations in the class) -- */ -- void init(in nsIFile file, -- in AString mode, -- in long flags); -- -- /** -- * Flush all written content held in memory buffers out to disk. -- * This is the equivalent of fflush() -- */ -- void flushBuffers(); --}; -diff --git dom/indexedDB/test/Makefile.in dom/indexedDB/test/Makefile.in -index 9c79b14..4c9a201 100644 ---- dom/indexedDB/test/Makefile.in -+++ dom/indexedDB/test/Makefile.in -@@ -54,11 +54,13 @@ MOCHITEST_FILES = \ - test_file_os_delete.html \ - test_file_put_get_object.html \ - test_file_put_get_values.html \ -+ test_file_quota.html \ - test_file_replace.html \ - test_file_resurrection_delete.html \ - test_file_resurrection_transaction_abort.html \ - test_file_sharing.html \ - test_file_transaction_abort.html \ -+ test_filehandle_quota.html \ - test_filehandle_serialization.html \ - test_filehandle_store_snapshot.html \ - test_getAll.html \ -diff --git dom/indexedDB/test/file.js dom/indexedDB/test/file.js -index 07bd10a..3c6194a 100644 ---- dom/indexedDB/test/file.js -+++ dom/indexedDB/test/file.js -@@ -3,6 +3,8 @@ - * http://creativecommons.org/publicdomain/zero/1.0/ - */ - -+const DEFAULT_QUOTA = 50 * 1024 * 1024; -+ - var bufferCache = []; - var utils = SpecialPowers.getDOMWindowUtils(window); - -@@ -184,25 +186,6 @@ function getUsage(usageHandler) - idbManager.getUsageForURI(uri, callback); - } - --function getUsageSync() --{ -- let usage; -- -- getUsage(function(aUsage, aFileUsage) { -- usage = aUsage; -- }); -- -- let comp = SpecialPowers.wrap(Components); -- let thread = comp.classes["@mozilla.org/thread-manager;1"] -- .getService(comp.interfaces.nsIThreadManager) -- .currentThread; -- while (!usage) { -- thread.processNextEvent(true); -- } -- -- return usage; --} -- - function scheduleGC() - { - SpecialPowers.exactGC(window, continueToNextStep); -diff --git dom/indexedDB/test/test_file_quota.html dom/indexedDB/test/test_file_quota.html -index b07880d..9fbc0c0 100644 ---- dom/indexedDB/test/test_file_quota.html -+++ dom/indexedDB/test/test_file_quota.html -@@ -13,14 +13,12 @@ - function testSteps() - { - const READ_WRITE = IDBTransaction.READ_WRITE; -- const DEFAULT_QUOTA_MB = 50; - - const name = window.location.pathname; - - const objectStoreName = "Blobs"; - -- const testData = { key: 0, value: {} }; -- const fileData = { key: 1, file: null }; -+ const fileData = { key: 1, file: getNullFile("random.bin", DEFAULT_QUOTA) }; - - let request = indexedDB.open(name, 1); - request.onerror = errorHandler; -@@ -32,21 +30,17 @@ - - let db = event.target.result; - -- let objectStore = db.createObjectStore(objectStoreName, { }); -- objectStore.add(testData.value, testData.key); -- -- let size = (DEFAULT_QUOTA_MB + 1) * 1024 * 1024 - getUsageSync(); -- fileData.file = getNullFile("random.bin", size); -+ db.createObjectStore(objectStoreName, { }); - - event = yield; - - is(event.type, "success", "Got correct event type"); - - trans = db.transaction([objectStoreName], READ_WRITE); -- objectStore = trans.objectStore(objectStoreName); -+ let objectStore = trans.objectStore(objectStoreName); - - request = objectStore.add(fileData.file, fileData.key); -- request.addEventListener("error", new ExpectError("UnknownError")); -+ request.addEventListener("error", new ExpectError("UnknownError", true)); - request.onsuccess = unexpectedSuccessHandler; - event = yield; - -diff --git dom/indexedDB/test/test_filehandle_quota.html dom/indexedDB/test/test_filehandle_quota.html -index addaf01..0506279 100644 ---- dom/indexedDB/test/test_filehandle_quota.html -+++ dom/indexedDB/test/test_filehandle_quota.html -@@ -13,7 +13,6 @@ - function testSteps() - { - const READ_WRITE = IDBTransaction.READ_WRITE; -- const DEFAULT_QUOTA_MB = 50; - - const name = window.location.pathname; - -@@ -39,10 +38,10 @@ - - let lockedFile = fileHandle.open("readwrite"); - -- let blob = getNullBlob((50 + 1) * 1024 * 1024 - getUsageSync()); -+ let blob = getNullBlob(DEFAULT_QUOTA); - - request = lockedFile.write(blob); -- request.addEventListener("error", new ExpectError("UnknownError")); -+ request.addEventListener("error", new ExpectError("UnknownError", true)); - request.onsuccess = unexpectedSuccessHandler; - event = yield; - -diff --git dom/quota/FileStreams.cpp dom/quota/FileStreams.cpp -new file mode 100644 -index 0000000..9de244f ---- /dev/null -+++ dom/quota/FileStreams.cpp -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* vim: set ts=2 et sw=2 tw=80: */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "FileStreams.h" -+ -+USING_QUOTA_NAMESPACE -+ -+template -+NS_IMETHODIMP -+FileQuotaStream::SetEOF() -+{ -+ nsresult rv = FileStreamBase::SetEOF(); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (mQuotaObject) { -+ int64_t offset; -+ nsresult rv = FileStreamBase::Tell(&offset); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ mQuotaObject->UpdateSize(offset); -+ } -+ -+ return NS_OK; -+} -+ -+template -+NS_IMETHODIMP -+FileQuotaStream::Close() -+{ -+ nsresult rv = FileStreamBase::Close(); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ mQuotaObject = nullptr; -+ -+ return NS_OK; -+} -+ -+template -+nsresult -+FileQuotaStream::DoOpen() -+{ -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ NS_ASSERTION(quotaManager, "Shouldn't be null!"); -+ -+ NS_ASSERTION(!mQuotaObject, "Creating quota object more than once?"); -+ mQuotaObject = quotaManager->GetQuotaObject(mOrigin, -+ FileStreamBase::mOpenParams.localFile); -+ -+ nsresult rv = FileStreamBase::DoOpen(); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (mQuotaObject && (FileStreamBase::mOpenParams.ioFlags & PR_TRUNCATE)) { -+ mQuotaObject->UpdateSize(0); -+ } -+ -+ return NS_OK; -+} -+ -+template -+NS_IMETHODIMP -+FileQuotaStreamWithWrite::Write(const char* aBuf, -+ uint32_t aCount, -+ uint32_t* _retval) -+{ -+ nsresult rv; -+ -+ if (FileQuotaStreamWithWrite::mQuotaObject) { -+ int64_t offset; -+ rv = FileStreamBase::Tell(&offset); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (!FileQuotaStreamWithWrite:: -+ mQuotaObject->MaybeAllocateMoreSpace(offset, aCount)) { -+ return NS_ERROR_FAILURE; -+ } -+ } -+ -+ rv = FileStreamBase::Write(aBuf, aCount, _retval); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ return NS_OK; -+} -+ -+NS_IMPL_ISUPPORTS_INHERITED0(FileInputStream, nsFileInputStream) -+ -+already_AddRefed -+FileInputStream::Create(const nsACString& aOrigin, nsIFile* aFile, -+ int32_t aIOFlags, int32_t aPerm, -+ int32_t aBehaviorFlags) -+{ -+ nsRefPtr stream = new FileInputStream(aOrigin); -+ nsresult rv = stream->Init(aFile, aIOFlags, aPerm, aBehaviorFlags); -+ NS_ENSURE_SUCCESS(rv, nullptr); -+ return stream.forget(); -+} -+ -+NS_IMPL_ISUPPORTS_INHERITED0(FileOutputStream, nsFileOutputStream) -+ -+already_AddRefed -+FileOutputStream::Create(const nsACString& aOrigin, nsIFile* aFile, -+ int32_t aIOFlags, int32_t aPerm, -+ int32_t aBehaviorFlags) -+{ -+ nsRefPtr stream = new FileOutputStream(aOrigin); -+ nsresult rv = stream->Init(aFile, aIOFlags, aPerm, aBehaviorFlags); -+ NS_ENSURE_SUCCESS(rv, nullptr); -+ return stream.forget(); -+} -+ -+NS_IMPL_ISUPPORTS_INHERITED0(FileStream, nsFileStream) -+ -+already_AddRefed -+FileStream::Create(const nsACString& aOrigin, nsIFile* aFile, int32_t aIOFlags, -+ int32_t aPerm, int32_t aBehaviorFlags) -+{ -+ nsRefPtr stream = new FileStream(aOrigin); -+ nsresult rv = stream->Init(aFile, aIOFlags, aPerm, aBehaviorFlags); -+ NS_ENSURE_SUCCESS(rv, nullptr); -+ return stream.forget(); -+} -diff --git dom/quota/FileStreams.h dom/quota/FileStreams.h -new file mode 100644 -index 0000000..77bfad4 ---- /dev/null -+++ dom/quota/FileStreams.h -@@ -0,0 +1,115 @@ -+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* vim: set ts=2 et sw=2 tw=80: */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef mozilla_dom_quota_filestreams_h__ -+#define mozilla_dom_quota_filestreams_h__ -+ -+#include "QuotaCommon.h" -+ -+#include "nsFileStreams.h" -+ -+#include "QuotaManager.h" -+ -+BEGIN_QUOTA_NAMESPACE -+ -+template -+class FileQuotaStream : public FileStreamBase -+{ -+public: -+ // nsFileStreamBase override -+ NS_IMETHOD -+ SetEOF() MOZ_OVERRIDE; -+ -+ NS_IMETHOD -+ Close() MOZ_OVERRIDE; -+ -+protected: -+ FileQuotaStream(const nsACString& aOrigin) -+ : mOrigin(aOrigin) -+ { } -+ -+ // nsFileStreamBase override -+ virtual nsresult -+ DoOpen() MOZ_OVERRIDE; -+ -+ nsCString mOrigin; -+ nsRefPtr mQuotaObject; -+}; -+ -+template -+class FileQuotaStreamWithWrite : public FileQuotaStream -+{ -+public: -+ // nsFileStreamBase override -+ NS_IMETHOD -+ Write(const char* aBuf, uint32_t aCount, uint32_t* _retval) MOZ_OVERRIDE; -+ -+protected: -+ FileQuotaStreamWithWrite(const nsACString& aOrigin) -+ : FileQuotaStream(aOrigin) -+ { } -+}; -+ -+class FileInputStream : public FileQuotaStream -+{ -+public: -+ NS_DECL_ISUPPORTS_INHERITED -+ -+ static already_AddRefed -+ Create(const nsACString& aOrigin, nsIFile* aFile, int32_t aIOFlags = -1, -+ int32_t aPerm = -1, int32_t aBehaviorFlags = 0); -+ -+private: -+ FileInputStream(const nsACString& aOrigin) -+ : FileQuotaStream(aOrigin) -+ { } -+ -+ virtual ~FileInputStream() { -+ Close(); -+ } -+}; -+ -+class FileOutputStream : public FileQuotaStreamWithWrite -+{ -+public: -+ NS_DECL_ISUPPORTS_INHERITED -+ -+ static already_AddRefed -+ Create(const nsACString& aOrigin, nsIFile* aFile, int32_t aIOFlags = -1, -+ int32_t aPerm = -1, int32_t aBehaviorFlags = 0); -+ -+private: -+ FileOutputStream(const nsACString& aOrigin) -+ : FileQuotaStreamWithWrite(aOrigin) -+ { } -+ -+ virtual ~FileOutputStream() { -+ Close(); -+ } -+}; -+ -+class FileStream : public FileQuotaStreamWithWrite -+{ -+public: -+ NS_DECL_ISUPPORTS_INHERITED -+ -+ static already_AddRefed -+ Create(const nsACString& aOrigin, nsIFile* aFile, int32_t aIOFlags = -1, -+ int32_t aPerm = -1, int32_t aBehaviorFlags = 0); -+ -+private: -+ FileStream(const nsACString& aOrigin) -+ : FileQuotaStreamWithWrite(aOrigin) -+ { } -+ -+ virtual ~FileStream() { -+ Close(); -+ } -+}; -+ -+END_QUOTA_NAMESPACE -+ -+#endif /* mozilla_dom_quota_filestreams_h__ */ -diff --git dom/quota/Makefile.in dom/quota/Makefile.in -new file mode 100644 -index 0000000..49be551 ---- /dev/null -+++ dom/quota/Makefile.in -@@ -0,0 +1,33 @@ -+# This Source Code Form is subject to the terms of the Mozilla Public -+# License, v. 2.0. If a copy of the MPL was not distributed with this file, -+# You can obtain one at http://mozilla.org/MPL/2.0/. -+ -+DEPTH = ../.. -+topsrcdir = @top_srcdir@ -+srcdir = @srcdir@ -+VPATH = @srcdir@ -+ -+include $(DEPTH)/config/autoconf.mk -+ -+MODULE = dom -+LIBRARY_NAME = domquota_s -+XPIDL_MODULE = dom_quota -+LIBXUL_LIBRARY = 1 -+FORCE_STATIC_LIB = 1 -+ -+include $(topsrcdir)/dom/dom-config.mk -+ -+EXPORTS_NAMESPACES = mozilla/dom/quota -+ -+CPPSRCS = \ -+ FileStreams.cpp \ -+ QuotaManager.cpp \ -+ $(NULL) -+ -+EXPORTS_mozilla/dom/quota = \ -+ FileStreams.h \ -+ QuotaCommon.h \ -+ QuotaManager.h \ -+ $(NULL) -+ -+include $(topsrcdir)/config/rules.mk -diff --git dom/quota/QuotaCommon.h dom/quota/QuotaCommon.h -new file mode 100644 -index 0000000..a415d17 ---- /dev/null -+++ dom/quota/QuotaCommon.h -@@ -0,0 +1,23 @@ -+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* vim: set ts=2 et sw=2 tw=80: */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this file, -+ * You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef mozilla_dom_quota_quotacommon_h__ -+#define mozilla_dom_quota_quotacommon_h__ -+ -+#include "nsAutoPtr.h" -+#include "nsCOMPtr.h" -+#include "nsDebug.h" -+#include "nsStringGlue.h" -+#include "nsTArray.h" -+ -+#define BEGIN_QUOTA_NAMESPACE \ -+ namespace mozilla { namespace dom { namespace quota { -+#define END_QUOTA_NAMESPACE \ -+ } /* namespace quota */ } /* namespace dom */ } /* namespace mozilla */ -+#define USING_QUOTA_NAMESPACE \ -+ using namespace mozilla::dom::quota; -+ -+#endif // mozilla_dom_quota_quotacommon_h__ -diff --git dom/quota/QuotaManager.cpp dom/quota/QuotaManager.cpp -new file mode 100644 -index 0000000..b251606 ---- /dev/null -+++ dom/quota/QuotaManager.cpp -@@ -0,0 +1,294 @@ -+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* vim: set ts=2 et sw=2 tw=80: */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this file, -+ * You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "QuotaManager.h" -+ -+#include "nsIFile.h" -+ -+#include "mozilla/ClearOnShutdown.h" -+#include "nsComponentManagerUtils.h" -+ -+#include "mozilla/dom/indexedDB/IndexedDatabaseManager.h" -+ -+USING_QUOTA_NAMESPACE -+ -+namespace { -+ -+nsAutoPtr gInstance; -+ -+PLDHashOperator -+RemoveQuotaForPatternCallback(const nsACString& aKey, -+ nsRefPtr& aValue, -+ void* aUserArg) -+{ -+ NS_ASSERTION(!aKey.IsEmpty(), "Empty key!"); -+ NS_ASSERTION(aValue, "Null pointer!"); -+ NS_ASSERTION(aUserArg, "Null pointer!"); -+ -+ const nsACString* pattern = -+ static_cast(aUserArg); -+ -+ if (StringBeginsWith(aKey, *pattern)) { -+ return PL_DHASH_REMOVE; -+ } -+ -+ return PL_DHASH_NEXT; -+} -+ -+} // anonymous namespace -+ -+void -+QuotaObject::AddRef() -+{ -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ if (!quotaManager) { -+ NS_ERROR("Null quota manager, this shouldn't happen, possible leak!"); -+ -+ NS_AtomicIncrementRefcnt(mRefCnt); -+ -+ return; -+ } -+ -+ MutexAutoLock lock(quotaManager->mQuotaMutex); -+ -+ ++mRefCnt; -+} -+ -+void -+QuotaObject::Release() -+{ -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ if (!quotaManager) { -+ NS_ERROR("Null quota manager, this shouldn't happen, possible leak!"); -+ -+ nsrefcnt count = NS_AtomicDecrementRefcnt(mRefCnt); -+ if (count == 0) { -+ mRefCnt = 1; -+ delete this; -+ } -+ -+ return; -+ } -+ -+ { -+ MutexAutoLock lock(quotaManager->mQuotaMutex); -+ -+ --mRefCnt; -+ -+ if (mRefCnt > 0) { -+ return; -+ } -+ -+ if (mOriginInfo) { -+ mOriginInfo->mQuotaObjects.Remove(mPath); -+ } -+ } -+ -+ delete this; -+} -+ -+void -+QuotaObject::UpdateSize(int64_t aSize) -+{ -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ NS_ASSERTION(quotaManager, "Shouldn't be null!"); -+ -+ MutexAutoLock lock(quotaManager->mQuotaMutex); -+ -+ if (mOriginInfo) { -+ mOriginInfo->mUsage -= mSize; -+ mSize = aSize; -+ mOriginInfo->mUsage += mSize; -+ } -+} -+ -+bool -+QuotaObject::MaybeAllocateMoreSpace(int64_t aOffset, int32_t aCount) -+{ -+ int64_t end = aOffset + aCount; -+ -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ NS_ASSERTION(quotaManager, "Shouldn't be null!"); -+ -+ MutexAutoLock lock(quotaManager->mQuotaMutex); -+ -+ if (mSize >= end || !mOriginInfo) { -+ return true; -+ } -+ -+ int64_t newUsage = mOriginInfo->mUsage - mSize + end; -+ if (newUsage > mOriginInfo->mLimit) { -+ if (!indexedDB::IndexedDatabaseManager::QuotaIsLifted()) { -+ return false; -+ } -+ -+ nsCString origin = mOriginInfo->mOrigin; -+ -+ mOriginInfo->LockedClearOriginInfos(); -+ NS_ASSERTION(!mOriginInfo, -+ "Should have cleared in LockedClearOriginInfos!"); -+ -+ quotaManager->mOriginInfos.Remove(origin); -+ -+ mSize = end; -+ -+ return true; -+ } -+ -+ mOriginInfo->mUsage = newUsage; -+ mSize = end; -+ -+ return true; -+} -+ -+#ifdef DEBUG -+void -+OriginInfo::LockedClearOriginInfos() -+{ -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ NS_ASSERTION(quotaManager, "Shouldn't be null!"); -+ -+ quotaManager->mQuotaMutex.AssertCurrentThreadOwns(); -+ -+ mQuotaObjects.EnumerateRead(ClearOriginInfoCallback, nullptr); -+} -+#endif -+ -+// static -+PLDHashOperator -+OriginInfo::ClearOriginInfoCallback(const nsAString& aKey, -+ QuotaObject* aValue, -+ void* aUserArg) -+{ -+ NS_ASSERTION(!aKey.IsEmpty(), "Empty key!"); -+ NS_ASSERTION(aValue, "Null pointer!"); -+ -+ aValue->mOriginInfo = nullptr; -+ -+ return PL_DHASH_NEXT; -+} -+ -+// static -+QuotaManager* -+QuotaManager::GetOrCreate() -+{ -+ if (!gInstance) { -+ NS_ASSERTION(NS_IsMainThread(), "Wrong thread!"); -+ -+ gInstance = new QuotaManager(); -+ -+ ClearOnShutdown(&gInstance); -+ } -+ -+ return gInstance; -+} -+ -+// static -+QuotaManager* -+QuotaManager::Get() -+{ -+ // Does not return an owning reference. -+ return gInstance; -+} -+ -+void -+QuotaManager::InitQuotaForOrigin(const nsACString& aOrigin, -+ int64_t aLimit, -+ int64_t aUsage) -+{ -+ OriginInfo* info = new OriginInfo(aOrigin, aLimit * 1024 * 1024, aUsage); -+ -+ MutexAutoLock lock(mQuotaMutex); -+ -+ NS_ASSERTION(!mOriginInfos.GetWeak(aOrigin), "Replacing an existing entry!"); -+ mOriginInfos.Put(aOrigin, info); -+} -+ -+void -+QuotaManager::DecreaseUsageForOrigin(const nsACString& aOrigin, -+ int64_t aSize) -+{ -+ MutexAutoLock lock(mQuotaMutex); -+ -+ nsRefPtr originInfo; -+ mOriginInfos.Get(aOrigin, getter_AddRefs(originInfo)); -+ -+ if (originInfo) { -+ originInfo->mUsage -= aSize; -+ } -+} -+ -+void -+QuotaManager::RemoveQuotaForPattern(const nsACString& aPattern) -+{ -+ NS_ASSERTION(!aPattern.IsEmpty(), "Empty pattern!"); -+ -+ MutexAutoLock lock(mQuotaMutex); -+ -+ mOriginInfos.Enumerate(RemoveQuotaForPatternCallback, -+ const_cast(&aPattern)); -+} -+ -+already_AddRefed -+QuotaManager::GetQuotaObject(const nsACString& aOrigin, -+ nsIFile* aFile) -+{ -+ NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!"); -+ -+ nsString path; -+ nsresult rv = aFile->GetPath(path); -+ NS_ENSURE_SUCCESS(rv, nullptr); -+ -+ int64_t fileSize; -+ -+ bool exists; -+ rv = aFile->Exists(&exists); -+ NS_ENSURE_SUCCESS(rv, nullptr); -+ -+ if (exists) { -+ rv = aFile->GetFileSize(&fileSize); -+ NS_ENSURE_SUCCESS(rv, nullptr); -+ } -+ else { -+ fileSize = 0; -+ } -+ -+ QuotaObject* info = nullptr; -+ { -+ MutexAutoLock lock(mQuotaMutex); -+ -+ nsRefPtr originInfo; -+ mOriginInfos.Get(aOrigin, getter_AddRefs(originInfo)); -+ -+ if (!originInfo) { -+ return nullptr; -+ } -+ -+ originInfo->mQuotaObjects.Get(path, &info); -+ -+ if (!info) { -+ info = new QuotaObject(originInfo, path, fileSize); -+ originInfo->mQuotaObjects.Put(path, info); -+ } -+ } -+ -+ nsRefPtr result = info; -+ return result.forget(); -+} -+ -+already_AddRefed -+QuotaManager::GetQuotaObject(const nsACString& aOrigin, -+ const nsAString& aPath) -+{ -+ nsresult rv; -+ nsCOMPtr file = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv); -+ NS_ENSURE_SUCCESS(rv, nullptr); -+ -+ rv = file->InitWithPath(aPath); -+ NS_ENSURE_SUCCESS(rv, nullptr); -+ -+ return GetQuotaObject(aOrigin, file); -+} -diff --git dom/quota/QuotaManager.h dom/quota/QuotaManager.h -new file mode 100644 -index 0000000..e19acdd ---- /dev/null -+++ dom/quota/QuotaManager.h -@@ -0,0 +1,147 @@ -+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* vim: set ts=2 et sw=2 tw=80: */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this file, -+ * You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef mozilla_dom_quota_quotamanager_h__ -+#define mozilla_dom_quota_quotamanager_h__ -+ -+#include "QuotaCommon.h" -+ -+#include "mozilla/Mutex.h" -+#include "nsDataHashtable.h" -+#include "nsRefPtrHashtable.h" -+#include "nsThreadUtils.h" -+ -+BEGIN_QUOTA_NAMESPACE -+ -+class OriginInfo; -+class QuotaManager; -+ -+class QuotaObject -+{ -+ friend class OriginInfo; -+ friend class QuotaManager; -+ -+public: -+ void -+ AddRef(); -+ -+ void -+ Release(); -+ -+ void -+ UpdateSize(int64_t aSize); -+ -+ bool -+ MaybeAllocateMoreSpace(int64_t aOffset, int32_t aCount); -+ -+private: -+ QuotaObject(OriginInfo* aOriginInfo, const nsAString& aPath, int64_t aSize) -+ : mOriginInfo(aOriginInfo), mPath(aPath), mSize(aSize) -+ { } -+ -+ virtual ~QuotaObject() -+ { } -+ -+ nsAutoRefCnt mRefCnt; -+ -+ OriginInfo* mOriginInfo; -+ nsString mPath; -+ int64_t mSize; -+}; -+ -+class OriginInfo -+{ -+ friend class QuotaManager; -+ friend class QuotaObject; -+ -+public: -+ OriginInfo(const nsACString& aOrigin, int64_t aLimit, int64_t aUsage) -+ : mOrigin(aOrigin), mLimit(aLimit), mUsage(aUsage) -+ { -+ mQuotaObjects.Init(); -+ } -+ -+ NS_INLINE_DECL_THREADSAFE_REFCOUNTING(OriginInfo) -+ -+private: -+ void -+#ifdef DEBUG -+ LockedClearOriginInfos(); -+#else -+ LockedClearOriginInfos() -+ { -+ mQuotaObjects.EnumerateRead(ClearOriginInfoCallback, nullptr); -+ } -+#endif -+ -+ static PLDHashOperator -+ ClearOriginInfoCallback(const nsAString& aKey, -+ QuotaObject* aValue, void* aUserArg); -+ -+ nsDataHashtable mQuotaObjects; -+ -+ nsCString mOrigin; -+ int64_t mLimit; -+ int64_t mUsage; -+}; -+ -+class QuotaManager -+{ -+ friend class nsAutoPtr; -+ friend class OriginInfo; -+ friend class QuotaObject; -+ -+public: -+ // Returns a non-owning reference. -+ static QuotaManager* -+ GetOrCreate(); -+ -+ // Returns a non-owning reference. -+ static QuotaManager* -+ Get(); -+ -+ void -+ InitQuotaForOrigin(const nsACString& aOrigin, -+ int64_t aLimit, -+ int64_t aUsage); -+ -+ void -+ DecreaseUsageForOrigin(const nsACString& aOrigin, -+ int64_t aSize); -+ -+ void -+ RemoveQuotaForPattern(const nsACString& aPattern); -+ -+ already_AddRefed -+ GetQuotaObject(const nsACString& aOrigin, -+ nsIFile* aFile); -+ -+ already_AddRefed -+ GetQuotaObject(const nsACString& aOrigin, -+ const nsAString& aPath); -+ -+private: -+ QuotaManager() -+ : mQuotaMutex("QuotaManager.mQuotaMutex") -+ { -+ NS_ASSERTION(NS_IsMainThread(), "Wrong thread!"); -+ -+ mOriginInfos.Init(); -+ } -+ -+ virtual ~QuotaManager() -+ { -+ NS_ASSERTION(NS_IsMainThread(), "Wrong thread!"); -+ } -+ -+ mozilla::Mutex mQuotaMutex; -+ -+ nsRefPtrHashtable mOriginInfos; -+}; -+ -+END_QUOTA_NAMESPACE -+ -+#endif /* mozilla_dom_quota_quotamanager_h__ */ -diff --git layout/build/Makefile.in layout/build/Makefile.in -index e6b32da..496b55f 100644 ---- layout/build/Makefile.in -+++ layout/build/Makefile.in -@@ -69,6 +69,7 @@ SHARED_LIBRARY_LIBS = \ - $(DEPTH)/dom/encoding/$(LIB_PREFIX)domencoding_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/file/$(LIB_PREFIX)domfile_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/power/$(LIB_PREFIX)dom_power_s.$(LIB_SUFFIX) \ -+ $(DEPTH)/dom/quota/$(LIB_PREFIX)domquota_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/settings/$(LIB_PREFIX)jsdomsettings_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/permission/$(LIB_PREFIX)jsdompermissionsettings_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/network/src/$(LIB_PREFIX)dom_network_s.$(LIB_SUFFIX) \ -diff --git netwerk/base/src/Makefile.in netwerk/base/src/Makefile.in -index 0c0d60e..e8cef48 100644 ---- netwerk/base/src/Makefile.in -+++ netwerk/base/src/Makefile.in -@@ -19,6 +19,7 @@ LIBXUL_LIBRARY = 1 - EXPORTS = \ - nsMIMEInputStream.h \ - nsURLHelper.h \ -+ nsFileStreams.h \ - $(NULL) - - EXPORTS_NAMESPACES = mozilla/net -diff --git netwerk/base/src/nsFileStreams.cpp netwerk/base/src/nsFileStreams.cpp -index 2420ffc..ecc26aa 100644 ---- netwerk/base/src/nsFileStreams.cpp -+++ netwerk/base/src/nsFileStreams.cpp -@@ -51,7 +51,9 @@ nsFileStreamBase::~nsFileStreamBase() - Close(); - } - --NS_IMPL_THREADSAFE_ISUPPORTS1(nsFileStreamBase, nsISeekableStream) -+NS_IMPL_THREADSAFE_ISUPPORTS2(nsFileStreamBase, -+ nsISeekableStream, -+ nsIFileMetadata) - - NS_IMETHODIMP - nsFileStreamBase::Seek(int32_t whence, int64_t offset) -@@ -124,6 +126,52 @@ nsFileStreamBase::SetEOF() - return NS_OK; - } - -+NS_IMETHODIMP -+nsFileStreamBase::GetSize(int64_t* _retval) -+{ -+ nsresult rv = DoPendingOpen(); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (!mFD) { -+ return NS_BASE_STREAM_CLOSED; -+ } -+ -+ PRFileInfo64 info; -+ if (PR_GetOpenFileInfo64(mFD, &info) == PR_FAILURE) { -+ return NS_BASE_STREAM_OSERROR; -+ } -+ -+ *_retval = int64_t(info.size); -+ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+nsFileStreamBase::GetLastModified(int64_t* _retval) -+{ -+ nsresult rv = DoPendingOpen(); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (!mFD) { -+ return NS_BASE_STREAM_CLOSED; -+ } -+ -+ PRFileInfo64 info; -+ if (PR_GetOpenFileInfo64(mFD, &info) == PR_FAILURE) { -+ return NS_BASE_STREAM_OSERROR; -+ } -+ -+ int64_t modTime = int64_t(info.modifyTime); -+ if (modTime == 0) { -+ *_retval = 0; -+ } -+ else { -+ *_retval = modTime / int64_t(PR_USEC_PER_MSEC); -+ } -+ -+ return NS_OK; -+} -+ - nsresult - nsFileStreamBase::Close() - { -@@ -934,13 +982,12 @@ nsSafeFileOutputStream::Write(const char *buf, uint32_t count, uint32_t *result) - //////////////////////////////////////////////////////////////////////////////// - // nsFileStream - --NS_IMPL_ISUPPORTS_INHERITED4(nsFileStream, -+NS_IMPL_ISUPPORTS_INHERITED3(nsFileStream, - nsFileStreamBase, - nsIInputStream, - nsIOutputStream, -- nsIFileStream, -- nsIFileMetadata) -- -+ nsIFileStream) -+ - NS_IMETHODIMP - nsFileStream::Init(nsIFile* file, int32_t ioFlags, int32_t perm, - int32_t behaviorFlags) -@@ -959,50 +1006,4 @@ nsFileStream::Init(nsIFile* file, int32_t ioFlags, int32_t perm, - mBehaviorFlags & nsIFileStream::DEFER_OPEN); - } - --NS_IMETHODIMP --nsFileStream::GetSize(int64_t* _retval) --{ -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mFD) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- PRFileInfo64 info; -- if (PR_GetOpenFileInfo64(mFD, &info) == PR_FAILURE) { -- return NS_BASE_STREAM_OSERROR; -- } -- -- *_retval = int64_t(info.size); -- -- return NS_OK; --} -- --NS_IMETHODIMP --nsFileStream::GetLastModified(int64_t* _retval) --{ -- nsresult rv = DoPendingOpen(); -- NS_ENSURE_SUCCESS(rv, rv); -- -- if (!mFD) { -- return NS_BASE_STREAM_CLOSED; -- } -- -- PRFileInfo64 info; -- if (PR_GetOpenFileInfo64(mFD, &info) == PR_FAILURE) { -- return NS_BASE_STREAM_OSERROR; -- } -- -- int64_t modTime = int64_t(info.modifyTime); -- if (modTime == 0) { -- *_retval = 0; -- } -- else { -- *_retval = modTime / int64_t(PR_USEC_PER_MSEC); -- } -- -- return NS_OK; --} -- - //////////////////////////////////////////////////////////////////////////////// -diff --git netwerk/base/src/nsFileStreams.h netwerk/base/src/nsFileStreams.h -index 13e5b45..1aa6a82 100644 ---- netwerk/base/src/nsFileStreams.h -+++ netwerk/base/src/nsFileStreams.h -@@ -24,11 +24,13 @@ - - //////////////////////////////////////////////////////////////////////////////// - --class nsFileStreamBase : public nsISeekableStream -+class nsFileStreamBase : public nsISeekableStream, -+ public nsIFileMetadata - { - public: - NS_DECL_ISUPPORTS - NS_DECL_NSISEEKABLESTREAM -+ NS_DECL_NSIFILEMETADATA - - nsFileStreamBase(); - virtual ~nsFileStreamBase(); -@@ -124,8 +126,8 @@ public: - NS_IMETHOD IsNonBlocking(bool* _retval) - { - return nsFileStreamBase::IsNonBlocking(_retval); -- } -- -+ } -+ - // Overrided from nsFileStreamBase - NS_IMETHOD Seek(int32_t aWhence, int64_t aOffset); - -@@ -260,13 +262,11 @@ protected: - class nsFileStream : public nsFileStreamBase, - public nsIInputStream, - public nsIOutputStream, -- public nsIFileStream, -- public nsIFileMetadata -+ public nsIFileStream - { - public: - NS_DECL_ISUPPORTS_INHERITED - NS_DECL_NSIFILESTREAM -- NS_DECL_NSIFILEMETADATA - NS_FORWARD_NSIINPUTSTREAM(nsFileStreamBase::) - - // Can't use NS_FORWARD_NSIOUTPUTSTREAM due to overlapping methods -diff --git storage/public/Makefile.in storage/public/Makefile.in -index c485d4e..c05e6f3 100644 ---- storage/public/Makefile.in -+++ storage/public/Makefile.in -@@ -36,7 +36,6 @@ XPIDLSRCS = \ - mozIStorageCompletionCallback.idl \ - mozIStorageBaseStatement.idl \ - mozIStorageAsyncStatement.idl \ -- mozIStorageServiceQuotaManagement.idl \ - mozIStorageVacuumParticipant.idl \ - $(NULL) - # SEE ABOVE NOTE! -diff --git storage/public/mozIStorageService.idl storage/public/mozIStorageService.idl -index 3087a11..483649b 100644 ---- storage/public/mozIStorageService.idl -+++ storage/public/mozIStorageService.idl -@@ -7,6 +7,7 @@ - - interface mozIStorageConnection; - interface nsIFile; -+interface nsIFileURL; - - /** - * The mozIStorageService interface is intended to be implemented by -@@ -15,7 +16,7 @@ interface nsIFile; - * - * This is the only way to open a database connection. - */ --[scriptable, uuid(fe8e95cb-b377-4c8d-bccb-d9198c67542b)] -+[scriptable, uuid(12bfad34-cca3-40fb-8736-d8bf9db61a27)] - interface mozIStorageService : nsISupports { - /** - * Get a connection to a named special database storage. -@@ -106,6 +107,16 @@ interface mozIStorageService : nsISupports { - */ - mozIStorageConnection openUnsharedDatabase(in nsIFile aDatabaseFile); - -+ /** -+ * See openDatabase(). Exactly the same only initialized with a file URL. -+ * Custom parameters can be passed to SQLite and VFS implementations through -+ * the query part of the URL. -+ * -+ * @param aURL -+ * A nsIFileURL that represents the database that is to be opened. -+ */ -+ mozIStorageConnection openDatabaseWithFileURL(in nsIFileURL aFileURL); -+ - /* - * Utilities - */ -diff --git storage/public/mozIStorageServiceQuotaManagement.idl storage/public/mozIStorageServiceQuotaManagement.idl -deleted file mode 100644 -index ee5086b..0000000 ---- storage/public/mozIStorageServiceQuotaManagement.idl -+++ /dev/null -@@ -1,99 +0,0 @@ --/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* vim: set ts=2 et sw=2 tw=80: */ --/* This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this -- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -- --#include "nsISupports.idl" -- --interface mozIStorageConnection; --interface nsIFile; -- --[scriptable, function, uuid(ae94f0a5-ebdf-48f4-9959-085e13235d8d)] --interface mozIStorageQuotaCallback : nsISupports --{ -- /** -- * Called when the file size quota for a group of databases is exceeded. -- * -- * @param aFilename -- * The filename of the database that has exceeded the quota. -- * -- * @param aCurrentSizeLimit -- * The current size (in bytes) of the quota. -- * -- * @param aCurrentTotalSize -- * The current size of all databases in the quota group. -- * -- * @param aUserData -- * Any additional data that was provided to the -- * setQuotaForFilenamePattern function. -- * -- * @returns A new quota size. A new quota of 0 will disable the quota callback -- * and any quota value less than aCurrentTotalSize will cause the -- * database operation to fail with NS_ERROR_FILE_NO_DEVICE_SPACE. -- */ -- long long quotaExceeded(in ACString aFilename, -- in long long aCurrentSizeLimit, -- in long long aCurrentTotalSize, -- in nsISupports aUserData); --}; -- --/** -- * This is a temporary interface that should eventually merge with -- * mozIStorageService. -- */ --[scriptable, uuid(4d81faf5-fe01-428b-99b8-c94cba12fd72)] --interface mozIStorageServiceQuotaManagement : nsISupports --{ -- /** -- * See mozIStorageService.openDatabase. Exactly the same only with a custom -- * SQLite VFS. -- */ -- mozIStorageConnection openDatabaseWithVFS(in nsIFile aDatabaseFile, -- in ACString aVFSName); -- -- /** -- * Set a file size quota for a group of databases matching the given filename -- * pattern, optionally specifying a callback when the quota is exceeded. -- * -- * @param aPattern -- * A pattern to match filenames for inclusion in the quota system. May -- * contain the following special characters: -- * '*' Matches any sequence of zero or more characters. -- * '?' Matches exactly one character. -- * [...] Matches one character from the enclosed list of characters. -- * [^...] Matches one character not in the enclosed list. -- * -- * @param aSizeLimit -- * The size limit (in bytes) for the quota group. -- * -- * @param aCallback -- * A callback that will be used when the quota is exceeded. -- * -- * @param aUserData -- * Additional information to be passed to the callback. -- */ -- void setQuotaForFilenamePattern(in ACString aPattern, -- in long long aSizeLimit, -- in mozIStorageQuotaCallback aCallback, -- in nsISupports aUserData); -- -- /** -- * Adds, removes, or updates the file size information maintained by the quota -- * system for files not opened through openDatabaseWithVFS(). -- * -- * Use this function when you want files to be included in quota calculations -- * that are either a) not SQLite databases, or b) SQLite databases that have -- * not been opened. -- * -- * This function will have no effect on files that do not match an existing -- * quota pattern (set previously by setQuotaForFilenamePattern()). -- * -- * @param aFile -- * The file for which quota information should be updated. If the file -- * exists then its size information will be added or refreshed. If the -- * file does not exist then the file will be removed from tracking -- * under the quota system. -- */ -- void updateQuotaInformationForFile(in nsIFile aFile); --}; -diff --git storage/public/storage.h storage/public/storage.h -index 8e571e2..08f39f3 100644 ---- storage/public/storage.h -+++ storage/public/storage.h -@@ -24,7 +24,6 @@ - #include "mozIStorageStatementCallback.h" - #include "mozIStorageBindingParamsArray.h" - #include "mozIStorageBindingParams.h" --#include "mozIStorageServiceQuotaManagement.h" - #include "mozIStorageVacuumParticipant.h" - #include "mozIStorageCompletionCallback.h" - #include "mozIStorageAsyncStatement.h" -diff --git storage/src/TelemetryVFS.cpp storage/src/TelemetryVFS.cpp -index 60de5c4..e4fce09 100644 ---- storage/src/TelemetryVFS.cpp -+++ storage/src/TelemetryVFS.cpp -@@ -10,6 +10,7 @@ - #include "sqlite3.h" - #include "nsThreadUtils.h" - #include "mozilla/Util.h" -+#include "mozilla/dom/quota/QuotaManager.h" - - /** - * This preference is a workaround to allow users/sysadmins to identify -@@ -24,6 +25,7 @@ - namespace { - - using namespace mozilla; -+using namespace mozilla::dom::quota; - - struct Histograms { - const char *name; -@@ -82,9 +84,17 @@ private: - }; - - struct telemetry_file { -- sqlite3_file base; // Base class. Must be first -- Histograms *histograms; // histograms pertaining to this file -- sqlite3_file pReal[1]; // This contains the vfs that actually does work -+ // Base class. Must be first -+ sqlite3_file base; -+ -+ // histograms pertaining to this file -+ Histograms *histograms; -+ -+ // quota object for this file -+ nsRefPtr quotaObject; -+ -+ // This contains the vfs that actually does work -+ sqlite3_file pReal[1]; - }; - - /* -@@ -99,6 +109,7 @@ xClose(sqlite3_file *pFile) - if( rc==SQLITE_OK ){ - delete p->base.pMethods; - p->base.pMethods = NULL; -+ p->quotaObject = nullptr; - } - return rc; - } -@@ -126,6 +137,9 @@ int - xWrite(sqlite3_file *pFile, const void *zBuf, int iAmt, sqlite_int64 iOfst) - { - telemetry_file *p = (telemetry_file *)pFile; -+ if (p->quotaObject && !p->quotaObject->MaybeAllocateMoreSpace(iOfst, iAmt)) { -+ return SQLITE_FULL; -+ } - IOThreadAutoTimer ioTimer(p->histograms->writeMS); - int rc; - rc = p->pReal->pMethods->xWrite(p->pReal, zBuf, iAmt, iOfst); -@@ -144,6 +158,9 @@ xTruncate(sqlite3_file *pFile, sqlite_int64 size) - int rc; - Telemetry::AutoTimer timer; - rc = p->pReal->pMethods->xTruncate(p->pReal, size); -+ if (rc == SQLITE_OK && p->quotaObject) { -+ p->quotaObject->UpdateSize(size); -+ } - return rc; - } - -@@ -300,6 +317,18 @@ xOpen(sqlite3_vfs* vfs, const char *zName, sqlite3_file* pFile, - break; - } - p->histograms = h; -+ -+ const char* origin; -+ if ((flags & SQLITE_OPEN_URI) && -+ (origin = sqlite3_uri_parameter(zName, "origin"))) { -+ QuotaManager* quotaManager = QuotaManager::Get(); -+ MOZ_ASSERT(quotaManager); -+ -+ p->quotaObject = quotaManager->GetQuotaObject(nsDependentCString(origin), -+ NS_ConvertUTF8toUTF16(zName)); -+ -+ } -+ - rc = orig_vfs->xOpen(orig_vfs, zName, p->pReal, flags, pOutFlags); - if( rc != SQLITE_OK ) - return rc; -diff --git storage/src/mozStorageConnection.cpp storage/src/mozStorageConnection.cpp -index 3afd3e1b..430824a 100644 ---- storage/src/mozStorageConnection.cpp -+++ storage/src/mozStorageConnection.cpp -@@ -12,6 +12,7 @@ - #include "nsIMemoryReporter.h" - #include "nsThreadUtils.h" - #include "nsIFile.h" -+#include "nsIFileURL.h" - #include "mozilla/Telemetry.h" - #include "mozilla/Mutex.h" - #include "mozilla/CondVar.h" -@@ -471,34 +472,83 @@ Connection::getAsyncExecutionTarget() - } - - nsresult --Connection::initialize(nsIFile *aDatabaseFile, -- const char* aVFSName) -+Connection::initialize() - { - NS_ASSERTION (!mDBConn, "Initialize called on already opened database!"); - SAMPLE_LABEL("storage", "Connection::initialize"); - -- int srv; -- nsresult rv; -+ // in memory database requested, sqlite uses a magic file name -+ int srv = ::sqlite3_open_v2(":memory:", &mDBConn, mFlags, NULL); -+ if (srv != SQLITE_OK) { -+ mDBConn = nullptr; -+ return convertResultCode(srv); -+ } -+ -+ return initializeInternal(nullptr); -+} -+ -+nsresult -+Connection::initialize(nsIFile *aDatabaseFile) -+{ -+ NS_ASSERTION (aDatabaseFile, "Passed null file!"); -+ NS_ASSERTION (!mDBConn, "Initialize called on already opened database!"); -+ SAMPLE_LABEL("storage", "Connection::initialize"); - - mDatabaseFile = aDatabaseFile; - -- if (aDatabaseFile) { -- nsAutoString path; -- rv = aDatabaseFile->GetPath(path); -- NS_ENSURE_SUCCESS(rv, rv); -+ nsAutoString path; -+ nsresult rv = aDatabaseFile->GetPath(path); -+ NS_ENSURE_SUCCESS(rv, rv); - -- srv = ::sqlite3_open_v2(NS_ConvertUTF16toUTF8(path).get(), &mDBConn, mFlags, -- aVFSName); -- } -- else { -- // in memory database requested, sqlite uses a magic file name -- srv = ::sqlite3_open_v2(":memory:", &mDBConn, mFlags, aVFSName); -+ int srv = ::sqlite3_open_v2(NS_ConvertUTF16toUTF8(path).get(), &mDBConn, -+ mFlags, NULL); -+ if (srv != SQLITE_OK) { -+ mDBConn = nullptr; -+ return convertResultCode(srv); - } -+ -+ rv = initializeInternal(aDatabaseFile); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ mDatabaseFile = aDatabaseFile; -+ -+ return NS_OK; -+} -+ -+nsresult -+Connection::initialize(nsIFileURL *aFileURL) -+{ -+ NS_ASSERTION (aFileURL, "Passed null file URL!"); -+ NS_ASSERTION (!mDBConn, "Initialize called on already opened database!"); -+ SAMPLE_LABEL("storage", "Connection::initialize"); -+ -+ nsCOMPtr databaseFile; -+ nsresult rv = aFileURL->GetFile(getter_AddRefs(databaseFile)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsAutoCString spec; -+ rv = aFileURL->GetSpec(spec); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ int srv = ::sqlite3_open_v2(spec.get(), &mDBConn, mFlags, NULL); - if (srv != SQLITE_OK) { - mDBConn = nullptr; - return convertResultCode(srv); - } - -+ rv = initializeInternal(databaseFile); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ mFileURL = aFileURL; -+ mDatabaseFile = databaseFile; -+ -+ return NS_OK; -+} -+ -+ -+nsresult -+Connection::initializeInternal(nsIFile* aDatabaseFile) -+{ - // Properly wrap the database handle's mutex. - sharedDBMutex.initWithMutex(sqlite3_db_mutex(mDBConn)); - -@@ -522,14 +572,14 @@ Connection::initialize(nsIFile *aDatabaseFile, - nsAutoCString pageSizeQuery(MOZ_STORAGE_UNIQUIFY_QUERY_STR - "PRAGMA page_size = "); - pageSizeQuery.AppendInt(pageSize); -- rv = ExecuteSimpleSQL(pageSizeQuery); -+ nsresult rv = ExecuteSimpleSQL(pageSizeQuery); - NS_ENSURE_SUCCESS(rv, rv); - - // Get the current page_size, since it may differ from the specified value. - sqlite3_stmt *stmt; - NS_NAMED_LITERAL_CSTRING(pragma_page_size, - MOZ_STORAGE_UNIQUIFY_QUERY_STR "PRAGMA page_size"); -- srv = prepareStatement(pragma_page_size, &stmt); -+ int srv = prepareStatement(pragma_page_size, &stmt); - if (srv == SQLITE_OK) { - if (SQLITE_ROW == stepStatement(stmt)) { - pageSize = ::sqlite3_column_int64(stmt, 0); -@@ -962,7 +1012,8 @@ Connection::Clone(bool aReadOnly, - nsRefPtr clone = new Connection(mStorageService, flags); - NS_ENSURE_TRUE(clone, NS_ERROR_OUT_OF_MEMORY); - -- nsresult rv = clone->initialize(mDatabaseFile); -+ nsresult rv = mFileURL ? clone->initialize(mFileURL) -+ : clone->initialize(mDatabaseFile); - NS_ENSURE_SUCCESS(rv, rv); - - // Copy over pragmas from the original connection. -diff --git storage/src/mozStorageConnection.h storage/src/mozStorageConnection.h -index b71f5db..97f5cf8 100644 ---- storage/src/mozStorageConnection.h -+++ storage/src/mozStorageConnection.h -@@ -25,6 +25,7 @@ - - struct PRLock; - class nsIFile; -+class nsIFileURL; - class nsIEventTarget; - class nsIThread; - -@@ -63,18 +64,27 @@ public: - Connection(Service *aService, int aFlags); - - /** -+ * Creates the connection to an in-memory database. -+ */ -+ nsresult initialize(); -+ -+ /** - * Creates the connection to the database. - * - * @param aDatabaseFile - * The nsIFile of the location of the database to open, or create if it -- * does not exist. Passing in nullptr here creates an in-memory -- * database. -- * @param aVFSName -- * The VFS that SQLite will use when opening this database. NULL means -- * "default". -+ * does not exist. - */ -- nsresult initialize(nsIFile *aDatabaseFile, -- const char* aVFSName = NULL); -+ nsresult initialize(nsIFile *aDatabaseFile); -+ -+ /** -+ * Creates the connection to the database. -+ * -+ * @param aFileURL -+ * The nsIFileURL of the location of the database to open, or create if it -+ * does not exist. -+ */ -+ nsresult initialize(nsIFileURL *aFileURL); - - // fetch the native handle - sqlite3 *GetNativeConnection() { return mDBConn; } -@@ -155,6 +165,8 @@ public: - private: - ~Connection(); - -+ nsresult initializeInternal(nsIFile *aDatabaseFile); -+ - /** - * Sets the database into a closed state so no further actions can be - * performed. -@@ -206,6 +218,7 @@ private: - int progressHandler(); - - sqlite3 *mDBConn; -+ nsCOMPtr mFileURL; - nsCOMPtr mDatabaseFile; - - /** -diff --git storage/src/mozStorageService.cpp storage/src/mozStorageService.cpp -index 00661d6..862a7da 100644 ---- storage/src/mozStorageService.cpp -+++ storage/src/mozStorageService.cpp -@@ -24,8 +24,6 @@ - #include "mozilla/Preferences.h" - - #include "sqlite3.h" --#include "test_quota.h" --#include "test_quota.c" - - #ifdef SQLITE_OS_WIN - // "windows.h" was included and it can #define lots of things we care about... -@@ -35,61 +33,6 @@ - #include "nsIPromptService.h" - #include "nsIMemoryReporter.h" - --namespace { -- --class QuotaCallbackData --{ --public: -- QuotaCallbackData(mozIStorageQuotaCallback *aCallback, -- nsISupports *aUserData) -- : callback(aCallback), userData(aUserData) -- { -- MOZ_COUNT_CTOR(QuotaCallbackData); -- } -- -- ~QuotaCallbackData() -- { -- MOZ_COUNT_DTOR(QuotaCallbackData); -- } -- -- static void Callback(const char *zFilename, -- sqlite3_int64 *piLimit, -- sqlite3_int64 iSize, -- void *pArg) -- { -- NS_ASSERTION(zFilename && strlen(zFilename), "Null or empty filename!"); -- NS_ASSERTION(piLimit, "Null pointer!"); -- -- QuotaCallbackData *data = static_cast(pArg); -- if (!data) { -- // No callback specified, return immediately. -- return; -- } -- -- NS_ASSERTION(data->callback, "Should never have a null callback!"); -- -- nsDependentCString filename(zFilename); -- -- int64_t newLimit; -- if (NS_SUCCEEDED(data->callback->QuotaExceeded(filename, *piLimit, -- iSize, data->userData, -- &newLimit))) { -- *piLimit = newLimit; -- } -- } -- -- static void Destroy(void *aUserData) -- { -- delete static_cast(aUserData); -- } -- --private: -- nsCOMPtr callback; -- nsCOMPtr userData; --}; -- --} // anonymous namespace -- - //////////////////////////////////////////////////////////////////////////////// - //// Defines - -@@ -345,11 +288,10 @@ private: - //////////////////////////////////////////////////////////////////////////////// - //// Service - --NS_IMPL_THREADSAFE_ISUPPORTS3( -+NS_IMPL_THREADSAFE_ISUPPORTS2( - Service, - mozIStorageService, -- nsIObserver, -- mozIStorageServiceQuotaManagement -+ nsIObserver - ) - - Service *Service::gService = nullptr; -@@ -438,10 +380,6 @@ Service::~Service() - - // Shutdown the sqlite3 API. Warn if shutdown did not turn out okay, but - // there is nothing actionable we can do in that case. -- rc = ::sqlite3_quota_shutdown(); -- if (rc != SQLITE_OK) -- NS_WARNING("sqlite3 did not shutdown cleanly."); -- - rc = ::sqlite3_shutdown(); - if (rc != SQLITE_OK) - NS_WARNING("sqlite3 did not shutdown cleanly."); -@@ -636,9 +574,6 @@ Service::initialize() - } else { - NS_WARNING("Failed to register telemetry VFS"); - } -- rc = ::sqlite3_quota_initialize("telemetry-vfs", 0); -- if (rc != SQLITE_OK) -- return convertResultCode(rc); - - // Set the default value for the toolkit.storage.synchronous pref. It will be - // updated with the user preference on the main thread. -@@ -739,28 +674,24 @@ Service::OpenSpecialDatabase(const char *aStorageKey, - // connection to use a memory DB. - } - else if (::strcmp(aStorageKey, "profile") == 0) { -- - rv = NS_GetSpecialDirectory(NS_APP_STORAGE_50_FILE, - getter_AddRefs(storageFile)); - NS_ENSURE_SUCCESS(rv, rv); - -- nsString filename; -- storageFile->GetPath(filename); -- nsCString filename8 = NS_ConvertUTF16toUTF8(filename.get()); - // fall through to DB initialization - } - else { - return NS_ERROR_INVALID_ARG; - } - -- Connection *msc = new Connection(this, SQLITE_OPEN_READWRITE); -- NS_ENSURE_TRUE(msc, NS_ERROR_OUT_OF_MEMORY); -+ nsRefPtr msc = new Connection(this, SQLITE_OPEN_READWRITE); - -- rv = msc->initialize(storageFile); -+ rv = storageFile ? msc->initialize(storageFile) : msc->initialize(); - NS_ENSURE_SUCCESS(rv, rv); - -- NS_ADDREF(*_connection = msc); -+ msc.forget(_connection); - return NS_OK; -+ - } - - NS_IMETHODIMP -@@ -774,12 +705,11 @@ Service::OpenDatabase(nsIFile *aDatabaseFile, - int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_SHAREDCACHE | - SQLITE_OPEN_CREATE; - nsRefPtr msc = new Connection(this, flags); -- NS_ENSURE_TRUE(msc, NS_ERROR_OUT_OF_MEMORY); - - nsresult rv = msc->initialize(aDatabaseFile); - NS_ENSURE_SUCCESS(rv, rv); - -- NS_ADDREF(*_connection = msc); -+ msc.forget(_connection); - return NS_OK; - } - -@@ -794,12 +724,30 @@ Service::OpenUnsharedDatabase(nsIFile *aDatabaseFile, - int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_PRIVATECACHE | - SQLITE_OPEN_CREATE; - nsRefPtr msc = new Connection(this, flags); -- NS_ENSURE_TRUE(msc, NS_ERROR_OUT_OF_MEMORY); - - nsresult rv = msc->initialize(aDatabaseFile); - NS_ENSURE_SUCCESS(rv, rv); - -- NS_ADDREF(*_connection = msc); -+ msc.forget(_connection); -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+Service::OpenDatabaseWithFileURL(nsIFileURL *aFileURL, -+ mozIStorageConnection **_connection) -+{ -+ NS_ENSURE_ARG(aFileURL); -+ -+ // Always ensure that SQLITE_OPEN_CREATE is passed in for compatibility -+ // reasons. -+ int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_SHAREDCACHE | -+ SQLITE_OPEN_CREATE | SQLITE_OPEN_URI; -+ nsRefPtr msc = new Connection(this, flags); -+ -+ nsresult rv = msc->initialize(aFileURL); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ msc.forget(_connection); - return NS_OK; - } - -@@ -885,67 +833,5 @@ Service::Observe(nsISupports *, const char *aTopic, const PRUnichar *) - return NS_OK; - } - --//////////////////////////////////////////////////////////////////////////////// --//// mozIStorageServiceQuotaManagement -- --NS_IMETHODIMP --Service::OpenDatabaseWithVFS(nsIFile *aDatabaseFile, -- const nsACString &aVFSName, -- mozIStorageConnection **_connection) --{ -- NS_ENSURE_ARG(aDatabaseFile); -- -- // Always ensure that SQLITE_OPEN_CREATE is passed in for compatibility -- // reasons. -- int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_SHAREDCACHE | -- SQLITE_OPEN_CREATE; -- nsRefPtr msc = new Connection(this, flags); -- NS_ENSURE_TRUE(msc, NS_ERROR_OUT_OF_MEMORY); -- -- nsresult rv = msc->initialize(aDatabaseFile, -- PromiseFlatCString(aVFSName).get()); -- NS_ENSURE_SUCCESS(rv, rv); -- -- NS_ADDREF(*_connection = msc); -- return NS_OK; --} -- --NS_IMETHODIMP --Service::SetQuotaForFilenamePattern(const nsACString &aPattern, -- int64_t aSizeLimit, -- mozIStorageQuotaCallback *aCallback, -- nsISupports *aUserData) --{ -- NS_ENSURE_FALSE(aPattern.IsEmpty(), NS_ERROR_INVALID_ARG); -- -- nsAutoPtr data; -- if (aSizeLimit && aCallback) { -- data = new QuotaCallbackData(aCallback, aUserData); -- } -- -- int rc = ::sqlite3_quota_set(PromiseFlatCString(aPattern).get(), -- aSizeLimit, QuotaCallbackData::Callback, -- data, QuotaCallbackData::Destroy); -- NS_ENSURE_TRUE(rc == SQLITE_OK, convertResultCode(rc)); -- -- data.forget(); -- return NS_OK; --} -- --NS_IMETHODIMP --Service::UpdateQuotaInformationForFile(nsIFile *aFile) --{ -- NS_ENSURE_ARG_POINTER(aFile); -- -- nsString path; -- nsresult rv = aFile->GetPath(path); -- NS_ENSURE_SUCCESS(rv, rv); -- -- int rc = ::sqlite3_quota_file(NS_ConvertUTF16toUTF8(path).get()); -- NS_ENSURE_TRUE(rc == SQLITE_OK, convertResultCode(rc)); -- -- return NS_OK; --} -- - } // namespace storage - } // namespace mozilla -diff --git storage/src/mozStorageService.h storage/src/mozStorageService.h -index 21c1ff8..3f5a546 100644 ---- storage/src/mozStorageService.h -+++ storage/src/mozStorageService.h -@@ -15,7 +15,6 @@ - #include "mozilla/Mutex.h" - - #include "mozIStorageService.h" --#include "mozIStorageServiceQuotaManagement.h" - - class nsIMemoryReporter; - class nsIMemoryMultiReporter; -@@ -28,7 +27,6 @@ namespace storage { - class Connection; - class Service : public mozIStorageService - , public nsIObserver -- , public mozIStorageServiceQuotaManagement - { - public: - /** -@@ -58,7 +56,6 @@ public: - NS_DECL_ISUPPORTS - NS_DECL_MOZISTORAGESERVICE - NS_DECL_NSIOBSERVER -- NS_DECL_MOZISTORAGESERVICEQUOTAMANAGEMENT - - /** - * Obtains an already AddRefed pointer to XPConnect. This is used by -diff --git toolkit/toolkit-makefiles.sh toolkit/toolkit-makefiles.sh -index 6a7d714..8f1bbe0 100644 ---- toolkit/toolkit-makefiles.sh -+++ toolkit/toolkit-makefiles.sh -@@ -68,6 +68,7 @@ MAKEFILES_dom=" - dom/plugins/base/Makefile - dom/plugins/ipc/Makefile - dom/power/Makefile -+ dom/quota/Makefile - dom/settings/Makefile - dom/sms/Makefile - dom/sms/interfaces/Makefile Modified: trunk/www/firefox/files/patch-bug807492 ============================================================================== --- trunk/www/firefox/files/patch-bug807492 Sat Feb 23 16:09:06 2013 (r1182) +++ trunk/www/firefox/files/patch-bug807492 Sat Feb 23 21:08:10 2013 (r1183) @@ -17,7 +17,7 @@ index c167461..8346c11 100644 --- configure.in +++ configure.in -@@ -1413,16 +1413,27 @@ if test "$GNU_CC"; then +@@ -1449,16 +1449,27 @@ if test "$GNU_CC"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -mssse3" AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) @@ -45,7 +45,7 @@ # -Werror=return-type - catches missing returns, zero false positives # -Wtype-limits - catches overflow bugs, few false positives # -Wempty-body - catches bugs, e.g. "if (c); foo();", few false positives -@@ -5232,17 +5243,17 @@ dnl Turn off webrtc for OS's we don't handle yet, but allow +@@ -5255,17 +5266,17 @@ dnl Turn off webrtc for OS's we don't ha dnl --enable-webrtc to override. Can disable for everything in dnl the master list above. if test -n "$MOZ_WEBRTC"; then @@ -64,13 +64,13 @@ ;; esac fi -@@ -8909,16 +8920,21 @@ if test "${OS_TARGET}" = "WINNT"; then - if test "$HAVE_64BIT_OS"; then - OS_BITS=64 +@@ -9061,16 +9072,21 @@ elif test "${OS_TARGET}" = "Android"; th + EXTRA_GYP_DEFINES="-D gtest_target_type=executable -D android_toolchain=${android_toolchain} -G os=android " + if test -n "$ARM_ARCH" && test "$ARM_ARCH" -lt 7; then + EXTRA_GYP_DEFINES+=" -D armv7=0 " else - OS_BITS=32 + EXTRA_GYP_DEFINES+=" -D armv7=1 " fi - EXTRA_GYP_DEFINES="-D MSVS_VERSION=${_MSVS_VERSION} -D MSVS_OS_BITS=${OS_BITS}" fi +# Don't try to compile sse4.1 code if toolchain doesn't support @@ -85,7 +85,7 @@ dnl so that regeneration via dependencies works correctly WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi" - GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}" + GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} -D target_arch=${WEBRTC_TARGET_ARCH} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}" diff --git js/src/config/system-headers js/src/config/system-headers index 9bd1efa..1095a01 100644 --- js/src/config/system-headers @@ -114,20 +114,20 @@ -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/event \ $(NULL) --ifeq ($(OS_ARCH), Darwin) +-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_ARCH), Darwin) ++ifeq ($(OS_TARGET), Darwin) DEFINES += -DDARWIN +else +DEFINES += -DBSD +endif endif - ifeq ($(OS_ARCH), Linux) + 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 \ @@ -146,7 +146,7 @@ endif endif --ifeq ($(OS_ARCH), Darwin) +-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) @@ -156,13 +156,13 @@ endif +endif - ifeq ($(OS_ARCH), Linux) + ifeq ($(OS_TARGET), Linux) LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include endif - ifneq ($(OS_TARGET),WINNT) - CPP_UNIT_TESTS = \ - ice_unittest.cpp \ + 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 @@ -341,13 +341,13 @@ if (!(my_locale = r_strdup(setlocale(LC_CTYPE, 0)))) ABORT(R_NO_MEMORY); -@@ -91,28 +99,28 @@ mbslen(const char *s, size_t *ncharsp) - if (!strstr(my_locale, "UTF-8")) - ABORT(R_NOT_FOUND); +@@ -93,28 +101,28 @@ mbslen(const char *s, size_t *ncharsp) #else - /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */ - if (! strcasestr(setlocale(LC_CTYPE, 0), "UTF-8")) - ABORT(R_NOT_FOUND); + /* 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); + if (!locale || !strcasestr(locale, "UTF-8")) + ABORT(R_NOT_FOUND); #endif -#ifdef DARWIN @@ -509,15 +509,15 @@ if (! buf) diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp -index f0cbf870..ba0f801 100644 +index 2a91e3d..31de641 100644 --- media/webrtc/signaling/signaling.gyp +++ media/webrtc/signaling/signaling.gyp -@@ -208,16 +208,29 @@ +@@ -212,16 +212,29 @@ 'SIPCC_BUILD', 'HAVE_WINSOCK2_H', 'CPR_STDINT_INCLUDE=\\"mozilla/StandardInteger.h\\"' ], - + 'cflags_mozilla': [ ], }], @@ -539,34 +539,34 @@ ], 'defines': [ 'SIP_OS_OSX', - 'OSX', + 'OSX', '_FORTIFY_SOURCE=2', ], -@@ -701,17 +714,17 @@ +@@ -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', - -@@ -746,24 +759,23 @@ + +@@ -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', @@ -581,12 +581,12 @@ - '_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 @@ -621,7 +621,7 @@ index a30e330..cfbd8a3 100644 --- media/webrtc/signaling/test/Makefile.in +++ media/webrtc/signaling/test/Makefile.in -@@ -22,32 +22,32 @@ LIBS = \ +@@ -22,17 +22,17 @@ LIBS = \ $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \ $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \ @@ -630,7 +630,7 @@ $(NULL) ifdef MOZ_SYDNEYAUDIO --ifeq ($(OS_ARCH),Linux) +-ifeq ($(OS_TARGET),Linux) +ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) LIBS += \ $(MOZ_ALSA_LIBS) \ @@ -638,22 +638,25 @@ endif endif - ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + ifeq ($(OS_TARGET),Android) + LIBS += \ +@@ -65,17 +65,17 @@ endif + ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) LIBS += \ $(XLIBS) \ - $(MOZ_GTK2_LIBS) \ - -lgthread-2.0 \ + $(TK_LIBS) \ + $(MOZ_PANGO_LIBS) \ $(NULL) endif --ifeq ($(OS_ARCH),Linux) +-ifeq ($(OS_TARGET),Linux) +ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) LIBS += \ $(MOZ_CAIRO_OSLIBS) \ $(NULL) endif - ifeq ($(OS_ARCH),Darwin) + ifeq ($(OS_TARGET),Darwin) LIBS += \ -framework AudioToolbox \ diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi Deleted: trunk/www/firefox/files/patch-bug817267 ============================================================================== --- trunk/www/firefox/files/patch-bug817267 Sat Feb 23 21:08:10 2013 (r1182) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,36 +0,0 @@ -commit faafeb1 -Author: Jan Beich -Date: Sat Dec 1 21:25:24 2012 -0500 - - Bug 817267 - dirfd() is a macro on some BSDs, fix build there. r=yoric ---- - dom/system/OSFileConstants.cpp | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp -index 75a41dc..63fc6b1 100644 ---- dom/system/OSFileConstants.cpp -+++ dom/system/OSFileConstants.cpp -@@ -41,6 +41,11 @@ - #include "OSFileConstants.h" - #include "nsIOSFileConstantsService.h" - -+#if defined(__DragonFly__) || defined(__FreeBSD__) \ -+ || defined(__NetBSD__) || defined(__OpenBSD__) -+#define __dd_fd dd_fd -+#endif -+ - /** - * This module defines the basic libc constants (error numbers, open modes, - * etc.) used by OS.File and possibly other OS-bound JavaScript libraries. -@@ -383,8 +388,8 @@ static dom::ConstantSpec gLibcProperties[] = - { "OSFILE_OFFSETOF_DIRENT_D_TYPE", INT_TO_JSVAL(offsetof (struct dirent, d_type)) }, - #endif // defined(DT_UNKNOWN) - -- // Under MacOS X, |dirfd| is a macro rather than a function, so we -- // need a little help to get it to work -+ // Under MacOS X and BSDs, |dirfd| is a macro rather than a -+ // function, so we need a little help to get it to work - #if defined(dirfd) - { "OSFILE_SIZEOF_DIR", INT_TO_JSVAL(sizeof (DIR)) }, - Added: trunk/www/firefox/files/patch-bug824317 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug824317 Sat Feb 23 21:08:10 2013 (r1183) @@ -0,0 +1,14 @@ +diff --git a/xpcom/string/public/nsAlgorithm.h b/xpcom/string/public/nsAlgorithm.h +index fa50194a..c5f5737 100644 +--- xpcom/string/public/nsAlgorithm.h ++++ xpcom/string/public/nsAlgorithm.h +@@ -42,7 +42,8 @@ NS_MAX( const T& a, const T& b ) + return a > b ? a : b; + } + +-#if defined(_MSC_VER) && (_MSC_VER < 1600) ++#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || \ ++ (defined(_GLIBCXX_USE_LONG_LONG) && (!_GLIBCXX_USE_C99 || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC)) + namespace std { + inline + long long Modified: trunk/www/firefox/files/patch-bug826985 ============================================================================== --- trunk/www/firefox/files/patch-bug826985 Sat Feb 23 16:09:06 2013 (r1182) +++ trunk/www/firefox/files/patch-bug826985 Sat Feb 23 21:08:10 2013 (r1183) @@ -15,10 +15,10 @@ index 6d05f9c..297615f 100644 --- configure.in +++ configure.in -@@ -5270,6 +5270,17 @@ if test -n "$MOZ_WEBRTC"; then - MOZ_VP8=1 - MOZ_VP8_ENCODER=1 - MOZ_VP8_ERROR_CONCEALMENT=1 +@@ -5267,6 +5267,18 @@ if test -n "$MOZ_WEBRTC"; then + ;; + esac + + dnl use libv4l on Linux to support more cameras + case "$target" in + *-android*|*-linuxandroid*) @@ -30,11 +30,12 @@ + AC_MSG_ERROR([WebRTC on Linux needs libv4l2 for video format conversion.])]) + ;; + esac ++ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -5288,6 +5299,7 @@ fi - AC_SUBST(MOZ_WEBRTC) +@@ -5311,6 +5323,7 @@ AC_SUBST(MOZ_WEBRTC) + AC_SUBST(MOZ_WEBRTC_LEAKING_TESTS) AC_SUBST(MOZ_WEBRTC_SIGNALING) AC_SUBST(MOZ_PEERCONNECTION) +AC_SUBST(MOZ_WEBRTC_LIBV4L) Added: trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Sat Feb 23 21:08:10 2013 (r1183) @@ -0,0 +1,14 @@ +--- media/libsoundtouch/src/cpu_detect_x86.cpp~ ++++ media/libsoundtouch/src/cpu_detect_x86.cpp +@@ -101,7 +101,10 @@ uint detectCPUextensions(void) + + uint res = 0; + +-#if defined(__GNUC__) ++#if defined(__clang__) && __clang_minor__ == 0 ++ // No __get_cpuid() on FreeBSD 9.0 with Clang 3.0 ++ return 0; ++#elif defined(__GNUC__) + // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support. + uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable. + From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 21:08:27 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 053BF192 for ; Sat, 23 Feb 2013 21:08:27 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9E17035B for ; Sat, 23 Feb 2013 21:08:26 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1NL8PAl088660 for ; Sat, 23 Feb 2013 21:08:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1NL8KBY088087 for freebsd-gecko@freebsd.org; Sat, 23 Feb 2013 21:08:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Feb 2013 21:08:20 GMT Message-Id: <201302232108.r1NL8KBY088087@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1184 - in trunk: Mk www/firefox-nightly/files www/firefox/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 21:08:27 -0000 Author: jbeich Date: Sat Feb 23 21:08:20 2013 New Revision: 1184 Log: drop clang 3.0 support over an error I cannot fix In file included from image/src/SVGDocumentWrapper.cpp:30: In file included from ../../../content/svg/content/src/nsSVGSVGElement.h:19: ./../../content/svg/content/src/SVGPreserveAspectRatio.h:60:16: error: use of overloaded operator '<' is ambiguous (with operand types 'uint16_t' (aka 'unsigned short') and 'mozilla::SVGAlign') if (aAlign < SVG_PRESERVEASPECTRATIO_NONE || ~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./../../content/svg/content/src/SVGPreserveAspectRatio.h:61:16: error: use of overloaded operator '>' is ambiguous (with operand types 'uint16_t' (aka 'unsigned short') and 'mozilla::SVGAlign') aAlign > SVG_PRESERVEASPECTRATIO_XMAXYMAX) ~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./../../content/svg/content/src/SVGPreserveAspectRatio.h:72:22: error: use of overloaded operator '<' is ambiguous (with operand types 'uint16_t' (aka 'unsigned short') and 'mozilla::SVGMeetOrSlice') if (aMeetOrSlice < SVG_MEETORSLICE_MEET || ~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~ ./../../content/svg/content/src/SVGPreserveAspectRatio.h:73:22: error: use of overloaded operator '>' is ambiguous (with operand types 'uint16_t' (aka 'unsigned short') and 'mozilla::SVGMeetOrSlice') aMeetOrSlice > SVG_MEETORSLICE_SLICE) ~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~ Deleted: trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sat Feb 23 21:08:10 2013 (r1183) +++ trunk/Mk/bsd.gecko.mk Sat Feb 23 21:08:20 2013 (r1184) @@ -569,7 +569,8 @@ CPP= ${CC} -E . endif # fallback to gcc otherwise -. if ${CC} == "cc" || ${CXX} == "c++" +. if ${CC} == "cc" || ${CXX} == "c++" \ + || ${CXX} == "clang++" && ${OSVERSION} < 900507 USE_GCC?= yes . endif .endif @@ -932,10 +933,6 @@ -e 's|mozilla/plugins|browser_plugins|g' \ ${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \ ${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp -.if ${CXX} == "clang++" && ${OSVERSION} < 900506 - @${GREP} -Flr -- '-mss' ${WRKSRC} | ${XARGS} \ - ${REINPLACE_CMD} -e 's/-mss/-mmmx &/' -.endif .if ${MOZILLA} != "kompozer" @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${MOZSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp Deleted: trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp ============================================================================== --- trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Sat Feb 23 21:08:20 2013 (r1183) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- media/libsoundtouch/src/cpu_detect_x86.cpp~ -+++ media/libsoundtouch/src/cpu_detect_x86.cpp -@@ -101,7 +101,10 @@ uint detectCPUextensions(void) - - uint res = 0; - --#if defined(__GNUC__) -+#if defined(__clang__) && __clang_minor__ == 0 -+ // No __get_cpuid() on FreeBSD 9.0 with Clang 3.0 -+ return 0; -+#elif defined(__GNUC__) - // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support. - uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable. - Deleted: trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp ============================================================================== --- trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Sat Feb 23 21:08:20 2013 (r1183) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- media/libsoundtouch/src/cpu_detect_x86.cpp~ -+++ media/libsoundtouch/src/cpu_detect_x86.cpp -@@ -101,7 +101,10 @@ uint detectCPUextensions(void) - - uint res = 0; - --#if defined(__GNUC__) -+#if defined(__clang__) && __clang_minor__ == 0 -+ // No __get_cpuid() on FreeBSD 9.0 with Clang 3.0 -+ return 0; -+#elif defined(__GNUC__) - // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support. - uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable. - From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 21:46:30 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EAE20CAF; Sat, 23 Feb 2013 21:46:30 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id C6E8A6FC; Sat, 23 Feb 2013 21:46:30 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NLkUGl002737; Sat, 23 Feb 2013 21:46:30 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NLkUV3002733; Sat, 23 Feb 2013 21:46:30 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 21:46:30 GMT Message-Id: <201302232146.r1NLkUV3002733@freefall.freebsd.org> To: rotkap@gmx.de, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/176376: seamonkey-2.16 is crashin on page load (i386) X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 21:46:31 -0000 Synopsis: seamonkey-2.16 is crashin on page load (i386) State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 21:46:30 UTC 2013 State-Changed-Why: Please follow the steps given in http://lists.freebsd.org/pipermail/freebsd-ports/2013-February/081633.html they should fix your problem. http://www.freebsd.org/cgi/query-pr.cgi?pr=176376 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 22:22:02 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2C224815 for ; Sat, 23 Feb 2013 22:22:02 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id AEB3E80C for ; Sat, 23 Feb 2013 22:22:01 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1NMM0ua025688 for ; Sat, 23 Feb 2013 22:22:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1NMLtKV024560 for freebsd-gecko@freebsd.org; Sat, 23 Feb 2013 22:21:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Feb 2013 22:21:55 GMT Message-Id: <201302232221.r1NMLtKV024560@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1185 - in trunk: Mk www/firefox-nightly/files www/firefox/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 22:22:02 -0000 Author: jbeich Date: Sat Feb 23 22:21:54 2013 New Revision: 1185 Log: backout last commit, it was done prematurely (bug 827521 has a fix) Added: trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sat Feb 23 21:08:20 2013 (r1184) +++ trunk/Mk/bsd.gecko.mk Sat Feb 23 22:21:54 2013 (r1185) @@ -569,8 +569,7 @@ CPP= ${CC} -E . endif # fallback to gcc otherwise -. if ${CC} == "cc" || ${CXX} == "c++" \ - || ${CXX} == "clang++" && ${OSVERSION} < 900507 +. if ${CC} == "cc" || ${CXX} == "c++" USE_GCC?= yes . endif .endif @@ -933,6 +932,10 @@ -e 's|mozilla/plugins|browser_plugins|g' \ ${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \ ${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp +.if ${CXX} == "clang++" && ${OSVERSION} < 900506 + @${GREP} -Flr -- '-mss' ${WRKSRC} | ${XARGS} \ + ${REINPLACE_CMD} -e 's/-mss/-mmmx &/' +.endif .if ${MOZILLA} != "kompozer" @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${MOZSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp Added: trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Sat Feb 23 22:21:54 2013 (r1185) @@ -0,0 +1,14 @@ +--- media/libsoundtouch/src/cpu_detect_x86.cpp~ ++++ media/libsoundtouch/src/cpu_detect_x86.cpp +@@ -101,7 +101,10 @@ uint detectCPUextensions(void) + + uint res = 0; + +-#if defined(__GNUC__) ++#if defined(__clang__) && __clang_minor__ == 0 ++ // No __get_cpuid() on FreeBSD 9.0 with Clang 3.0 ++ return 0; ++#elif defined(__GNUC__) + // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support. + uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable. + Added: trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Sat Feb 23 22:21:54 2013 (r1185) @@ -0,0 +1,14 @@ +--- media/libsoundtouch/src/cpu_detect_x86.cpp~ ++++ media/libsoundtouch/src/cpu_detect_x86.cpp +@@ -101,7 +101,10 @@ uint detectCPUextensions(void) + + uint res = 0; + +-#if defined(__GNUC__) ++#if defined(__clang__) && __clang_minor__ == 0 ++ // No __get_cpuid() on FreeBSD 9.0 with Clang 3.0 ++ return 0; ++#elif defined(__GNUC__) + // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support. + uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable. + From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:05:25 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 80637673; Sat, 23 Feb 2013 23:05:25 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 41B2C987; Sat, 23 Feb 2013 23:05:25 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NN5P1k017500; Sat, 23 Feb 2013 23:05:25 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NN5P9P017496; Sat, 23 Feb 2013 23:05:25 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 23:05:25 GMT Message-Id: <201302232305.r1NN5P9P017496@freefall.freebsd.org> To: naddy@freebsd.org, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/171255: Fix www/firefox on FreeBSD 7.4/amd64 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:05:25 -0000 Synopsis: Fix www/firefox on FreeBSD 7.4/amd64 State-Changed-From-To: patched->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 23:05:24 UTC 2013 State-Changed-Why: Close this PR as a MFC to stable/7 is very unlikely at this point. http://www.freebsd.org/cgi/query-pr.cgi?pr=171255 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:21:02 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 66A347A5; Sat, 23 Feb 2013 23:21:02 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 35D379CA; Sat, 23 Feb 2013 23:21:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NNL2Ff021681; Sat, 23 Feb 2013 23:21:02 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NNL1W9021677; Sat, 23 Feb 2013 23:21:01 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 23:21:01 GMT Message-Id: <201302232321.r1NNL1W9021677@freefall.freebsd.org> To: pmn@bakarika.net, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/162075: www/firefox >= 7.0.1_2 bug with respect to pentadactyl addon X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:21:02 -0000 Synopsis: www/firefox >= 7.0.1_2 bug with respect to pentadactyl addon State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 23:21:01 UTC 2013 State-Changed-Why: If this is still a problem with current versions of firefox/seamonkey/thunderbird please reply to this email with new logs and traces. CClose these PRs for now as they should be resolved. http://www.freebsd.org/cgi/query-pr.cgi?pr=162075 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:21:06 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3E0887A6; Sat, 23 Feb 2013 23:21:06 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 10EB29CB; Sat, 23 Feb 2013 23:21:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NNL5jR021750; Sat, 23 Feb 2013 23:21:05 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NNL5sc021746; Sat, 23 Feb 2013 23:21:05 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 23:21:05 GMT Message-Id: <201302232321.r1NNL5sc021746@freefall.freebsd.org> To: gerard.amailland@jouy.inra.fr, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/167397: mail/thunderbird-i18n Version 12.0 and freebsd 9.0: cannot change language X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:21:06 -0000 Synopsis: mail/thunderbird-i18n Version 12.0 and freebsd 9.0: cannot change language State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 23:21:05 UTC 2013 State-Changed-Why: If this is still a problem with current versions of firefox/seamonkey/thunderbird please reply to this email with new logs and traces. CClose these PRs for now as they should be resolved. http://www.freebsd.org/cgi/query-pr.cgi?pr=167397 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:21:08 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BFEA17B3; Sat, 23 Feb 2013 23:21:08 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 897499CC; Sat, 23 Feb 2013 23:21:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NNL85b021817; Sat, 23 Feb 2013 23:21:08 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NNL8Tr021813; Sat, 23 Feb 2013 23:21:08 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 23:21:08 GMT Message-Id: <201302232321.r1NNL8Tr021813@freefall.freebsd.org> To: hokan@me.umn.edu, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/162939: www/firefox crashes with Zotero add-on X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:21:08 -0000 Synopsis: www/firefox crashes with Zotero add-on State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 23:21:07 UTC 2013 State-Changed-Why: If this is still a problem with current versions of firefox/seamonkey/thunderbird please reply to this email with new logs and traces. CClose these PRs for now as they should be resolved. http://www.freebsd.org/cgi/query-pr.cgi?pr=162939 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:21:13 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 168F57B6; Sat, 23 Feb 2013 23:21:13 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E7A0D9CE; Sat, 23 Feb 2013 23:21:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NNLCH6021882; Sat, 23 Feb 2013 23:21:12 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NNLA8a021878; Sat, 23 Feb 2013 23:21:10 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 23:21:10 GMT Message-Id: <201302232321.r1NNLA8a021878@freefall.freebsd.org> To: hm@hm.net.br, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/169241: www/firefox Right mouse buttom click freeze screen X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:21:13 -0000 Synopsis: www/firefox Right mouse buttom click freeze screen State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 23:21:10 UTC 2013 State-Changed-Why: If this is still a problem with current versions of firefox/seamonkey/thunderbird please reply to this email with new logs and traces. CClose these PRs for now as they should be resolved. http://www.freebsd.org/cgi/query-pr.cgi?pr=169241 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:21:16 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2F0437C3; Sat, 23 Feb 2013 23:21:16 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 0BFA89CF; Sat, 23 Feb 2013 23:21:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NNLF08021947; Sat, 23 Feb 2013 23:21:15 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NNLFYS021943; Sat, 23 Feb 2013 23:21:15 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 23:21:15 GMT Message-Id: <201302232321.r1NNLFYS021943@freefall.freebsd.org> To: thomas@gibfest.dk, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/156335: www/firefox: Repeatable firefox-4.0_1,1 crash X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:21:16 -0000 Synopsis: www/firefox: Repeatable firefox-4.0_1,1 crash State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 23:21:15 UTC 2013 State-Changed-Why: If this is still a problem with current versions of firefox/seamonkey/thunderbird please reply to this email with new logs and traces. CClose these PRs for now as they should be resolved. http://www.freebsd.org/cgi/query-pr.cgi?pr=156335 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:21:19 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 784667C6; Sat, 23 Feb 2013 23:21:19 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 554B59D0; Sat, 23 Feb 2013 23:21:19 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NNLJft022012; Sat, 23 Feb 2013 23:21:19 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NNLIsT022008; Sat, 23 Feb 2013 23:21:18 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 23:21:18 GMT Message-Id: <201302232321.r1NNLIsT022008@freefall.freebsd.org> To: zaphod@berentweb.com, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/164013: www/firefox: Firefox-9 Icons & xpi-addons from ports X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:21:19 -0000 Synopsis: www/firefox: Firefox-9 Icons & xpi-addons from ports State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 23:21:18 UTC 2013 State-Changed-Why: If this is still a problem with current versions of firefox/seamonkey/thunderbird please reply to this email with new logs and traces. CClose these PRs for now as they should be resolved. http://www.freebsd.org/cgi/query-pr.cgi?pr=164013 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:21:22 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CE3517D1; Sat, 23 Feb 2013 23:21:22 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id AB20C9D1; Sat, 23 Feb 2013 23:21:22 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NNLMkg022077; Sat, 23 Feb 2013 23:21:22 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NNLLdl022073; Sat, 23 Feb 2013 23:21:21 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 23:21:21 GMT Message-Id: <201302232321.r1NNLLdl022073@freefall.freebsd.org> To: stanislav@icmail.ru, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/171219: www/firefox-i18n russian language pack don't translate interfase X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:21:22 -0000 Synopsis: www/firefox-i18n russian language pack don't translate interfase State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 23:21:21 UTC 2013 State-Changed-Why: If this is still a problem with current versions of firefox/seamonkey/thunderbird please reply to this email with new logs and traces. CClose these PRs for now as they should be resolved. http://www.freebsd.org/cgi/query-pr.cgi?pr=171219 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:21:26 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 460677DE; Sat, 23 Feb 2013 23:21:26 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 206B09D2; Sat, 23 Feb 2013 23:21:26 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NNLQBe022142; Sat, 23 Feb 2013 23:21:26 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NNLPiu022138; Sat, 23 Feb 2013 23:21:25 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 23:21:25 GMT Message-Id: <201302232321.r1NNLPiu022138@freefall.freebsd.org> To: dev-null@FreeBSD.org, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/173937: mail/thunderbird core dumps when using enigmail to generate a key X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:21:26 -0000 Synopsis: mail/thunderbird core dumps when using enigmail to generate a key State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 23:21:25 UTC 2013 State-Changed-Why: If this is still a problem with current versions of firefox/seamonkey/thunderbird please reply to this email with new logs and traces. CClose these PRs for now as they should be resolved. http://www.freebsd.org/cgi/query-pr.cgi?pr=173937 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:21:30 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5D29B7EC; Sat, 23 Feb 2013 23:21:30 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 39DF19D5; Sat, 23 Feb 2013 23:21:30 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1NNLUvK022207; Sat, 23 Feb 2013 23:21:30 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1NNLSi4022203; Sat, 23 Feb 2013 23:21:28 GMT (envelope-from flo) Date: Sat, 23 Feb 2013 23:21:28 GMT Message-Id: <201302232321.r1NNLSi4022203@freefall.freebsd.org> To: otacilio.neto@ee.ufcg.edu.br, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Subject: Re: ports/174096: mail/thunderbird 17 and 16 crashes when try write a new mail. X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:21:30 -0000 Synopsis: mail/thunderbird 17 and 16 crashes when try write a new mail. State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Sat Feb 23 23:21:28 UTC 2013 State-Changed-Why: If this is still a problem with current versions of firefox/seamonkey/thunderbird please reply to this email with new logs and traces. CClose these PRs for now as they should be resolved. http://www.freebsd.org/cgi/query-pr.cgi?pr=174096 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 23:41:52 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B4967D7B for ; Sat, 23 Feb 2013 23:41:52 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id DEF26A44 for ; Sat, 23 Feb 2013 23:41:51 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1NNfoj4067697 for ; Sat, 23 Feb 2013 23:41:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1NNfirp063273 for freebsd-gecko@freebsd.org; Sat, 23 Feb 2013 23:41:44 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Feb 2013 23:41:44 GMT Message-Id: <201302232341.r1NNfirp063273@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1186 - in trunk: . Mk mail/linux-thunderbird mail/thunderbird mail/thunderbird-esr www/firefox www/firefox-esr-i18n www/firefox-i18n www/firefox-nightly www/firefox-nightly/files www/firefox/files www/linux-seamonkey www/seamonkey www/seamonkey-i18n www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 23:41:52 -0000 Author: flo Date: Sat Feb 23 23:41:44 2013 New Revision: 1186 Log: Sync with ports, to make merging of patches from the gecko repo to ports easier Modified: trunk/Gecko_ChangeLog trunk/Mk/bsd.gecko.mk trunk/mail/linux-thunderbird/Makefile trunk/mail/thunderbird-esr/Makefile trunk/mail/thunderbird/Makefile trunk/www/firefox-esr-i18n/Makefile trunk/www/firefox-esr-i18n/distinfo trunk/www/firefox-i18n/Makefile trunk/www/firefox-i18n/distinfo trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/files/patch-bug807492 trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp trunk/www/firefox/Makefile trunk/www/firefox/files/patch-bug807492 trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp trunk/www/linux-seamonkey/Makefile trunk/www/seamonkey-i18n/Makefile trunk/www/seamonkey/Makefile trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk trunk/www/seamonkey/files/patch-bug807492 trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/Gecko_ChangeLog Sat Feb 23 23:41:44 2013 (r1186) @@ -1,3 +0,0 @@ -19.0: -- gcc42 is dead, long live gcc46: dropped upstream for firefox/seamonkey -- add DuckDuckGo search plugin following Debian-based distros Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/Mk/bsd.gecko.mk Sat Feb 23 23:41:44 2013 (r1186) @@ -55,12 +55,12 @@ # user. # # USE_GECKO= libxul19<->libxul -# This will sed -e 's/libxul/libxul19/' on Makefile.in's and configure +# This will sed -e 's/libxul/libxul19/' on Makefile.in's and configure # if ${GECKO}=="libxul19" # # Example: # USE_GECKO= libxul libxul19 -# +# # post-patch: # @${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|' \ # ${MOZSRC}/configure @@ -70,7 +70,7 @@ # # Example: # USE_GECKO= libxul libxul19 -# +# # post-patch: # .if ${GECKO}=="libxul19" # @${REINPLACE_CMD} -e 's|mozilla-|libxul-|' \ @@ -179,7 +179,7 @@ # is given by the maintainer via the port or by the # user via defined variable try to find the highest # stable installed version. -# Available values: yes 17+ 18+ 17 18+ +# Available values: yes 17+ 19+ 17 19+ # NOTE: # default value 17 is used in case of USE_FIREFOX=yes # @@ -187,19 +187,19 @@ # Available values: see USE_FIREFOX # # USE_SEAMONKEY Add runtime dependency on SeaMonkey. If no -# version is given by the maintainer via the port +# version is given by the maintainer via the port # or by the user via defined variable try to find # the highest stable installed version. -# Available values: yes 15+ 15 +# Available values: yes 16+ 16 # NOTE: -# default value 15 is used in case of USE_SEAMONKEY=yes +# default value 16 is used in case of USE_SEAMONKEY=yes # # USE_SEAMONKEY_BUILD Add buildtime dependency on SeaMonkey. # Available values: see USE_SEAMONKEY # -# USE_THUNDERBIRD Add runtime dependency on Thunderbird. If no -# version is given by the maintainer via the port -# or by the user via defined variable try to find +# USE_THUNDERBIRD Add runtime dependency on Thunderbird. If no +# version is given by the maintainer via the port +# or by the user via defined variable try to find # the highest stable installed version. # Available values: yes 10+ 17+ 10 17 # NOTE: @@ -221,11 +221,11 @@ .endif _FIREFOX_DEFAULT_VERSION= 17 -_FIREFOX_VERSIONS= 17 18 -_FIREFOX_RANGE_VERSIONS= 17+ 18+ +_FIREFOX_VERSIONS= 17 19 +_FIREFOX_RANGE_VERSIONS= 17+ 19+ # For specifying [17, ..]+ -_FIREFOX_18P= 18 ${_FIREFOX_17P} +_FIREFOX_19P= 19 ${_FIREFOX_17P} _FIREFOX_17P= 17 # Set the default Firefox version and check if USE_FIREFOX=yes was given @@ -272,7 +272,7 @@ # Dependence lines for different Firefox versions 17_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -18_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +19_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox # Add dependencies .if defined(USE_FIREFOX) @@ -294,12 +294,12 @@ _SEAMONKEY_BUILD_DEPENDS= yes .endif -_SEAMONKEY_DEFAULT_VERSION= 15 -_SEAMONKEY_VERSIONS= 15 -_SEAMONKEY_RANGE_VERSIONS= 15+ +_SEAMONKEY_DEFAULT_VERSION= 16 +_SEAMONKEY_VERSIONS= 16 +_SEAMONKEY_RANGE_VERSIONS= 16+ -# For specifying [15, ..]+ -_SEAMONKEY_15P= 15 +# For specifying [16, ..]+ +_SEAMONKEY_16P= 16 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given .if ${USE_SEAMONKEY} == "yes" @@ -341,7 +341,7 @@ .endif # Dependence lines for different SeaMonkey versions -15_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey +16_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey # Add dependencies .if defined(USE_SEAMONKEY) @@ -672,7 +672,7 @@ .else MOZ_OPTIONS+= --enable-necko-protocols=${MOZ_PROTOCOLS} .endif -# others +# others MOZ_OPTIONS+= --with-system-zlib \ --with-system-bz2 \ --disable-debug-symbols \ Modified: trunk/mail/linux-thunderbird/Makefile ============================================================================== --- trunk/mail/linux-thunderbird/Makefile Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/mail/linux-thunderbird/Makefile Sat Feb 23 23:41:44 2013 (r1186) @@ -4,8 +4,7 @@ PORTNAME= thunderbird PORTVERSION= 17.0.3 CATEGORIES= mail -#MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US -MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/linux-i686/en-US +MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US DISTNAME= ${PORTNAME}-${DISTVERSION}esr MAINTAINER= gecko@FreeBSD.org Modified: trunk/mail/thunderbird-esr/Makefile ============================================================================== --- trunk/mail/thunderbird-esr/Makefile Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/mail/thunderbird-esr/Makefile Sat Feb 23 23:41:44 2013 (r1186) @@ -5,8 +5,7 @@ DISTVERSION= 17.0.3 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} -#MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source -MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source DISTFILES= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/mail/thunderbird/Makefile Sat Feb 23 23:41:44 2013 (r1186) @@ -2,7 +2,7 @@ # $FreeBSD: head/mail/thunderbird/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= thunderbird -DISTVERSION= 19.0b1 +DISTVERSION= 19.0 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -19,7 +19,7 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -EM_VERSION= 1.5.0 +EM_VERSION= 1.5.1 L_VERSION= 2.1b1 USE_AUTOTOOLS= autoconf213:env Modified: trunk/www/firefox-esr-i18n/Makefile ============================================================================== --- trunk/www/firefox-esr-i18n/Makefile Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/firefox-esr-i18n/Makefile Sat Feb 23 23:41:44 2013 (r1186) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox-esr-i18n/Makefile 310207 2013-01-10 22:29:23Z flo $ PORTNAME= firefox-i18n -PORTVERSION= 17.0.2 +PORTVERSION= 17.0.3 CATEGORIES= www MASTER_SITE_SUBDIR= firefox/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= Modified: trunk/www/firefox-esr-i18n/distinfo ============================================================================== --- trunk/www/firefox-esr-i18n/distinfo Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/firefox-esr-i18n/distinfo Sat Feb 23 23:41:44 2013 (r1186) @@ -1,164 +1,164 @@ -SHA256 (xpi/firefox-i18n-17.0.2/af.xpi) = 6d5b8d789da804fb261093e5ad6026273497b8ba2eb505dab2d8637195cb6ebd -SIZE (xpi/firefox-i18n-17.0.2/af.xpi) = 285646 -SHA256 (xpi/firefox-i18n-17.0.2/ak.xpi) = d25e30e73ea0c9ad96cd5f58344d624cbabaa5dcd355c8760ef43013f1e0a04d -SIZE (xpi/firefox-i18n-17.0.2/ak.xpi) = 287476 -SHA256 (xpi/firefox-i18n-17.0.2/ar.xpi) = 528f44b1054fe2f426d942fa69011666c2e3c245aaeaccdf652d9d9cab9004ea -SIZE (xpi/firefox-i18n-17.0.2/ar.xpi) = 316007 -SHA256 (xpi/firefox-i18n-17.0.2/ast.xpi) = 918812abf88a6ab942e551fecd8f25f72a3f91218d4dd19c1d7cc991de38c63a -SIZE (xpi/firefox-i18n-17.0.2/ast.xpi) = 268623 -SHA256 (xpi/firefox-i18n-17.0.2/be.xpi) = 6eb8091585624dcc4781dfd876b1952ce1bdc6004bb7d2885c1e405ae2a01c7c -SIZE (xpi/firefox-i18n-17.0.2/be.xpi) = 277911 -SHA256 (xpi/firefox-i18n-17.0.2/bg.xpi) = 979d1fb47d0d4c76269ad271e032212f7eb6f35dab0b4393d695e32073857765 -SIZE (xpi/firefox-i18n-17.0.2/bg.xpi) = 331761 -SHA256 (xpi/firefox-i18n-17.0.2/bn-BD.xpi) = 27bfe4fde40586a18897701f4fd786b78b6237c56c22a7dd64ffacb6007f38a6 -SIZE (xpi/firefox-i18n-17.0.2/bn-BD.xpi) = 343803 -SHA256 (xpi/firefox-i18n-17.0.2/bn-IN.xpi) = 47399b587379b5eed87a7648d5c9783d3996bd550e31b0fd031b59719d0e8897 -SIZE (xpi/firefox-i18n-17.0.2/bn-IN.xpi) = 377521 -SHA256 (xpi/firefox-i18n-17.0.2/br.xpi) = 17230b71212b70583828ac84abf197a607336c72b39039add18c2931b00bbef3 -SIZE (xpi/firefox-i18n-17.0.2/br.xpi) = 296083 -SHA256 (xpi/firefox-i18n-17.0.2/bs.xpi) = 398cc929a711e785f6058b40838943227dd8e90f35d67dd903f25a6aba9931ca -SIZE (xpi/firefox-i18n-17.0.2/bs.xpi) = 296723 -SHA256 (xpi/firefox-i18n-17.0.2/ca.xpi) = 07dcf710f1b5b3a80aadd1ae680a8b65d802740ded815bbc6aa06464b2f0c17d -SIZE (xpi/firefox-i18n-17.0.2/ca.xpi) = 298032 -SHA256 (xpi/firefox-i18n-17.0.2/cs.xpi) = 6e235250929d1a9b273ed49b58d03f14a29ffafde4f35d1fbde733cf42961a35 -SIZE (xpi/firefox-i18n-17.0.2/cs.xpi) = 298633 -SHA256 (xpi/firefox-i18n-17.0.2/cy.xpi) = 734201eb4ba589380559af9875a1161d5684a5a08393c5f886ea1c2962852b62 -SIZE (xpi/firefox-i18n-17.0.2/cy.xpi) = 289368 -SHA256 (xpi/firefox-i18n-17.0.2/da.xpi) = b986646e296e3addc098893213e090632dcb69235b313eeff39bad58e47c948d -SIZE (xpi/firefox-i18n-17.0.2/da.xpi) = 287168 -SHA256 (xpi/firefox-i18n-17.0.2/de.xpi) = 9caf742303a72dd0183b7a9685f4c902ea5ba8bb808cb2571fd7f3eb2bbbdea5 -SIZE (xpi/firefox-i18n-17.0.2/de.xpi) = 274884 -SHA256 (xpi/firefox-i18n-17.0.2/el.xpi) = 77f3022fd8cc99094163ff731631957cf504992222f02d448e69aaa6df4b1d7f -SIZE (xpi/firefox-i18n-17.0.2/el.xpi) = 316152 -SHA256 (xpi/firefox-i18n-17.0.2/en-GB.xpi) = abfe856366428908f4a8392667968dd65cb894dd2af4d8a6e82b343d497b7d92 -SIZE (xpi/firefox-i18n-17.0.2/en-GB.xpi) = 276604 -SHA256 (xpi/firefox-i18n-17.0.2/en-US.xpi) = fca93c146b34b808546dbf88d2c17d26bd68ed26a4ce4dcf4e9f31d103764ffe -SIZE (xpi/firefox-i18n-17.0.2/en-US.xpi) = 276655 -SHA256 (xpi/firefox-i18n-17.0.2/en-ZA.xpi) = 21465bfe612c8656fa676ab545e096ed96f65cbdf7aeadbdbb712f8375b508b6 -SIZE (xpi/firefox-i18n-17.0.2/en-ZA.xpi) = 277435 -SHA256 (xpi/firefox-i18n-17.0.2/eo.xpi) = 81fd6274cd248840a02879341025a1399bb1f16863d8352255064de12bfd8784 -SIZE (xpi/firefox-i18n-17.0.2/eo.xpi) = 289300 -SHA256 (xpi/firefox-i18n-17.0.2/es-AR.xpi) = c0efd7922fcffea22b86bbb78f3e67d6e3641523e4806d2dd21bca104c2f9485 -SIZE (xpi/firefox-i18n-17.0.2/es-AR.xpi) = 293739 -SHA256 (xpi/firefox-i18n-17.0.2/es-CL.xpi) = 1f94635df9d969aa3e02486bd0a89490d02d71e61961d0fa6162537d110f14ac -SIZE (xpi/firefox-i18n-17.0.2/es-CL.xpi) = 301378 -SHA256 (xpi/firefox-i18n-17.0.2/es-ES.xpi) = ecf0f9a4279cab133779eca077b93a5336dfb37c78a088863de0ee60ac7c1426 -SIZE (xpi/firefox-i18n-17.0.2/es-ES.xpi) = 246685 -SHA256 (xpi/firefox-i18n-17.0.2/es-MX.xpi) = 336c3262f8b8ab9822de6e574714c47dfc5edc960b622ddc6838a775d57b1cf4 -SIZE (xpi/firefox-i18n-17.0.2/es-MX.xpi) = 252471 -SHA256 (xpi/firefox-i18n-17.0.2/et.xpi) = 0756ac731e0cd6571f7c6f826c67ffce040dcaf9db233c71f83c9fcb2703e3af -SIZE (xpi/firefox-i18n-17.0.2/et.xpi) = 289194 -SHA256 (xpi/firefox-i18n-17.0.2/eu.xpi) = 47ea6e37cf4e83443abc33e297a7c7b059627a73477c96d4fe71c8319f79abd5 -SIZE (xpi/firefox-i18n-17.0.2/eu.xpi) = 288727 -SHA256 (xpi/firefox-i18n-17.0.2/fa.xpi) = e4406bde464693adb956f882310ac7c2d1231343ff2087ff40257581980c1cfd -SIZE (xpi/firefox-i18n-17.0.2/fa.xpi) = 328497 -SHA256 (xpi/firefox-i18n-17.0.2/fi.xpi) = 5192fbc5cd6401df1dd429647d18917c5fb760e384909fb8b151abeddcf11219 -SIZE (xpi/firefox-i18n-17.0.2/fi.xpi) = 293155 -SHA256 (xpi/firefox-i18n-17.0.2/fr.xpi) = 3917245c0c2b7a6b5eefc84733aed1a8cf9af7c749845825d3db2459075d62db -SIZE (xpi/firefox-i18n-17.0.2/fr.xpi) = 297862 -SHA256 (xpi/firefox-i18n-17.0.2/fy-NL.xpi) = bf6798af96f37c5d7e205586adb00d5a603f6cda6f68931a37026a9a21fd7943 -SIZE (xpi/firefox-i18n-17.0.2/fy-NL.xpi) = 294190 -SHA256 (xpi/firefox-i18n-17.0.2/ga-IE.xpi) = 84583f93270ac4fec14522bac7567f21ea34f4fbe2ac21c7059b0aeaa9deef81 -SIZE (xpi/firefox-i18n-17.0.2/ga-IE.xpi) = 301476 -SHA256 (xpi/firefox-i18n-17.0.2/gl.xpi) = 68df133bf048268db0f026e34952303e518a03db34fb8da3cf6864ffd44d52ba -SIZE (xpi/firefox-i18n-17.0.2/gl.xpi) = 291497 -SHA256 (xpi/firefox-i18n-17.0.2/gu-IN.xpi) = 7663fb8fc33167fe69bc144d952d6f7468ba1dc7c4e577c8e4d5bfae822f8a45 -SIZE (xpi/firefox-i18n-17.0.2/gu-IN.xpi) = 323980 -SHA256 (xpi/firefox-i18n-17.0.2/he.xpi) = a63942d94f82e7d82488af6481d66bc7ebc252ff22bc83465ff92d85260a0665 -SIZE (xpi/firefox-i18n-17.0.2/he.xpi) = 305982 -SHA256 (xpi/firefox-i18n-17.0.2/hi-IN.xpi) = 0d3ca8f2d75b94826625e9058465e51897d517ae1a5304f6976a775b7df4e980 -SIZE (xpi/firefox-i18n-17.0.2/hi-IN.xpi) = 335364 -SHA256 (xpi/firefox-i18n-17.0.2/hr.xpi) = 10c19f435aab461c68c373b3a641fc58b2a6ee6e652fda2a86180a9ee092eeda -SIZE (xpi/firefox-i18n-17.0.2/hr.xpi) = 292440 -SHA256 (xpi/firefox-i18n-17.0.2/hu.xpi) = 579fed50c2d95b34e252b2b201e46b059a57779add5eb715ea60511212c60ee5 -SIZE (xpi/firefox-i18n-17.0.2/hu.xpi) = 307544 -SHA256 (xpi/firefox-i18n-17.0.2/hy-AM.xpi) = c491aed01542cb4fe7ece9b9f6381d5719d02ae588fb4765fa8b122a357e3d69 -SIZE (xpi/firefox-i18n-17.0.2/hy-AM.xpi) = 332703 -SHA256 (xpi/firefox-i18n-17.0.2/id.xpi) = 28383d70e236213d8f9691e41f36f2d97f90d41eff5e4cbc12788d89dd0baa41 -SIZE (xpi/firefox-i18n-17.0.2/id.xpi) = 288225 -SHA256 (xpi/firefox-i18n-17.0.2/is.xpi) = 6d44bad43c84d53ab443fc7175390e142688307682015ceb4564cb981893c4be -SIZE (xpi/firefox-i18n-17.0.2/is.xpi) = 289408 -SHA256 (xpi/firefox-i18n-17.0.2/it.xpi) = 55d0b58610a6237a821d6a1e2ad3f3982d03c0fb6cdacc7c01185a089e7e72e4 -SIZE (xpi/firefox-i18n-17.0.2/it.xpi) = 243145 -SHA256 (xpi/firefox-i18n-17.0.2/ja.xpi) = 22723d0f2d958d1ed991157efdebea1358a5de10e855c206a349d3f349cfb27a -SIZE (xpi/firefox-i18n-17.0.2/ja.xpi) = 326990 -SHA256 (xpi/firefox-i18n-17.0.2/kk.xpi) = 208ad4848ed9cf22413912ea60234f697e12967e75527542a0e56bb7b662bf8e -SIZE (xpi/firefox-i18n-17.0.2/kk.xpi) = 334852 -SHA256 (xpi/firefox-i18n-17.0.2/kn.xpi) = 97e8be41f22e0d188190d3b093d6b6ddf6e9ae08c3af8ebb0f4ae7dfc811322a -SIZE (xpi/firefox-i18n-17.0.2/kn.xpi) = 359400 -SHA256 (xpi/firefox-i18n-17.0.2/ko.xpi) = ad09b95fb698bbb977e03d06f45a4cdc98f33cdaa726d53902b1ae6a2879d659 -SIZE (xpi/firefox-i18n-17.0.2/ko.xpi) = 301229 -SHA256 (xpi/firefox-i18n-17.0.2/ku.xpi) = 591ad0aec47eeb41719747ab8890e4985c3fead338c5dcb47196c08a7bbca2e1 -SIZE (xpi/firefox-i18n-17.0.2/ku.xpi) = 309398 -SHA256 (xpi/firefox-i18n-17.0.2/lg.xpi) = 52037aff0b854432bcadb125e81124eaf3bc53e4a3c066a61cfc5135ab9a2750 -SIZE (xpi/firefox-i18n-17.0.2/lg.xpi) = 295127 -SHA256 (xpi/firefox-i18n-17.0.2/lt.xpi) = eca9fcabfc1e486ad59ee841460c0379b0bd2e54f1487c63bd61e89d94cabeb7 -SIZE (xpi/firefox-i18n-17.0.2/lt.xpi) = 353962 -SHA256 (xpi/firefox-i18n-17.0.2/lv.xpi) = 11e2eb38248f7e4e39cca3550c3e2953c5541bdc8e78a4aa34f0d578a69c161c -SIZE (xpi/firefox-i18n-17.0.2/lv.xpi) = 295904 -SHA256 (xpi/firefox-i18n-17.0.2/mai.xpi) = 7d93d89c7875fa0a46994b1fecbf1355629b5438e33d4837faefd9242120661f -SIZE (xpi/firefox-i18n-17.0.2/mai.xpi) = 332767 -SHA256 (xpi/firefox-i18n-17.0.2/mk.xpi) = 96bbbb901703e6943e0071f42149b3f79b4689ae52fc1736d1e769f54b830cd3 -SIZE (xpi/firefox-i18n-17.0.2/mk.xpi) = 320078 -SHA256 (xpi/firefox-i18n-17.0.2/ml.xpi) = 185fea73d12ddd3f37b28b6c6235caca5bd468bb601cbcf6cce9ff148931b7f3 -SIZE (xpi/firefox-i18n-17.0.2/ml.xpi) = 366041 -SHA256 (xpi/firefox-i18n-17.0.2/mr.xpi) = 7c36acce4865ff26e5eb0dd60085f703ac6f004f4b6a0ca7aa1ce7c904be718c -SIZE (xpi/firefox-i18n-17.0.2/mr.xpi) = 332360 -SHA256 (xpi/firefox-i18n-17.0.2/nb-NO.xpi) = f5a27194dc2ca6a6a7e2cb7c70784fb3798b49a1f008ff90d98e68997f44ced9 -SIZE (xpi/firefox-i18n-17.0.2/nb-NO.xpi) = 289388 -SHA256 (xpi/firefox-i18n-17.0.2/nl.xpi) = 26c6860c0eead97210586fef461cfc4fb85d726ee8b3941a371686233db60bdc -SIZE (xpi/firefox-i18n-17.0.2/nl.xpi) = 290612 -SHA256 (xpi/firefox-i18n-17.0.2/nn-NO.xpi) = 543971f7f6b15d8ae63120e9fc3f0f7cb1f0a897ca95face942d581e5791186c -SIZE (xpi/firefox-i18n-17.0.2/nn-NO.xpi) = 292344 -SHA256 (xpi/firefox-i18n-17.0.2/nso.xpi) = 1c1baebb622c2826b4e1eb763468bbe0bf56f7fdd2e6431abd7f32004dd55f11 -SIZE (xpi/firefox-i18n-17.0.2/nso.xpi) = 292650 -SHA256 (xpi/firefox-i18n-17.0.2/or.xpi) = c2f1ca7cca066f39ac6883d1067b3c79016a381d46447eb7e4a5293280328d15 -SIZE (xpi/firefox-i18n-17.0.2/or.xpi) = 334183 -SHA256 (xpi/firefox-i18n-17.0.2/pa-IN.xpi) = ff49e418d4e325e4c9fa84781742374b3c27aefbf6b8bbe09887775caaa91ebf -SIZE (xpi/firefox-i18n-17.0.2/pa-IN.xpi) = 323004 -SHA256 (xpi/firefox-i18n-17.0.2/pl.xpi) = 7f721e9882045105313429509ab226e41095b5770884344641de151cb9263388 -SIZE (xpi/firefox-i18n-17.0.2/pl.xpi) = 305535 -SHA256 (xpi/firefox-i18n-17.0.2/pt-BR.xpi) = 15ca70dd7ab5347f1cba36694c3b95186ec51116ce025e5c37af3fbe89e71c61 -SIZE (xpi/firefox-i18n-17.0.2/pt-BR.xpi) = 293744 -SHA256 (xpi/firefox-i18n-17.0.2/pt-PT.xpi) = 0e8a3ca7f66147f0ae6c31d6a852d3b1ccc0ce7ba6172ba3c508e00fbd02fdd7 -SIZE (xpi/firefox-i18n-17.0.2/pt-PT.xpi) = 295958 -SHA256 (xpi/firefox-i18n-17.0.2/rm.xpi) = 3e679cb3e971c789355f49c14e23224182443a2288c77c951cabd7a2c4114213 -SIZE (xpi/firefox-i18n-17.0.2/rm.xpi) = 292966 -SHA256 (xpi/firefox-i18n-17.0.2/ro.xpi) = 09609f849f05a04682ef546680b4f759314ba06019b7dd934790a92e17a366c3 -SIZE (xpi/firefox-i18n-17.0.2/ro.xpi) = 314752 -SHA256 (xpi/firefox-i18n-17.0.2/ru.xpi) = 6527cac471d9871acb1a6da80de4d9710b81ebd49fe43129d2786c3d96e90436 -SIZE (xpi/firefox-i18n-17.0.2/ru.xpi) = 289415 -SHA256 (xpi/firefox-i18n-17.0.2/si.xpi) = 0fb93b12d416021158623f7d7b5b63dda7502a9f20702e30d7744e94ebdf77aa -SIZE (xpi/firefox-i18n-17.0.2/si.xpi) = 321864 -SHA256 (xpi/firefox-i18n-17.0.2/sk.xpi) = ccce11f3a9d13609053a1a3ff147d34c5bade81f7453b3da0ee487df1f5376a6 -SIZE (xpi/firefox-i18n-17.0.2/sk.xpi) = 305978 -SHA256 (xpi/firefox-i18n-17.0.2/sl.xpi) = c90f58f2eb25729d2427e19013ff2d0101c2e99bc4234835fed68c6959287781 -SIZE (xpi/firefox-i18n-17.0.2/sl.xpi) = 291138 -SHA256 (xpi/firefox-i18n-17.0.2/son.xpi) = f88c4f4dbc5b7ade0de1346e35bbc2bacb642eb1d1659d32d7893fcce5737377 -SIZE (xpi/firefox-i18n-17.0.2/son.xpi) = 288184 -SHA256 (xpi/firefox-i18n-17.0.2/sq.xpi) = e3e8314dfbf0d0f864a76916ef3f19ac57256db64f42c4f1ac05cdb0eab9a845 -SIZE (xpi/firefox-i18n-17.0.2/sq.xpi) = 295666 -SHA256 (xpi/firefox-i18n-17.0.2/sr.xpi) = 189f7b005034028a09e10a45f6809c0606dceee1345e986003702ef571a57f31 -SIZE (xpi/firefox-i18n-17.0.2/sr.xpi) = 338515 -SHA256 (xpi/firefox-i18n-17.0.2/sv-SE.xpi) = 0c9892582a3f219fc07e6ba4e588984c008feca940faab729882a50c5e3ac4f2 -SIZE (xpi/firefox-i18n-17.0.2/sv-SE.xpi) = 292584 -SHA256 (xpi/firefox-i18n-17.0.2/ta-LK.xpi) = 91ace66d948897af1e4ab2b519dd6f4572bf13915c9d21a6a7f07cff9dab86f2 -SIZE (xpi/firefox-i18n-17.0.2/ta-LK.xpi) = 344432 -SHA256 (xpi/firefox-i18n-17.0.2/ta.xpi) = 315956e7fccce6adf7f784800a03a7f7e5a24601eb575bd76c6734fec2f1b398 -SIZE (xpi/firefox-i18n-17.0.2/ta.xpi) = 329867 -SHA256 (xpi/firefox-i18n-17.0.2/te.xpi) = 33c6a4a17e92ab3268758ece255271888658cbd9061aee0aea2d50956b85a525 -SIZE (xpi/firefox-i18n-17.0.2/te.xpi) = 346458 -SHA256 (xpi/firefox-i18n-17.0.2/th.xpi) = a13de019b2814a5bb31648dcaff04ba66c128e5e809541899c729bb87171a501 -SIZE (xpi/firefox-i18n-17.0.2/th.xpi) = 328177 -SHA256 (xpi/firefox-i18n-17.0.2/tr.xpi) = b684db78c4f01e13ebdc779f8802b2883f5f8ff8015c38458634a10fb99871b5 -SIZE (xpi/firefox-i18n-17.0.2/tr.xpi) = 300342 -SHA256 (xpi/firefox-i18n-17.0.2/uk.xpi) = e5474caf32058dece593b881802bffd23a9c1548d44a51227dc83d3c8c6b4e01 -SIZE (xpi/firefox-i18n-17.0.2/uk.xpi) = 328751 -SHA256 (xpi/firefox-i18n-17.0.2/vi.xpi) = 8d305abdae1b2dd69fcd73ca56c9ae664208a7cdcfeb3e0e58103dd606256412 -SIZE (xpi/firefox-i18n-17.0.2/vi.xpi) = 318048 -SHA256 (xpi/firefox-i18n-17.0.2/zh-CN.xpi) = 7746f105a0bc76603b07d51e0b01aa88f53edc6dbc4e98e864f7e4c607a5c526 -SIZE (xpi/firefox-i18n-17.0.2/zh-CN.xpi) = 308750 -SHA256 (xpi/firefox-i18n-17.0.2/zh-TW.xpi) = 7724971a455a04f7f8709720fa734ad407a73d09584f7fc16cdf8d7ece31b2e5 -SIZE (xpi/firefox-i18n-17.0.2/zh-TW.xpi) = 309938 -SHA256 (xpi/firefox-i18n-17.0.2/zu.xpi) = 81a2bf30599c6805b47d8af2708c9b2c8bd3d2611f1f0596259ba9ac854e4a98 -SIZE (xpi/firefox-i18n-17.0.2/zu.xpi) = 301094 +SHA256 (xpi/firefox-i18n-17.0.3/af.xpi) = 071c03c7d09774f84b38e6eb26f764f51520914e1e49ab4954b3f7d3662c69cd +SIZE (xpi/firefox-i18n-17.0.3/af.xpi) = 281146 +SHA256 (xpi/firefox-i18n-17.0.3/ak.xpi) = 85b5d080c8d6b70837af017ccb011c421b1fa8ee4dfafd41887ae39b48a1d32c +SIZE (xpi/firefox-i18n-17.0.3/ak.xpi) = 282976 +SHA256 (xpi/firefox-i18n-17.0.3/ar.xpi) = ebea08a32bac331ca001482f0fff34dc8cc4d97d821fa3d091880b36b9afd39a +SIZE (xpi/firefox-i18n-17.0.3/ar.xpi) = 311507 +SHA256 (xpi/firefox-i18n-17.0.3/ast.xpi) = 6df336a7e8b99981d64c0a41688ed70467c3a614f322d60fa87eeca6a1289386 +SIZE (xpi/firefox-i18n-17.0.3/ast.xpi) = 264123 +SHA256 (xpi/firefox-i18n-17.0.3/be.xpi) = 3bcaa079c67bc122bb1c92033df36ab04bcfcf2d939fba9a2a05a40461fd0532 +SIZE (xpi/firefox-i18n-17.0.3/be.xpi) = 273411 +SHA256 (xpi/firefox-i18n-17.0.3/bg.xpi) = 62e9d2155c66d926e41cab60fd5580adb863e4d614df5191f0e22d9f65949ac8 +SIZE (xpi/firefox-i18n-17.0.3/bg.xpi) = 327261 +SHA256 (xpi/firefox-i18n-17.0.3/bn-BD.xpi) = 2bfcf529e8e1ca8f225bc604f4d7d4162cf21e578de7289c96359b1af4d1ce09 +SIZE (xpi/firefox-i18n-17.0.3/bn-BD.xpi) = 339303 +SHA256 (xpi/firefox-i18n-17.0.3/bn-IN.xpi) = 06b5adcf0a57caa2b5f0a1f43d08c28d22337c922124bed6cfaab32439cd199b +SIZE (xpi/firefox-i18n-17.0.3/bn-IN.xpi) = 373021 +SHA256 (xpi/firefox-i18n-17.0.3/br.xpi) = 9e43de7ba8ad6c5a204022d8c80e05f6f9cc58ddb3c5eae883649da16c036fa9 +SIZE (xpi/firefox-i18n-17.0.3/br.xpi) = 291583 +SHA256 (xpi/firefox-i18n-17.0.3/bs.xpi) = 30fa48f7f9749b81f51ae23a8255136c893e7ab6464010505f25585a9b66e7aa +SIZE (xpi/firefox-i18n-17.0.3/bs.xpi) = 292223 +SHA256 (xpi/firefox-i18n-17.0.3/ca.xpi) = 780e7a3f704b8dcffeb0d0d13dee7c792c2d84d25051479700ab4b5d21640b76 +SIZE (xpi/firefox-i18n-17.0.3/ca.xpi) = 293532 +SHA256 (xpi/firefox-i18n-17.0.3/cs.xpi) = 8fc0992479ad173be558ddebe462609963a1881069a0bd67a51790a6fb0e38c3 +SIZE (xpi/firefox-i18n-17.0.3/cs.xpi) = 294133 +SHA256 (xpi/firefox-i18n-17.0.3/cy.xpi) = 2c1c8842ad9ecb48c2f2ffa7c077009523ae9b9b6a90908ddc07b8c0e40c8b99 +SIZE (xpi/firefox-i18n-17.0.3/cy.xpi) = 284868 +SHA256 (xpi/firefox-i18n-17.0.3/da.xpi) = c6b538880b5d9a15172f43ac636b88834a398c59fff40289be915c71da401bcb +SIZE (xpi/firefox-i18n-17.0.3/da.xpi) = 282668 +SHA256 (xpi/firefox-i18n-17.0.3/de.xpi) = 67e6cc6edfab6d27f04c7855a9f740bc077919a8bf2cec95299d394afe83b69d +SIZE (xpi/firefox-i18n-17.0.3/de.xpi) = 270384 +SHA256 (xpi/firefox-i18n-17.0.3/el.xpi) = 87db7ebefe6b6811445b8b7f5db8f46b9492c57c497ddb139766a32335e38053 +SIZE (xpi/firefox-i18n-17.0.3/el.xpi) = 311652 +SHA256 (xpi/firefox-i18n-17.0.3/en-GB.xpi) = 40953b0fa5aac14aae0c0ecd3cb12542c147656f49bfc849f25fb81100bf8832 +SIZE (xpi/firefox-i18n-17.0.3/en-GB.xpi) = 272104 +SHA256 (xpi/firefox-i18n-17.0.3/en-US.xpi) = b85ada0b8f566a787793455feb4df909ce9bff6781cedd0e00d5870d061f61a0 +SIZE (xpi/firefox-i18n-17.0.3/en-US.xpi) = 272155 +SHA256 (xpi/firefox-i18n-17.0.3/en-ZA.xpi) = bcbaeab24284eabb64a97bda3e5b79ce01d56ac69860410362d2d9fd2e697177 +SIZE (xpi/firefox-i18n-17.0.3/en-ZA.xpi) = 272935 +SHA256 (xpi/firefox-i18n-17.0.3/eo.xpi) = e639f7a711a1b5b306abe7f62bbdbcb204ff1d1a13ed4d6b873692a13c2d55e2 +SIZE (xpi/firefox-i18n-17.0.3/eo.xpi) = 284800 +SHA256 (xpi/firefox-i18n-17.0.3/es-AR.xpi) = e1a7ac8e553f396c7250b4a787f29620a2508fbdc6db299590b5b07f91f3593c +SIZE (xpi/firefox-i18n-17.0.3/es-AR.xpi) = 289239 +SHA256 (xpi/firefox-i18n-17.0.3/es-CL.xpi) = 8a6c03a96217270089491fdf93094ff624506108e0c13798105a36b1370a3dc5 +SIZE (xpi/firefox-i18n-17.0.3/es-CL.xpi) = 296878 +SHA256 (xpi/firefox-i18n-17.0.3/es-ES.xpi) = 71298332c8284d493e3f68fa00e8820027e1f3304964954ddc84fb0d7e83b30d +SIZE (xpi/firefox-i18n-17.0.3/es-ES.xpi) = 242185 +SHA256 (xpi/firefox-i18n-17.0.3/es-MX.xpi) = fecae1f3f77c01b9851d7dc7ee42d91716170ae5c8e1998682d722ae04006a46 +SIZE (xpi/firefox-i18n-17.0.3/es-MX.xpi) = 247971 +SHA256 (xpi/firefox-i18n-17.0.3/et.xpi) = 0cf1da98ebace0bf477fe022873ec6e9ef032b8f784ed62a0a8ce95856fee179 +SIZE (xpi/firefox-i18n-17.0.3/et.xpi) = 284694 +SHA256 (xpi/firefox-i18n-17.0.3/eu.xpi) = e0531fe4cdb76daa009cf69f8a9b29e8e3708eff1a96f0a2d7c1c50fd2675fe8 +SIZE (xpi/firefox-i18n-17.0.3/eu.xpi) = 284227 +SHA256 (xpi/firefox-i18n-17.0.3/fa.xpi) = f7b21691ac0e318ad5f41bf787e26478f46d8c9ac2a0548cbd7ffee660274f44 +SIZE (xpi/firefox-i18n-17.0.3/fa.xpi) = 323997 +SHA256 (xpi/firefox-i18n-17.0.3/fi.xpi) = b68b35eb34fa274a5eaf64aa692fabf3a21a97350b7e074308f8453c7bbefe8e +SIZE (xpi/firefox-i18n-17.0.3/fi.xpi) = 288655 +SHA256 (xpi/firefox-i18n-17.0.3/fr.xpi) = bc22e8340b8bc16ea8582eea36231d03e62efe665113f27e286a571cdfb7fcb3 +SIZE (xpi/firefox-i18n-17.0.3/fr.xpi) = 293362 +SHA256 (xpi/firefox-i18n-17.0.3/fy-NL.xpi) = 5867adc287aaf8f6a0f8a4882d4b0b4a494de179bcaa0e8fbfed68f20f69f1ed +SIZE (xpi/firefox-i18n-17.0.3/fy-NL.xpi) = 289690 +SHA256 (xpi/firefox-i18n-17.0.3/ga-IE.xpi) = 4560a8e8b7a7fa416e6442e4fc41cc863915141aac799520a3f6e1bc173e586e +SIZE (xpi/firefox-i18n-17.0.3/ga-IE.xpi) = 296976 +SHA256 (xpi/firefox-i18n-17.0.3/gl.xpi) = 32ae1c3ea97d6c20810612f6b74b72769a126793d712efcb7ef0cee07edfee77 +SIZE (xpi/firefox-i18n-17.0.3/gl.xpi) = 286997 +SHA256 (xpi/firefox-i18n-17.0.3/gu-IN.xpi) = a0561e383171d84e507d81d2eeca579209e05ed0b3e04e9a0264e0d4039d91dc +SIZE (xpi/firefox-i18n-17.0.3/gu-IN.xpi) = 319480 +SHA256 (xpi/firefox-i18n-17.0.3/he.xpi) = 9d01149e413cafbae02ef45ad0a49f344a236ac525a31e292b93c54f8e81671e +SIZE (xpi/firefox-i18n-17.0.3/he.xpi) = 301482 +SHA256 (xpi/firefox-i18n-17.0.3/hi-IN.xpi) = a74daa68927bfb308a277ec282165158e3f811022842a674ad579458cfc4fce6 +SIZE (xpi/firefox-i18n-17.0.3/hi-IN.xpi) = 330864 +SHA256 (xpi/firefox-i18n-17.0.3/hr.xpi) = 0bd2a193ac6210c7560ce5394710f90b280c465b266111e861770ab88cf34e89 +SIZE (xpi/firefox-i18n-17.0.3/hr.xpi) = 287940 +SHA256 (xpi/firefox-i18n-17.0.3/hu.xpi) = 7b19195dd57861ee08ca290e8914526047d799f5422b423debd5adcdf509a7d1 +SIZE (xpi/firefox-i18n-17.0.3/hu.xpi) = 303044 +SHA256 (xpi/firefox-i18n-17.0.3/hy-AM.xpi) = 86eed06a8e26d3c8a1af0d1e16189b6cdfd93f5c29b33925ff0fcde9ba29f4bd +SIZE (xpi/firefox-i18n-17.0.3/hy-AM.xpi) = 328203 +SHA256 (xpi/firefox-i18n-17.0.3/id.xpi) = 8c5b5a079b70eab1aff3ed4cf5d464e781cd0b86525e2434aa408484ab583fc6 +SIZE (xpi/firefox-i18n-17.0.3/id.xpi) = 283725 +SHA256 (xpi/firefox-i18n-17.0.3/is.xpi) = eb944419c1761ee0a7baa1752270980ca188cb41adcedc84ecbbfceb90da5ef1 +SIZE (xpi/firefox-i18n-17.0.3/is.xpi) = 284908 +SHA256 (xpi/firefox-i18n-17.0.3/it.xpi) = 2635678324bce8ba939bc3f0fba89f0b67c0ef830b183a41f684e9105aa85932 +SIZE (xpi/firefox-i18n-17.0.3/it.xpi) = 238645 +SHA256 (xpi/firefox-i18n-17.0.3/ja.xpi) = b916891003c257c78ae8554e96591dc8ffa99f44f156ce9262a9f6694f168cfd +SIZE (xpi/firefox-i18n-17.0.3/ja.xpi) = 322490 +SHA256 (xpi/firefox-i18n-17.0.3/kk.xpi) = 4136ea609019182b415426e80aad92ae539767b7a8ed920ade1950858ad8e189 +SIZE (xpi/firefox-i18n-17.0.3/kk.xpi) = 330352 +SHA256 (xpi/firefox-i18n-17.0.3/kn.xpi) = 246f062c4e08749f5903adf9b5c5efcadd6855947b2837489dc0e94e990a4cc6 +SIZE (xpi/firefox-i18n-17.0.3/kn.xpi) = 354900 +SHA256 (xpi/firefox-i18n-17.0.3/ko.xpi) = f1dcce3f2acac9d2a5aa0ac6eda1830e4797ce3bd4e7a362c3d5f835be0cee7e +SIZE (xpi/firefox-i18n-17.0.3/ko.xpi) = 296729 +SHA256 (xpi/firefox-i18n-17.0.3/ku.xpi) = d2bd6612dc5581672810d5dbdcddb39fa4a5ff0a60f05f028e956e3d6a887680 +SIZE (xpi/firefox-i18n-17.0.3/ku.xpi) = 304898 +SHA256 (xpi/firefox-i18n-17.0.3/lg.xpi) = a8c709b0fe04906f767eb343dd652ecc96d459315876f28e3291a0deef0d827c +SIZE (xpi/firefox-i18n-17.0.3/lg.xpi) = 290627 +SHA256 (xpi/firefox-i18n-17.0.3/lt.xpi) = fdef59413db84a8b72e34a0eab04ed9ad5299a79bf4e955d95496b5d3bbd68a9 +SIZE (xpi/firefox-i18n-17.0.3/lt.xpi) = 349462 +SHA256 (xpi/firefox-i18n-17.0.3/lv.xpi) = 3ef7ef6fcbb710f1250a994ffd145467c0c7e11762c3913e50d278536e4c2246 +SIZE (xpi/firefox-i18n-17.0.3/lv.xpi) = 291404 +SHA256 (xpi/firefox-i18n-17.0.3/mai.xpi) = e33b5faa9c79134653dd54d1e7f9b16ac859ab34f932daa6261be01549368fc5 +SIZE (xpi/firefox-i18n-17.0.3/mai.xpi) = 328267 +SHA256 (xpi/firefox-i18n-17.0.3/mk.xpi) = 1afd534fbde7a716cf821bb4eb8269b60984706aac3fa153a57f9519c90c218d +SIZE (xpi/firefox-i18n-17.0.3/mk.xpi) = 315578 +SHA256 (xpi/firefox-i18n-17.0.3/ml.xpi) = ebcc45470917f2bbd6b645be2aea1da2664e0df2a4eacb8fe8b00b7b219b93f5 +SIZE (xpi/firefox-i18n-17.0.3/ml.xpi) = 361541 +SHA256 (xpi/firefox-i18n-17.0.3/mr.xpi) = 40fe666ea4df02f75019448dfe8b692dabf4d53d64e8bcbd49ba1518232bd458 +SIZE (xpi/firefox-i18n-17.0.3/mr.xpi) = 327860 +SHA256 (xpi/firefox-i18n-17.0.3/nb-NO.xpi) = cae05936e932beb9484851ad37a6a44e59dcd548c9c4d126edf6ca1f0dde301e +SIZE (xpi/firefox-i18n-17.0.3/nb-NO.xpi) = 284888 +SHA256 (xpi/firefox-i18n-17.0.3/nl.xpi) = 23fac03ab21b3fcb6288fe384d81f576626563eb9f80f556444a0ecfc500cbdb +SIZE (xpi/firefox-i18n-17.0.3/nl.xpi) = 286127 +SHA256 (xpi/firefox-i18n-17.0.3/nn-NO.xpi) = f240b672631b7b4386fb2135867af37d539991217151b3c771ff6e7bdc7361b2 +SIZE (xpi/firefox-i18n-17.0.3/nn-NO.xpi) = 287844 +SHA256 (xpi/firefox-i18n-17.0.3/nso.xpi) = 4e24b9012dc2e985ca2e01f8e237a5252865baf949b0c58d7221020357aea7fc +SIZE (xpi/firefox-i18n-17.0.3/nso.xpi) = 288150 +SHA256 (xpi/firefox-i18n-17.0.3/or.xpi) = ed8ea2d5d746edd0f5acede107145d22d5e92a141c6b86cdbe7bf322066bf2ba +SIZE (xpi/firefox-i18n-17.0.3/or.xpi) = 329683 +SHA256 (xpi/firefox-i18n-17.0.3/pa-IN.xpi) = 13183f3938022dd23cba4948eeea2d2bfc13d6f42d634e9673f604475392cd19 +SIZE (xpi/firefox-i18n-17.0.3/pa-IN.xpi) = 331278 +SHA256 (xpi/firefox-i18n-17.0.3/pl.xpi) = b4662a1f310ef35fae92ba83fd92cb646b174cb70fb6d1f50c3fa852cb36090e +SIZE (xpi/firefox-i18n-17.0.3/pl.xpi) = 301305 +SHA256 (xpi/firefox-i18n-17.0.3/pt-BR.xpi) = 5e664054449c6a40e11c5d2233322b4ced24946e5b57fa13eed944fca24e7f9f +SIZE (xpi/firefox-i18n-17.0.3/pt-BR.xpi) = 290171 +SHA256 (xpi/firefox-i18n-17.0.3/pt-PT.xpi) = cc64bed7a253c84430516dbfcf9ab827e75d6a364abbb6bd2d875adf7f4dc181 +SIZE (xpi/firefox-i18n-17.0.3/pt-PT.xpi) = 291545 +SHA256 (xpi/firefox-i18n-17.0.3/rm.xpi) = a1dafc56067b354c06c3a2a0182b0bfee280ecab4a5c01fe00b2fdc4c2df8fcb +SIZE (xpi/firefox-i18n-17.0.3/rm.xpi) = 288466 +SHA256 (xpi/firefox-i18n-17.0.3/ro.xpi) = 8fc36326936c6e74d5088a6d82d6dace486b46f0bc33923ab0a43b0766864116 +SIZE (xpi/firefox-i18n-17.0.3/ro.xpi) = 315765 +SHA256 (xpi/firefox-i18n-17.0.3/ru.xpi) = 66a8b0801f651513a3d03b1a296bdc755d4d60d8c4648a12aefe000e142f58e3 +SIZE (xpi/firefox-i18n-17.0.3/ru.xpi) = 285022 +SHA256 (xpi/firefox-i18n-17.0.3/si.xpi) = ad9a95d61bbf0b636ce912026ad6d5bdc18a9802eddedffede30c960eac27699 +SIZE (xpi/firefox-i18n-17.0.3/si.xpi) = 316130 +SHA256 (xpi/firefox-i18n-17.0.3/sk.xpi) = c93f8b83bb702c5a17c35f66b9e404426b32893d723b96ba02045d78e9d34308 +SIZE (xpi/firefox-i18n-17.0.3/sk.xpi) = 301478 +SHA256 (xpi/firefox-i18n-17.0.3/sl.xpi) = 12109be0edc18cf0241648f850f911c21ff0821d0c26627ac6b3922391fa7e8f +SIZE (xpi/firefox-i18n-17.0.3/sl.xpi) = 286668 +SHA256 (xpi/firefox-i18n-17.0.3/son.xpi) = eda1b1c033fb8fa437aec361855bace08ead483a4d88696dedf5379c38f80b49 +SIZE (xpi/firefox-i18n-17.0.3/son.xpi) = 283684 +SHA256 (xpi/firefox-i18n-17.0.3/sq.xpi) = b300a7f049269a460fd973f7dfae20a81b64d4d0932092e4ac67ac8f58c38c7b +SIZE (xpi/firefox-i18n-17.0.3/sq.xpi) = 291166 +SHA256 (xpi/firefox-i18n-17.0.3/sr.xpi) = 8fd7f9b18be7e4010b35750e27e34d092d69fc131598f51ba53567233fce02bf +SIZE (xpi/firefox-i18n-17.0.3/sr.xpi) = 329241 +SHA256 (xpi/firefox-i18n-17.0.3/sv-SE.xpi) = c499fae2bafb87fe4ce3d75b534d29e7cb75d2c2ef41a7f330694c36abc33eaa +SIZE (xpi/firefox-i18n-17.0.3/sv-SE.xpi) = 288084 +SHA256 (xpi/firefox-i18n-17.0.3/ta-LK.xpi) = 6efc61a98280c37c05298e598a5aa9869c7d6d2aa1eab086cb26c8ec091f4ffc +SIZE (xpi/firefox-i18n-17.0.3/ta-LK.xpi) = 338714 +SHA256 (xpi/firefox-i18n-17.0.3/ta.xpi) = 928673b7fb228e566b15b28cca41a03237e6976e87d8bb19df2ee259f787b4c6 +SIZE (xpi/firefox-i18n-17.0.3/ta.xpi) = 325367 +SHA256 (xpi/firefox-i18n-17.0.3/te.xpi) = f0404f033b28bf3c8ee00948825e3cdc17586cb8fcbeb801d2a7b36ca24aa4fd +SIZE (xpi/firefox-i18n-17.0.3/te.xpi) = 341958 +SHA256 (xpi/firefox-i18n-17.0.3/th.xpi) = e66dc95b67e76d37b23796bf18402f8bdf21fd743bad8a45e60425ed34d34d54 +SIZE (xpi/firefox-i18n-17.0.3/th.xpi) = 323677 +SHA256 (xpi/firefox-i18n-17.0.3/tr.xpi) = 22259941866f48d9c91b9e4fbf5989a3c9a30be3c163aa11e09431289ffb83cc +SIZE (xpi/firefox-i18n-17.0.3/tr.xpi) = 294519 +SHA256 (xpi/firefox-i18n-17.0.3/uk.xpi) = 3db2693e6ca5ea64cddf060baba6ad9d24ec31c07ee18e85767611afbb3fe0b8 +SIZE (xpi/firefox-i18n-17.0.3/uk.xpi) = 324251 +SHA256 (xpi/firefox-i18n-17.0.3/vi.xpi) = ddb67f1f6a7e20860ddc7a2b62e9ec81cd6a7f2cf7d0920d5338beedd3be903b +SIZE (xpi/firefox-i18n-17.0.3/vi.xpi) = 312377 +SHA256 (xpi/firefox-i18n-17.0.3/zh-CN.xpi) = 7a5e15d11fb4923296fd1cbcb3a365a57570cd56842bbdf65edcb43d06b3ac59 +SIZE (xpi/firefox-i18n-17.0.3/zh-CN.xpi) = 304250 +SHA256 (xpi/firefox-i18n-17.0.3/zh-TW.xpi) = 8c767d464011c4bdc71b41322221ffeb56e2bde6336c1ed1014cb5a8651a5d34 +SIZE (xpi/firefox-i18n-17.0.3/zh-TW.xpi) = 305457 +SHA256 (xpi/firefox-i18n-17.0.3/zu.xpi) = 109766d170405a47dfbfa63ecc23c556c32105ab1d77853b8d5ad709453a4fb4 +SIZE (xpi/firefox-i18n-17.0.3/zu.xpi) = 296594 Modified: trunk/www/firefox-i18n/Makefile ============================================================================== --- trunk/www/firefox-i18n/Makefile Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/firefox-i18n/Makefile Sat Feb 23 23:41:44 2013 (r1186) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox-i18n/Makefile 310207 2013-01-10 22:29:23Z flo $ PORTNAME= firefox-i18n -PORTVERSION= 18.0 +PORTVERSION= 19.0 CATEGORIES= www MASTER_SITE_SUBDIR= firefox/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -14,7 +14,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USE_FIREFOX= 18 +USE_FIREFOX= 19 USE_XPI= firefox linux-firefox USE_SUBMAKE= yes Modified: trunk/www/firefox-i18n/distinfo ============================================================================== --- trunk/www/firefox-i18n/distinfo Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/firefox-i18n/distinfo Sat Feb 23 23:41:44 2013 (r1186) @@ -1,164 +1,164 @@ -SHA256 (xpi/firefox-i18n-18.0/af.xpi) = ec615f98f61239de0fef37a13ae4d9dc86176c7293b00abba276ff47a2213a10 -SIZE (xpi/firefox-i18n-18.0/af.xpi) = 290197 -SHA256 (xpi/firefox-i18n-18.0/ak.xpi) = c419c301af9f98e9789797a9f3c4ff4641754f72f35d10adc1fed36a2f00237e -SIZE (xpi/firefox-i18n-18.0/ak.xpi) = 292032 -SHA256 (xpi/firefox-i18n-18.0/ar.xpi) = 6eaedfe083a03737cb70cb4a95a997817e7ebf4e97b4da7c94e49c732d0df0cb -SIZE (xpi/firefox-i18n-18.0/ar.xpi) = 320810 -SHA256 (xpi/firefox-i18n-18.0/ast.xpi) = ffd0c2726fa3ebacdff7557b59e5d93af1d79f0f93921a2aa05b68a244116589 -SIZE (xpi/firefox-i18n-18.0/ast.xpi) = 274123 -SHA256 (xpi/firefox-i18n-18.0/be.xpi) = d248a4be34e4be30c8c5e5f1f73f036854088010113ab252cc9202aae2d340ca -SIZE (xpi/firefox-i18n-18.0/be.xpi) = 283984 -SHA256 (xpi/firefox-i18n-18.0/bg.xpi) = 113d52823f8946d9ed7f342054efc6095f4f65b59174528f39847103f0d36a8b -SIZE (xpi/firefox-i18n-18.0/bg.xpi) = 336593 -SHA256 (xpi/firefox-i18n-18.0/bn-BD.xpi) = df70c518378890f7445c3f7779e4d366834bf52d319135def75ce957d6e479c3 -SIZE (xpi/firefox-i18n-18.0/bn-BD.xpi) = 349685 -SHA256 (xpi/firefox-i18n-18.0/bn-IN.xpi) = c22d62a41af648e3e73ad3364c25b80889dacc602be7ce6c302eb84ca62df451 -SIZE (xpi/firefox-i18n-18.0/bn-IN.xpi) = 382202 -SHA256 (xpi/firefox-i18n-18.0/br.xpi) = dee9c3d21d515b067b75f3b1bbccd9a43fac8853dc7e68315871f04c494162b0 -SIZE (xpi/firefox-i18n-18.0/br.xpi) = 299178 -SHA256 (xpi/firefox-i18n-18.0/bs.xpi) = d65ddcc4b537049ab2120a66825081cdc5c386b65dc6125f9702a7059eab4101 -SIZE (xpi/firefox-i18n-18.0/bs.xpi) = 301364 -SHA256 (xpi/firefox-i18n-18.0/ca.xpi) = 07fe39e491e7db5d353e6b802fa0ef8118c88ec6c436fdec61b8af41a13cae57 -SIZE (xpi/firefox-i18n-18.0/ca.xpi) = 301729 -SHA256 (xpi/firefox-i18n-18.0/cs.xpi) = 5fbc3d6e30bb3da7924c2e4b94325bfa74376369f134f52804febeb0a3f69bfa -SIZE (xpi/firefox-i18n-18.0/cs.xpi) = 303376 -SHA256 (xpi/firefox-i18n-18.0/cy.xpi) = 45057fe7aa10c0bba63833075fa9a174585a60c20c723f354a6a15f735d9ac69 -SIZE (xpi/firefox-i18n-18.0/cy.xpi) = 294047 -SHA256 (xpi/firefox-i18n-18.0/da.xpi) = 9700f5a3e3af5a11e3815217d4eb33041c05e4a36a7a8967dda1f99fc5a45373 -SIZE (xpi/firefox-i18n-18.0/da.xpi) = 290720 -SHA256 (xpi/firefox-i18n-18.0/de.xpi) = 0313e4b1f39f64c6cf1790aacec4ac2460fb030cf299b721d84bf93628816d0c -SIZE (xpi/firefox-i18n-18.0/de.xpi) = 278521 -SHA256 (xpi/firefox-i18n-18.0/el.xpi) = bf98480d33aa29d10f2f6a6e1a3c3d701e0a7ca7545baadfef4764fa3f9c2d23 -SIZE (xpi/firefox-i18n-18.0/el.xpi) = 328483 -SHA256 (xpi/firefox-i18n-18.0/en-GB.xpi) = 8bb7df4df90ba3e76e41cd268fbfda0836c11e6bbd29608b88b42deaea602e8f -SIZE (xpi/firefox-i18n-18.0/en-GB.xpi) = 279671 -SHA256 (xpi/firefox-i18n-18.0/en-US.xpi) = 440405f3a5f721d9e9488cb0f59bbc98da2f94992b72647c465ea7432e3fa533 -SIZE (xpi/firefox-i18n-18.0/en-US.xpi) = 281027 -SHA256 (xpi/firefox-i18n-18.0/en-ZA.xpi) = 9d1257ecde3ac065add91f0a886a36b8e49eeaf0a16104189ec854d0f8939f95 -SIZE (xpi/firefox-i18n-18.0/en-ZA.xpi) = 281568 -SHA256 (xpi/firefox-i18n-18.0/eo.xpi) = abf3a015163f65ee5a2d3ea46a2fd46428f4e9339122a5f8a769bfd1bcfe256a -SIZE (xpi/firefox-i18n-18.0/eo.xpi) = 294113 -SHA256 (xpi/firefox-i18n-18.0/es-AR.xpi) = 24e14f386f4e0cc7d57676fe14e6f907881dac8cb16c096c30993800c815ea6f -SIZE (xpi/firefox-i18n-18.0/es-AR.xpi) = 296926 -SHA256 (xpi/firefox-i18n-18.0/es-CL.xpi) = 1544c0d2162bcc345a65fb0cd5897f6cde268eea6ec579b56c14a96e776635de -SIZE (xpi/firefox-i18n-18.0/es-CL.xpi) = 305621 -SHA256 (xpi/firefox-i18n-18.0/es-ES.xpi) = 97650503d3364f5b108e0e4a685aa0e260b480c75a8cd7ffe5285f7f4db0c487 -SIZE (xpi/firefox-i18n-18.0/es-ES.xpi) = 249721 -SHA256 (xpi/firefox-i18n-18.0/es-MX.xpi) = 70e093b910b54a77006202a98306cd66824553df15ae9e61aec61b7ddcecec6f -SIZE (xpi/firefox-i18n-18.0/es-MX.xpi) = 257693 -SHA256 (xpi/firefox-i18n-18.0/et.xpi) = cef0e3ef852574d3fdb8147b07940cbf96694241948859eb2f93fc58f6c4623f -SIZE (xpi/firefox-i18n-18.0/et.xpi) = 292421 -SHA256 (xpi/firefox-i18n-18.0/eu.xpi) = 8a60e9402cd0bdeb8dae1490a1ff2b990f91a7196fafba1c2cc29a595cbe41d4 -SIZE (xpi/firefox-i18n-18.0/eu.xpi) = 292628 -SHA256 (xpi/firefox-i18n-18.0/fa.xpi) = 80dfeed5a601678efa5373172b1593a7c0a5d7427f88e09b36e4eab29aee03eb -SIZE (xpi/firefox-i18n-18.0/fa.xpi) = 328164 -SHA256 (xpi/firefox-i18n-18.0/fi.xpi) = 8edfceb32534a6065942acde7a60e4faea37bee602d96ca8e6fcf3ee6546d463 -SIZE (xpi/firefox-i18n-18.0/fi.xpi) = 296405 -SHA256 (xpi/firefox-i18n-18.0/fr.xpi) = da8ee38aeac38a048b046082c1095a26d527da8f32a70a2f6be6fe644cfbe34a -SIZE (xpi/firefox-i18n-18.0/fr.xpi) = 301055 -SHA256 (xpi/firefox-i18n-18.0/fy-NL.xpi) = 3565d2b8aecb35c977573776a40cf9125825c560614cab54717dc0513951343d -SIZE (xpi/firefox-i18n-18.0/fy-NL.xpi) = 297842 -SHA256 (xpi/firefox-i18n-18.0/ga-IE.xpi) = e710115da28cc6875987c8e89d5b02cce65cc4f5e5bd259e9d00ee84182afd31 -SIZE (xpi/firefox-i18n-18.0/ga-IE.xpi) = 306165 -SHA256 (xpi/firefox-i18n-18.0/gl.xpi) = fdb3ead49de542f9a4fefb550a8937fde2a01bbf2f5c714adb4ff8a3413a2ead -SIZE (xpi/firefox-i18n-18.0/gl.xpi) = 296117 -SHA256 (xpi/firefox-i18n-18.0/gu-IN.xpi) = 337ad24946899d504958dae8d96a6e9819cee433e718038a2ca3712da36ca04b -SIZE (xpi/firefox-i18n-18.0/gu-IN.xpi) = 329139 -SHA256 (xpi/firefox-i18n-18.0/he.xpi) = 00bec56fcebd5542a1500c31681acce7af4e31ad083549559a2d5f0ceed7c6df -SIZE (xpi/firefox-i18n-18.0/he.xpi) = 310625 -SHA256 (xpi/firefox-i18n-18.0/hi-IN.xpi) = 0c8ff57d18dc1202157269c393e936d3587c2dda9551558db0d346f55fe36a03 -SIZE (xpi/firefox-i18n-18.0/hi-IN.xpi) = 340355 -SHA256 (xpi/firefox-i18n-18.0/hr.xpi) = 2b0055ab81ccd10f94ae0612a777f4ba2a63638b0f06c17b66702e756ac9b6ca -SIZE (xpi/firefox-i18n-18.0/hr.xpi) = 295802 -SHA256 (xpi/firefox-i18n-18.0/hu.xpi) = cb502aa109d76d8bf781954b0694b772906bc9f7ce3c8d32728fd1753a0d9d1d -SIZE (xpi/firefox-i18n-18.0/hu.xpi) = 311629 -SHA256 (xpi/firefox-i18n-18.0/hy-AM.xpi) = 4ce31c92ec6e8e8bcd0ca29916dea53d83292af9211c36ccd47a418762070e0e -SIZE (xpi/firefox-i18n-18.0/hy-AM.xpi) = 337288 -SHA256 (xpi/firefox-i18n-18.0/id.xpi) = cc855a5abc73239d03879765ca5167ed22cbd11a6264f3086e9c37e2fe05df42 -SIZE (xpi/firefox-i18n-18.0/id.xpi) = 292685 -SHA256 (xpi/firefox-i18n-18.0/is.xpi) = ca884bb02d6b710003b764cb86aa6f519f96b572c1c3c5331031d4bab90e0cc8 -SIZE (xpi/firefox-i18n-18.0/is.xpi) = 293896 -SHA256 (xpi/firefox-i18n-18.0/it.xpi) = fa81e9536555aeca783e2176c9814061f5bdcfe4666db859e86cf5cbf2d9a0ea -SIZE (xpi/firefox-i18n-18.0/it.xpi) = 245757 -SHA256 (xpi/firefox-i18n-18.0/ja.xpi) = b86cbd21a6cb19e3e48a27664eccb8fbae8a8358f70b89ffadbc0710c21d1f65 -SIZE (xpi/firefox-i18n-18.0/ja.xpi) = 332142 -SHA256 (xpi/firefox-i18n-18.0/kk.xpi) = caf8a17e0ce3c6a7bddfaac114b97507a8142165101581c17e3be399aba7d610 -SIZE (xpi/firefox-i18n-18.0/kk.xpi) = 338262 -SHA256 (xpi/firefox-i18n-18.0/kn.xpi) = 10afd530fcc2f0e503ef36a62157e89be485233f5b18e6ab144e9ee004a1a955 -SIZE (xpi/firefox-i18n-18.0/kn.xpi) = 364066 -SHA256 (xpi/firefox-i18n-18.0/ko.xpi) = 91ece69cf30b96207c18b6038d246e4ae56b0cbe0c6b0bf8ae9601a31894e72e -SIZE (xpi/firefox-i18n-18.0/ko.xpi) = 304674 -SHA256 (xpi/firefox-i18n-18.0/ku.xpi) = 8d359e1a60208d72f85da04f4ec35fd5b560667a8909f2bbd5687396fb8639b1 -SIZE (xpi/firefox-i18n-18.0/ku.xpi) = 313503 -SHA256 (xpi/firefox-i18n-18.0/lg.xpi) = 2fb581047bfd9455a9dcb38a815a22856edab63dd67610080777576a4f90735e -SIZE (xpi/firefox-i18n-18.0/lg.xpi) = 299711 -SHA256 (xpi/firefox-i18n-18.0/lt.xpi) = a1df9b7576835c5d286cbb94c90380c83e1af62a338f97821580274057b4244d -SIZE (xpi/firefox-i18n-18.0/lt.xpi) = 312535 -SHA256 (xpi/firefox-i18n-18.0/lv.xpi) = 20b29f6aef2262d5c8cbb1325d73fe033be946bb3174183726103831cdf6eecf -SIZE (xpi/firefox-i18n-18.0/lv.xpi) = 293706 -SHA256 (xpi/firefox-i18n-18.0/mai.xpi) = 43954afb184f86b77e8f8c8cc912fe2cf046b0c66425ed2442a5a342986a57b5 -SIZE (xpi/firefox-i18n-18.0/mai.xpi) = 337574 -SHA256 (xpi/firefox-i18n-18.0/mk.xpi) = bd102720786b7ce2bd5914eac87aedad1ca77d0e0d6f7af66c9a68e58cb03480 -SIZE (xpi/firefox-i18n-18.0/mk.xpi) = 324802 -SHA256 (xpi/firefox-i18n-18.0/ml.xpi) = 1dd385805f170d361aed64cd2c8b0e178a63e463aa1f52e1d203aedbb9f8be0f -SIZE (xpi/firefox-i18n-18.0/ml.xpi) = 371094 -SHA256 (xpi/firefox-i18n-18.0/mr.xpi) = 017d48da78ec0417dd374fb75773ee79a426fb7eb734c61c6c76e804b56f55b1 -SIZE (xpi/firefox-i18n-18.0/mr.xpi) = 337701 -SHA256 (xpi/firefox-i18n-18.0/nb-NO.xpi) = a3493d5882ef1d0c7d5b04b019cc910e9af59eb213ee0250017a8560228f2b23 -SIZE (xpi/firefox-i18n-18.0/nb-NO.xpi) = 292590 -SHA256 (xpi/firefox-i18n-18.0/nl.xpi) = 314c2abc7fc62d230fd113ccb70dafedcf76782b8ebf0421a47d909c6be71789 -SIZE (xpi/firefox-i18n-18.0/nl.xpi) = 293813 -SHA256 (xpi/firefox-i18n-18.0/nn-NO.xpi) = f48a90ace289cccf3b0a8edf4e558d36e1b0127f314e7afe39f10ba5fecbe4f8 -SIZE (xpi/firefox-i18n-18.0/nn-NO.xpi) = 296936 -SHA256 (xpi/firefox-i18n-18.0/nso.xpi) = 83d70f8222e3489c64aa574734b6093f363c7e87fa8509a4f354929613277c4a -SIZE (xpi/firefox-i18n-18.0/nso.xpi) = 297261 -SHA256 (xpi/firefox-i18n-18.0/or.xpi) = ababf628d316fa9928c9c593d3468b84db06751eb05efd2a22fdc4e7c867ce86 -SIZE (xpi/firefox-i18n-18.0/or.xpi) = 339402 -SHA256 (xpi/firefox-i18n-18.0/pa-IN.xpi) = 09691aab9de0f7cc497933485b8d25c2865826018f299cc72749c4dc2149f01b -SIZE (xpi/firefox-i18n-18.0/pa-IN.xpi) = 327711 -SHA256 (xpi/firefox-i18n-18.0/pl.xpi) = b1db3cd45b2b27749d43413cf68508c9e4b92f10d253cea870d2393b8bfc5ffb -SIZE (xpi/firefox-i18n-18.0/pl.xpi) = 310234 -SHA256 (xpi/firefox-i18n-18.0/pt-BR.xpi) = 7f835180c342665f7d575d04c5164440cdfce9396c9e15d05c22129927fcecae -SIZE (xpi/firefox-i18n-18.0/pt-BR.xpi) = 298674 -SHA256 (xpi/firefox-i18n-18.0/pt-PT.xpi) = 44b36f7dd48626908dd091c00afd2a081620859135fd734bcc7f37d80226b01f -SIZE (xpi/firefox-i18n-18.0/pt-PT.xpi) = 298405 -SHA256 (xpi/firefox-i18n-18.0/rm.xpi) = 5fadabd7559ec85405d599e8c15fd153e8f0341e9410ce96aa2f9e016a795cf3 -SIZE (xpi/firefox-i18n-18.0/rm.xpi) = 296158 -SHA256 (xpi/firefox-i18n-18.0/ro.xpi) = 23e18fdd2805398e18f81e755e42bfa41e3d7e8c68bb990295ceaf47b256b833 -SIZE (xpi/firefox-i18n-18.0/ro.xpi) = 319296 -SHA256 (xpi/firefox-i18n-18.0/ru.xpi) = 7a9916f8cc2e743e3a3a10b03a3575fb0d9a7807aeddfe3a51147fb1e3f2e795 -SIZE (xpi/firefox-i18n-18.0/ru.xpi) = 292427 -SHA256 (xpi/firefox-i18n-18.0/si.xpi) = 972449afca04b1470156edf6278cacef2a8ea95eeb0ef3cb1d43e660ba0d389f -SIZE (xpi/firefox-i18n-18.0/si.xpi) = 326714 -SHA256 (xpi/firefox-i18n-18.0/sk.xpi) = 6d95a4bb54f6f004df610af33229830ba4e4ee040af1fe7452738361207994f8 -SIZE (xpi/firefox-i18n-18.0/sk.xpi) = 309261 -SHA256 (xpi/firefox-i18n-18.0/sl.xpi) = b42f103b75d1475509e5fa99cd100e25c0dc8919d3f9eb6f273633ba87582d75 -SIZE (xpi/firefox-i18n-18.0/sl.xpi) = 292333 -SHA256 (xpi/firefox-i18n-18.0/son.xpi) = d82ff652148a24587a5ca41ab42373e8aad3692ac77203ddd881ed02a0bd57df -SIZE (xpi/firefox-i18n-18.0/son.xpi) = 292736 -SHA256 (xpi/firefox-i18n-18.0/sq.xpi) = 609ac57fe54034f649e564edf69ba1b278a9f1aab06f4a311092cb9c1b667874 -SIZE (xpi/firefox-i18n-18.0/sq.xpi) = 299091 -SHA256 (xpi/firefox-i18n-18.0/sr.xpi) = 59eca44e8bc84a1fcbb5d705f30a27fa9703dccadc350371a5f351f84f5e3e5c -SIZE (xpi/firefox-i18n-18.0/sr.xpi) = 342986 -SHA256 (xpi/firefox-i18n-18.0/sv-SE.xpi) = ba6296e0d25e7d33ac048863d10f4f504cbba6c21559f8970f99e639dd3228e2 -SIZE (xpi/firefox-i18n-18.0/sv-SE.xpi) = 296299 -SHA256 (xpi/firefox-i18n-18.0/ta-LK.xpi) = 846f09087d642091542b3c2938b31ea6191dbdb448f5da6252a327d4e8d64907 -SIZE (xpi/firefox-i18n-18.0/ta-LK.xpi) = 348880 -SHA256 (xpi/firefox-i18n-18.0/ta.xpi) = db4183c24131d95f26f3c06c20959ea41891525550c2ed6a5c697db83e10397f -SIZE (xpi/firefox-i18n-18.0/ta.xpi) = 333867 -SHA256 (xpi/firefox-i18n-18.0/te.xpi) = f81fa1ec7bea4f8f0f249fb96410ee991915e190074db940d489a3b2a4130e40 -SIZE (xpi/firefox-i18n-18.0/te.xpi) = 348022 -SHA256 (xpi/firefox-i18n-18.0/th.xpi) = 083921dd603a4c86da42e27150eba77ef422279d7cca6a06c6121aec44fed302 -SIZE (xpi/firefox-i18n-18.0/th.xpi) = 332567 -SHA256 (xpi/firefox-i18n-18.0/tr.xpi) = 940a948eaf1ee4805399aa1fedabdb6fdf108ec5b8b56210f8157c6010e68cad -SIZE (xpi/firefox-i18n-18.0/tr.xpi) = 303776 -SHA256 (xpi/firefox-i18n-18.0/uk.xpi) = 91be4d10068ea3032d049664eee8ffb1790b12a7951e453dd4c4bef566ddc8af -SIZE (xpi/firefox-i18n-18.0/uk.xpi) = 333533 -SHA256 (xpi/firefox-i18n-18.0/vi.xpi) = 42c1361211a0692e6475c30fe464735eab7fd03d2dd9e0168a669684c0fc0a48 -SIZE (xpi/firefox-i18n-18.0/vi.xpi) = 322148 -SHA256 (xpi/firefox-i18n-18.0/zh-CN.xpi) = fa5816d39c1752d987c3772414526ced9e92f63c6c9f22805ca5b2da4f6d03c7 -SIZE (xpi/firefox-i18n-18.0/zh-CN.xpi) = 313764 -SHA256 (xpi/firefox-i18n-18.0/zh-TW.xpi) = 9fe7a039ddaf7c0666c3e25cc87c6a342a5ac09b0316c60f7723c927167c2095 -SIZE (xpi/firefox-i18n-18.0/zh-TW.xpi) = 315081 -SHA256 (xpi/firefox-i18n-18.0/zu.xpi) = 442ea76cdfc9f94eb66c4479b9647466d1f06d5c2bad993dee45542937bdfbcd -SIZE (xpi/firefox-i18n-18.0/zu.xpi) = 305238 +SHA256 (xpi/firefox-i18n-19.0/af.xpi) = 5e7cc33a96a21535baf9f13bf7fa35b4617f0e13302f8c727e7191347dfbb2e2 +SIZE (xpi/firefox-i18n-19.0/af.xpi) = 293480 +SHA256 (xpi/firefox-i18n-19.0/ak.xpi) = d91e1ec1d678cd6d965ad18fe64f4a0d2bcb0f6ee6e027f002d764d039f3d215 +SIZE (xpi/firefox-i18n-19.0/ak.xpi) = 296795 +SHA256 (xpi/firefox-i18n-19.0/ar.xpi) = e6b56191f49a7e0ad90ac2f7afe4440e369466d6a0227ba702457aa17f78ec01 +SIZE (xpi/firefox-i18n-19.0/ar.xpi) = 324465 +SHA256 (xpi/firefox-i18n-19.0/ast.xpi) = 56de0774d08cb9efa57a47c5abf1d57f894e4519991d4471c29c773d52986f41 +SIZE (xpi/firefox-i18n-19.0/ast.xpi) = 269700 +SHA256 (xpi/firefox-i18n-19.0/be.xpi) = 8e3cee7ff980ed5d2ee89efbfba8d8564ce4065aaa234df3560de28560411b5e +SIZE (xpi/firefox-i18n-19.0/be.xpi) = 287724 +SHA256 (xpi/firefox-i18n-19.0/bg.xpi) = 3544a66622bc364c4574292adb9ba8f59c90e0d7caed0a8d2fc793246255f6de +SIZE (xpi/firefox-i18n-19.0/bg.xpi) = 341210 +SHA256 (xpi/firefox-i18n-19.0/bn-BD.xpi) = b91f4fb0767176eef3c6421da58ae5701131be163fd6d97ec15536b97239b0ea +SIZE (xpi/firefox-i18n-19.0/bn-BD.xpi) = 354720 +SHA256 (xpi/firefox-i18n-19.0/bn-IN.xpi) = acdc4910ac7ae52a64beb3e0f908585d3dddc95378e663651e36e3d54ab33541 +SIZE (xpi/firefox-i18n-19.0/bn-IN.xpi) = 386850 +SHA256 (xpi/firefox-i18n-19.0/br.xpi) = dc7399b7077d1a08eb5e772a6af190010b91ab12b63a8d50ea37ae40dcd9aa3f +SIZE (xpi/firefox-i18n-19.0/br.xpi) = 302695 +SHA256 (xpi/firefox-i18n-19.0/bs.xpi) = 25d230c78c8e61c7e60cb177e2524336425c875f072683e6c2a02768bd79d54b +SIZE (xpi/firefox-i18n-19.0/bs.xpi) = 298729 +SHA256 (xpi/firefox-i18n-19.0/ca.xpi) = 65cfe6fca3139d42e915f92792c42be46c0ba05c46ddef94e1f557d8c45dff10 +SIZE (xpi/firefox-i18n-19.0/ca.xpi) = 305630 +SHA256 (xpi/firefox-i18n-19.0/cs.xpi) = 7e88e39d04cd2c72be43d497d64b668e47881c71e4c64c5f953748939cf81cd0 +SIZE (xpi/firefox-i18n-19.0/cs.xpi) = 304696 +SHA256 (xpi/firefox-i18n-19.0/cy.xpi) = 78f95c1c39ab6e81477170c30fb35fa879a87eb4673c3f2bccc3019ba291a5f7 +SIZE (xpi/firefox-i18n-19.0/cy.xpi) = 297429 +SHA256 (xpi/firefox-i18n-19.0/da.xpi) = 67dfe14e655ba0257d2ac9f7fd39d0dfb81a953e4e39bbdb162b5b150920195e +SIZE (xpi/firefox-i18n-19.0/da.xpi) = 294085 +SHA256 (xpi/firefox-i18n-19.0/de.xpi) = 6324feb3ee3f25c63cb213ac894ea642994dfc09656c23fa32661448d418bfc8 +SIZE (xpi/firefox-i18n-19.0/de.xpi) = 284208 +SHA256 (xpi/firefox-i18n-19.0/el.xpi) = c5987453160ebb20cee405536ff00d43179d2bef308e29e3f5daa894431de38b +SIZE (xpi/firefox-i18n-19.0/el.xpi) = 331441 +SHA256 (xpi/firefox-i18n-19.0/en-GB.xpi) = afc847fad4b9d4aafb3f41f86220dc009857d534cf8d2c7f3df92bf609ff7a3d +SIZE (xpi/firefox-i18n-19.0/en-GB.xpi) = 283378 +SHA256 (xpi/firefox-i18n-19.0/en-US.xpi) = 261249c2a9a02c27457ab733874da690c44e4fb85c39d4437a5974ce99bfba31 +SIZE (xpi/firefox-i18n-19.0/en-US.xpi) = 284312 +SHA256 (xpi/firefox-i18n-19.0/en-ZA.xpi) = 5043dde07d54b33ea9cd6b8f08f38117edd63fce956ebb407a376767104d6cd7 +SIZE (xpi/firefox-i18n-19.0/en-ZA.xpi) = 285996 +SHA256 (xpi/firefox-i18n-19.0/eo.xpi) = 0d5a6c9b88c57d950bfe8a12f6503aa16b7b1e9b34a480e3ce0f130f086bf2af +SIZE (xpi/firefox-i18n-19.0/eo.xpi) = 297644 +SHA256 (xpi/firefox-i18n-19.0/es-AR.xpi) = 35e7c4779a9001ae66027f19e12032b76e8a958ff87cd742e0e3feae1c300b62 +SIZE (xpi/firefox-i18n-19.0/es-AR.xpi) = 300308 +SHA256 (xpi/firefox-i18n-19.0/es-CL.xpi) = 05c8406e6fd8ced7c991d029dd70b42d97369a57a379eb19e18b2660d9b19a65 +SIZE (xpi/firefox-i18n-19.0/es-CL.xpi) = 310181 +SHA256 (xpi/firefox-i18n-19.0/es-ES.xpi) = 584a7622188ba483268f7b364cd5bda9832bbf567c2e2a214be946325737c9e5 +SIZE (xpi/firefox-i18n-19.0/es-ES.xpi) = 251866 +SHA256 (xpi/firefox-i18n-19.0/es-MX.xpi) = 7d161ab3181defbf0ed36bd70a2e5b231fc3b91b1d32e86b9669a6bd7d311c14 +SIZE (xpi/firefox-i18n-19.0/es-MX.xpi) = 262700 +SHA256 (xpi/firefox-i18n-19.0/et.xpi) = bb6c7cf9742e4db4298372974d43764ace5ff4aef7b0597eeea20014afe02aa4 +SIZE (xpi/firefox-i18n-19.0/et.xpi) = 295617 +SHA256 (xpi/firefox-i18n-19.0/eu.xpi) = 461b5575b57757c5b994f4e919de15b8cee3c7c0cdb1b4d90641389739317d2a +SIZE (xpi/firefox-i18n-19.0/eu.xpi) = 296323 +SHA256 (xpi/firefox-i18n-19.0/fa.xpi) = 2f37bd7161ea61ea29859d646e49edd4c9feb03a6da1952954e2feb78f1831bf +SIZE (xpi/firefox-i18n-19.0/fa.xpi) = 333056 +SHA256 (xpi/firefox-i18n-19.0/fi.xpi) = 7f6c4f4d1f03e9b8975f8cf6512e00f1d2430b59ecfffb9eaab65f7069c91c6d +SIZE (xpi/firefox-i18n-19.0/fi.xpi) = 301417 +SHA256 (xpi/firefox-i18n-19.0/fr.xpi) = e49340bd382f3602f6555fa0d82695be3f791090f356a1ba7b9e455f2c76a6af +SIZE (xpi/firefox-i18n-19.0/fr.xpi) = 304705 +SHA256 (xpi/firefox-i18n-19.0/fy-NL.xpi) = cda5fd0bed6e27adc6f9f71e50ecef519ff1994dd33869059e808e935a1e7c20 +SIZE (xpi/firefox-i18n-19.0/fy-NL.xpi) = 301151 +SHA256 (xpi/firefox-i18n-19.0/ga-IE.xpi) = 06749185300fde36a2611e11a64c8674504497e06a59b187a34623a00ac02637 +SIZE (xpi/firefox-i18n-19.0/ga-IE.xpi) = 311074 +SHA256 (xpi/firefox-i18n-19.0/gl.xpi) = 2fb1a7d30f1ba6c94b93178ba2a23643eea32b6d0978b9801e4fa3c2cbe03196 +SIZE (xpi/firefox-i18n-19.0/gl.xpi) = 297731 +SHA256 (xpi/firefox-i18n-19.0/gu-IN.xpi) = 63241c25ac04d752eabb3299f391cab763c3ca06c2a1b43395cf1da59d1b7464 +SIZE (xpi/firefox-i18n-19.0/gu-IN.xpi) = 334025 +SHA256 (xpi/firefox-i18n-19.0/he.xpi) = e9ed8f70aa4b1b3ce7360cc47c0995bdcf3fbec45f6b2c0012bcb9c461fb6bb6 +SIZE (xpi/firefox-i18n-19.0/he.xpi) = 315414 +SHA256 (xpi/firefox-i18n-19.0/hi-IN.xpi) = acd9df5372cd821269f920165518c0334e08e9ebccef13b37058d15a7a1dacfd +SIZE (xpi/firefox-i18n-19.0/hi-IN.xpi) = 345262 +SHA256 (xpi/firefox-i18n-19.0/hr.xpi) = cfe940d61a29e6d35b2278337e9235b4c2e881fb3307c8d199f99b04a2da5649 +SIZE (xpi/firefox-i18n-19.0/hr.xpi) = 299017 +SHA256 (xpi/firefox-i18n-19.0/hu.xpi) = d97003e900203620db759cdf483571e7bfb682675872e67f6d332e65b142c36f +SIZE (xpi/firefox-i18n-19.0/hu.xpi) = 315579 +SHA256 (xpi/firefox-i18n-19.0/hy-AM.xpi) = 10618efcf43ef27a38506018bfd993cfa5a927b8efb63f0fcded5826c0ac20b3 +SIZE (xpi/firefox-i18n-19.0/hy-AM.xpi) = 341820 +SHA256 (xpi/firefox-i18n-19.0/id.xpi) = e958e26bd9233f6b0c391cf489f0f1092f0069cb73b63c9c67dde31bf3fdb29e +SIZE (xpi/firefox-i18n-19.0/id.xpi) = 292472 +SHA256 (xpi/firefox-i18n-19.0/is.xpi) = 253e6e481b1853481ee04b75eb8766a273338364e43a7fe52926c0cd138ab19f +SIZE (xpi/firefox-i18n-19.0/is.xpi) = 297284 +SHA256 (xpi/firefox-i18n-19.0/it.xpi) = 7f248fc2d9680e70d8b7519f9734358964b32d10a456f4873797bfd90f2d52c7 +SIZE (xpi/firefox-i18n-19.0/it.xpi) = 247778 +SHA256 (xpi/firefox-i18n-19.0/ja.xpi) = 5cc1d583c4afd10e24290717b61692bf0da1caada1ebd84c0ff4df668977cd3b +SIZE (xpi/firefox-i18n-19.0/ja.xpi) = 335904 +SHA256 (xpi/firefox-i18n-19.0/kk.xpi) = f9a7285957b02409db57a7de45b4a0146e7791ea31f4aa67f27b867c98f84fb1 +SIZE (xpi/firefox-i18n-19.0/kk.xpi) = 341872 +SHA256 (xpi/firefox-i18n-19.0/kn.xpi) = da4482fa6d9169f07374bf068c747abf3858a63f7fb008af335c795dccad308e +SIZE (xpi/firefox-i18n-19.0/kn.xpi) = 368747 +SHA256 (xpi/firefox-i18n-19.0/ko.xpi) = 2ca94a81334ea4b2ee9c639336ba0a59326021013bdcd33371caf0f8ddf0c100 +SIZE (xpi/firefox-i18n-19.0/ko.xpi) = 308895 +SHA256 (xpi/firefox-i18n-19.0/ku.xpi) = 67b4d6fb2a21a8b4b63acbf14e30544f47b3ce6f44936ebc69ad1cdeb2b8de0d +SIZE (xpi/firefox-i18n-19.0/ku.xpi) = 317697 +SHA256 (xpi/firefox-i18n-19.0/lg.xpi) = ec8a4af20de3de290b7256d188400abfa22773773c1effcc51b30d0cb87b4e82 +SIZE (xpi/firefox-i18n-19.0/lg.xpi) = 304559 +SHA256 (xpi/firefox-i18n-19.0/lt.xpi) = 7aa0fff9cefb2ed31d88f1f9941bbc5892e268b9f2be3cd7f85d04c7f00ae125 +SIZE (xpi/firefox-i18n-19.0/lt.xpi) = 315941 +SHA256 (xpi/firefox-i18n-19.0/lv.xpi) = 0422a3ea27abcbfc9bf71c36ecde213cc3fdaf339cc0cb11c7fe0e10d69d5737 +SIZE (xpi/firefox-i18n-19.0/lv.xpi) = 296143 +SHA256 (xpi/firefox-i18n-19.0/mai.xpi) = cb9d6e592d01391567616dd648fa4bbf47b3a6cb3fa183f2305de3a195edb094 +SIZE (xpi/firefox-i18n-19.0/mai.xpi) = 342111 +SHA256 (xpi/firefox-i18n-19.0/mk.xpi) = 074aed6b772491556b43bc0023602ca2fae5f34253bf00b09431c44a930ecb81 +SIZE (xpi/firefox-i18n-19.0/mk.xpi) = 327845 +SHA256 (xpi/firefox-i18n-19.0/ml.xpi) = cd2736ba83fd279ace22f501ed8a850095e08daa496a87b84069cf95b47179c2 +SIZE (xpi/firefox-i18n-19.0/ml.xpi) = 375909 +SHA256 (xpi/firefox-i18n-19.0/mr.xpi) = 13cd27ccbe0b21bcd834c5ae5ae6342eeabbbfdd37b320ff96f96021deb860c2 +SIZE (xpi/firefox-i18n-19.0/mr.xpi) = 342900 +SHA256 (xpi/firefox-i18n-19.0/nb-NO.xpi) = bcf4930a0d06deea89a31da0f60f488d0b92dd779112ad0523d953eaca6cc394 +SIZE (xpi/firefox-i18n-19.0/nb-NO.xpi) = 296250 +SHA256 (xpi/firefox-i18n-19.0/nl.xpi) = 3f1f5b7a710b9b0e3f0a3f9bf622d4c31c3ea366e8d073e8b8801aaba8a97a69 +SIZE (xpi/firefox-i18n-19.0/nl.xpi) = 297333 +SHA256 (xpi/firefox-i18n-19.0/nn-NO.xpi) = 15c47228c93133a2231adfcceb231cbf2504f409a062c828c3735ebda847eb81 +SIZE (xpi/firefox-i18n-19.0/nn-NO.xpi) = 301552 +SHA256 (xpi/firefox-i18n-19.0/nso.xpi) = 148d39f225357374e363eb42d484a621c602839b0295de578224876876e51e03 +SIZE (xpi/firefox-i18n-19.0/nso.xpi) = 302142 +SHA256 (xpi/firefox-i18n-19.0/or.xpi) = 10b6ac82a2a516587116a5f1d3e7cbd8360c450f1abe34d5c5355dc5c19fcd45 +SIZE (xpi/firefox-i18n-19.0/or.xpi) = 344153 +SHA256 (xpi/firefox-i18n-19.0/pa-IN.xpi) = 78114420aeed2e0cb8e3fa2a81cf89af87572290f70b26ac569a8c4a76ae127c +SIZE (xpi/firefox-i18n-19.0/pa-IN.xpi) = 332279 +SHA256 (xpi/firefox-i18n-19.0/pl.xpi) = 4de9850ee0fc79f2c27565c0f019a95667f7147bf48555a9fd6dffe01a79e28d +SIZE (xpi/firefox-i18n-19.0/pl.xpi) = 308691 +SHA256 (xpi/firefox-i18n-19.0/pt-BR.xpi) = 3a37bfbfb2f0c8dab386bce47dd3d9e4c9531aebc42535e2055c591bdbbe3dd5 +SIZE (xpi/firefox-i18n-19.0/pt-BR.xpi) = 302351 +SHA256 (xpi/firefox-i18n-19.0/pt-PT.xpi) = 17505d62baae0d63ccf4d63ce30f8aea5152194b9449517fc6f3af949fab02f6 +SIZE (xpi/firefox-i18n-19.0/pt-PT.xpi) = 303166 +SHA256 (xpi/firefox-i18n-19.0/rm.xpi) = 0fa5a10a6130705f641b45e9a61ecf6151875ef718e5699be0ad0072048a37a2 +SIZE (xpi/firefox-i18n-19.0/rm.xpi) = 299334 +SHA256 (xpi/firefox-i18n-19.0/ro.xpi) = 4ff03d018c9704f5a8e92efd710f78a674811d5543a9e2c22a363484a404a371 +SIZE (xpi/firefox-i18n-19.0/ro.xpi) = 324144 +SHA256 (xpi/firefox-i18n-19.0/ru.xpi) = 09891df55e121705af2b981c2147fa483e049011487d7f6f0e7282bc551f6a97 +SIZE (xpi/firefox-i18n-19.0/ru.xpi) = 294933 +SHA256 (xpi/firefox-i18n-19.0/si.xpi) = 09c9eef1385eae860be9617318de8b4e67055ad7e13d1948ac8a9ba2997c746d +SIZE (xpi/firefox-i18n-19.0/si.xpi) = 331553 +SHA256 (xpi/firefox-i18n-19.0/sk.xpi) = 3d4a832193ab966da629a933696d0a707a99561b300b55b8774af4e8579c6f0a +SIZE (xpi/firefox-i18n-19.0/sk.xpi) = 312848 +SHA256 (xpi/firefox-i18n-19.0/sl.xpi) = 7c0296c092be4428b12f82304f8b179d07d6d01d6581de17f8baa9d6cd21b792 +SIZE (xpi/firefox-i18n-19.0/sl.xpi) = 295534 +SHA256 (xpi/firefox-i18n-19.0/son.xpi) = 9a391fc79bb380a1bbee6377d2c4f3e453207d956ae0fb8211634b60813dc6d6 +SIZE (xpi/firefox-i18n-19.0/son.xpi) = 297373 +SHA256 (xpi/firefox-i18n-19.0/sq.xpi) = 7a83058b4da777ba0a522cc4d7450980e77bde68f2aec3f53c2872f81f8268e3 +SIZE (xpi/firefox-i18n-19.0/sq.xpi) = 304122 +SHA256 (xpi/firefox-i18n-19.0/sr.xpi) = 54ccc918ff54c0f519658d26f9b764bc45771b3c1b1ae3aa4c3f12db71a6f1f8 +SIZE (xpi/firefox-i18n-19.0/sr.xpi) = 347552 +SHA256 (xpi/firefox-i18n-19.0/sv-SE.xpi) = 8806ae13afa370576a1016ed06e7c02b5bc8f13eb49f20fa33fafb529ee029c6 +SIZE (xpi/firefox-i18n-19.0/sv-SE.xpi) = 299878 +SHA256 (xpi/firefox-i18n-19.0/ta-LK.xpi) = c30a6e655f5c2116831ba1e44dbdd3b041f9dfc1f8cfea2bff7dadcbcdc05dd6 +SIZE (xpi/firefox-i18n-19.0/ta-LK.xpi) = 353088 +SHA256 (xpi/firefox-i18n-19.0/ta.xpi) = 3409e7e441311d9a3d6a5eb7c38cefacb36e5da2b4b8118ca245f1223d054a11 +SIZE (xpi/firefox-i18n-19.0/ta.xpi) = 338035 +SHA256 (xpi/firefox-i18n-19.0/te.xpi) = d02bd63ae0e5b8114dc912e754bab826f0196ad71c27ae87d136f53410222874 +SIZE (xpi/firefox-i18n-19.0/te.xpi) = 353257 +SHA256 (xpi/firefox-i18n-19.0/th.xpi) = 863a6bc856aa4d4ca96ccb0bcbabcf9aaf887ed3f85e6a7910fd8c8eab361826 +SIZE (xpi/firefox-i18n-19.0/th.xpi) = 337186 +SHA256 (xpi/firefox-i18n-19.0/tr.xpi) = 1e79eee25926173f9b97720b14cf0179f2260b3efc5eb1441b649d8deeb52cf8 +SIZE (xpi/firefox-i18n-19.0/tr.xpi) = 307541 +SHA256 (xpi/firefox-i18n-19.0/uk.xpi) = b22ef4f959b8a3b77e8e9f9f324c5b577d11a7215d80e081589f1d2d90e7f583 +SIZE (xpi/firefox-i18n-19.0/uk.xpi) = 338322 +SHA256 (xpi/firefox-i18n-19.0/vi.xpi) = f82a4ddf1de277f8d0c10ad559329e3e1fbe00bec82ccb5a8d3a43daa3421106 +SIZE (xpi/firefox-i18n-19.0/vi.xpi) = 320834 +SHA256 (xpi/firefox-i18n-19.0/zh-CN.xpi) = 6e4e9842c7cf5a14befa641aa7df897c84eb46caa28aa24ebe3c1a045aacd2d9 +SIZE (xpi/firefox-i18n-19.0/zh-CN.xpi) = 317961 +SHA256 (xpi/firefox-i18n-19.0/zh-TW.xpi) = 6427a8a3a9b2009188cd5714fc0cb3fb7f5511639c7d1a4372445a13c3a273b0 +SIZE (xpi/firefox-i18n-19.0/zh-TW.xpi) = 318476 +SHA256 (xpi/firefox-i18n-19.0/zu.xpi) = 7f0f34f400c52603bad1f34c05434f6d981663ecfdca0e2678e9ef2f6750199e +SIZE (xpi/firefox-i18n-19.0/zu.xpi) = 309495 Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/firefox-nightly/Makefile Sat Feb 23 23:41:44 2013 (r1186) @@ -40,6 +40,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl +USE_DOS2UNIX= media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp NO_MOZPKGINSTALL=yes FIREFOX_ICON= ${MOZILLA}.png Modified: trunk/www/firefox-nightly/files/patch-bug807492 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug807492 Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/firefox-nightly/files/patch-bug807492 Sat Feb 23 23:41:44 2013 (r1186) @@ -421,25 +421,15 @@ 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 -@@ -28,17 +28,17 @@ - * - * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.58 2004/04/07 04:19:49 imp Exp $ - */ - - #ifndef _SYS_QUEUE_H_ - #define _SYS_QUEUE_H_ - +@@ -33,5 +33,5 @@ + #define _SYS_QUEUE_H_ + -#ifndef DARWIN +#if !defined(BSD) && !defined(DARWIN) #include #define __offsetof offsetof #endif - - #define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = STAILQ_FIRST((head)); \ - (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ - (var) = (tvar)) + diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp index 2a91e3d..31de641 100644 --- media/webrtc/signaling/signaling.gyp Modified: trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp ============================================================================== --- trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Sat Feb 23 23:41:44 2013 (r1186) @@ -1,16 +1,16 @@ --- media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp~ +++ media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -21,6 +21,13 @@ Scott McMurray - #include "constants.hpp" - #include - -+#ifdef __FreeBSD__ -+# include -+# if __FreeBSD_version < 900506 -+# define getchar boost_getchar -+# endif -+#endif -+ - namespace boost { - namespace detail { - //This only works on unsigned data types + #include "constants.hpp" + #include + ++#ifdef __FreeBSD__ ++# include ++# if __FreeBSD_version < 900506 ++# define getchar boost_getchar ++# endif ++#endif ++ + namespace boost { + namespace detail { + //This only works on unsigned data types Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/firefox/Makefile Sat Feb 23 23:41:44 2013 (r1186) @@ -7,7 +7,6 @@ CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -#MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org @@ -38,6 +37,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl +USE_DOS2UNIX= media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp NO_MOZPKGINSTALL=yes FIREFOX_ICON= ${MOZILLA}.png Modified: trunk/www/firefox/files/patch-bug807492 ============================================================================== --- trunk/www/firefox/files/patch-bug807492 Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/firefox/files/patch-bug807492 Sat Feb 23 23:41:44 2013 (r1186) @@ -446,25 +446,15 @@ 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 -@@ -28,17 +28,17 @@ - * - * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.58 2004/04/07 04:19:49 imp Exp $ - */ - - #ifndef _SYS_QUEUE_H_ - #define _SYS_QUEUE_H_ - +@@ -33,5 +33,5 @@ + #define _SYS_QUEUE_H_ + -#ifndef DARWIN +#if !defined(BSD) && !defined(DARWIN) #include #define __offsetof offsetof #endif - - #define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = STAILQ_FIRST((head)); \ - (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ - (var) = (tvar)) + diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c index 3aced8b..be020bb 100644 --- media/mtransport/third_party/nrappkit/src/util/util.c Modified: trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp ============================================================================== --- trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Sat Feb 23 23:41:44 2013 (r1186) @@ -1,16 +1,16 @@ --- media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp~ +++ media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -21,6 +21,13 @@ Scott McMurray - #include "constants.hpp" - #include - -+#ifdef __FreeBSD__ -+# include -+# if __FreeBSD_version < 900506 -+# define getchar boost_getchar -+# endif -+#endif -+ - namespace boost { - namespace detail { - //This only works on unsigned data types + #include "constants.hpp" + #include + ++#ifdef __FreeBSD__ ++# include ++# if __FreeBSD_version < 900506 ++# define getchar boost_getchar ++# endif ++#endif ++ + namespace boost { + namespace detail { + //This only works on unsigned data types Modified: trunk/www/linux-seamonkey/Makefile ============================================================================== --- trunk/www/linux-seamonkey/Makefile Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/linux-seamonkey/Makefile Sat Feb 23 23:41:44 2013 (r1186) @@ -4,8 +4,7 @@ PORTNAME= seamonkey PORTVERSION= 2.16 CATEGORIES= www -#MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US -MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser Modified: trunk/www/seamonkey-i18n/Makefile ============================================================================== --- trunk/www/seamonkey-i18n/Makefile Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/seamonkey-i18n/Makefile Sat Feb 23 23:41:44 2013 (r1186) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/seamonkey-i18n/Makefile 310207 2013-01-10 22:29:23Z flo $ PORTNAME= seamonkey-i18n -PORTVERSION= 2.15 +PORTVERSION= 2.16 CATEGORIES= www MASTER_SITE_SUBDIR= seamonkey/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= @@ -18,7 +18,7 @@ PLISTD?= ${WRKDIR}/plist_dirs PLISTF?= ${WRKDIR}/plist_files -USE_SEAMONKEY= 15 +USE_SEAMONKEY= 16 USE_XPI= seamonkey linux-seamonkey USE_SUBMAKE= yes Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/seamonkey/Makefile Sat Feb 23 23:41:44 2013 (r1186) @@ -5,8 +5,7 @@ DISTVERSION= 2.16 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} -#MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -MASTER_SITE_SUBDIR= ${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} @@ -35,6 +34,7 @@ GNU_CONFIGURE= yes ALL_TARGET= default USE_GL= gl +USE_DOS2UNIX= mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome Modified: trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk ============================================================================== --- trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk Sat Feb 23 23:41:44 2013 (r1186) @@ -6,8 +6,6 @@ +ifdef disabled APP_LIBXUL_DIRS += \ - $(DEPTH)$(SUBDIR)/mailnews/base \ - $(DEPTH)$(SUBDIR)/mailnews/mime/public \ $(DEPTH)$(SUBDIR)/mailnews \ $(NULL) +endif Modified: trunk/www/seamonkey/files/patch-bug807492 ============================================================================== --- trunk/www/seamonkey/files/patch-bug807492 Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/seamonkey/files/patch-bug807492 Sat Feb 23 23:41:44 2013 (r1186) @@ -446,25 +446,15 @@ 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 -@@ -28,17 +28,17 @@ - * - * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.58 2004/04/07 04:19:49 imp Exp $ - */ - - #ifndef _SYS_QUEUE_H_ - #define _SYS_QUEUE_H_ - +@@ -33,5 +33,5 @@ + #define _SYS_QUEUE_H_ + -#ifndef DARWIN +#if !defined(BSD) && !defined(DARWIN) #include #define __offsetof offsetof #endif - - #define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = STAILQ_FIRST((head)); \ - (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ - (var) = (tvar)) + diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c index 3aced8b..be020bb 100644 --- mozilla/media/mtransport/third_party/nrappkit/src/util/util.c Modified: trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Sat Feb 23 22:21:54 2013 (r1185) +++ trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Sat Feb 23 23:41:44 2013 (r1186) @@ -1,16 +1,16 @@ --- mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp~ +++ mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -21,6 +21,13 @@ Scott McMurray - #include "constants.hpp" - #include - -+#ifdef __FreeBSD__ -+# include -+# if __FreeBSD_version < 900506 -+# define getchar boost_getchar -+# endif -+#endif -+ - namespace boost { - namespace detail { - //This only works on unsigned data types + #include "constants.hpp" + #include + ++#ifdef __FreeBSD__ ++# include ++# if __FreeBSD_version < 900506 ++# define getchar boost_getchar ++# endif ++#endif ++ + namespace boost { + namespace detail { + //This only works on unsigned data types