From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 22 11:06:46 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F0B30300 for ; Mon, 22 Oct 2012 11:06:45 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id D7ABC8FC23 for ; Mon, 22 Oct 2012 11:06:45 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9MB6jh0044695 for ; Mon, 22 Oct 2012 11:06:45 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9MB6jIZ044693 for gecko@FreeBSD.org; Mon, 22 Oct 2012 11:06:45 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 22 Oct 2012 11:06:45 GMT Message-Id: <201210221106.q9MB6jIZ044693@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, 22 Oct 2012 11:06:46 -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 -------------------------------------------------------------------------------- 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 o ports/167298 gecko mail/thunderbird-i18n and www/firefox-i18n fail to fet 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 19 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 22 21:20:20 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9F77C559 for ; Mon, 22 Oct 2012 21:20:20 +0000 (UTC) (envelope-from albat0r78@wanadoo.fr) Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [IPv6:2a01:e0c:1:1599::10]) by mx1.freebsd.org (Postfix) with ESMTP id 538B48FC08 for ; Mon, 22 Oct 2012 21:20:18 +0000 (UTC) Received: from LNBoX (unknown [88.164.179.61]) by smtp1-g21.free.fr (Postfix) with ESMTP id C9F7E94013F for ; Mon, 22 Oct 2012 23:20:13 +0200 (CEST) Date: Mon, 22 Oct 2012 23:20:12 +0200 From: Albat0r To: gecko@FreeBSD.org Subject: FreeBSD Port: kompozer-0.8.b3_3 Message-ID: <20121022232012.7e1e299e@LNBoX> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.6; amd64-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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, 22 Oct 2012 21:20:20 -0000 Hello, I have trouble running kompozer. When I start it, I have a "1" return code, and nothing happens. I opened a thread but got no answer : http://forums.freebsd.org/showthread.php?p=194164#post194164 I could find this after adding set -x to the script. + MRE_HOME=/usr/local/lib/mre/mre-0.8b3 But this file doesn't exist : ls: /usr/local/lib/mre: No such file or directory I tried both the package and the port, with the same result. Have you ever had this kind of problem with this program ? Thanks Laurent From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 22 22:54:42 2012 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A673DDC for ; Mon, 22 Oct 2012 22:54:42 +0000 (UTC) (envelope-from nikolai7@kerek.myjino.ru) Received: from srv24-s-st.jino.ru (srv24-s-st.jino.ru [81.177.6.31]) by mx1.freebsd.org (Postfix) with ESMTP id 8F79E8FC0A for ; Mon, 22 Oct 2012 22:54:41 +0000 (UTC) Received: from 95-27-17-42.broadband.corbina.ru (95-27-17-42.broadband.corbina.ru [95.27.17.42]) (Authenticated sender: nikolai7@kerek.myjino.ru) by srv24-s-st.jino.ru (Postfix) with ESMTP id CF93ADF1505 for ; Tue, 23 Oct 2012 02:55:23 +0400 (MSK) From: "infomagz" Subject: =?utf-8?B?0JLRgdC10Lwg0LvRjtCx0LjRgtC10LvRj9C8INCw0LfQsNGA0YLQsCE=?= To: "gecko" MIME-Version: 1.0 Organization: infomagz Date: Tue, 23 Oct 2012 02:54:59 +0400 Message-Id: <20121022225523.CF93ADF1505@srv24-s-st.jino.ru> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.14 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, 22 Oct 2012 22:54:42 -0000 =EF=BB=BFwww.infomagz.ru=20 =D0=98=D0=BD=D1=82=D0=B5=D1=80=D0=B5=D1=81=D1=83=D1=8E=D1=82 =D0=BB=D1= =83=D1=87=D1=88=D0=B8=D0=B5 =D0=BE=D0=BD=D0=BB=D0=B0=D0=B9=D0=BD =D0=BA= =D0=B0=D0=B7=D0=B8=D0=BD=D0=BE? =D0=9D=D0=B0 =D0=BD=D0=B0=D1=88=D0=B5=D0= =BC =D1=81=D0=B0=D0=B9=D1=82=D0=B5 =D0=BF=D1=80=D0=B5=D0=B4=D0=BB=D0=B0= =D0=B3=D0=B0=D0=B5=D0=BC =D0=92=D0=B0=D0=BC =D0=BF=D0=BE=D1=81=D0=B5=D1= =82=D0=B8=D1=82=D1=8C =D0=BD=D0=B0=D0=B8=D0=B1=D0=BE=D0=BB=D0=B5=D0=B5= =D1=89=D0=B5=D0=B4=D1=80=D1=8B=D0=B5, =D1=87=D0=B5=D1=81=D1=82=D0=BD=D1= =8B=D0=B5 =D0=B8 =D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B5=D0=BD=D0=BD= =D1=8B=D0=B5 =D0=BE=D0=BD=D0=BB=D0=B0=D0=B9=D0=BD =D0=BA=D0=B0=D0=B7=D0= =B8=D0=BD=D0=BE, =D0=B2 =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D1=85 =D1= =80=D0=B5=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE =D0=B2=D1=8B=D0=B8=D0=B3=D1=80= =D0=B0=D1=82=D1=8C =D0=B4=D0=B5=D0=BD=D1=8C=D0=B3=D0=B8. =D0=A1=D0=BF=D0= =B5=D1=86=D0=B8=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE =D0=B4=D0=BB=D1=8F =D0=B3= =D0=BE=D1=81=D1=82=D0=B5=D0=B9 =D0=BD=D0=B0=D1=88=D0=B5=D0=B3=D0=BE =D1= =81=D0=B0=D0=B9=D1=82=D0=B0 =D0=BC=D1=8B =D1=81=D0=B4=D0=B5=D0=BB=D0=B0= =D0=BB=D0=B8 =D0=BF=D0=BE=D0=B4=D0=B1=D0=BE=D1=80=D0=BA=D1=83 =D1=81=D0= =B0=D0=BC=D1=8B=D1=85 =D0=BF=D0=BE=D0=BF=D1=83=D0=BB=D1=8F=D1=80=D0=BD= =D1=8B=D1=85 =D0=B8 =D0=BF=D0=BB=D0=B0=D1=82=D0=B5=D0=B6=D0=B5=D1=81=D0= =BF=D0=BE=D1=81=D0=BE=D0=B1=D0=BD=D1=8B=D1=85 =D0=BA=D0=B0=D0=B7=D0=B8= =D0=BD=D0=BE, =D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=B2=D0= =B0=D1=8E=D1=89=D0=B8=D1=85 =D1=80=D1=83=D1=81=D1=81=D0=BA=D0=B8=D0=B9= =D1=8F=D0=B7=D1=8B=D0=BA =D0=B8 WebMoney. =D0=92=D1=81=D0=B5 =D0=BA=D0=B0=D0=B7=D0=B8=D0=BD=D0=BE =D0=B3=D0=B0=D1= =80=D0=B0=D0=BD=D1=82=D0=B8=D1=80=D1=83=D1=8E=D1=82: =D1=88=D0=B8=D1=80= =D0=BE=D0=BA=D0=B8=D0=B9 =D0=B2=D1=8B=D0=B1=D0=BE=D1=80 =D0=B8=D0=B3=D1= =80, =D0=B2=D1=8B=D1=81=D0=BE=D0=BA=D0=B8=D0=B5 =D0=BF=D1=80=D0=BE=D1=86= =D0=B5=D0=BD=D1=82=D1=8B =D0=BE=D1=82=D0=B4=D0=B0=D1=87=D0=B8 (96% - 9= 8%), =D0=B1=D1=8B=D1=81=D1=82=D1=80=D1=8B=D0=B5 =D0=B2=D1=8B=D0=BF=D0=BB= =D0=B0=D1=82=D1=8B =D0=B2=D1=8B=D0=B8=D0=B3=D1=80=D1=8B=D1=88=D0=B5=D0= =B9, =D0=BC=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B= =D0=B5 =D0=B4=D0=B6=D0=B5=D0=BA=D0=BF=D0=BE=D1=82=D1=8B =D0=B8 =D1=89=D0= =B5=D0=B4=D1=80=D1=8B=D0=B5 =D0=B1=D0=BE=D0=BD=D1=83=D1=81=D1=8B.=20 From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 24 16:11:25 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A7ADD9F for ; Wed, 24 Oct 2012 16:11:25 +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 2FAED8FC0A for ; Wed, 24 Oct 2012 16:11:23 +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 q9OGBHxQ024788 for ; Wed, 24 Oct 2012 16:11: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 q9OGBCE2024304 for freebsd-gecko@freebsd.org; Wed, 24 Oct 2012 16:11:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 24 Oct 2012 16:11:12 GMT Message-Id: <201210241611.q9OGBCE2024304@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] r1075 - 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: Wed, 24 Oct 2012 16:11:25 -0000 Author: jbeich Date: Wed Oct 24 16:11:11 2012 New Revision: 1075 Log: - split unassigned based on bugtracker - use paths - avoid redundant words - add jsperf task Modified: trunk/Gecko_TODO Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Fri Oct 19 03:19:40 2012 (r1074) +++ trunk/Gecko_TODO Wed Oct 24 16:11:11 2012 (r1075) @@ -1,21 +1,25 @@ -unassigned: +unassigned (upstream): +- media/webrtc +- toolkit/crashreporter +- OSS or GStreamer for media/libcubeb +- pmc(3) for js/src/perf + https://developer.mozilla.org/en-US/docs/Performance/JS::PerfMeasurement +- mozboot (ex.: bug 790750) +- fix pause latency issue with OSS in libsydneyaudio (deprecated) +- push patch-js-src-methodjit-MethodJIT.cpp (needs a test case) +- push patch-sysdb + +unassigned (ports): - port libxul-1.9 consumers to libxul-10, lest they be removed -- implement either OSS or GStreamer backend for libcubeb -- fix pause latency issue with OSS backend in libsydneyaudio (deprecated) -- port WebRTC -- port Crash Reporter - add BlueGriffon to replace www/kompozer - switch to system libxul (needs slaves with common patches); a Debian patch to reduce configure time can be useful - move duplicated `>=' deps into bsd.gecko.mk (system libxul?) -- push @plt/.hidden patch for JS upstream (needs a test case) -- push system db(3) patch upstream - replace FAKEDIR with STAGEDIR - get rid of symlink farms for webplugins and xpi-* ports - document GStreamer plugins needed for HTML5 Video (in pkg-message) - document performance issues with non-ESR (layers.acceleration.force-enabled -> true ?) -- mozboot backend for FreeBSD (see bug 790750 for an example) jbeich: - push ALSA patch upstream From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 24 16:11:28 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 50324A2 for ; Wed, 24 Oct 2012 16:11: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 E492A8FC14 for ; Wed, 24 Oct 2012 16:11: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 q9OGBR9B027376 for ; Wed, 24 Oct 2012 16:11:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q9OGBL5d025826 for freebsd-gecko@freebsd.org; Wed, 24 Oct 2012 16:11:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 24 Oct 2012 16:11:21 GMT Message-Id: <201210241611.q9OGBL5d025826@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] r1076 - in trunk: mail/thunderbird mail/thunderbird-esr www/firefox www/firefox-esr www/firefox-nightly www/libxul 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: Wed, 24 Oct 2012 16:11:28 -0000 Author: jbeich Date: Wed Oct 24 16:11:21 2012 New Revision: 1076 Log: yasm only used for bundled libvpx, libjpeg-turbo Modified: trunk/mail/thunderbird-esr/Makefile trunk/mail/thunderbird/Makefile trunk/www/firefox-esr/Makefile trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile trunk/www/libxul/Makefile trunk/www/seamonkey/Makefile Modified: trunk/mail/thunderbird-esr/Makefile ============================================================================== --- trunk/mail/thunderbird-esr/Makefile Wed Oct 24 16:11:11 2012 (r1075) +++ trunk/mail/thunderbird-esr/Makefile Wed Oct 24 16:11:21 2012 (r1076) @@ -76,10 +76,6 @@ .endif .endif -.if ${ARCH} == amd64 || ${ARCH} == i386 -BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm -.endif - .if !empty(CXX:M*clang++*) CFLAGS+= -Wno-return-type-c-linkage .endif Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Wed Oct 24 16:11:11 2012 (r1075) +++ trunk/mail/thunderbird/Makefile Wed Oct 24 16:11:21 2012 (r1076) @@ -77,10 +77,6 @@ .endif .endif -.if ${ARCH} == amd64 || ${ARCH} == i386 -BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm -.endif - .if ${PORT_OPTIONS:MENIGMAIL} MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail DISTFILES+= ${EM_DISTFILE}:enigmail Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Wed Oct 24 16:11:11 2012 (r1075) +++ trunk/www/firefox-esr/Makefile Wed Oct 24 16:11:21 2012 (r1076) @@ -80,10 +80,6 @@ @MOZ_OBJDIR@/_profile/pgo/profileserver.py" .endif -.if ${ARCH} == amd64 || ${ARCH} == i386 -BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm -.endif - .if !empty(CXX:M*clang++*) CXXFLAGS+= -Wno-return-type-c-linkage .endif Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Wed Oct 24 16:11:11 2012 (r1075) +++ trunk/www/firefox-nightly/Makefile Wed Oct 24 16:11:21 2012 (r1076) @@ -84,10 +84,6 @@ @MOZ_OBJDIR@/_profile/pgo/profileserver.py" .endif -.if ${ARCH} == amd64 || ${ARCH} == i386 -BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm -.endif - pre-extract: .if ${PORT_OPTIONS:MPGO} @${ECHO} "*****************************************************************" Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Wed Oct 24 16:11:11 2012 (r1075) +++ trunk/www/firefox/Makefile Wed Oct 24 16:11:21 2012 (r1076) @@ -83,10 +83,6 @@ @MOZ_OBJDIR@/_profile/pgo/profileserver.py" .endif -.if ${ARCH} == amd64 || ${ARCH} == i386 -BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm -.endif - pre-extract: .if ${PORT_OPTIONS:MPGO} @${ECHO} "*****************************************************************" Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Wed Oct 24 16:11:11 2012 (r1075) +++ trunk/www/libxul/Makefile Wed Oct 24 16:11:21 2012 (r1076) @@ -69,10 +69,6 @@ .endif .endif -.if ${ARCH} == amd64 || ${ARCH} == i386 -BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm -.endif - .if !empty(CXX:M*clang++*) CXXFLAGS+= -Wno-return-type-c-linkage .endif Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Wed Oct 24 16:11:11 2012 (r1075) +++ trunk/www/seamonkey/Makefile Wed Oct 24 16:11:21 2012 (r1076) @@ -111,10 +111,6 @@ MOZ_OPTIONS+= --disable-composer .endif -.if ${ARCH} == amd64 || ${ARCH} == i386 -BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm -.endif - .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 24 16:11:35 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A24BCB1 for ; Wed, 24 Oct 2012 16:11:35 +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 2A5798FC0C for ; Wed, 24 Oct 2012 16:11:34 +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 q9OGBYtb029992 for ; Wed, 24 Oct 2012 16:11:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q9OGBTPH029753 for freebsd-gecko@freebsd.org; Wed, 24 Oct 2012 16:11:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 24 Oct 2012 16:11:29 GMT Message-Id: <201210241611.q9OGBTPH029753@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] r1077 - trunk/www/firefox 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, 24 Oct 2012 16:11:35 -0000 Author: jbeich Date: Wed Oct 24 16:11:28 2012 New Revision: 1077 Log: Qt/Linux needs some love from upstream to be usable Reported by: many Modified: trunk/www/firefox/Makefile.options Modified: trunk/www/firefox/Makefile.options ============================================================================== --- trunk/www/firefox/Makefile.options Wed Oct 24 16:11:21 2012 (r1076) +++ trunk/www/firefox/Makefile.options Wed Oct 24 16:11:28 2012 (r1077) @@ -16,3 +16,4 @@ LIBPROXY_DESC?= Proxy support via libproxy LIGHTNING_DESC?= Calendar extension LOGGING_DESC?= Additional log messages +QT4_DESC?= Qt GUI (EXPERIMENTAL, bug 521582) From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 24 16:11:46 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D88E4CC for ; Wed, 24 Oct 2012 16:11:46 +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 428458FC16 for ; Wed, 24 Oct 2012 16:11:46 +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 q9OGBj7C032435 for ; Wed, 24 Oct 2012 16:11:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q9OGBePx030660 for freebsd-gecko@freebsd.org; Wed, 24 Oct 2012 16:11:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 24 Oct 2012 16:11:40 GMT Message-Id: <201210241611.q9OGBePx030660@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] r1078 - in trunk: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files 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: Wed, 24 Oct 2012 16:11:46 -0000 Author: jbeich Date: Wed Oct 24 16:11:39 2012 New Revision: 1078 Log: better fix for missing nkgio issue Added: trunk/mail/thunderbird-esr/files/patch-bug799441 trunk/mail/thunderbird/files/patch-bug799441 trunk/www/firefox-esr/files/patch-bug799441 trunk/www/firefox/files/patch-bug799441 trunk/www/seamonkey/files/patch-bug799441 Modified: trunk/www/firefox-esr/files/patch-bug713802 trunk/www/firefox/files/patch-bug713802 trunk/www/libxul/files/patch-bug713802 trunk/www/seamonkey/files/patch-bug713802 Added: trunk/mail/thunderbird-esr/files/patch-bug799441 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird-esr/files/patch-bug799441 Wed Oct 24 16:11:39 2012 (r1078) @@ -0,0 +1,116 @@ +commit b9accdd +Author: Mike Hommey +Date: Thu Oct 18 14:47:10 2012 +0200 + + Bug 799441 - Build GIO module in libxul. r=ted +--- + configure.in | 6 ++++++ + extensions/gio/Makefile.in | 14 +++----------- + toolkit/library/Makefile.in | 5 +++++ + toolkit/library/nsStaticXULComponents.cpp | 7 +++++++ + toolkit/toolkit-tiers.mk | 4 ++++ + 5 files changed, 25 insertions(+), 11 deletions(-) + +diff --git configure.in configure.in +index a9fb5f1..37e6db8 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + ++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then ++ MOZ_GIO_COMPONENT=1 ++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` ++fi ++AC_SUBST(MOZ_GIO_COMPONENT) ++ + if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then + AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.]) + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` +diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in +index ccf2846..79112a8 100644 +--- mozilla/extensions/gio/Makefile.in ++++ mozilla/extensions/gio/Makefile.in +@@ -14,6 +14,9 @@ MODULE = nkgio + LIBRARY_NAME = nkgio + SHORT_LIBNAME = nkgio + IS_COMPONENT = 1 ++EXPORT_LIBRARY = 1 ++MODULE_NAME = nsGIOModule ++LIBXUL_LIBRARY = 1 + + CPPSRCS = \ + nsGIOProtocolHandler.cpp \ +@@ -21,15 +24,4 @@ CPPSRCS = \ + + LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + +-EXTRA_DSO_LDOPTS = \ +- $(XPCOM_GLUE_LDOPTS) \ +- $(NSPR_LIBS) \ +- $(MOZ_GIO_LIBS) \ +- $(NULL) +- +-# make sure this component is never statically linked into the main +-# application. this is necessary since we don't want to force users +-# to install gio in order to use the rest of mozilla ;-) +-FORCE_SHARED_LIB= 1 +- + include $(topsrcdir)/config/rules.mk +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 7f9046e..6499758 100644 +--- mozilla/toolkit/library/libxul-config.mk ++++ mozilla/toolkit/library/libxul-config.mk +@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug + endif + endif + ++ifdef MOZ_GIO_COMPONENT ++DEFINES += -DMOZ_GIO_COMPONENT ++COMPONENT_LIBS += nkgio ++endif ++ + ifdef MOZ_APP_COMPONENT_LIBS + COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS) + endif +diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp +index e1d90f2..85b21a2 100644 +--- mozilla/toolkit/library/nsStaticXULComponents.cpp ++++ mozilla/toolkit/library/nsStaticXULComponents.cpp +@@ -164,6 +164,12 @@ + #define PROFILER_MODULE + #endif + ++#if defined(MOZ_GIO_COMPONENT) ++#define GIO_MODULE MODULE(nsGIOModule) ++#else ++#define GIO_MODULE ++#endif ++ + #define XUL_MODULES \ + MODULE(nsUConvModule) \ + MODULE(nsI18nModule) \ +@@ -220,6 +226,7 @@ + MODULE(nsTelemetryModule) \ + MODULE(jsinspector) \ + MODULE(jsdebugger) \ ++ GIO_MODULE \ + /* end of list */ + + #define MODULE(_name) \ +diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk +index e87d7af..4b16d23 100644 +--- mozilla/toolkit/toolkit-tiers.mk ++++ mozilla/toolkit/toolkit-tiers.mk +@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger + + tier_platform_dirs += other-licenses/snappy + ++ifdef MOZ_GIO_COMPONENT ++tier_platform_dirs += extensions/gio ++endif ++ + ifdef APP_LIBXUL_STATICDIRS + # Applications can cheat and ask for code to be + # built before libxul so libxul can be linked against it. Added: trunk/mail/thunderbird/files/patch-bug799441 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug799441 Wed Oct 24 16:11:39 2012 (r1078) @@ -0,0 +1,116 @@ +commit b9accdd +Author: Mike Hommey +Date: Thu Oct 18 14:47:10 2012 +0200 + + Bug 799441 - Build GIO module in libxul. r=ted +--- + configure.in | 6 ++++++ + extensions/gio/Makefile.in | 14 +++----------- + toolkit/library/Makefile.in | 5 +++++ + toolkit/library/nsStaticXULComponents.cpp | 7 +++++++ + toolkit/toolkit-tiers.mk | 4 ++++ + 5 files changed, 25 insertions(+), 11 deletions(-) + +diff --git configure.in configure.in +index a9fb5f1..37e6db8 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + ++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then ++ MOZ_GIO_COMPONENT=1 ++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` ++fi ++AC_SUBST(MOZ_GIO_COMPONENT) ++ + if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then + AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.]) + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` +diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in +index ccf2846..79112a8 100644 +--- mozilla/extensions/gio/Makefile.in ++++ mozilla/extensions/gio/Makefile.in +@@ -14,6 +14,9 @@ MODULE = nkgio + LIBRARY_NAME = nkgio + SHORT_LIBNAME = nkgio + IS_COMPONENT = 1 ++EXPORT_LIBRARY = 1 ++MODULE_NAME = nsGIOModule ++LIBXUL_LIBRARY = 1 + + CPPSRCS = \ + nsGIOProtocolHandler.cpp \ +@@ -21,15 +24,4 @@ CPPSRCS = \ + + LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + +-EXTRA_DSO_LDOPTS = \ +- $(XPCOM_GLUE_LDOPTS) \ +- $(NSPR_LIBS) \ +- $(MOZ_GIO_LIBS) \ +- $(NULL) +- +-# make sure this component is never statically linked into the main +-# application. this is necessary since we don't want to force users +-# to install gio in order to use the rest of mozilla ;-) +-FORCE_SHARED_LIB= 1 +- + include $(topsrcdir)/config/rules.mk +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 7f9046e..6499758 100644 +--- mozilla/toolkit/library/Makefile.in ++++ mozilla/toolkit/library/Makefile.in +@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug + endif + endif + ++ifdef MOZ_GIO_COMPONENT ++DEFINES += -DMOZ_GIO_COMPONENT ++COMPONENT_LIBS += nkgio ++endif ++ + ifdef MOZ_APP_COMPONENT_LIBS + COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS) + endif +diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp +index e1d90f2..85b21a2 100644 +--- mozilla/toolkit/library/nsStaticXULComponents.cpp ++++ mozilla/toolkit/library/nsStaticXULComponents.cpp +@@ -164,6 +164,12 @@ + #define PROFILER_MODULE + #endif + ++#if defined(MOZ_GIO_COMPONENT) ++#define GIO_MODULE MODULE(nsGIOModule) ++#else ++#define GIO_MODULE ++#endif ++ + #define XUL_MODULES \ + MODULE(nsUConvModule) \ + MODULE(nsI18nModule) \ +@@ -220,6 +226,7 @@ + MODULE(nsTelemetryModule) \ + MODULE(jsinspector) \ + MODULE(jsdebugger) \ ++ GIO_MODULE \ + /* end of list */ + + #define MODULE(_name) \ +diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk +index e87d7af..4b16d23 100644 +--- mozilla/toolkit/toolkit-tiers.mk ++++ mozilla/toolkit/toolkit-tiers.mk +@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger + + tier_platform_dirs += other-licenses/snappy + ++ifdef MOZ_GIO_COMPONENT ++tier_platform_dirs += extensions/gio ++endif ++ + ifdef APP_LIBXUL_STATICDIRS + # Applications can cheat and ask for code to be + # built before libxul so libxul can be linked against it. Modified: trunk/www/firefox-esr/files/patch-bug713802 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug713802 Wed Oct 24 16:11:28 2012 (r1077) +++ trunk/www/firefox-esr/files/patch-bug713802 Wed Oct 24 16:11:39 2012 (r1078) @@ -25,19 +25,6 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. ---- browser/installer/package-manifest.in~ -+++ browser/installer/package-manifest.in -@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so - - ; [Extensions] - ; -+#ifdef MOZ_ENABLE_GIO -+bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ -+#endif -+ - #ifdef MOZ_ENABLE_GNOMEVFS - bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ - #endif diff --git configure.in configure.in index 87a9391..2118651 100644 --- configure.in Added: trunk/www/firefox-esr/files/patch-bug799441 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug799441 Wed Oct 24 16:11:39 2012 (r1078) @@ -0,0 +1,116 @@ +commit b9accdd +Author: Mike Hommey +Date: Thu Oct 18 14:47:10 2012 +0200 + + Bug 799441 - Build GIO module in libxul. r=ted +--- + configure.in | 6 ++++++ + extensions/gio/Makefile.in | 14 +++----------- + toolkit/library/Makefile.in | 5 +++++ + toolkit/library/nsStaticXULComponents.cpp | 7 +++++++ + toolkit/toolkit-tiers.mk | 4 ++++ + 5 files changed, 25 insertions(+), 11 deletions(-) + +diff --git configure.in configure.in +index a9fb5f1..37e6db8 100644 +--- configure.in ++++ configure.in +@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + ++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then ++ MOZ_GIO_COMPONENT=1 ++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` ++fi ++AC_SUBST(MOZ_GIO_COMPONENT) ++ + if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then + AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.]) + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` +diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in +index ccf2846..79112a8 100644 +--- extensions/gio/Makefile.in ++++ extensions/gio/Makefile.in +@@ -14,6 +14,9 @@ MODULE = nkgio + LIBRARY_NAME = nkgio + SHORT_LIBNAME = nkgio + IS_COMPONENT = 1 ++EXPORT_LIBRARY = 1 ++MODULE_NAME = nsGIOModule ++LIBXUL_LIBRARY = 1 + + CPPSRCS = \ + nsGIOProtocolHandler.cpp \ +@@ -21,15 +24,4 @@ CPPSRCS = \ + + LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + +-EXTRA_DSO_LDOPTS = \ +- $(XPCOM_GLUE_LDOPTS) \ +- $(MOZ_COMPONENT_LIBS) \ +- $(MOZ_GIO_LIBS) \ +- $(NULL) +- +-# make sure this component is never statically linked into the main +-# application. this is necessary since we don't want to force users +-# to install gio in order to use the rest of mozilla ;-) +-FORCE_SHARED_LIB= 1 +- + include $(topsrcdir)/config/rules.mk +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 7f9046e..6499758 100644 +--- toolkit/library/libxul-config.mk ++++ toolkit/library/libxul-config.mk +@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug + endif + endif + ++ifdef MOZ_GIO_COMPONENT ++DEFINES += -DMOZ_GIO_COMPONENT ++COMPONENT_LIBS += nkgio ++endif ++ + ifdef MOZ_APP_COMPONENT_LIBS + COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS) + endif +diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp +index e1d90f2..85b21a2 100644 +--- toolkit/library/nsStaticXULComponents.cpp ++++ toolkit/library/nsStaticXULComponents.cpp +@@ -164,6 +164,12 @@ + #define PROFILER_MODULE + #endif + ++#if defined(MOZ_GIO_COMPONENT) ++#define GIO_MODULE MODULE(nsGIOModule) ++#else ++#define GIO_MODULE ++#endif ++ + #define XUL_MODULES \ + MODULE(nsUConvModule) \ + MODULE(nsI18nModule) \ +@@ -220,6 +226,7 @@ + MODULE(nsTelemetryModule) \ + MODULE(jsinspector) \ + MODULE(jsdebugger) \ ++ GIO_MODULE \ + /* end of list */ + + #define MODULE(_name) \ +diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk +index e87d7af..4b16d23 100644 +--- toolkit/toolkit-tiers.mk ++++ toolkit/toolkit-tiers.mk +@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger + + tier_platform_dirs += other-licenses/snappy + ++ifdef MOZ_GIO_COMPONENT ++tier_platform_dirs += extensions/gio ++endif ++ + ifdef APP_LIBXUL_STATICDIRS + # Applications can cheat and ask for code to be + # built before libxul so libxul can be linked against it. Modified: trunk/www/firefox/files/patch-bug713802 ============================================================================== --- trunk/www/firefox/files/patch-bug713802 Wed Oct 24 16:11:28 2012 (r1077) +++ trunk/www/firefox/files/patch-bug713802 Wed Oct 24 16:11:39 2012 (r1078) @@ -25,19 +25,6 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. ---- browser/installer/package-manifest.in~ -+++ browser/installer/package-manifest.in -@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so - - ; [Extensions] - ; -+#ifdef MOZ_ENABLE_GIO -+bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ -+#endif -+ - #ifdef MOZ_ENABLE_GNOMEVFS - bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ - #endif diff --git configure.in configure.in index 87a9391..2118651 100644 --- configure.in Added: trunk/www/firefox/files/patch-bug799441 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug799441 Wed Oct 24 16:11:39 2012 (r1078) @@ -0,0 +1,116 @@ +commit b9accdd +Author: Mike Hommey +Date: Thu Oct 18 14:47:10 2012 +0200 + + Bug 799441 - Build GIO module in libxul. r=ted +--- + configure.in | 6 ++++++ + extensions/gio/Makefile.in | 14 +++----------- + toolkit/library/Makefile.in | 5 +++++ + toolkit/library/nsStaticXULComponents.cpp | 7 +++++++ + toolkit/toolkit-tiers.mk | 4 ++++ + 5 files changed, 25 insertions(+), 11 deletions(-) + +diff --git configure.in configure.in +index a9fb5f1..37e6db8 100644 +--- configure.in ++++ configure.in +@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + ++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then ++ MOZ_GIO_COMPONENT=1 ++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` ++fi ++AC_SUBST(MOZ_GIO_COMPONENT) ++ + if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then + AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.]) + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` +diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in +index ccf2846..79112a8 100644 +--- extensions/gio/Makefile.in ++++ extensions/gio/Makefile.in +@@ -14,6 +14,9 @@ MODULE = nkgio + LIBRARY_NAME = nkgio + SHORT_LIBNAME = nkgio + IS_COMPONENT = 1 ++EXPORT_LIBRARY = 1 ++MODULE_NAME = nsGIOModule ++LIBXUL_LIBRARY = 1 + + CPPSRCS = \ + nsGIOProtocolHandler.cpp \ +@@ -21,15 +24,4 @@ CPPSRCS = \ + + LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + +-EXTRA_DSO_LDOPTS = \ +- $(XPCOM_GLUE_LDOPTS) \ +- $(MOZ_COMPONENT_LIBS) \ +- $(MOZ_GIO_LIBS) \ +- $(NULL) +- +-# make sure this component is never statically linked into the main +-# application. this is necessary since we don't want to force users +-# to install gio in order to use the rest of mozilla ;-) +-FORCE_SHARED_LIB= 1 +- + include $(topsrcdir)/config/rules.mk +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 7f9046e..6499758 100644 +--- toolkit/library/Makefile.in ++++ toolkit/library/Makefile.in +@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug + endif + endif + ++ifdef MOZ_GIO_COMPONENT ++DEFINES += -DMOZ_GIO_COMPONENT ++COMPONENT_LIBS += nkgio ++endif ++ + ifdef MOZ_APP_COMPONENT_LIBS + COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS) + endif +diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp +index e1d90f2..85b21a2 100644 +--- toolkit/library/nsStaticXULComponents.cpp ++++ toolkit/library/nsStaticXULComponents.cpp +@@ -164,6 +164,12 @@ + #define PROFILER_MODULE + #endif + ++#if defined(MOZ_GIO_COMPONENT) ++#define GIO_MODULE MODULE(nsGIOModule) ++#else ++#define GIO_MODULE ++#endif ++ + #define XUL_MODULES \ + MODULE(nsUConvModule) \ + MODULE(nsI18nModule) \ +@@ -220,6 +226,7 @@ + MODULE(nsTelemetryModule) \ + MODULE(jsinspector) \ + MODULE(jsdebugger) \ ++ GIO_MODULE \ + /* end of list */ + + #define MODULE(_name) \ +diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk +index e87d7af..4b16d23 100644 +--- toolkit/toolkit-tiers.mk ++++ toolkit/toolkit-tiers.mk +@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger + + tier_platform_dirs += other-licenses/snappy + ++ifdef MOZ_GIO_COMPONENT ++tier_platform_dirs += extensions/gio ++endif ++ + ifdef APP_LIBXUL_STATICDIRS + # Applications can cheat and ask for code to be + # built before libxul so libxul can be linked against it. Modified: trunk/www/libxul/files/patch-bug713802 ============================================================================== --- trunk/www/libxul/files/patch-bug713802 Wed Oct 24 16:11:28 2012 (r1077) +++ trunk/www/libxul/files/patch-bug713802 Wed Oct 24 16:11:39 2012 (r1078) @@ -25,19 +25,6 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. ---- browser/installer/package-manifest.in~ -+++ browser/installer/package-manifest.in -@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so - - ; [Extensions] - ; -+#ifdef MOZ_ENABLE_GIO -+bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ -+#endif -+ - #ifdef MOZ_ENABLE_GNOMEVFS - bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ - #endif diff --git configure.in configure.in index 87a9391..2118651 100644 --- configure.in Modified: trunk/www/seamonkey/files/patch-bug713802 ============================================================================== --- trunk/www/seamonkey/files/patch-bug713802 Wed Oct 24 16:11:28 2012 (r1077) +++ trunk/www/seamonkey/files/patch-bug713802 Wed Oct 24 16:11:39 2012 (r1078) @@ -25,19 +25,6 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. ---- mozilla/browser/installer/package-manifest.in~ -+++ mozilla/browser/installer/package-manifest.in -@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so - - ; [Extensions] - ; -+#ifdef MOZ_ENABLE_GIO -+bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ -+#endif -+ - #ifdef MOZ_ENABLE_GNOMEVFS - bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ - #endif diff --git mozilla/configure.in mozilla/configure.in index 87a9391..2118651 100644 --- mozilla/configure.in @@ -109,18 +96,6 @@ MOZ_UPDATER=1 # This should usually be the same as the value MAR_CHANNEL_ID. # If more than one ID is needed, then you should use a comma separated list ---- suite/installer/package-manifest.in~ -+++ suite/installer/package-manifest.in -@@ -265,6 +265,9 @@ - @BINPATH@/components/necko_wifi.xpt - #endif - @BINPATH@/components/necko_wyciwyg.xpt -+#ifdef MOZ_ENABLE_GIO -+@BINPATH@/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ -+#endif - #ifdef MOZ_ENABLE_GNOMEVFS - @BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ - #endif commit d884d75 Author: Karl Tomlinson Added: trunk/www/seamonkey/files/patch-bug799441 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug799441 Wed Oct 24 16:11:39 2012 (r1078) @@ -0,0 +1,116 @@ +commit b9accdd +Author: Mike Hommey +Date: Thu Oct 18 14:47:10 2012 +0200 + + Bug 799441 - Build GIO module in libxul. r=ted +--- + configure.in | 6 ++++++ + extensions/gio/Makefile.in | 14 +++----------- + toolkit/library/Makefile.in | 5 +++++ + toolkit/library/nsStaticXULComponents.cpp | 7 +++++++ + toolkit/toolkit-tiers.mk | 4 ++++ + 5 files changed, 25 insertions(+), 11 deletions(-) + +diff --git configure.in configure.in +index a9fb5f1..37e6db8 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + ++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then ++ MOZ_GIO_COMPONENT=1 ++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` ++fi ++AC_SUBST(MOZ_GIO_COMPONENT) ++ + if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then + AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.]) + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` +diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in +index ccf2846..79112a8 100644 +--- mozilla/extensions/gio/Makefile.in ++++ mozilla/extensions/gio/Makefile.in +@@ -14,6 +14,9 @@ MODULE = nkgio + LIBRARY_NAME = nkgio + SHORT_LIBNAME = nkgio + IS_COMPONENT = 1 ++EXPORT_LIBRARY = 1 ++MODULE_NAME = nsGIOModule ++LIBXUL_LIBRARY = 1 + + CPPSRCS = \ + nsGIOProtocolHandler.cpp \ +@@ -21,15 +24,4 @@ CPPSRCS = \ + + LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + +-EXTRA_DSO_LDOPTS = \ +- $(XPCOM_GLUE_LDOPTS) \ +- $(MOZ_COMPONENT_LIBS) \ +- $(MOZ_GIO_LIBS) \ +- $(NULL) +- +-# make sure this component is never statically linked into the main +-# application. this is necessary since we don't want to force users +-# to install gio in order to use the rest of mozilla ;-) +-FORCE_SHARED_LIB= 1 +- + include $(topsrcdir)/config/rules.mk +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 7f9046e..6499758 100644 +--- mozilla/toolkit/library/Makefile.in ++++ mozilla/toolkit/library/Makefile.in +@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug + endif + endif + ++ifdef MOZ_GIO_COMPONENT ++DEFINES += -DMOZ_GIO_COMPONENT ++COMPONENT_LIBS += nkgio ++endif ++ + ifdef MOZ_APP_COMPONENT_LIBS + COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS) + endif +diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp +index e1d90f2..85b21a2 100644 +--- mozilla/toolkit/library/nsStaticXULComponents.cpp ++++ mozilla/toolkit/library/nsStaticXULComponents.cpp +@@ -164,6 +164,12 @@ + #define PROFILER_MODULE + #endif + ++#if defined(MOZ_GIO_COMPONENT) ++#define GIO_MODULE MODULE(nsGIOModule) ++#else ++#define GIO_MODULE ++#endif ++ + #define XUL_MODULES \ + MODULE(nsUConvModule) \ + MODULE(nsI18nModule) \ +@@ -220,6 +226,7 @@ + MODULE(nsTelemetryModule) \ + MODULE(jsinspector) \ + MODULE(jsdebugger) \ ++ GIO_MODULE \ + /* end of list */ + + #define MODULE(_name) \ +diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk +index e87d7af..4b16d23 100644 +--- mozilla/toolkit/toolkit-tiers.mk ++++ mozilla/toolkit/toolkit-tiers.mk +@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger + + tier_platform_dirs += other-licenses/snappy + ++ifdef MOZ_GIO_COMPONENT ++tier_platform_dirs += extensions/gio ++endif ++ + ifdef APP_LIBXUL_STATICDIRS + # Applications can cheat and ask for code to be + # built before libxul so libxul can be linked against it. From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 24 16:11:53 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A18DED3 for ; Wed, 24 Oct 2012 16:11:53 +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 2AB7B8FC17 for ; Wed, 24 Oct 2012 16:11:52 +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 q9OGBqlT033837 for ; Wed, 24 Oct 2012 16:11:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q9OGBlAQ033205 for freebsd-gecko@freebsd.org; Wed, 24 Oct 2012 16:11:47 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 24 Oct 2012 16:11:47 GMT Message-Id: <201210241611.q9OGBlAQ033205@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] r1079 - 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: Wed, 24 Oct 2012 16:11:53 -0000 Author: jbeich Date: Wed Oct 24 16:11:46 2012 New Revision: 1079 Log: - prepare to libc++ becoming default - don't link -lcxxrt into every binary/library Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Oct 24 16:11:39 2012 (r1078) +++ trunk/Mk/bsd.gecko.mk Wed Oct 24 16:11:46 2012 (r1079) @@ -659,8 +659,8 @@ --disable-updater \ --disable-pedantic -.if ${CXXFLAGS:M-stdlib=libc++} -LIBS+= -lcxxrt +.if ${CXX:T:Mclang++} && exists(/usr/lib/libc++.so) +LIBS+= -Wl,--as-needed,-lcxxrt,--no-as-needed .endif .if ${PORT_OPTIONS:MQT4} From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 24 16:12:15 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8D5D71A9 for ; Wed, 24 Oct 2012 16:12:15 +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 30A7C8FC14 for ; Wed, 24 Oct 2012 16:12:13 +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 q9OGCD3A050390 for ; Wed, 24 Oct 2012 16:12:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q9OGC6h2035090 for freebsd-gecko@freebsd.org; Wed, 24 Oct 2012 16:12:06 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 24 Oct 2012 16:12:06 GMT Message-Id: <201210241612.q9OGC6h2035090@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] r1080 - in trunk: . mail/thunderbird mail/thunderbird/files security/ca_root_nss security/nss www/firefox www/firefox-nightly www/firefox/files www/seamonkey 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: Wed, 24 Oct 2012 16:12:15 -0000 Author: jbeich Date: Wed Oct 24 16:12:06 2012 New Revision: 1080 Log: update Added: trunk/mail/thunderbird/files/patch-bug786690 trunk/mail/thunderbird/files/patch-bug803811 trunk/mail/thunderbird/files/patch-mozilla-config-baseconfig.mk - copied, changed from r1079, trunk/mail/thunderbird/files/patch-config-baseconfig.mk trunk/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in - copied, changed from r1079, trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in trunk/www/firefox/files/patch-bug786690 trunk/www/firefox/files/patch-js-src-js-confdefs.h.in - copied, changed from r1079, trunk/www/firefox/files/patch-js-src-configure.in trunk/www/seamonkey/files/patch-bug786690 trunk/www/seamonkey/files/patch-bug803811 Deleted: trunk/Gecko_UPDATING trunk/mail/thunderbird/files/patch-bug761077 trunk/mail/thunderbird/files/patch-bug774671 trunk/mail/thunderbird/files/patch-bug775257 trunk/mail/thunderbird/files/patch-bug777696 trunk/mail/thunderbird/files/patch-bug778056 trunk/mail/thunderbird/files/patch-bug779847 trunk/mail/thunderbird/files/patch-bug783571 trunk/mail/thunderbird/files/patch-bug784741 trunk/mail/thunderbird/files/patch-bug784776 trunk/mail/thunderbird/files/patch-config-autoconf.mk.in trunk/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp trunk/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in trunk/www/firefox/files/patch-bug761077 trunk/www/firefox/files/patch-bug774671 trunk/www/firefox/files/patch-bug775257 trunk/www/firefox/files/patch-bug777696 trunk/www/firefox/files/patch-bug778056 trunk/www/firefox/files/patch-bug779847 trunk/www/firefox/files/patch-bug784741 trunk/www/firefox/files/patch-bug784776 trunk/www/firefox/files/patch-js-src-configure.in trunk/www/seamonkey/files/patch-bug761077 trunk/www/seamonkey/files/patch-bug774671 trunk/www/seamonkey/files/patch-bug775257 trunk/www/seamonkey/files/patch-bug777696 trunk/www/seamonkey/files/patch-bug778056 trunk/www/seamonkey/files/patch-bug779847 trunk/www/seamonkey/files/patch-bug784741 trunk/www/seamonkey/files/patch-bug784776 trunk/www/seamonkey/files/patch-config-autoconf.mk.in trunk/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp trunk/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp trunk/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp Modified: trunk/Gecko_ChangeLog trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/distinfo trunk/mail/thunderbird/files/extra-bug780531 trunk/mail/thunderbird/files/patch-alsapulse trunk/mail/thunderbird/files/patch-bug753046 trunk/mail/thunderbird/files/patch-bug783463 trunk/mail/thunderbird/files/patch-bug788039 trunk/mail/thunderbird/files/patch-bug788108 trunk/mail/thunderbird/files/patch-bug788955 trunk/mail/thunderbird/files/patch-config-baseconfig.mk trunk/security/ca_root_nss/Makefile trunk/security/ca_root_nss/distinfo trunk/security/nss/Makefile trunk/security/nss/distinfo trunk/security/nss/pkg-plist trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/firefox/files/extra-bug780531 trunk/www/firefox/files/patch-alsapulse trunk/www/firefox/files/patch-bug753046 trunk/www/firefox/files/patch-bug783463 trunk/www/firefox/files/patch-bug788039 trunk/www/firefox/files/patch-bug788108 trunk/www/firefox/files/patch-bug788955 trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo trunk/www/seamonkey/files/extra-bug780531 trunk/www/seamonkey/files/patch-alsapulse trunk/www/seamonkey/files/patch-bug753046 trunk/www/seamonkey/files/patch-bug783463 trunk/www/seamonkey/files/patch-bug788039 trunk/www/seamonkey/files/patch-bug788108 trunk/www/seamonkey/files/patch-bug788955 trunk/www/seamonkey/files/patch-config-baseconfig.mk trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/Gecko_ChangeLog Wed Oct 24 16:12:06 2012 (r1080) @@ -1,22 +1,2 @@ -16.0: -- integrate enigmail into thunderbird/seamonkey as an option -- enable ENIGMAIL, LIGHTNING and GIO options by default -- switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better - latency during pause and seeking with HTML5 video -- remove fedisableexcept() hacks, obsolete since FreeBSD 4.0 -- support system hunspell dictionaries [1] -- unbreak -esr ports with clang3.2 [2] -- unbreak nss build when CC contains full path [3] -- remove GNOME option grouping [4] -- add more reporters in about:memory: page-faults-hard, page-faults-soft, - resident, vsize -- use bundled jemalloc 3.0.0 on FreeBSD < 10.0 for gecko 16.0, - only heap-allocated reporter works in about:memory (see bug 762445) -- use lrintf() instead of slow C cast in bundled libopus -- use libjpeg-turbo's faster color conversion if available during build -- record startup time for telemetry -- use -z origin instead of hardcoding path to gecko runtime -- fail early if incompatible libxul version is installed (in USE_GECKO) -- *miscellaneous cleanups and fixups* - -PR: ports/171534 [1], ports/171566 [2], ports/172164 [3], ports/172201 [4] +17.0: +- *misc* Deleted: trunk/Gecko_UPDATING ============================================================================== --- trunk/Gecko_UPDATING Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,8 +0,0 @@ -20121010: - AFFECTS: users of www/firefox and www/seamonkey - AUTHOR: gecko@FreeBSD.org - - When using Firefox or SeaMonkey compiled with ALSA option ON it may - crash on assert in cubeb_refill_stream as described in ports/170473. - To fix either set media.use_cubeb -> false in about:config or rebuild - audio/alsa-plugins with ARIFF_OSS option disabled (default). Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/mail/thunderbird/Makefile Wed Oct 24 16:12:06 2012 (r1080) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 16.0 +DISTVERSION= 17.0b1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -61,7 +61,7 @@ .include "${.CURDIR}/../../www/firefox/Makefile.options" .include -WRKSRC= ${WRKDIR}/comm-release +WRKSRC= ${WRKDIR}/comm-beta MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi Modified: trunk/mail/thunderbird/distinfo ============================================================================== --- trunk/mail/thunderbird/distinfo Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/mail/thunderbird/distinfo Wed Oct 24 16:12:06 2012 (r1080) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-16.0b3.source.tar.bz2) = fc089c1a374ec6fb85f693286a2331e2161e4d53cf3e6cbb7cc377a5b8e7ec8c -SIZE (thunderbird-16.0b3.source.tar.bz2) = 111775667 -SHA256 (enigmail-1.4.4.tar.gz) = ec62bb701968f72ad35546660132e6e47d4ebe684df1d27fc615cb9010a203b8 -SIZE (enigmail-1.4.4.tar.gz) = 1269444 +SHA256 (thunderbird-17.0b1.source.tar.bz2) = d563a9ea290e08e2b27de0d9c40403eec753d11cc1fdeed3b5f5b9a817d22a44 +SIZE (thunderbird-17.0b1.source.tar.bz2) = 113248011 +SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020 +SIZE (enigmail-1.4.5.tar.gz) = 1269207 Modified: trunk/mail/thunderbird/files/extra-bug780531 ============================================================================== --- trunk/mail/thunderbird/files/extra-bug780531 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/mail/thunderbird/files/extra-bug780531 Wed Oct 24 16:12:06 2012 (r1080) @@ -1,32 +1,22 @@ --- mozilla/configure.in~ +++ mozilla/configure.in -@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then - MOZ_SYDNEYAUDIO=1 - MOZ_CUBEB=1 - MOZ_MEDIA=1 -- case "$target_cpu" in -+ case "$target" in - arm*) - MOZ_TREMOR=1 - ;; -+ *-freebsd*) -+ MOZ_TREMOR=1 -+ ;; - *) - MOZ_VORBIS=1 - ;; -@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then - MOZ_SYDNEYAUDIO=1 - MOZ_CUBEB=1 - MOZ_MEDIA=1 -- case "$target_cpu" in -+ case "$target" in - arm*) - MOZ_TREMOR=1 - ;; -+ *-freebsd*) -+ MOZ_TREMOR=1 -+ ;; - *) - MOZ_VORBIS=1 - ;; +@@ -5151,12 +5148,17 @@ fi + + AC_SUBST(MOZ_WEBRTC) + +-case "$target_cpu" in +-arm*) ++case "$target" in ++arm-*-linux*) + MOZ_SAMPLE_TYPE_S16LE=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE) + AC_SUBST(MOZ_SAMPLE_TYPE_S16LE) + ;; ++*-freebsd*) ++ MOZ_SAMPLE_TYPE_S16LE=1 ++ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE) ++ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE) ++;; + *) + MOZ_SAMPLE_TYPE_FLOAT32=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) Modified: trunk/mail/thunderbird/files/patch-alsapulse ============================================================================== --- trunk/mail/thunderbird/files/patch-alsapulse Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/mail/thunderbird/files/patch-alsapulse Wed Oct 24 16:12:06 2012 (r1080) @@ -1,27 +1,8 @@ -diff --git mozilla/config/autoconf.mk.in mozilla/config/autoconf.mk.in -index 44c0b06..748511b 100644 ---- mozilla/config/autoconf.mk.in -+++ mozilla/config/autoconf.mk.in -@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ - MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ - MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ - -+MOZ_ALSA = @MOZ_ALSA@ - MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ - MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ - -+MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@ -+MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ -+MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ -+ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ - GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ diff --git mozilla/configure.in mozilla/configure.in index 5980b76..11f5f77 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -5600,13 +5600,45 @@ dnl ======================================================== +@@ -5600,13 +5600,25 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== @@ -45,28 +26,8 @@ +AC_SUBST(MOZ_ALSA) + -+dnl ======================================================== -+dnl = Enable PulseAudio -+dnl ======================================================== -+ -+MOZ_ARG_ENABLE_BOOL(pulseaudio, -+[ --enable-pulseaudio Enable PulseAudio support], -+MOZ_PULSEAUDIO=1, -+MOZ_PULSEAUDIO=) -+ -+if test -n "$MOZ_PULSEAUDIO"; then -+ AC_DEFINE(MOZ_CUBEB) -+ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , -+ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" -+ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) -+fi -+ -+AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) -+AC_SUBST(MOZ_PULSEAUDIO_LIBS) -+AC_SUBST(MOZ_PULSEAUDIO) -+ dnl ======================================================== - dnl = Enable GStreamer + dnl = Enable PulseAudio dnl ======================================================== diff --git mozilla/media/libcubeb/src/Makefile.in mozilla/media/libcubeb/src/Makefile.in index 5ab4dd8..c8df26f 100644 @@ -83,7 +44,7 @@ endif ifeq ($(OS_TARGET),Darwin) -@@ -42,4 +38,16 @@ CSRCS = \ +@@ -42,6 +38,12 @@ CSRCS = \ $(NULL) endif @@ -93,25 +54,9 @@ + $(NULL) +endif + -+ifdef MOZ_PULSEAUDIO -+CSRCS = \ -+ cubeb_pulse.c \ -+ $(NULL) -+endif -+ - include $(topsrcdir)/config/rules.mk -diff --git mozilla/media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c -index 599aea2..41fd5af 100644 ---- mozilla/media/libcubeb/src/cubeb_alsa.c -+++ mozilla/media/libcubeb/src/cubeb_alsa.c -@@ -6,6 +6,6 @@ - #undef NDEBUG - #define _BSD_SOURCE --#define _POSIX_SOURCE -+#define _XOPEN_SOURCE 500 - #include - #include - #include + ifdef MOZ_PULSEAUDIO + CSRCS = \ + cubeb_pulse.c \ diff --git mozilla/media/libsydneyaudio/src/Makefile.in mozilla/media/libsydneyaudio/src/Makefile.in index 8dda8ce..b19641d 100644 --- mozilla/media/libsydneyaudio/src/Makefile.in @@ -150,7 +95,7 @@ index 43384e9..e46a6e3 100644 --- mozilla/toolkit/library/Makefile.in +++ mozilla/toolkit/library/Makefile.in -@@ -379,10 +379,13 @@ endif +@@ -370,14 +370,11 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) @@ -160,9 +105,10 @@ +ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) endif -+ifdef MOZ_PULSEAUDIO -+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) -+endif +-endif +- + ifdef MOZ_PULSEAUDIO +-ifdef MOZ_CUBEB + EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif endif - - ifdef HAVE_CLOCK_MONOTONIC Modified: trunk/mail/thunderbird/files/patch-bug753046 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug753046 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/mail/thunderbird/files/patch-bug753046 Wed Oct 24 16:12:06 2012 (r1080) @@ -56,7 +56,7 @@ --- mozilla/ipc/chromium/Makefile.in.orig 2012-02-16 06:40:33.000000000 +0000 +++ mozilla/ipc/chromium/Makefile.in -@@ -278,6 +278,34 @@ endif +@@ -278,6 +278,33 @@ endif endif # } OS_LINUX @@ -64,7 +64,6 @@ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -404,19 +403,6 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -diff --git mozilla/ipc/chromium/src/base/file_util_linux.cc mozilla/ipc/chromium/src/base/file_util_linux.cc -index 171e44f..0c6dfcc 100644 ---- mozilla/ipc/chromium/src/base/file_util_linux.cc -+++ mozilla/ipc/chromium/src/base/file_util_linux.cc -@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { - } - - bool GetShmemTempDir(FilePath* path) { --#ifdef ANDROID -+#if defined(ANDROID) || defined(OS_BSD) - return GetTempDir(path); - #else - *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -541,8 +527,7 @@ pthread_set_name_np(pthread_self(), name); -#elif defined(__NetBSD__) +#elif defined(OS_NETBSD) -- pthread_setname_np(pthread_self(), "%s", name); -+ pthread_setname_np(pthread_self(), "%s", (void *)name); + pthread_setname_np(pthread_self(), "%s", (void *)name); #else prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ @@ -586,7 +571,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,318 @@ +@@ -0,0 +1,367 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -621,6 +606,20 @@ +#define HAVE_POSIX_SPAWN 1 +#endif + ++/* ++ * On platforms that are not gonk based, we fall back to an arbitrary ++ * UID. This is generally the UID for user `nobody', albeit it is not ++ * always the case. ++ */ ++ ++#if defined(OS_NETBSD) || defined(OS_OPENBSD) ++# define CHILD_UNPRIVILEGED_UID 32767 ++# define CHILD_UNPRIVILEGED_GID 32767 ++#else ++# define CHILD_UNPRIVILEGED_UID 65534 ++# define CHILD_UNPRIVILEGED_GID 65534 ++#endif ++ +#ifndef __dso_public +# ifdef __exported +# define __dso_public __exported @@ -669,6 +668,17 @@ + const environment_map& env_vars_to_set, + bool wait, ProcessHandle* process_handle, + ProcessArchitecture arch) { ++ return LaunchApp(argv, fds_to_remap, env_vars_to_set, ++ SAME_PRIVILEGES_AS_PARENT, ++ wait, process_handle); ++} ++ ++bool LaunchApp(const std::vector& argv, ++ const file_handle_mapping_vector& fds_to_remap, ++ const environment_map& env_vars_to_set, ++ ChildPrivileges privs, ++ bool wait, ProcessHandle* process_handle, ++ ProcessArchitecture arch) { + bool retval = true; + + char* argv_copy[argv.size() + 1]; @@ -783,6 +793,17 @@ + const environment_map& env_vars_to_set, + bool wait, ProcessHandle* process_handle, + ProcessArchitecture arch) { ++ return LaunchApp(argv, fds_to_remap, env_vars_to_set, ++ SAME_PRIVILEGES_AS_PARENT, ++ wait, process_handle); ++} ++ ++bool LaunchApp(const std::vector& argv, ++ const file_handle_mapping_vector& fds_to_remap, ++ const environment_map& env_vars_to_set, ++ ChildPrivileges privs, ++ bool wait, ProcessHandle* process_handle, ++ ProcessArchitecture arch) { + scoped_array argv_cstr(new char*[argv.size() + 1]); + // Illegal to allocate memory after fork and before execvp + InjectiveMultimap fd_shuffle1, fd_shuffle2; @@ -805,19 +826,32 @@ + + CloseSuperfluousFds(fd_shuffle2); + ++ for (size_t i = 0; i < argv.size(); i++) ++ argv_cstr[i] = const_cast(argv[i].c_str()); ++ argv_cstr[argv.size()] = NULL; ++ ++ if (privs == UNPRIVILEGED) { ++ if (setgid(CHILD_UNPRIVILEGED_GID) != 0) { ++ DLOG(ERROR) << "FAILED TO setgid() CHILD PROCESS, path: " << argv_cstr[0]; ++ _exit(127); ++ } ++ if (setuid(CHILD_UNPRIVILEGED_UID) != 0) { ++ DLOG(ERROR) << "FAILED TO setuid() CHILD PROCESS, path: " << argv_cstr[0]; ++ _exit(127); ++ } ++ if (chdir("/") != 0) ++ gProcessLog.print("==> could not chdir()\n"); ++ } ++ + for (environment_map::const_iterator it = env_vars_to_set.begin(); + it != env_vars_to_set.end(); ++it) { + if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/)) + _exit(127); + } -+ -+ for (size_t i = 0; i < argv.size(); i++) -+ argv_cstr[i] = const_cast(argv[i].c_str()); -+ argv_cstr[argv.size()] = NULL; -+ execvp(argv_cstr[0], argv_cstr.get()); ++ execv(argv_cstr[0], argv_cstr.get()); + // if we get here, we're in serious trouble and should complain loudly + DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0]; -+ exit(127); ++ _exit(127); + } else { + gProcessLog.print("==> process %d launched child process %d\n", + GetCurrentProcId(), pid); @@ -1144,7 +1178,7 @@ base::LaunchApp(childArgv, mFileMap, -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - newEnvVars, + newEnvVars, privs, #endif false, &process, arch); diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h Deleted: trunk/mail/thunderbird/files/patch-bug761077 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug761077 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,88 +0,0 @@ -diff --git mozilla/xpcom/reflect/xptcall/public/genstubs.pl mozilla/xpcom/reflect/xptcall/public/genstubs.pl -index b8a87a5..918c4cf 100644 ---- mozilla/xpcom/reflect/xptcall/public/genstubs.pl -+++ mozilla/xpcom/reflect/xptcall/public/genstubs.pl -@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n"; - print OUTFILE "* 1 is AddRef\n"; - print OUTFILE "* 2 is Release\n"; - print OUTFILE "*/\n"; --print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n"; -+print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n"; - for($i = 0; $i < $entry_count; $i++) { - print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n"; - } -diff --git mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc -index eb66761..807db26 100644 ---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc -+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); -diff --git mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in -index ae6ed66..2783957 100644 ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -70,7 +70,7 @@ endif - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -269,7 +269,7 @@ endif - # - # Linux/PPC - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) -+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp - ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -278,7 +278,7 @@ endif - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +350,7 @@ endif - # - # OpenBSD/SPARC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) -+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp - ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s - endif -diff --git mozilla/xpcom/reflect/xptcall/src/xptcprivate.h mozilla/xpcom/reflect/xptcall/src/xptcprivate.h -index d903ced..e4ec832 100644 ---- mozilla/xpcom/reflect/xptcall/src/xptcprivate.h -+++ mozilla/xpcom/reflect/xptcall/src/xptcprivate.h -@@ -14,7 +14,7 @@ - - class xptiInterfaceEntry; - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; -@@ -31,7 +31,7 @@ public: - #undef STUB_ENTRY - #undef SENTINEL_ENTRY - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); Deleted: trunk/mail/thunderbird/files/patch-bug774671 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug774671 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,40 +0,0 @@ -commit 7e9eda2 -Author: Rafael Ávila de Espíndola -Date: Tue Jul 17 12:54:41 2012 -0400 - - Bug 774671 - Fix mismatched declarations. r=luke. ---- - mozilla/js/src/jsproxy.h | 2 +- - mozilla/js/src/jsprvtd.h | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git mozilla/js/src/jsproxy.h mozilla/js/src/jsproxy.h -index ec26e3a..aa0e782 100644 ---- mozilla/js/src/jsproxy.h -+++ mozilla/js/src/jsproxy.h -@@ -13,7 +13,7 @@ - - namespace js { - --class Wrapper; -+class JS_FRIEND_API(Wrapper); - - /* - * A proxy is a JSObject that implements generic behavior by providing custom -diff --git mozilla/js/src/jsprvtd.h mozilla/js/src/jsprvtd.h -index 19b5aef..93e1216 100644 ---- mozilla/js/src/jsprvtd.h -+++ mozilla/js/src/jsprvtd.h -@@ -146,9 +146,9 @@ struct TreeContext; - class UpvarCookie; - - class Proxy; --class BaseProxyHandler; --class DirectWrapper; --class CrossCompartmentWrapper; -+class JS_FRIEND_API(BaseProxyHandler); -+class JS_FRIEND_API(DirectWrapper); -+class JS_FRIEND_API(CrossCompartmentWrapper); - - class TempAllocPolicy; - class RuntimeAllocPolicy; Deleted: trunk/mail/thunderbird/files/patch-bug775257 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug775257 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ -commit 8fc8b74 -Author: Oleg Romashin -Date: Wed Jul 18 22:46:11 2012 -0400 - - Bug 775257 - Gstreamer backend on Meego N9 produce extra noise in audio playback.r=giles ---- - content/media/gstreamer/nsGStreamerReader.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp -index c48f92e..0fb801a 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -130,8 +130,13 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor) - gst_object_unref(sinkpad); - - mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! " -+#ifndef MOZ_TREMOR - "appsink name=audiosink sync=true caps=audio/x-raw-float," - "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL); -+#else -+ "appsink name=audiosink sync=true caps=audio/x-raw-int," -+ "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL); -+#endif - mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink), - "audiosink")); - gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks, Deleted: trunk/mail/thunderbird/files/patch-bug777696 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug777696 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,32 +0,0 @@ -commit 0c0d1a8 -Author: Landry Breuil -Date: Mon Jul 30 17:57:15 2012 +0200 - - Bug 777696: Fix gstreamer backend on big endian architectures. r=doublec ---- - content/media/gstreamer/nsGStreamerReader.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp -index 0fb801a..4a69196 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -132,10 +132,18 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor) - mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! " - #ifdef MOZ_TREMOR - "appsink name=audiosink sync=true caps=audio/x-raw-float," -+#ifdef IS_LITTLE_ENDIAN - "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL); - #else -+ "channels={1,2},rate=44100,width=32,endianness=4321", TRUE, NULL); -+#endif -+#else - "appsink name=audiosink sync=true caps=audio/x-raw-int," -+#ifdef IS_LITTLE_ENDIAN - "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL); -+#else -+ "channels={1,2},rate=48000,width=16,endianness=4321", TRUE, NULL); -+#endif - #endif - mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink), - "audiosink")); Deleted: trunk/mail/thunderbird/files/patch-bug778056 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug778056 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- mozilla/memory/mozalloc/mozalloc.cpp~ -+++ mozilla/memory/mozalloc/mozalloc.cpp -@@ -19,6 +19,9 @@ - #if defined(XP_UNIX) - # include // for valloc on *BSD - #endif //if defined(XP_UNIX) -+#if defined(__FreeBSD__) -+# include // for malloc_usable_size -+#endif // if defined(__FreeBSD__) - - #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) - # define MOZALLOC_EXPORT __declspec(dllexport) -@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr) - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) -+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) - // Android bionic libc doesn't have malloc_usable_size. - return malloc_usable_size(ptr); - #elif defined(XP_WIN) Deleted: trunk/mail/thunderbird/files/patch-bug779847 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug779847 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ ---- mozilla/gfx/ycbcr/Makefile.in -+++ mozilla/gfx/ycbcr/Makefile.in -@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \ - $(NULL) - endif - else --ifeq ($(OS_ARCH),Linux) --CPPSRCS += yuv_row_posix.cpp \ -- $(NULL) --else --ifeq ($(OS_ARCH),SunOS) --CPPSRCS += yuv_row_posix.cpp \ -- $(NULL) --else --ifeq ($(OS_ARCH),Darwin) -+ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH))) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) - else - CPPSRCS += yuv_row_other.cpp \ - $(NULL) --endif # Darwin --endif # SunOS --endif # linux -+endif # posix - endif # windows - - ifeq (arm,$(findstring arm,$(OS_TEST))) Modified: trunk/mail/thunderbird/files/patch-bug783463 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug783463 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/mail/thunderbird/files/patch-bug783463 Wed Oct 24 16:12:06 2012 (r1080) @@ -12,23 +12,3 @@ SkTime_Unix.cpp \ $(NULL) endif ---- mozilla/widget/qt/nsNativeThemeQt.cpp~ -+++ mozilla/widget/qt/nsNativeThemeQt.cpp -@@ -25,7 +25,6 @@ - #include "nsThemeConstants.h" - #include "nsIServiceManager.h" - #include "nsIDOMHTMLInputElement.h" --#include - - - #include "gfxASurface.h" ---- mozilla/widget/qt/nsSound.cpp~ -+++ mozilla/widget/qt/nsSound.cpp -@@ -40,6 +40,7 @@ - #include - - #include -+#include - - #include "nscore.h" - #include "plstr.h" Deleted: trunk/mail/thunderbird/files/patch-bug783571 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug783571 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,22 +0,0 @@ ---- mail/components/Makefile.in~ -+++ mail/components/Makefile.in -@@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk - # least one module from search/ on all platforms - DIRS = compose cloudfile preferences addrbook migration activity search about-support wintaskbar newmailaccount im - --ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT))) -+ifneq (,$(filter windows gtk2 cocoa qt, $(MOZ_WIDGET_TOOLKIT))) - DIRS += shell - endif - ---- mail/components/build/Makefile.in~ -+++ mail/components/build/Makefile.in -@@ -78,7 +78,7 @@ SHARED_LIBRARY_LIBS = \ - ../migration/src/$(LIB_PREFIX)profilemigration_s.$(LIB_SUFFIX) \ - $(NULL) - --ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT))) -+ifneq (,$(filter windows cocoa gtk2 qt, $(MOZ_WIDGET_TOOLKIT))) - SHARED_LIBRARY_LIBS += ../shell/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX) - endif - Deleted: trunk/mail/thunderbird/files/patch-bug784741 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug784741 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ -diff --git js/src/Makefile.in js/src/Makefile.in -index 8eb385f..01bd8e3 100644 ---- mozilla/js/src/Makefile.in -+++ mozilla/js/src/Makefile.in -@@ -323,6 +323,7 @@ endif - - ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) - ENABLE_YARR_JIT = 1 -+DEFINES += -DENABLE_YARR_JIT=1 - - VPATH += $(srcdir)/assembler/assembler \ - $(srcdir)/methodjit \ -diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h -index 6570f2d..0c84896 100644 ---- mozilla/js/src/assembler/wtf/Platform.h -+++ mozilla/js/src/assembler/wtf/Platform.h -@@ -1102,9 +1102,7 @@ - #if WTF_PLATFORM_CHROMIUM - #define ENABLE_YARR_JIT 0 - --#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT) --#define ENABLE_YARR_JIT 1 -- -+#elif ENABLE_YARR_JIT - /* Setting this flag compares JIT results with interpreter results. */ - #define ENABLE_YARR_JIT_DEBUG 0 - #endif -diff --git js/src/configure.in js/src/configure.in -index c142eb7..34f98b9 100644 ---- mozilla/js/src/configure.in -+++ mozilla/js/src/configure.in -@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug, - (using compiler flags DBG)], - [ if test "$enableval" != "no"; then - MOZ_DEBUG=1 -- ENABLE_METHODJIT_SPEW=1 -+ if test "$ENABLE_METHODJIT"; then -+ # needs MethodJIT or YarrJIT -+ ENABLE_METHODJIT_SPEW=1 -+ fi - if test -n "$enableval" -a "$enableval" != "yes"; then - MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` - _MOZ_DEBUG_FLAGS_SET=1 Deleted: trunk/mail/thunderbird/files/patch-bug784776 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug784776 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,33 +0,0 @@ ---- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~ -+++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp -@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources() - { - if (mSharedHandle) { - gl()->ReleaseSharedHandle(mShareType, mSharedHandle); -- mSharedHandle = NULL; -+ mSharedHandle = 0; - } - - mYUVTexture[0].Release(); ---- mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp~ -+++ mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp -@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr - struct tm *tmc; - int i; - -- tt = time((time_t)NULL); -+ tt = time(NULL); - tmc = localtime(&tt); - - tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM ---- mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp~ -+++ mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp -@@ -40,7 +40,7 @@ CrossProcessMutexHandle - CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle) - { - NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!"); -- return NULL; -+ return 0; - } - - } Added: trunk/mail/thunderbird/files/patch-bug786690 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug786690 Wed Oct 24 16:12:06 2012 (r1080) @@ -0,0 +1,26 @@ +commit 38301c3 +Author: Michael Wu +Date: Fri Aug 31 10:18:46 2012 -0300 + + Bug 786690 - Fix buffered streams on 16 bit outputs, r=kinetik +--- + content/media/nsAudioStream.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git content/media/nsAudioStream.cpp content/media/nsAudioStream.cpp +index ac8ef58..8087d31 100644 +--- mozilla/content/media/nsAudioStream.cpp ++++ mozilla/content/media/nsAudioStream.cpp +@@ -953,10 +953,11 @@ nsBufferedAudioStream::Init(int32_t aNumChannels, int32_t aRate) + params.channels = aNumChannels; + #ifdef MOZ_SAMPLE_TYPE_S16LE + params.format = CUBEB_SAMPLE_S16NE; ++ mBytesPerFrame = sizeof(int16_t) * aNumChannels; + #else /* MOZ_SAMPLE_TYPE_FLOAT32 */ + params.format = CUBEB_SAMPLE_FLOAT32NE; +-#endif + mBytesPerFrame = sizeof(float) * aNumChannels; ++#endif + + { + cubeb_stream* stream; Modified: trunk/mail/thunderbird/files/patch-bug788039 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug788039 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/mail/thunderbird/files/patch-bug788039 Wed Oct 24 16:12:06 2012 (r1080) @@ -1,16 +1,5 @@ # Bug 788039 - With no prefix search libevent via pkg-config. ---- mozilla/config/autoconf.mk.in~ -+++ mozilla/config/autoconf.mk.in -@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA - - MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@ - MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@ --MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@ -+MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@ - - MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@ - MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@ --- mozilla/configure.in~ +++ mozilla/configure.in @@ -3854,7 +3854,7 @@ fi Modified: trunk/mail/thunderbird/files/patch-bug788108 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug788108 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/mail/thunderbird/files/patch-bug788108 Wed Oct 24 16:12:06 2012 (r1080) @@ -7,7 +7,7 @@ -//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. -#ifdef __FreeBSD__ -#include --#ifdef __alpha__ +-#if !defined(__i386__) && !defined(__x86_64__) -static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; -#else -static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; Modified: trunk/mail/thunderbird/files/patch-bug788955 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug788955 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/mail/thunderbird/files/patch-bug788955 Wed Oct 24 16:12:06 2012 (r1080) @@ -26,16 +26,6 @@ add_makefiles " memory/jemalloc/Makefile " ---- mozilla/config/autoconf.mk.in -+++ mozilla/config/autoconf.mk.in -@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@ - MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@ - MOZ_MEMORY = @MOZ_MEMORY@ - MOZ_JEMALLOC = @MOZ_JEMALLOC@ -+MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@ - MOZ_PROFILING = @MOZ_PROFILING@ - MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@ - MOZ_JPROF = @MOZ_JPROF@ diff --git configure.in configure.in index bb05782..2f32516 100644 --- mozilla/configure.in Added: trunk/mail/thunderbird/files/patch-bug803811 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug803811 Wed Oct 24 16:12:06 2012 (r1080) @@ -0,0 +1,111 @@ +commit 4ff5f0c +Author: Landry Breuil +Date: Wed Oct 24 09:56:51 2012 +0400 + + Bug 803811 - Fix system zlib detection by porting bug #763651 +--- + aclocal.m4 | 1 + + configure.in | 46 ++++++---------------------------------------- + 2 files changed, 7 insertions(+), 40 deletions(-) + +diff --git aclocal.m4 aclocal.m4 +index f5486dd..a3924d1 100644 +--- aclocal.m4 ++++ aclocal.m4 +@@ -16,6 +16,7 @@ builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl + builtin(include, mozilla/build/autoconf/lto.m4)dnl + builtin(include, mozilla/build/autoconf/frameptr.m4)dnl + builtin(include, mozilla/build/autoconf/compiler-opts.m4)dnl ++builtin(include, mozilla/build/autoconf/zlib.m4)dnl + + MOZ_PROG_CHECKMSYS() + +diff --git configure.in configure.in +index be833e8..c90fe39 100644 +--- configure.in ++++ configure.in +@@ -63,7 +63,6 @@ dnl Set the version number of the libs included with mozilla + dnl ======================================================== + MOZJPEG=62 + MOZPNG=10401 +-MOZZLIB=0x1230 + NSPR_VERSION=4 + NSS_VERSION=3 + +@@ -868,8 +867,6 @@ MOZ_USER_DIR=".mozilla" + + MOZ_JPEG_CFLAGS= + MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/mozilla/jpeg)' +-MOZ_ZLIB_CFLAGS= +-MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)' + MOZ_BZ2_CFLAGS= + MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/mozilla/modules/libbz2/src)' + MOZ_PNG_CFLAGS= +@@ -3957,47 +3954,19 @@ if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$MOZ_NATIVE_JPEG" = 1; then + MOZ_JPEG_CFLAGS="-I${JPEG_DIR}/include" + MOZ_JPEG_LIBS="-L${JPEG_DIR}/lib ${MOZ_JPEG_LIBS}" + fi ++fi # SKIP_LIBRARY_CHECKS + + dnl system ZLIB support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-zlib, +-[ --with-system-zlib[=PFX] +- Use system libz [installed at prefix PFX]], +- ZLIB_DIR=$withval) + +-_SAVE_CFLAGS=$CFLAGS +-_SAVE_LDFLAGS=$LDFLAGS +-_SAVE_LIBS=$LIBS +-if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then +- CFLAGS="-I${ZLIB_DIR}/include $CFLAGS" +- LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS" +-fi +-if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then +- MOZ_NATIVE_ZLIB= +-else +- AC_CHECK_LIB(z, gzread, [MOZ_NATIVE_ZLIB=1 MOZ_ZLIB_LIBS="-lz"], +- [MOZ_NATIVE_ZLIB=]) +-fi +-if test "$MOZ_NATIVE_ZLIB" = 1; then +- MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'` +- AC_TRY_COMPILE([ #include +- #include +- #include ], +- [ #if ZLIB_VERNUM < $MOZZLIBNUM +- #error "Insufficient zlib version ($MOZZLIBNUM required)." +- #endif ], +- MOZ_NATIVE_ZLIB=1, +-AC_MSG_ERROR([Insufficient zlib version for --with-system-zlib ($MOZZLIB required)])) +-fi +-CFLAGS=$_SAVE_CFLAGS +-LDFLAGS=$_SAVE_LDFLAGS +-LIBS=$_SAVE_LIBS ++MOZ_ZLIB_CHECK([1.2.3]) + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then +- MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include" +- MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" ++if test "$MOZ_NATIVE_ZLIB" != 1; then ++ MOZ_ZLIB_CFLAGS= ++ MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)' + fi + ++if test -z "$SKIP_LIBRARY_CHECKS"; then + dnl system BZIP2 Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-bz2, +@@ -6556,13 +6525,10 @@ AC_SUBST(MOZ_NATIVE_MAKEDEPEND) + AC_SUBST(SYSTEM_LIBXUL) + AC_SUBST(MOZ_NATIVE_JPEG) + AC_SUBST(MOZ_NATIVE_PNG) +-AC_SUBST(MOZ_NATIVE_ZLIB) + AC_SUBST(MOZ_NATIVE_BZ2) + + AC_SUBST(MOZ_JPEG_CFLAGS) + AC_SUBST(MOZ_JPEG_LIBS) +-AC_SUBST(MOZ_ZLIB_CFLAGS) +-AC_SUBST(MOZ_ZLIB_LIBS) + AC_SUBST(MOZ_BZ2_CFLAGS) + AC_SUBST(MOZ_BZ2_LIBS) + AC_SUBST(MOZ_PNG_CFLAGS) Deleted: trunk/mail/thunderbird/files/patch-config-autoconf.mk.in ============================================================================== --- trunk/mail/thunderbird/files/patch-config-autoconf.mk.in Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200 -+++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200 -@@ -57,14 +57,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/%%MOZILLA%% - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/%%MOZILLA%% -+sdkdir = $(libdir)/%%MOZILLA%% - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ Modified: trunk/mail/thunderbird/files/patch-config-baseconfig.mk ============================================================================== --- trunk/mail/thunderbird/files/patch-config-baseconfig.mk Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/mail/thunderbird/files/patch-config-baseconfig.mk Wed Oct 24 16:12:06 2012 (r1080) @@ -1,5 +1,5 @@ ---- mozilla/config/baseconfig.mk~ -+++ mozilla/config/baseconfig.mk +--- config/baseconfig.mk~ ++++ config/baseconfig.mk @@ -1,9 +1,9 @@ INCLUDED_AUTOCONF_MK = 1 @@ -11,6 +11,6 @@ +idldir = $(datadir)/idl/%%MOZILLA%% +installdir = $(libdir)/%%MOZILLA%% +sdkdir = $(libdir)/%%MOZILLA%% - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't + MOZILLA_SRCDIR = $(topsrcdir)/mozilla + MOZDEPTH = $(DEPTH)/mozilla + DIST = $(MOZDEPTH)/dist Deleted: trunk/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- mailnews/addrbook/src/nsDirPrefs.cpp~ -+++ mailnews/addrbook/src/nsDirPrefs.cpp -@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid - DIR_Server *s=nsnull; - - switch (position) { -- case DIR_POS_APPEND: -+ case (PRInt32)DIR_POS_APPEND: - /* Do nothing if the request is to append a server that is already - * in the list. - */ -@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid - wholeList->AppendElement(server); - break; - -- case DIR_POS_DELETE: -+ case (PRInt32)DIR_POS_DELETE: - /* Remove the prefs corresponding to the given server. If the prefName - * value is nsnull, the server has never been saved and there are no - * prefs to remove. Deleted: trunk/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,29 +0,0 @@ ---- mailnews/compose/src/nsSmtpProtocol.cpp~ -+++ mailnews/compose/src/nsSmtpProtocol.cpp -@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr - - switch (code) - { -- case NS_ERROR_SMTP_SERVER_ERROR: -- case NS_ERROR_TCP_READ_ERROR: -- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: -- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: -- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: -- case NS_ERROR_SENDING_FROM_COMMAND: -- case NS_ERROR_SENDING_RCPT_COMMAND: -- case NS_ERROR_SENDING_DATA_COMMAND: -- case NS_ERROR_SENDING_MESSAGE: -- case NS_ERROR_SMTP_GREETING: -+ case (int)NS_ERROR_SMTP_SERVER_ERROR: -+ case (int)NS_ERROR_TCP_READ_ERROR: -+ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: -+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: -+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: -+ case (int)NS_ERROR_SENDING_FROM_COMMAND: -+ case (int)NS_ERROR_SENDING_RCPT_COMMAND: -+ case (int)NS_ERROR_SENDING_DATA_COMMAND: -+ case (int)NS_ERROR_SENDING_MESSAGE: -+ case (int)NS_ERROR_SMTP_GREETING: - bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg)); - msg = nsTextFormatter::vsmprintf(eMsg.get(), args); - break; Copied and modified: trunk/mail/thunderbird/files/patch-mozilla-config-baseconfig.mk (from r1079, trunk/mail/thunderbird/files/patch-config-baseconfig.mk) ============================================================================== Deleted: trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 -+++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n - * C++ implementations should define these macros only when __STDC_LIMIT_MACROS - * is defined before is included. */ - #define __STDC_LIMIT_MACROS -+#define __STDC_CONSTANT_MACROS - - #endif /* _JS_CONFDEFS_H_ */ - Copied and modified: trunk/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in (from r1079, trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in) ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in Wed Oct 24 16:11:46 2012 (r1079, copy source) +++ trunk/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in Wed Oct 24 16:12:06 2012 (r1080) @@ -1,6 +1,6 @@ ---- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 -+++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n +--- mozilla/js/src/js-confdefs.h.in~ ++++ mozilla/js/src/js-confdefs.h.in +@@ -12,6 +12,7 @@ * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before is included. */ #define __STDC_LIMIT_MACROS Modified: trunk/security/ca_root_nss/Makefile ============================================================================== --- trunk/security/ca_root_nss/Makefile Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/security/ca_root_nss/Makefile Wed Oct 24 16:12:06 2012 (r1080) @@ -29,7 +29,7 @@ # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.13.6 +VERSION_NSS= 3.14 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl Modified: trunk/security/ca_root_nss/distinfo ============================================================================== --- trunk/security/ca_root_nss/distinfo Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/security/ca_root_nss/distinfo Wed Oct 24 16:12:06 2012 (r1080) @@ -1,2 +1,2 @@ -SHA256 (nss-3.13.6.tar.gz) = f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0 -SIZE (nss-3.13.6.tar.gz) = 6109538 +SHA256 (nss-3.14.tar.gz) = b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b +SIZE (nss-3.14.tar.gz) = 6068755 Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/security/nss/Makefile Wed Oct 24 16:12:06 2012 (r1080) @@ -6,8 +6,7 @@ # $MCom ports-experimental/security/nss/Makefile,v 1.4 2008/02/23 15:47:28 ahze Exp $ PORTNAME= nss -PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH} -PORTREVISION= 1 +PORTVERSION= ${_MAJOR}.${_MINOR} #.${_PATCH} CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src @@ -22,8 +21,8 @@ sqlite3.8:${PORTSDIR}/databases/sqlite3 _MAJOR= 3 -_MINOR= 13 -_PATCH= 6 +_MINOR= 14 +_PATCH= 0 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss Modified: trunk/security/nss/distinfo ============================================================================== --- trunk/security/nss/distinfo Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/security/nss/distinfo Wed Oct 24 16:12:06 2012 (r1080) @@ -1,2 +1,2 @@ -SHA256 (nss-3.13.6.tar.gz) = f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0 -SIZE (nss-3.13.6.tar.gz) = 6109538 +SHA256 (nss-3.14.tar.gz) = b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b +SIZE (nss-3.14.tar.gz) = 6068755 Modified: trunk/security/nss/pkg-plist ============================================================================== --- trunk/security/nss/pkg-plist Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/security/nss/pkg-plist Wed Oct 24 16:12:06 2012 (r1080) @@ -114,6 +114,9 @@ include/nss/nss/sslerr.h include/nss/nss/sslproto.h include/nss/nss/sslt.h +include/nss/nss/utilmodt.h +include/nss/nss/utilpars.h +include/nss/nss/utilparst.h include/nss/nss/utilrename.h lib/nss/libcrmf.a lib/nss/libfreebl3.so Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox-nightly/Makefile Wed Oct 24 16:12:06 2012 (r1080) @@ -18,7 +18,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.9.2:${PORTSDIR}/devel/nspr \ - nss>=3.13.6_1:${PORTSDIR}/security/nss \ + nss>=3.14:${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 \ Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox-nightly/Makefile.hgrev Wed Oct 24 16:12:06 2012 (r1080) @@ -1 +1 @@ -HGREV= 110708:fd5556088388 +HGREV= 110988:acf7f73e8b18 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox-nightly/distinfo Wed Oct 24 16:12:06 2012 (r1080) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/fd5556088388.tar.bz2) = 65ce23d4b5c97d4c8bc3bf3bb7bdf842e67fd26b5b3747469c3b516948fb5c42 -SIZE (firefox-nightly/fd5556088388.tar.bz2) = 94933045 +SHA256 (firefox-nightly/acf7f73e8b18.tar.bz2) = 9f28ba8f8bfa1e5177cd333bd3e703f9a49e5641fe827a1af81e07eb51cc5f06 +SIZE (firefox-nightly/acf7f73e8b18.tar.bz2) = 95110689 Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox/Makefile Wed Oct 24 16:12:06 2012 (r1080) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 16.0 +DISTVERSION= 17.0b2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -57,7 +57,7 @@ .include -WRKSRC:= ${WRKDIR}/mozilla-release +WRKSRC:= ${WRKDIR}/mozilla-beta .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox/distinfo Wed Oct 24 16:12:06 2012 (r1080) @@ -1,2 +1,2 @@ -SHA256 (firefox-16.0.source.tar.bz2) = 60d4e73a5ff2f796d8c9f3d0650a15afe6c140e017d0678ccf16c968e2c5ff55 -SIZE (firefox-16.0.source.tar.bz2) = 89461772 +SHA256 (firefox-17.0b2.source.tar.bz2) = 8d926563c15b22d240751e88bf7695b746ac193130ad5710a5f7ffc35dc6e725 +SIZE (firefox-17.0b2.source.tar.bz2) = 90986633 Modified: trunk/www/firefox/files/extra-bug780531 ============================================================================== --- trunk/www/firefox/files/extra-bug780531 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox/files/extra-bug780531 Wed Oct 24 16:12:06 2012 (r1080) @@ -1,32 +1,22 @@ --- configure.in~ +++ configure.in -@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then - MOZ_SYDNEYAUDIO=1 - MOZ_CUBEB=1 - MOZ_MEDIA=1 -- case "$target_cpu" in -+ case "$target" in - arm*) - MOZ_TREMOR=1 - ;; -+ *-freebsd*) -+ MOZ_TREMOR=1 -+ ;; - *) - MOZ_VORBIS=1 - ;; -@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then - MOZ_SYDNEYAUDIO=1 - MOZ_CUBEB=1 - MOZ_MEDIA=1 -- case "$target_cpu" in -+ case "$target" in - arm*) - MOZ_TREMOR=1 - ;; -+ *-freebsd*) -+ MOZ_TREMOR=1 -+ ;; - *) - MOZ_VORBIS=1 - ;; +@@ -5151,12 +5148,17 @@ fi + + AC_SUBST(MOZ_WEBRTC) + +-case "$target_cpu" in +-arm*) ++case "$target" in ++arm-*-linux*) + MOZ_SAMPLE_TYPE_S16LE=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE) + AC_SUBST(MOZ_SAMPLE_TYPE_S16LE) + ;; ++*-freebsd*) ++ MOZ_SAMPLE_TYPE_S16LE=1 ++ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE) ++ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE) ++;; + *) + MOZ_SAMPLE_TYPE_FLOAT32=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) Modified: trunk/www/firefox/files/patch-alsapulse ============================================================================== --- trunk/www/firefox/files/patch-alsapulse Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox/files/patch-alsapulse Wed Oct 24 16:12:06 2012 (r1080) @@ -1,27 +1,8 @@ -diff --git config/autoconf.mk.in config/autoconf.mk.in -index 44c0b06..748511b 100644 ---- config/autoconf.mk.in -+++ config/autoconf.mk.in -@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ - MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ - MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ - -+MOZ_ALSA = @MOZ_ALSA@ - MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ - MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ - -+MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@ -+MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ -+MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ -+ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ - GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ diff --git configure.in configure.in index 5980b76..11f5f77 100644 --- configure.in +++ configure.in -@@ -5600,13 +5600,45 @@ dnl ======================================================== +@@ -5600,13 +5600,25 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== @@ -45,28 +26,8 @@ +AC_SUBST(MOZ_ALSA) + -+dnl ======================================================== -+dnl = Enable PulseAudio -+dnl ======================================================== -+ -+MOZ_ARG_ENABLE_BOOL(pulseaudio, -+[ --enable-pulseaudio Enable PulseAudio support], -+MOZ_PULSEAUDIO=1, -+MOZ_PULSEAUDIO=) -+ -+if test -n "$MOZ_PULSEAUDIO"; then -+ AC_DEFINE(MOZ_CUBEB) -+ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , -+ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" -+ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) -+fi -+ -+AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) -+AC_SUBST(MOZ_PULSEAUDIO_LIBS) -+AC_SUBST(MOZ_PULSEAUDIO) -+ dnl ======================================================== - dnl = Enable GStreamer + dnl = Enable PulseAudio dnl ======================================================== diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in index 5ab4dd8..c8df26f 100644 @@ -83,7 +44,7 @@ endif ifeq ($(OS_TARGET),Darwin) -@@ -42,4 +38,16 @@ CSRCS = \ +@@ -42,6 +38,12 @@ CSRCS = \ $(NULL) endif @@ -93,25 +54,9 @@ + $(NULL) +endif + -+ifdef MOZ_PULSEAUDIO -+CSRCS = \ -+ cubeb_pulse.c \ -+ $(NULL) -+endif -+ - include $(topsrcdir)/config/rules.mk -diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c -index 599aea2..41fd5af 100644 ---- media/libcubeb/src/cubeb_alsa.c -+++ media/libcubeb/src/cubeb_alsa.c -@@ -6,6 +6,6 @@ - #undef NDEBUG - #define _BSD_SOURCE --#define _POSIX_SOURCE -+#define _XOPEN_SOURCE 500 - #include - #include - #include + 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 @@ -150,7 +95,7 @@ index 43384e9..e46a6e3 100644 --- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -379,10 +379,13 @@ endif +@@ -370,14 +370,11 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) @@ -160,9 +105,10 @@ +ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) endif -+ifdef MOZ_PULSEAUDIO -+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) -+endif +-endif +- + ifdef MOZ_PULSEAUDIO +-ifdef MOZ_CUBEB + EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif endif - - ifdef HAVE_CLOCK_MONOTONIC Modified: trunk/www/firefox/files/patch-bug753046 ============================================================================== --- trunk/www/firefox/files/patch-bug753046 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox/files/patch-bug753046 Wed Oct 24 16:12:06 2012 (r1080) @@ -56,7 +56,7 @@ --- ipc/chromium/Makefile.in.orig 2012-02-16 06:40:33.000000000 +0000 +++ ipc/chromium/Makefile.in -@@ -278,6 +278,34 @@ endif +@@ -278,6 +278,33 @@ endif endif # } OS_LINUX @@ -64,7 +64,6 @@ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -404,19 +403,6 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc -index 171e44f..0c6dfcc 100644 ---- ipc/chromium/src/base/file_util_linux.cc -+++ ipc/chromium/src/base/file_util_linux.cc -@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { - } - - bool GetShmemTempDir(FilePath* path) { --#ifdef ANDROID -+#if defined(ANDROID) || defined(OS_BSD) - return GetTempDir(path); - #else - *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -541,8 +527,7 @@ pthread_set_name_np(pthread_self(), name); -#elif defined(__NetBSD__) +#elif defined(OS_NETBSD) -- pthread_setname_np(pthread_self(), "%s", name); -+ pthread_setname_np(pthread_self(), "%s", (void *)name); + pthread_setname_np(pthread_self(), "%s", (void *)name); #else prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ @@ -586,7 +571,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,318 @@ +@@ -0,0 +1,367 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -621,6 +606,20 @@ +#define HAVE_POSIX_SPAWN 1 +#endif + ++/* ++ * On platforms that are not gonk based, we fall back to an arbitrary ++ * UID. This is generally the UID for user `nobody', albeit it is not ++ * always the case. ++ */ ++ ++#if defined(OS_NETBSD) || defined(OS_OPENBSD) ++# define CHILD_UNPRIVILEGED_UID 32767 ++# define CHILD_UNPRIVILEGED_GID 32767 ++#else ++# define CHILD_UNPRIVILEGED_UID 65534 ++# define CHILD_UNPRIVILEGED_GID 65534 ++#endif ++ +#ifndef __dso_public +# ifdef __exported +# define __dso_public __exported @@ -669,6 +668,17 @@ + const environment_map& env_vars_to_set, + bool wait, ProcessHandle* process_handle, + ProcessArchitecture arch) { ++ return LaunchApp(argv, fds_to_remap, env_vars_to_set, ++ SAME_PRIVILEGES_AS_PARENT, ++ wait, process_handle); ++} ++ ++bool LaunchApp(const std::vector& argv, ++ const file_handle_mapping_vector& fds_to_remap, ++ const environment_map& env_vars_to_set, ++ ChildPrivileges privs, ++ bool wait, ProcessHandle* process_handle, ++ ProcessArchitecture arch) { + bool retval = true; + + char* argv_copy[argv.size() + 1]; @@ -783,6 +793,17 @@ + const environment_map& env_vars_to_set, + bool wait, ProcessHandle* process_handle, + ProcessArchitecture arch) { ++ return LaunchApp(argv, fds_to_remap, env_vars_to_set, ++ SAME_PRIVILEGES_AS_PARENT, ++ wait, process_handle); ++} ++ ++bool LaunchApp(const std::vector& argv, ++ const file_handle_mapping_vector& fds_to_remap, ++ const environment_map& env_vars_to_set, ++ ChildPrivileges privs, ++ bool wait, ProcessHandle* process_handle, ++ ProcessArchitecture arch) { + scoped_array argv_cstr(new char*[argv.size() + 1]); + // Illegal to allocate memory after fork and before execvp + InjectiveMultimap fd_shuffle1, fd_shuffle2; @@ -805,19 +826,32 @@ + + CloseSuperfluousFds(fd_shuffle2); + ++ for (size_t i = 0; i < argv.size(); i++) ++ argv_cstr[i] = const_cast(argv[i].c_str()); ++ argv_cstr[argv.size()] = NULL; ++ ++ if (privs == UNPRIVILEGED) { ++ if (setgid(CHILD_UNPRIVILEGED_GID) != 0) { ++ DLOG(ERROR) << "FAILED TO setgid() CHILD PROCESS, path: " << argv_cstr[0]; ++ _exit(127); ++ } ++ if (setuid(CHILD_UNPRIVILEGED_UID) != 0) { ++ DLOG(ERROR) << "FAILED TO setuid() CHILD PROCESS, path: " << argv_cstr[0]; ++ _exit(127); ++ } ++ if (chdir("/") != 0) ++ gProcessLog.print("==> could not chdir()\n"); ++ } ++ + for (environment_map::const_iterator it = env_vars_to_set.begin(); + it != env_vars_to_set.end(); ++it) { + if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/)) + _exit(127); + } -+ -+ for (size_t i = 0; i < argv.size(); i++) -+ argv_cstr[i] = const_cast(argv[i].c_str()); -+ argv_cstr[argv.size()] = NULL; -+ execvp(argv_cstr[0], argv_cstr.get()); ++ execv(argv_cstr[0], argv_cstr.get()); + // if we get here, we're in serious trouble and should complain loudly + DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0]; -+ exit(127); ++ _exit(127); + } else { + gProcessLog.print("==> process %d launched child process %d\n", + GetCurrentProcId(), pid); @@ -1144,7 +1178,7 @@ base::LaunchApp(childArgv, mFileMap, -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - newEnvVars, + newEnvVars, privs, #endif false, &process, arch); diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h Deleted: trunk/www/firefox/files/patch-bug761077 ============================================================================== --- trunk/www/firefox/files/patch-bug761077 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,88 +0,0 @@ -diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl -index b8a87a5..918c4cf 100644 ---- xpcom/reflect/xptcall/public/genstubs.pl -+++ xpcom/reflect/xptcall/public/genstubs.pl -@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n"; - print OUTFILE "* 1 is AddRef\n"; - print OUTFILE "* 2 is Release\n"; - print OUTFILE "*/\n"; --print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n"; -+print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n"; - for($i = 0; $i < $entry_count; $i++) { - print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n"; - } -diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc -index eb66761..807db26 100644 ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); -diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in -index ae6ed66..2783957 100644 ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -70,7 +70,7 @@ endif - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -269,7 +269,7 @@ endif - # - # Linux/PPC - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) -+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp - ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -278,7 +278,7 @@ endif - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +350,7 @@ endif - # - # OpenBSD/SPARC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) -+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp - ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s - endif -diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h -index d903ced..e4ec832 100644 ---- xpcom/reflect/xptcall/src/xptcprivate.h -+++ xpcom/reflect/xptcall/src/xptcprivate.h -@@ -14,7 +14,7 @@ - - class xptiInterfaceEntry; - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; -@@ -31,7 +31,7 @@ public: - #undef STUB_ENTRY - #undef SENTINEL_ENTRY - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); Deleted: trunk/www/firefox/files/patch-bug774671 ============================================================================== --- trunk/www/firefox/files/patch-bug774671 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,40 +0,0 @@ -commit 7e9eda2 -Author: Rafael Ávila de Espíndola -Date: Tue Jul 17 12:54:41 2012 -0400 - - Bug 774671 - Fix mismatched declarations. r=luke. ---- - js/src/jsproxy.h | 2 +- - js/src/jsprvtd.h | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git js/src/jsproxy.h js/src/jsproxy.h -index ec26e3a..aa0e782 100644 ---- js/src/jsproxy.h -+++ js/src/jsproxy.h -@@ -13,7 +13,7 @@ - - namespace js { - --class Wrapper; -+class JS_FRIEND_API(Wrapper); - - /* - * A proxy is a JSObject that implements generic behavior by providing custom -diff --git js/src/jsprvtd.h js/src/jsprvtd.h -index 19b5aef..93e1216 100644 ---- js/src/jsprvtd.h -+++ js/src/jsprvtd.h -@@ -146,9 +146,9 @@ struct TreeContext; - class UpvarCookie; - - class Proxy; --class BaseProxyHandler; --class DirectWrapper; --class CrossCompartmentWrapper; -+class JS_FRIEND_API(BaseProxyHandler); -+class JS_FRIEND_API(DirectWrapper); -+class JS_FRIEND_API(CrossCompartmentWrapper); - - class TempAllocPolicy; - class RuntimeAllocPolicy; Deleted: trunk/www/firefox/files/patch-bug775257 ============================================================================== --- trunk/www/firefox/files/patch-bug775257 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ -commit 8fc8b74 -Author: Oleg Romashin -Date: Wed Jul 18 22:46:11 2012 -0400 - - Bug 775257 - Gstreamer backend on Meego N9 produce extra noise in audio playback.r=giles ---- - content/media/gstreamer/nsGStreamerReader.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index c48f92e..0fb801a 100644 ---- content/media/gstreamer/nsGStreamerReader.cpp -+++ content/media/gstreamer/nsGStreamerReader.cpp -@@ -130,8 +130,13 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor) - gst_object_unref(sinkpad); - - mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! " -+#ifndef MOZ_TREMOR - "appsink name=audiosink sync=true caps=audio/x-raw-float," - "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL); -+#else -+ "appsink name=audiosink sync=true caps=audio/x-raw-int," -+ "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL); -+#endif - mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink), - "audiosink")); - gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks, Deleted: trunk/www/firefox/files/patch-bug777696 ============================================================================== --- trunk/www/firefox/files/patch-bug777696 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,32 +0,0 @@ -commit 0c0d1a8 -Author: Landry Breuil -Date: Mon Jul 30 17:57:15 2012 +0200 - - Bug 777696: Fix gstreamer backend on big endian architectures. r=doublec ---- - content/media/gstreamer/nsGStreamerReader.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 0fb801a..4a69196 100644 ---- content/media/gstreamer/nsGStreamerReader.cpp -+++ content/media/gstreamer/nsGStreamerReader.cpp -@@ -132,10 +132,18 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor) - mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! " - #ifdef MOZ_TREMOR - "appsink name=audiosink sync=true caps=audio/x-raw-float," -+#ifdef IS_LITTLE_ENDIAN - "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL); - #else -+ "channels={1,2},rate=44100,width=32,endianness=4321", TRUE, NULL); -+#endif -+#else - "appsink name=audiosink sync=true caps=audio/x-raw-int," -+#ifdef IS_LITTLE_ENDIAN - "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL); -+#else -+ "channels={1,2},rate=48000,width=16,endianness=4321", TRUE, NULL); -+#endif - #endif - mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink), - "audiosink")); Deleted: trunk/www/firefox/files/patch-bug778056 ============================================================================== --- trunk/www/firefox/files/patch-bug778056 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- memory/mozalloc/mozalloc.cpp~ -+++ memory/mozalloc/mozalloc.cpp -@@ -19,6 +19,9 @@ - #if defined(XP_UNIX) - # include // for valloc on *BSD - #endif //if defined(XP_UNIX) -+#if defined(__FreeBSD__) -+# include // for malloc_usable_size -+#endif // if defined(__FreeBSD__) - - #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) - # define MOZALLOC_EXPORT __declspec(dllexport) -@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr) - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) -+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) - // Android bionic libc doesn't have malloc_usable_size. - return malloc_usable_size(ptr); - #elif defined(XP_WIN) Deleted: trunk/www/firefox/files/patch-bug779847 ============================================================================== --- trunk/www/firefox/files/patch-bug779847 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ ---- gfx/ycbcr/Makefile.in -+++ gfx/ycbcr/Makefile.in -@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \ - $(NULL) - endif - else --ifeq ($(OS_ARCH),Linux) --CPPSRCS += yuv_row_posix.cpp \ -- $(NULL) --else --ifeq ($(OS_ARCH),SunOS) --CPPSRCS += yuv_row_posix.cpp \ -- $(NULL) --else --ifeq ($(OS_ARCH),Darwin) -+ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH))) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) - else - CPPSRCS += yuv_row_other.cpp \ - $(NULL) --endif # Darwin --endif # SunOS --endif # linux -+endif # posix - endif # windows - - ifeq (arm,$(findstring arm,$(OS_TEST))) Modified: trunk/www/firefox/files/patch-bug783463 ============================================================================== --- trunk/www/firefox/files/patch-bug783463 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox/files/patch-bug783463 Wed Oct 24 16:12:06 2012 (r1080) @@ -12,23 +12,3 @@ SkTime_Unix.cpp \ $(NULL) endif ---- widget/qt/nsNativeThemeQt.cpp~ -+++ widget/qt/nsNativeThemeQt.cpp -@@ -25,7 +25,6 @@ - #include "nsThemeConstants.h" - #include "nsIServiceManager.h" - #include "nsIDOMHTMLInputElement.h" --#include - - - #include "gfxASurface.h" ---- widget/qt/nsSound.cpp~ -+++ widget/qt/nsSound.cpp -@@ -40,6 +40,7 @@ - #include - - #include -+#include - - #include "nscore.h" - #include "plstr.h" Deleted: trunk/www/firefox/files/patch-bug784741 ============================================================================== --- trunk/www/firefox/files/patch-bug784741 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ -diff --git js/src/Makefile.in js/src/Makefile.in -index 8eb385f..01bd8e3 100644 ---- js/src/Makefile.in -+++ js/src/Makefile.in -@@ -323,6 +323,7 @@ endif - - ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) - ENABLE_YARR_JIT = 1 -+DEFINES += -DENABLE_YARR_JIT=1 - - VPATH += $(srcdir)/assembler/assembler \ - $(srcdir)/methodjit \ -diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h -index 6570f2d..0c84896 100644 ---- js/src/assembler/wtf/Platform.h -+++ js/src/assembler/wtf/Platform.h -@@ -1102,9 +1102,7 @@ - #if WTF_PLATFORM_CHROMIUM - #define ENABLE_YARR_JIT 0 - --#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT) --#define ENABLE_YARR_JIT 1 -- -+#elif ENABLE_YARR_JIT - /* Setting this flag compares JIT results with interpreter results. */ - #define ENABLE_YARR_JIT_DEBUG 0 - #endif -diff --git js/src/configure.in js/src/configure.in -index c142eb7..34f98b9 100644 ---- js/src/configure.in -+++ js/src/configure.in -@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug, - (using compiler flags DBG)], - [ if test "$enableval" != "no"; then - MOZ_DEBUG=1 -- ENABLE_METHODJIT_SPEW=1 -+ if test "$ENABLE_METHODJIT"; then -+ # needs MethodJIT or YarrJIT -+ ENABLE_METHODJIT_SPEW=1 -+ fi - if test -n "$enableval" -a "$enableval" != "yes"; then - MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` - _MOZ_DEBUG_FLAGS_SET=1 Deleted: trunk/www/firefox/files/patch-bug784776 ============================================================================== --- trunk/www/firefox/files/patch-bug784776 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,33 +0,0 @@ ---- gfx/layers/opengl/ImageLayerOGL.cpp~ -+++ gfx/layers/opengl/ImageLayerOGL.cpp -@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources() - { - if (mSharedHandle) { - gl()->ReleaseSharedHandle(mShareType, mSharedHandle); -- mSharedHandle = NULL; -+ mSharedHandle = 0; - } - - mYUVTexture[0].Release(); ---- intl/locale/src/unix/nsDateTimeFormatUnix.cpp~ -+++ intl/locale/src/unix/nsDateTimeFormatUnix.cpp -@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr - struct tm *tmc; - int i; - -- tt = time((time_t)NULL); -+ tt = time(NULL); - tmc = localtime(&tt); - - tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM ---- ipc/glue/CrossProcessMutex_unimplemented.cpp~ -+++ ipc/glue/CrossProcessMutex_unimplemented.cpp -@@ -40,7 +40,7 @@ CrossProcessMutexHandle - CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle) - { - NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!"); -- return NULL; -+ return 0; - } - - } Added: trunk/www/firefox/files/patch-bug786690 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug786690 Wed Oct 24 16:12:06 2012 (r1080) @@ -0,0 +1,26 @@ +commit 38301c3 +Author: Michael Wu +Date: Fri Aug 31 10:18:46 2012 -0300 + + Bug 786690 - Fix buffered streams on 16 bit outputs, r=kinetik +--- + content/media/nsAudioStream.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git content/media/nsAudioStream.cpp content/media/nsAudioStream.cpp +index ac8ef58..8087d31 100644 +--- content/media/nsAudioStream.cpp ++++ content/media/nsAudioStream.cpp +@@ -953,10 +953,11 @@ nsBufferedAudioStream::Init(int32_t aNumChannels, int32_t aRate) + params.channels = aNumChannels; + #ifdef MOZ_SAMPLE_TYPE_S16LE + params.format = CUBEB_SAMPLE_S16NE; ++ mBytesPerFrame = sizeof(int16_t) * aNumChannels; + #else /* MOZ_SAMPLE_TYPE_FLOAT32 */ + params.format = CUBEB_SAMPLE_FLOAT32NE; +-#endif + mBytesPerFrame = sizeof(float) * aNumChannels; ++#endif + + { + cubeb_stream* stream; Modified: trunk/www/firefox/files/patch-bug788039 ============================================================================== --- trunk/www/firefox/files/patch-bug788039 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox/files/patch-bug788039 Wed Oct 24 16:12:06 2012 (r1080) @@ -1,16 +1,5 @@ # Bug 788039 - With no prefix search libevent via pkg-config. ---- config/autoconf.mk.in~ -+++ config/autoconf.mk.in -@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA - - MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@ - MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@ --MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@ -+MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@ - - MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@ - MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@ --- configure.in~ +++ configure.in @@ -3854,7 +3854,7 @@ fi Modified: trunk/www/firefox/files/patch-bug788108 ============================================================================== --- trunk/www/firefox/files/patch-bug788108 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox/files/patch-bug788108 Wed Oct 24 16:12:06 2012 (r1080) @@ -7,7 +7,7 @@ -//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. -#ifdef __FreeBSD__ -#include --#ifdef __alpha__ +-#if !defined(__i386__) && !defined(__x86_64__) -static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; -#else -static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; Modified: trunk/www/firefox/files/patch-bug788955 ============================================================================== --- trunk/www/firefox/files/patch-bug788955 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/firefox/files/patch-bug788955 Wed Oct 24 16:12:06 2012 (r1080) @@ -26,16 +26,6 @@ add_makefiles " memory/jemalloc/Makefile " ---- config/autoconf.mk.in -+++ config/autoconf.mk.in -@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@ - MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@ - MOZ_MEMORY = @MOZ_MEMORY@ - MOZ_JEMALLOC = @MOZ_JEMALLOC@ -+MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@ - MOZ_PROFILING = @MOZ_PROFILING@ - MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@ - MOZ_JPROF = @MOZ_JPROF@ diff --git configure.in configure.in index bb05782..2f32516 100644 --- configure.in Deleted: trunk/www/firefox/files/patch-js-src-configure.in ============================================================================== --- trunk/www/firefox/files/patch-js-src-configure.in Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 -+++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n - * C++ implementations should define these macros only when __STDC_LIMIT_MACROS - * is defined before is included. */ - #define __STDC_LIMIT_MACROS -+#define __STDC_CONSTANT_MACROS - - #endif /* _JS_CONFDEFS_H_ */ - Copied and modified: trunk/www/firefox/files/patch-js-src-js-confdefs.h.in (from r1079, trunk/www/firefox/files/patch-js-src-configure.in) ============================================================================== --- trunk/www/firefox/files/patch-js-src-configure.in Wed Oct 24 16:11:46 2012 (r1079, copy source) +++ trunk/www/firefox/files/patch-js-src-js-confdefs.h.in Wed Oct 24 16:12:06 2012 (r1080) @@ -1,6 +1,6 @@ ---- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 -+++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n +--- js/src/js-confdefs.h.in~ ++++ js/src/js-confdefs.h.in +@@ -12,6 +12,7 @@ * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before is included. */ #define __STDC_LIMIT_MACROS Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/Makefile Wed Oct 24 16:12:06 2012 (r1080) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.13 +DISTVERSION= 2.14b1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -62,7 +62,7 @@ .include -WRKSRC= ${WRKDIR}/comm-release +WRKSRC= ${WRKDIR}/comm-beta MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/distinfo Wed Oct 24 16:12:06 2012 (r1080) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.13b5.source.tar.bz2) = f889be2870eca444c8bc9fcf580f24094ee73f68ccd7864111ecff8a64072cdb -SIZE (seamonkey-2.13b5.source.tar.bz2) = 111970776 -SHA256 (enigmail-1.4.4.tar.gz) = ec62bb701968f72ad35546660132e6e47d4ebe684df1d27fc615cb9010a203b8 -SIZE (enigmail-1.4.4.tar.gz) = 1269444 +SHA256 (seamonkey-2.14b1.source.tar.bz2) = e9416c46a7d2e2d6c477d7eb0a030965a42cd20479a05e6a968239099199a40c +SIZE (seamonkey-2.14b1.source.tar.bz2) = 113981679 +SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020 +SIZE (enigmail-1.4.5.tar.gz) = 1269207 Modified: trunk/www/seamonkey/files/extra-bug780531 ============================================================================== --- trunk/www/seamonkey/files/extra-bug780531 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/files/extra-bug780531 Wed Oct 24 16:12:06 2012 (r1080) @@ -1,32 +1,22 @@ --- mozilla/configure.in~ +++ mozilla/configure.in -@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then - MOZ_SYDNEYAUDIO=1 - MOZ_CUBEB=1 - MOZ_MEDIA=1 -- case "$target_cpu" in -+ case "$target" in - arm*) - MOZ_TREMOR=1 - ;; -+ *-freebsd*) -+ MOZ_TREMOR=1 -+ ;; - *) - MOZ_VORBIS=1 - ;; -@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then - MOZ_SYDNEYAUDIO=1 - MOZ_CUBEB=1 - MOZ_MEDIA=1 -- case "$target_cpu" in -+ case "$target" in - arm*) - MOZ_TREMOR=1 - ;; -+ *-freebsd*) -+ MOZ_TREMOR=1 -+ ;; - *) - MOZ_VORBIS=1 - ;; +@@ -5151,12 +5148,17 @@ fi + + AC_SUBST(MOZ_WEBRTC) + +-case "$target_cpu" in +-arm*) ++case "$target" in ++arm-*-linux*) + MOZ_SAMPLE_TYPE_S16LE=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE) + AC_SUBST(MOZ_SAMPLE_TYPE_S16LE) + ;; ++*-freebsd*) ++ MOZ_SAMPLE_TYPE_S16LE=1 ++ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE) ++ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE) ++;; + *) + MOZ_SAMPLE_TYPE_FLOAT32=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) Modified: trunk/www/seamonkey/files/patch-alsapulse ============================================================================== --- trunk/www/seamonkey/files/patch-alsapulse Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/files/patch-alsapulse Wed Oct 24 16:12:06 2012 (r1080) @@ -1,27 +1,8 @@ -diff --git mozilla/config/autoconf.mk.in mozilla/config/autoconf.mk.in -index 44c0b06..748511b 100644 ---- mozilla/config/autoconf.mk.in -+++ mozilla/config/autoconf.mk.in -@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ - MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ - MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ - -+MOZ_ALSA = @MOZ_ALSA@ - MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ - MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ - -+MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@ -+MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ -+MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ -+ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ - GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ diff --git mozilla/configure.in mozilla/configure.in index 5980b76..11f5f77 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -5600,13 +5600,45 @@ dnl ======================================================== +@@ -5600,13 +5600,25 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== @@ -45,28 +26,8 @@ +AC_SUBST(MOZ_ALSA) + -+dnl ======================================================== -+dnl = Enable PulseAudio -+dnl ======================================================== -+ -+MOZ_ARG_ENABLE_BOOL(pulseaudio, -+[ --enable-pulseaudio Enable PulseAudio support], -+MOZ_PULSEAUDIO=1, -+MOZ_PULSEAUDIO=) -+ -+if test -n "$MOZ_PULSEAUDIO"; then -+ AC_DEFINE(MOZ_CUBEB) -+ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , -+ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" -+ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) -+fi -+ -+AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) -+AC_SUBST(MOZ_PULSEAUDIO_LIBS) -+AC_SUBST(MOZ_PULSEAUDIO) -+ dnl ======================================================== - dnl = Enable GStreamer + dnl = Enable PulseAudio dnl ======================================================== diff --git mozilla/media/libcubeb/src/Makefile.in mozilla/media/libcubeb/src/Makefile.in index 5ab4dd8..c8df26f 100644 @@ -83,7 +44,7 @@ endif ifeq ($(OS_TARGET),Darwin) -@@ -42,4 +38,16 @@ CSRCS = \ +@@ -42,6 +38,12 @@ CSRCS = \ $(NULL) endif @@ -93,25 +54,9 @@ + $(NULL) +endif + -+ifdef MOZ_PULSEAUDIO -+CSRCS = \ -+ cubeb_pulse.c \ -+ $(NULL) -+endif -+ - include $(topsrcdir)/config/rules.mk -diff --git mozilla/media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c -index 599aea2..41fd5af 100644 ---- mozilla/media/libcubeb/src/cubeb_alsa.c -+++ mozilla/media/libcubeb/src/cubeb_alsa.c -@@ -6,6 +6,6 @@ - #undef NDEBUG - #define _BSD_SOURCE --#define _POSIX_SOURCE -+#define _XOPEN_SOURCE 500 - #include - #include - #include + ifdef MOZ_PULSEAUDIO + CSRCS = \ + cubeb_pulse.c \ diff --git mozilla/media/libsydneyaudio/src/Makefile.in mozilla/media/libsydneyaudio/src/Makefile.in index 8dda8ce..b19641d 100644 --- mozilla/media/libsydneyaudio/src/Makefile.in @@ -150,7 +95,7 @@ index 43384e9..e46a6e3 100644 --- mozilla/toolkit/library/Makefile.in +++ mozilla/toolkit/library/Makefile.in -@@ -379,10 +379,13 @@ endif +@@ -370,14 +370,11 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) @@ -160,9 +105,10 @@ +ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) endif -+ifdef MOZ_PULSEAUDIO -+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) -+endif +-endif +- + ifdef MOZ_PULSEAUDIO +-ifdef MOZ_CUBEB + EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif endif - - ifdef HAVE_CLOCK_MONOTONIC Modified: trunk/www/seamonkey/files/patch-bug753046 ============================================================================== --- trunk/www/seamonkey/files/patch-bug753046 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/files/patch-bug753046 Wed Oct 24 16:12:06 2012 (r1080) @@ -56,7 +56,7 @@ --- mozilla/ipc/chromium/Makefile.in.orig 2012-02-16 06:40:33.000000000 +0000 +++ mozilla/ipc/chromium/Makefile.in -@@ -278,6 +278,34 @@ endif +@@ -278,6 +278,33 @@ endif endif # } OS_LINUX @@ -64,7 +64,6 @@ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -404,19 +403,6 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -diff --git mozilla/ipc/chromium/src/base/file_util_linux.cc mozilla/ipc/chromium/src/base/file_util_linux.cc -index 171e44f..0c6dfcc 100644 ---- mozilla/ipc/chromium/src/base/file_util_linux.cc -+++ mozilla/ipc/chromium/src/base/file_util_linux.cc -@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { - } - - bool GetShmemTempDir(FilePath* path) { --#ifdef ANDROID -+#if defined(ANDROID) || defined(OS_BSD) - return GetTempDir(path); - #else - *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -541,8 +527,7 @@ pthread_set_name_np(pthread_self(), name); -#elif defined(__NetBSD__) +#elif defined(OS_NETBSD) -- pthread_setname_np(pthread_self(), "%s", name); -+ pthread_setname_np(pthread_self(), "%s", (void *)name); + pthread_setname_np(pthread_self(), "%s", (void *)name); #else prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ @@ -586,7 +571,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,318 @@ +@@ -0,0 +1,367 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -621,6 +606,20 @@ +#define HAVE_POSIX_SPAWN 1 +#endif + ++/* ++ * On platforms that are not gonk based, we fall back to an arbitrary ++ * UID. This is generally the UID for user `nobody', albeit it is not ++ * always the case. ++ */ ++ ++#if defined(OS_NETBSD) || defined(OS_OPENBSD) ++# define CHILD_UNPRIVILEGED_UID 32767 ++# define CHILD_UNPRIVILEGED_GID 32767 ++#else ++# define CHILD_UNPRIVILEGED_UID 65534 ++# define CHILD_UNPRIVILEGED_GID 65534 ++#endif ++ +#ifndef __dso_public +# ifdef __exported +# define __dso_public __exported @@ -669,6 +668,17 @@ + const environment_map& env_vars_to_set, + bool wait, ProcessHandle* process_handle, + ProcessArchitecture arch) { ++ return LaunchApp(argv, fds_to_remap, env_vars_to_set, ++ SAME_PRIVILEGES_AS_PARENT, ++ wait, process_handle); ++} ++ ++bool LaunchApp(const std::vector& argv, ++ const file_handle_mapping_vector& fds_to_remap, ++ const environment_map& env_vars_to_set, ++ ChildPrivileges privs, ++ bool wait, ProcessHandle* process_handle, ++ ProcessArchitecture arch) { + bool retval = true; + + char* argv_copy[argv.size() + 1]; @@ -783,6 +793,17 @@ + const environment_map& env_vars_to_set, + bool wait, ProcessHandle* process_handle, + ProcessArchitecture arch) { ++ return LaunchApp(argv, fds_to_remap, env_vars_to_set, ++ SAME_PRIVILEGES_AS_PARENT, ++ wait, process_handle); ++} ++ ++bool LaunchApp(const std::vector& argv, ++ const file_handle_mapping_vector& fds_to_remap, ++ const environment_map& env_vars_to_set, ++ ChildPrivileges privs, ++ bool wait, ProcessHandle* process_handle, ++ ProcessArchitecture arch) { + scoped_array argv_cstr(new char*[argv.size() + 1]); + // Illegal to allocate memory after fork and before execvp + InjectiveMultimap fd_shuffle1, fd_shuffle2; @@ -805,19 +826,32 @@ + + CloseSuperfluousFds(fd_shuffle2); + ++ for (size_t i = 0; i < argv.size(); i++) ++ argv_cstr[i] = const_cast(argv[i].c_str()); ++ argv_cstr[argv.size()] = NULL; ++ ++ if (privs == UNPRIVILEGED) { ++ if (setgid(CHILD_UNPRIVILEGED_GID) != 0) { ++ DLOG(ERROR) << "FAILED TO setgid() CHILD PROCESS, path: " << argv_cstr[0]; ++ _exit(127); ++ } ++ if (setuid(CHILD_UNPRIVILEGED_UID) != 0) { ++ DLOG(ERROR) << "FAILED TO setuid() CHILD PROCESS, path: " << argv_cstr[0]; ++ _exit(127); ++ } ++ if (chdir("/") != 0) ++ gProcessLog.print("==> could not chdir()\n"); ++ } ++ + for (environment_map::const_iterator it = env_vars_to_set.begin(); + it != env_vars_to_set.end(); ++it) { + if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/)) + _exit(127); + } -+ -+ for (size_t i = 0; i < argv.size(); i++) -+ argv_cstr[i] = const_cast(argv[i].c_str()); -+ argv_cstr[argv.size()] = NULL; -+ execvp(argv_cstr[0], argv_cstr.get()); ++ execv(argv_cstr[0], argv_cstr.get()); + // if we get here, we're in serious trouble and should complain loudly + DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0]; -+ exit(127); ++ _exit(127); + } else { + gProcessLog.print("==> process %d launched child process %d\n", + GetCurrentProcId(), pid); @@ -1144,7 +1178,7 @@ base::LaunchApp(childArgv, mFileMap, -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - newEnvVars, + newEnvVars, privs, #endif false, &process, arch); diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h Deleted: trunk/www/seamonkey/files/patch-bug761077 ============================================================================== --- trunk/www/seamonkey/files/patch-bug761077 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,88 +0,0 @@ -diff --git mozilla/xpcom/reflect/xptcall/public/genstubs.pl mozilla/xpcom/reflect/xptcall/public/genstubs.pl -index b8a87a5..918c4cf 100644 ---- mozilla/xpcom/reflect/xptcall/public/genstubs.pl -+++ mozilla/xpcom/reflect/xptcall/public/genstubs.pl -@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n"; - print OUTFILE "* 1 is AddRef\n"; - print OUTFILE "* 2 is Release\n"; - print OUTFILE "*/\n"; --print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n"; -+print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n"; - for($i = 0; $i < $entry_count; $i++) { - print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n"; - } -diff --git mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc -index eb66761..807db26 100644 ---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc -+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); -diff --git mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in -index ae6ed66..2783957 100644 ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -70,7 +70,7 @@ endif - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -269,7 +269,7 @@ endif - # - # Linux/PPC - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) -+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp - ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -278,7 +278,7 @@ endif - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +350,7 @@ endif - # - # OpenBSD/SPARC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) -+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp - ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s - endif -diff --git mozilla/xpcom/reflect/xptcall/src/xptcprivate.h mozilla/xpcom/reflect/xptcall/src/xptcprivate.h -index d903ced..e4ec832 100644 ---- mozilla/xpcom/reflect/xptcall/src/xptcprivate.h -+++ mozilla/xpcom/reflect/xptcall/src/xptcprivate.h -@@ -14,7 +14,7 @@ - - class xptiInterfaceEntry; - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; -@@ -31,7 +31,7 @@ public: - #undef STUB_ENTRY - #undef SENTINEL_ENTRY - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); Deleted: trunk/www/seamonkey/files/patch-bug774671 ============================================================================== --- trunk/www/seamonkey/files/patch-bug774671 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,40 +0,0 @@ -commit 7e9eda2 -Author: Rafael Ávila de Espíndola -Date: Tue Jul 17 12:54:41 2012 -0400 - - Bug 774671 - Fix mismatched declarations. r=luke. ---- - mozilla/js/src/jsproxy.h | 2 +- - mozilla/js/src/jsprvtd.h | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git mozilla/js/src/jsproxy.h mozilla/js/src/jsproxy.h -index ec26e3a..aa0e782 100644 ---- mozilla/js/src/jsproxy.h -+++ mozilla/js/src/jsproxy.h -@@ -13,7 +13,7 @@ - - namespace js { - --class Wrapper; -+class JS_FRIEND_API(Wrapper); - - /* - * A proxy is a JSObject that implements generic behavior by providing custom -diff --git mozilla/js/src/jsprvtd.h mozilla/js/src/jsprvtd.h -index 19b5aef..93e1216 100644 ---- mozilla/js/src/jsprvtd.h -+++ mozilla/js/src/jsprvtd.h -@@ -146,9 +146,9 @@ struct TreeContext; - class UpvarCookie; - - class Proxy; --class BaseProxyHandler; --class DirectWrapper; --class CrossCompartmentWrapper; -+class JS_FRIEND_API(BaseProxyHandler); -+class JS_FRIEND_API(DirectWrapper); -+class JS_FRIEND_API(CrossCompartmentWrapper); - - class TempAllocPolicy; - class RuntimeAllocPolicy; Deleted: trunk/www/seamonkey/files/patch-bug775257 ============================================================================== --- trunk/www/seamonkey/files/patch-bug775257 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ -commit 8fc8b74 -Author: Oleg Romashin -Date: Wed Jul 18 22:46:11 2012 -0400 - - Bug 775257 - Gstreamer backend on Meego N9 produce extra noise in audio playback.r=giles ---- - content/media/gstreamer/nsGStreamerReader.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp -index c48f92e..0fb801a 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -130,8 +130,13 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor) - gst_object_unref(sinkpad); - - mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! " -+#ifndef MOZ_TREMOR - "appsink name=audiosink sync=true caps=audio/x-raw-float," - "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL); -+#else -+ "appsink name=audiosink sync=true caps=audio/x-raw-int," -+ "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL); -+#endif - mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink), - "audiosink")); - gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks, Deleted: trunk/www/seamonkey/files/patch-bug777696 ============================================================================== --- trunk/www/seamonkey/files/patch-bug777696 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,32 +0,0 @@ -commit 0c0d1a8 -Author: Landry Breuil -Date: Mon Jul 30 17:57:15 2012 +0200 - - Bug 777696: Fix gstreamer backend on big endian architectures. r=doublec ---- - content/media/gstreamer/nsGStreamerReader.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp -index 0fb801a..4a69196 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -132,10 +132,18 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor) - mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! " - #ifdef MOZ_TREMOR - "appsink name=audiosink sync=true caps=audio/x-raw-float," -+#ifdef IS_LITTLE_ENDIAN - "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL); - #else -+ "channels={1,2},rate=44100,width=32,endianness=4321", TRUE, NULL); -+#endif -+#else - "appsink name=audiosink sync=true caps=audio/x-raw-int," -+#ifdef IS_LITTLE_ENDIAN - "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL); -+#else -+ "channels={1,2},rate=48000,width=16,endianness=4321", TRUE, NULL); -+#endif - #endif - mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink), - "audiosink")); Deleted: trunk/www/seamonkey/files/patch-bug778056 ============================================================================== --- trunk/www/seamonkey/files/patch-bug778056 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- mozilla/memory/mozalloc/mozalloc.cpp~ -+++ mozilla/memory/mozalloc/mozalloc.cpp -@@ -19,6 +19,9 @@ - #if defined(XP_UNIX) - # include // for valloc on *BSD - #endif //if defined(XP_UNIX) -+#if defined(__FreeBSD__) -+# include // for malloc_usable_size -+#endif // if defined(__FreeBSD__) - - #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) - # define MOZALLOC_EXPORT __declspec(dllexport) -@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr) - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) -+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) - // Android bionic libc doesn't have malloc_usable_size. - return malloc_usable_size(ptr); - #elif defined(XP_WIN) Deleted: trunk/www/seamonkey/files/patch-bug779847 ============================================================================== --- trunk/www/seamonkey/files/patch-bug779847 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ ---- mozilla/gfx/ycbcr/Makefile.in -+++ mozilla/gfx/ycbcr/Makefile.in -@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \ - $(NULL) - endif - else --ifeq ($(OS_ARCH),Linux) --CPPSRCS += yuv_row_posix.cpp \ -- $(NULL) --else --ifeq ($(OS_ARCH),SunOS) --CPPSRCS += yuv_row_posix.cpp \ -- $(NULL) --else --ifeq ($(OS_ARCH),Darwin) -+ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH))) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) - else - CPPSRCS += yuv_row_other.cpp \ - $(NULL) --endif # Darwin --endif # SunOS --endif # linux -+endif # posix - endif # windows - - ifeq (arm,$(findstring arm,$(OS_TEST))) Modified: trunk/www/seamonkey/files/patch-bug783463 ============================================================================== --- trunk/www/seamonkey/files/patch-bug783463 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/files/patch-bug783463 Wed Oct 24 16:12:06 2012 (r1080) @@ -12,23 +12,3 @@ SkTime_Unix.cpp \ $(NULL) endif ---- mozilla/widget/qt/nsNativeThemeQt.cpp~ -+++ mozilla/widget/qt/nsNativeThemeQt.cpp -@@ -25,7 +25,6 @@ - #include "nsThemeConstants.h" - #include "nsIServiceManager.h" - #include "nsIDOMHTMLInputElement.h" --#include - - - #include "gfxASurface.h" ---- mozilla/widget/qt/nsSound.cpp~ -+++ mozilla/widget/qt/nsSound.cpp -@@ -40,6 +40,7 @@ - #include - - #include -+#include - - #include "nscore.h" - #include "plstr.h" Deleted: trunk/www/seamonkey/files/patch-bug784741 ============================================================================== --- trunk/www/seamonkey/files/patch-bug784741 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ -diff --git js/src/Makefile.in js/src/Makefile.in -index 8eb385f..01bd8e3 100644 ---- mozilla/js/src/Makefile.in -+++ mozilla/js/src/Makefile.in -@@ -323,6 +323,7 @@ endif - - ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) - ENABLE_YARR_JIT = 1 -+DEFINES += -DENABLE_YARR_JIT=1 - - VPATH += $(srcdir)/assembler/assembler \ - $(srcdir)/methodjit \ -diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h -index 6570f2d..0c84896 100644 ---- mozilla/js/src/assembler/wtf/Platform.h -+++ mozilla/js/src/assembler/wtf/Platform.h -@@ -1102,9 +1102,7 @@ - #if WTF_PLATFORM_CHROMIUM - #define ENABLE_YARR_JIT 0 - --#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT) --#define ENABLE_YARR_JIT 1 -- -+#elif ENABLE_YARR_JIT - /* Setting this flag compares JIT results with interpreter results. */ - #define ENABLE_YARR_JIT_DEBUG 0 - #endif -diff --git js/src/configure.in js/src/configure.in -index c142eb7..34f98b9 100644 ---- mozilla/js/src/configure.in -+++ mozilla/js/src/configure.in -@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug, - (using compiler flags DBG)], - [ if test "$enableval" != "no"; then - MOZ_DEBUG=1 -- ENABLE_METHODJIT_SPEW=1 -+ if test "$ENABLE_METHODJIT"; then -+ # needs MethodJIT or YarrJIT -+ ENABLE_METHODJIT_SPEW=1 -+ fi - if test -n "$enableval" -a "$enableval" != "yes"; then - MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` - _MOZ_DEBUG_FLAGS_SET=1 Deleted: trunk/www/seamonkey/files/patch-bug784776 ============================================================================== --- trunk/www/seamonkey/files/patch-bug784776 Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,33 +0,0 @@ ---- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~ -+++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp -@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources() - { - if (mSharedHandle) { - gl()->ReleaseSharedHandle(mShareType, mSharedHandle); -- mSharedHandle = NULL; -+ mSharedHandle = 0; - } - - mYUVTexture[0].Release(); ---- mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp~ -+++ mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp -@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr - struct tm *tmc; - int i; - -- tt = time((time_t)NULL); -+ tt = time(NULL); - tmc = localtime(&tt); - - tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM ---- mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp~ -+++ mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp -@@ -40,7 +40,7 @@ CrossProcessMutexHandle - CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle) - { - NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!"); -- return NULL; -+ return 0; - } - - } Added: trunk/www/seamonkey/files/patch-bug786690 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug786690 Wed Oct 24 16:12:06 2012 (r1080) @@ -0,0 +1,26 @@ +commit 38301c3 +Author: Michael Wu +Date: Fri Aug 31 10:18:46 2012 -0300 + + Bug 786690 - Fix buffered streams on 16 bit outputs, r=kinetik +--- + content/media/nsAudioStream.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git content/media/nsAudioStream.cpp content/media/nsAudioStream.cpp +index ac8ef58..8087d31 100644 +--- mozilla/content/media/nsAudioStream.cpp ++++ mozilla/content/media/nsAudioStream.cpp +@@ -953,10 +953,11 @@ nsBufferedAudioStream::Init(int32_t aNumChannels, int32_t aRate) + params.channels = aNumChannels; + #ifdef MOZ_SAMPLE_TYPE_S16LE + params.format = CUBEB_SAMPLE_S16NE; ++ mBytesPerFrame = sizeof(int16_t) * aNumChannels; + #else /* MOZ_SAMPLE_TYPE_FLOAT32 */ + params.format = CUBEB_SAMPLE_FLOAT32NE; +-#endif + mBytesPerFrame = sizeof(float) * aNumChannels; ++#endif + + { + cubeb_stream* stream; Modified: trunk/www/seamonkey/files/patch-bug788039 ============================================================================== --- trunk/www/seamonkey/files/patch-bug788039 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/files/patch-bug788039 Wed Oct 24 16:12:06 2012 (r1080) @@ -1,16 +1,5 @@ # Bug 788039 - With no prefix search libevent via pkg-config. ---- mozilla/config/autoconf.mk.in~ -+++ mozilla/config/autoconf.mk.in -@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA - - MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@ - MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@ --MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@ -+MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@ - - MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@ - MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@ --- mozilla/configure.in~ +++ mozilla/configure.in @@ -3854,7 +3854,7 @@ fi Modified: trunk/www/seamonkey/files/patch-bug788108 ============================================================================== --- trunk/www/seamonkey/files/patch-bug788108 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/files/patch-bug788108 Wed Oct 24 16:12:06 2012 (r1080) @@ -7,7 +7,7 @@ -//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. -#ifdef __FreeBSD__ -#include --#ifdef __alpha__ +-#if !defined(__i386__) && !defined(__x86_64__) -static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; -#else -static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; Modified: trunk/www/seamonkey/files/patch-bug788955 ============================================================================== --- trunk/www/seamonkey/files/patch-bug788955 Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/files/patch-bug788955 Wed Oct 24 16:12:06 2012 (r1080) @@ -26,16 +26,6 @@ add_makefiles " memory/jemalloc/Makefile " ---- mozilla/config/autoconf.mk.in -+++ mozilla/config/autoconf.mk.in -@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@ - MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@ - MOZ_MEMORY = @MOZ_MEMORY@ - MOZ_JEMALLOC = @MOZ_JEMALLOC@ -+MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@ - MOZ_PROFILING = @MOZ_PROFILING@ - MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@ - MOZ_JPROF = @MOZ_JPROF@ diff --git configure.in configure.in index bb05782..2f32516 100644 --- mozilla/configure.in Added: trunk/www/seamonkey/files/patch-bug803811 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug803811 Wed Oct 24 16:12:06 2012 (r1080) @@ -0,0 +1,111 @@ +commit 4ff5f0c +Author: Landry Breuil +Date: Wed Oct 24 09:56:51 2012 +0400 + + Bug 803811 - Fix system zlib detection by porting bug #763651 +--- + aclocal.m4 | 1 + + configure.in | 46 ++++++---------------------------------------- + 2 files changed, 7 insertions(+), 40 deletions(-) + +diff --git aclocal.m4 aclocal.m4 +index f5486dd..a3924d1 100644 +--- aclocal.m4 ++++ aclocal.m4 +@@ -16,6 +16,7 @@ builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl + builtin(include, mozilla/build/autoconf/lto.m4)dnl + builtin(include, mozilla/build/autoconf/frameptr.m4)dnl + builtin(include, mozilla/build/autoconf/compiler-opts.m4)dnl ++builtin(include, mozilla/build/autoconf/zlib.m4)dnl + + MOZ_PROG_CHECKMSYS() + +diff --git configure.in configure.in +index be833e8..c90fe39 100644 +--- configure.in ++++ configure.in +@@ -63,7 +63,6 @@ dnl Set the version number of the libs included with mozilla + dnl ======================================================== + MOZJPEG=62 + MOZPNG=10401 +-MOZZLIB=0x1230 + NSPR_VERSION=4 + NSS_VERSION=3 + +@@ -868,8 +867,6 @@ MOZ_USER_DIR=".mozilla" + + MOZ_JPEG_CFLAGS= + MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/mozilla/jpeg)' +-MOZ_ZLIB_CFLAGS= +-MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)' + MOZ_BZ2_CFLAGS= + MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/mozilla/modules/libbz2/src)' + MOZ_PNG_CFLAGS= +@@ -3957,47 +3954,19 @@ if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$MOZ_NATIVE_JPEG" = 1; then + MOZ_JPEG_CFLAGS="-I${JPEG_DIR}/include" + MOZ_JPEG_LIBS="-L${JPEG_DIR}/lib ${MOZ_JPEG_LIBS}" + fi ++fi # SKIP_LIBRARY_CHECKS + + dnl system ZLIB support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-zlib, +-[ --with-system-zlib[=PFX] +- Use system libz [installed at prefix PFX]], +- ZLIB_DIR=$withval) + +-_SAVE_CFLAGS=$CFLAGS +-_SAVE_LDFLAGS=$LDFLAGS +-_SAVE_LIBS=$LIBS +-if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then +- CFLAGS="-I${ZLIB_DIR}/include $CFLAGS" +- LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS" +-fi +-if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then +- MOZ_NATIVE_ZLIB= +-else +- AC_CHECK_LIB(z, gzread, [MOZ_NATIVE_ZLIB=1 MOZ_ZLIB_LIBS="-lz"], +- [MOZ_NATIVE_ZLIB=]) +-fi +-if test "$MOZ_NATIVE_ZLIB" = 1; then +- MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'` +- AC_TRY_COMPILE([ #include +- #include +- #include ], +- [ #if ZLIB_VERNUM < $MOZZLIBNUM +- #error "Insufficient zlib version ($MOZZLIBNUM required)." +- #endif ], +- MOZ_NATIVE_ZLIB=1, +-AC_MSG_ERROR([Insufficient zlib version for --with-system-zlib ($MOZZLIB required)])) +-fi +-CFLAGS=$_SAVE_CFLAGS +-LDFLAGS=$_SAVE_LDFLAGS +-LIBS=$_SAVE_LIBS ++MOZ_ZLIB_CHECK([1.2.3]) + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then +- MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include" +- MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" ++if test "$MOZ_NATIVE_ZLIB" != 1; then ++ MOZ_ZLIB_CFLAGS= ++ MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)' + fi + ++if test -z "$SKIP_LIBRARY_CHECKS"; then + dnl system BZIP2 Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-bz2, +@@ -6556,13 +6525,10 @@ AC_SUBST(MOZ_NATIVE_MAKEDEPEND) + AC_SUBST(SYSTEM_LIBXUL) + AC_SUBST(MOZ_NATIVE_JPEG) + AC_SUBST(MOZ_NATIVE_PNG) +-AC_SUBST(MOZ_NATIVE_ZLIB) + AC_SUBST(MOZ_NATIVE_BZ2) + + AC_SUBST(MOZ_JPEG_CFLAGS) + AC_SUBST(MOZ_JPEG_LIBS) +-AC_SUBST(MOZ_ZLIB_CFLAGS) +-AC_SUBST(MOZ_ZLIB_LIBS) + AC_SUBST(MOZ_BZ2_CFLAGS) + AC_SUBST(MOZ_BZ2_LIBS) + AC_SUBST(MOZ_PNG_CFLAGS) Deleted: trunk/www/seamonkey/files/patch-config-autoconf.mk.in ============================================================================== --- trunk/www/seamonkey/files/patch-config-autoconf.mk.in Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200 -+++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200 -@@ -57,14 +57,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/%%MOZILLA%% - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/%%MOZILLA%% -+sdkdir = $(libdir)/%%MOZILLA%% - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ Modified: trunk/www/seamonkey/files/patch-config-baseconfig.mk ============================================================================== --- trunk/www/seamonkey/files/patch-config-baseconfig.mk Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/files/patch-config-baseconfig.mk Wed Oct 24 16:12:06 2012 (r1080) @@ -1,5 +1,5 @@ ---- mozilla/config/baseconfig.mk~ -+++ mozilla/config/baseconfig.mk +--- config/baseconfig.mk~ ++++ config/baseconfig.mk @@ -1,9 +1,9 @@ INCLUDED_AUTOCONF_MK = 1 @@ -11,6 +11,6 @@ +idldir = $(datadir)/idl/%%MOZILLA%% +installdir = $(libdir)/%%MOZILLA%% +sdkdir = $(libdir)/%%MOZILLA%% - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't + MOZILLA_SRCDIR = $(topsrcdir)/mozilla + MOZDEPTH = $(DEPTH)/mozilla + DIST = $(MOZDEPTH)/dist Deleted: trunk/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- mailnews/addrbook/src/nsDirPrefs.cpp~ -+++ mailnews/addrbook/src/nsDirPrefs.cpp -@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid - DIR_Server *s=nsnull; - - switch (position) { -- case DIR_POS_APPEND: -+ case (PRInt32)DIR_POS_APPEND: - /* Do nothing if the request is to append a server that is already - * in the list. - */ -@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid - wholeList->AppendElement(server); - break; - -- case DIR_POS_DELETE: -+ case (PRInt32)DIR_POS_DELETE: - /* Remove the prefs corresponding to the given server. If the prefName - * value is nsnull, the server has never been saved and there are no - * prefs to remove. Deleted: trunk/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,29 +0,0 @@ ---- mailnews/compose/src/nsSmtpProtocol.cpp~ -+++ mailnews/compose/src/nsSmtpProtocol.cpp -@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr - - switch (code) - { -- case NS_ERROR_SMTP_SERVER_ERROR: -- case NS_ERROR_TCP_READ_ERROR: -- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: -- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: -- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: -- case NS_ERROR_SENDING_FROM_COMMAND: -- case NS_ERROR_SENDING_RCPT_COMMAND: -- case NS_ERROR_SENDING_DATA_COMMAND: -- case NS_ERROR_SENDING_MESSAGE: -- case NS_ERROR_SMTP_GREETING: -+ case (int)NS_ERROR_SMTP_SERVER_ERROR: -+ case (int)NS_ERROR_TCP_READ_ERROR: -+ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: -+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: -+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: -+ case (int)NS_ERROR_SENDING_FROM_COMMAND: -+ case (int)NS_ERROR_SENDING_RCPT_COMMAND: -+ case (int)NS_ERROR_SENDING_DATA_COMMAND: -+ case (int)NS_ERROR_SENDING_MESSAGE: -+ case (int)NS_ERROR_SMTP_GREETING: - bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg)); - msg = nsTextFormatter::vsmprintf(eMsg.get(), args); - break; Deleted: trunk/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp Wed Oct 24 16:12:06 2012 (r1079) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/content/svg/content/src/nsSVGElement.cpp.orig 2010-05-12 16:46:09.000000000 +0200 -+++ mozilla/content/svg/content/src/nsSVGElement.cpp 2010-05-12 16:49:33.000000000 +0200 -@@ -102,7 +102,11 @@ - // vararg-list methods in this file: - // nsSVGElement::GetAnimated{Length,Number,Integer}Values - // See bug 547964 for details: --PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull)); -+// I really try to get the details but I'm not allowed to -+// access this bug in bugzilla: -+// You are not authorized to access bug #547964. -+// So disable this ASSERT as it breaks build. -+//PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull)); - - - nsSVGEnumMapping nsSVGElement::sSVGUnitTypesMap[] = { Modified: trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in Wed Oct 24 16:11:46 2012 (r1079) +++ trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in Wed Oct 24 16:12:06 2012 (r1080) @@ -1,6 +1,6 @@ ---- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 -+++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n +--- mozilla/js/src/js-confdefs.h.in~ ++++ mozilla/js/src/js-confdefs.h.in +@@ -12,6 +12,7 @@ * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before is included. */ #define __STDC_LIMIT_MACROS From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 24 16:17:02 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 341EB3D6 for ; Wed, 24 Oct 2012 16:17: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 B598D8FC12 for ; Wed, 24 Oct 2012 16:17: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 q9OGH0I9059478 for ; Wed, 24 Oct 2012 16:17: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 q9OGGtgv058974 for freebsd-gecko@freebsd.org; Wed, 24 Oct 2012 16:16:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 24 Oct 2012 16:16:55 GMT Message-Id: <201210241616.q9OGGtgv058974@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] r1081 - 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: Wed, 24 Oct 2012 16:17:02 -0000 Author: jbeich Date: Wed Oct 24 16:16:55 2012 New Revision: 1081 Log: oops, test correct library and drop CXX check Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Oct 24 16:12:06 2012 (r1080) +++ trunk/Mk/bsd.gecko.mk Wed Oct 24 16:16:55 2012 (r1081) @@ -659,7 +659,7 @@ --disable-updater \ --disable-pedantic -.if ${CXX:T:Mclang++} && exists(/usr/lib/libc++.so) +.if exists(/usr/lib/libcxxrt.so) LIBS+= -Wl,--as-needed,-lcxxrt,--no-as-needed .endif From owner-freebsd-gecko@FreeBSD.ORG Thu Oct 25 09:15:40 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4223E6AB; Thu, 25 Oct 2012 09:15:40 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 145518FC1B; Thu, 25 Oct 2012 09:15:40 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9P9Fdjh045353; Thu, 25 Oct 2012 09:15:39 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9P9FduZ045349; Thu, 25 Oct 2012 09:15:39 GMT (envelope-from edwin) Date: Thu, 25 Oct 2012 09:15:39 GMT Message-Id: <201210250915.q9P9FduZ045349@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Subject: Re: ports/173052: www/firefox 16 update/install failed 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, 25 Oct 2012 09:15:40 -0000 Synopsis: www/firefox 16 update/install failed Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Thu Oct 25 09:15:39 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=173052 From owner-freebsd-gecko@FreeBSD.ORG Fri Oct 26 16:16:52 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BEFE3704 for ; Fri, 26 Oct 2012 16:16: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 554898FC08 for ; Fri, 26 Oct 2012 16:16: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 q9QGGjiN073778 for ; Fri, 26 Oct 2012 16:16:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q9QGGekX072988 for freebsd-gecko@freebsd.org; Fri, 26 Oct 2012 16:16:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 26 Oct 2012 16:16:40 GMT Message-Id: <201210261616.q9QGGekX072988@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] r1082 - in 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: Fri, 26 Oct 2012 16:16:52 -0000 Author: jbeich Date: Fri Oct 26 16:16:39 2012 New Revision: 1082 Log: unbreak GNOMEVFS2 after r1042 Modified: trunk/Gecko_ChangeLog trunk/Mk/bsd.gecko.mk Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Wed Oct 24 16:16:55 2012 (r1081) +++ trunk/Gecko_ChangeLog Fri Oct 26 16:16:39 2012 (r1082) @@ -1,2 +1,5 @@ 17.0: +- with GNOMEVFS2 option build its extension, too [1] - *misc* + +PR: ports/173052 [1] Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Oct 24 16:16:55 2012 (r1081) +++ trunk/Mk/bsd.gecko.mk Fri Oct 26 16:16:39 2012 (r1082) @@ -723,6 +723,7 @@ .if ${PORT_OPTIONS:MGNOMEVFS2} USE_GNOME+= gnomevfs2 MOZ_OPTIONS+= --enable-gnomevfs +MOZ_OPTIONS:= ${MOZ_OPTIONS:C/(extensions)=(.*)/\1=\2,gnomevfs/} .else MOZ_OPTIONS+= --disable-gnomevfs .endif From owner-freebsd-gecko@FreeBSD.ORG Sat Oct 27 18:32:29 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 883DAFD4 for ; Sat, 27 Oct 2012 18:32:29 +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 0CD608FC16 for ; Sat, 27 Oct 2012 18:32:28 +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 q9RIWM10076539 for ; Sat, 27 Oct 2012 18:32:22 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q9RIWHRh076401 for freebsd-gecko@freebsd.org; Sat, 27 Oct 2012 18:32:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 27 Oct 2012 18:32:17 GMT Message-Id: <201210271832.q9RIWHRh076401@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] r1083 - 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: Sat, 27 Oct 2012 18:32:29 -0000 Author: jbeich Date: Sat Oct 27 18:32:16 2012 New Revision: 1083 Log: changes besides r1080 should work on 16.0.2, too Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Fri Oct 26 16:16:39 2012 (r1082) +++ trunk/Gecko_ChangeLog Sat Oct 27 18:32:16 2012 (r1083) @@ -1,5 +1,7 @@ -17.0: +16.0.2: - with GNOMEVFS2 option build its extension, too [1] -- *misc* +- make heap-committed and heap-dirty reporters work in about:memory +- properly mark QT4 as experimental (needs love upstream) +- *miscellaneous cleanups and fixups* PR: ports/173052 [1] From owner-freebsd-gecko@FreeBSD.ORG Sat Oct 27 21:33:14 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B139C215 for ; Sat, 27 Oct 2012 21:33:14 +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 359F98FC08 for ; Sat, 27 Oct 2012 21:33:13 +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 q9RLXCuC072835 for ; Sat, 27 Oct 2012 21:33: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 q9RLX7H0072518 for freebsd-gecko@freebsd.org; Sat, 27 Oct 2012 21:33:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 27 Oct 2012 21:33:07 GMT Message-Id: <201210272133.q9RLX7H0072518@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] r1084 - trunk/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: Sat, 27 Oct 2012 21:33:14 -0000 Author: jbeich Date: Sat Oct 27 21:33:07 2012 New Revision: 1084 Log: build chatzilla again after r1082 Modified: trunk/www/seamonkey/Makefile Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Sat Oct 27 18:32:16 2012 (r1083) +++ trunk/www/seamonkey/Makefile Sat Oct 27 21:33:07 2012 (r1084) @@ -60,6 +60,12 @@ OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/} +.include + +.if ${PORT_OPTIONS:MCHATZILLA} +MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc +.endif + .include WRKSRC= ${WRKDIR}/comm-beta @@ -103,9 +109,6 @@ ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm .endif .endif -.if ${PORT_OPTIONS:MCHATZILLA} -MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc -.endif .if ! ${PORT_OPTIONS:MCOMPOSER} MOZ_OPTIONS+= --disable-composer From owner-freebsd-gecko@FreeBSD.ORG Sat Oct 27 22:37:42 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 780E63BE for ; Sat, 27 Oct 2012 22:37:42 +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 0D7308FC08 for ; Sat, 27 Oct 2012 22:37:41 +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 q9RMbeON085390 for ; Sat, 27 Oct 2012 22:37: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 q9RMbZnQ083928 for freebsd-gecko@freebsd.org; Sat, 27 Oct 2012 22:37:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 27 Oct 2012 22:37:35 GMT Message-Id: <201210272237.q9RMbZnQ083928@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] r1085 - in trunk: . mail/thunderbird/files www/firefox-nightly/files www/firefox/files 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, 27 Oct 2012 22:37:42 -0000 Author: jbeich Date: Sat Oct 27 22:37:35 2012 New Revision: 1085 Log: add more h264 codecs for youtube, 1080p/720p and 240p Added: trunk/mail/thunderbird/files/patch-bug806139 trunk/www/firefox-nightly/files/patch-bug806139 trunk/www/firefox/files/patch-bug806139 trunk/www/seamonkey/files/patch-bug806139 Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Sat Oct 27 21:33:07 2012 (r1084) +++ trunk/Gecko_ChangeLog Sat Oct 27 22:37:35 2012 (r1085) @@ -1,3 +1,6 @@ +17.0: +- support more h264 codecs when using GSTREAMER with YouTube + 16.0.2: - with GNOMEVFS2 option build its extension, too [1] - make heap-committed and heap-dirty reporters work in about:memory Added: trunk/mail/thunderbird/files/patch-bug806139 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug806139 Sat Oct 27 22:37:35 2012 (r1085) @@ -0,0 +1,29 @@ +--- mozilla/content/html/content/public/nsHTMLMediaElement.h~ ++++ mozilla/content/html/content/public/nsHTMLMediaElement.h +@@ -311,7 +311,7 @@ public: + static bool IsH264Enabled(); + static bool IsH264Type(const nsACString& aType); + static const char gH264Types[3][16]; +- static char const *const gH264Codecs[7]; ++ static char const *const gH264Codecs[9]; + #endif + + #ifdef MOZ_WIDGET_GONK +--- mozilla/content/html/content/src/nsHTMLMediaElement.cpp~ ++++ mozilla/content/html/content/src/nsHTMLMediaElement.cpp +@@ -2114,12 +2114,14 @@ const char nsHTMLMediaElement::gH264Type + "video/quicktime", + }; + +-char const *const nsHTMLMediaElement::gH264Codecs[7] = { ++char const *const nsHTMLMediaElement::gH264Codecs[9] = { + "avc1.42E01E", + "avc1.42001E", + "avc1.58A01E", + "avc1.4D401E", + "avc1.64001E", ++ "avc1.64001F", ++ "mp4v.20.3", + "mp4a.40.2", + nullptr + }; Added: trunk/www/firefox-nightly/files/patch-bug806139 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug806139 Sat Oct 27 22:37:35 2012 (r1085) @@ -0,0 +1,29 @@ +--- content/html/content/public/nsHTMLMediaElement.h~ ++++ content/html/content/public/nsHTMLMediaElement.h +@@ -311,7 +311,7 @@ public: + static bool IsH264Enabled(); + static bool IsH264Type(const nsACString& aType); + static const char gH264Types[3][16]; +- static char const *const gH264Codecs[7]; ++ static char const *const gH264Codecs[9]; + #endif + + #ifdef MOZ_WIDGET_GONK +--- content/html/content/src/nsHTMLMediaElement.cpp~ ++++ content/html/content/src/nsHTMLMediaElement.cpp +@@ -2134,12 +2134,14 @@ nsHTMLMediaElement::IsWebMType(const nsA + #endif + + #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) +-char const *const nsHTMLMediaElement::gH264Codecs[7] = { ++char const *const nsHTMLMediaElement::gH264Codecs[9] = { + "avc1.42E01E", // H.264 Constrained Baseline Profile Level 3.0 + "avc1.42001E", // H.264 Baseline Profile Level 3.0 + "avc1.58A01E", // H.264 Extended Profile Level 3.0 + "avc1.4D401E", // H.264 Main Profile Level 3.0 + "avc1.64001E", // H.264 High Profile Level 3.0 ++ "avc1.64001F", // H.264 High Profile Level 3.1 ++ "mp4v.20.3", // 3GPP + "mp4a.40.2", // AAC-LC + nullptr + }; Added: trunk/www/firefox/files/patch-bug806139 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug806139 Sat Oct 27 22:37:35 2012 (r1085) @@ -0,0 +1,29 @@ +--- content/html/content/public/nsHTMLMediaElement.h~ ++++ content/html/content/public/nsHTMLMediaElement.h +@@ -311,7 +311,7 @@ public: + static bool IsH264Enabled(); + static bool IsH264Type(const nsACString& aType); + static const char gH264Types[3][16]; +- static char const *const gH264Codecs[7]; ++ static char const *const gH264Codecs[9]; + #endif + + #ifdef MOZ_WIDGET_GONK +--- content/html/content/src/nsHTMLMediaElement.cpp~ ++++ content/html/content/src/nsHTMLMediaElement.cpp +@@ -2114,12 +2114,14 @@ const char nsHTMLMediaElement::gH264Type + "video/quicktime", + }; + +-char const *const nsHTMLMediaElement::gH264Codecs[7] = { ++char const *const nsHTMLMediaElement::gH264Codecs[9] = { + "avc1.42E01E", + "avc1.42001E", + "avc1.58A01E", + "avc1.4D401E", + "avc1.64001E", ++ "avc1.64001F", ++ "mp4v.20.3", + "mp4a.40.2", + nullptr + }; Added: trunk/www/seamonkey/files/patch-bug806139 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug806139 Sat Oct 27 22:37:35 2012 (r1085) @@ -0,0 +1,29 @@ +--- mozilla/content/html/content/public/nsHTMLMediaElement.h~ ++++ mozilla/content/html/content/public/nsHTMLMediaElement.h +@@ -311,7 +311,7 @@ public: + static bool IsH264Enabled(); + static bool IsH264Type(const nsACString& aType); + static const char gH264Types[3][16]; +- static char const *const gH264Codecs[7]; ++ static char const *const gH264Codecs[9]; + #endif + + #ifdef MOZ_WIDGET_GONK +--- mozilla/content/html/content/src/nsHTMLMediaElement.cpp~ ++++ mozilla/content/html/content/src/nsHTMLMediaElement.cpp +@@ -2114,12 +2114,14 @@ const char nsHTMLMediaElement::gH264Type + "video/quicktime", + }; + +-char const *const nsHTMLMediaElement::gH264Codecs[7] = { ++char const *const nsHTMLMediaElement::gH264Codecs[9] = { + "avc1.42E01E", + "avc1.42001E", + "avc1.58A01E", + "avc1.4D401E", + "avc1.64001E", ++ "avc1.64001F", ++ "mp4v.20.3", + "mp4a.40.2", + nullptr + };