From owner-svn-ports-all@FreeBSD.ORG Thu Jan 10 22:29:26 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5FD50A21; Thu, 10 Jan 2013 22:29:26 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4304FD8F; Thu, 10 Jan 2013 22:29:26 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0AMTQHX054824; Thu, 10 Jan 2013 22:29:26 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0AMTOBl054811; Thu, 10 Jan 2013 22:29:24 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201301102229.r0AMTOBl054811@svn.freebsd.org> From: Florian Smeets Date: Thu, 10 Jan 2013 22:29:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310207 - in head: Mk www/firefox www/firefox-esr www/firefox-esr-i18n www/firefox-esr/files www/firefox-i18n www/firefox/files www/seamonkey www/seamonkey-i18n www/seamonkey/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2013 22:29:26 -0000 Author: flo Date: Thu Jan 10 22:29:23 2013 New Revision: 310207 URL: http://svnweb.freebsd.org/changeset/ports/310207 Log: - update www/firefox to 18.0 - update www/firefox-esr to 17.0.2 - update www/seamonkey to 2.15 (enigmail to 1.5.0) - remove QT4 option to avoid confusion (it turned out to be too experimental) In collaboration with: Jan Beich Security: http://www.vuxml.org/freebsd/a4ed6632-5aa9-11e2-8fcb-c8600054b392.html Added: head/www/firefox-esr/files/extra-bug780531 (contents, props changed) head/www/firefox-esr/files/patch-bug722975 (contents, props changed) head/www/firefox-esr/files/patch-bug732340 (contents, props changed) head/www/firefox-esr/files/patch-bug784631 (contents, props changed) head/www/firefox-esr/files/patch-bug786995 (contents, props changed) head/www/firefox-esr/files/patch-bug787904 (contents, props changed) head/www/firefox-esr/files/patch-bug788955 (contents, props changed) head/www/firefox-esr/files/patch-bug789656 (contents, props changed) head/www/firefox-esr/files/patch-bug806139 (contents, props changed) head/www/firefox-esr/files/patch-bug828003 (contents, props changed) head/www/firefox-esr/files/patch-clang32-libc++-visibility-hack (contents, props changed) head/www/firefox-esr/files/patch-config-baseconfig.mk (contents, props changed) head/www/firefox-esr/files/patch-content-media-nsAudioStream.cpp (contents, props changed) head/www/firefox-esr/files/patch-js-src-js-confdefs.h.in (contents, props changed) head/www/firefox-esr/files/patch-z-bug762445 (contents, props changed) head/www/firefox/files/patch-bug783505 (contents, props changed) head/www/firefox/files/patch-bug787804 (contents, props changed) head/www/firefox/files/patch-bug798354 (contents, props changed) head/www/firefox/files/patch-bug800401 (contents, props changed) head/www/firefox/files/patch-bug807492 (contents, props changed) head/www/firefox/files/patch-bug815025 (contents, props changed) head/www/firefox/files/patch-bug817481 (contents, props changed) head/www/firefox/files/patch-bug826985 (contents, props changed) head/www/firefox/files/patch-bug828003 (contents, props changed) head/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h (contents, props changed) head/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc (contents, props changed) head/www/firefox/files/patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc (contents, props changed) head/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp (contents, props changed) head/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc (contents, props changed) head/www/firefox/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h (contents, props changed) head/www/firefox/files/patch-python-psutil-psutil-_psutil_bsd.c (contents, props changed) head/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp (contents, props changed) head/www/firefox/files/patch-z-bug815916 (contents, props changed) head/www/seamonkey/files/patch-bug783505 (contents, props changed) head/www/seamonkey/files/patch-bug787804 (contents, props changed) head/www/seamonkey/files/patch-bug798354 (contents, props changed) head/www/seamonkey/files/patch-bug800401 (contents, props changed) head/www/seamonkey/files/patch-bug807492 (contents, props changed) head/www/seamonkey/files/patch-bug815025 (contents, props changed) head/www/seamonkey/files/patch-bug817481 (contents, props changed) head/www/seamonkey/files/patch-bug826985 (contents, props changed) head/www/seamonkey/files/patch-bug828003 (contents, props changed) head/www/seamonkey/files/patch-enigmail-ipc-src-Makefile (contents, props changed) head/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h (contents, props changed) head/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-platform_thread_posix.cc (contents, props changed) head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc (contents, props changed) head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp (contents, props changed) head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc (contents, props changed) head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h (contents, props changed) head/www/seamonkey/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c (contents, props changed) head/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp (contents, props changed) head/www/seamonkey/files/patch-z-bug815916 (contents, props changed) Deleted: head/www/firefox-esr/files/patch-bug653551 head/www/firefox-esr/files/patch-bug691898 head/www/firefox-esr/files/patch-bug696030 head/www/firefox-esr/files/patch-bug714312 head/www/firefox-esr/files/patch-bug725655 head/www/firefox-esr/files/patch-bug728968 head/www/firefox-esr/files/patch-bug729155 head/www/firefox-esr/files/patch-bug741737 head/www/firefox-esr/files/patch-bug761077 head/www/firefox-esr/files/patch-bug778056 head/www/firefox-esr/files/patch-bug779847 head/www/firefox-esr/files/patch-bug784776 head/www/firefox-esr/files/patch-clang32-visibility-hack head/www/firefox-esr/files/patch-config_autoconf.mk.in head/www/firefox-esr/files/patch-dom-ipc-ContentChild.cpp head/www/firefox-esr/files/patch-gfx-qcms-qcmstypes.h head/www/firefox-esr/files/patch-js-src-configure.in head/www/firefox-esr/files/patch-toolkit-xre-nsEmbedFunctions.cpp head/www/firefox/files/patch-bug713802 head/www/firefox/files/patch-bug753046 head/www/firefox/files/patch-bug784631 head/www/firefox/files/patch-bug786995 head/www/firefox/files/patch-bug787904 head/www/firefox/files/patch-bug788039 head/www/firefox/files/patch-bug788108 head/www/firefox/files/patch-bug789436 head/www/firefox/files/patch-bug789656 head/www/firefox/files/patch-bug789693 head/www/firefox/files/patch-bug791366 head/www/firefox/files/patch-bug799441 head/www/firefox/files/patch-gfx-qcms-qcmstypes.h head/www/seamonkey/files/patch-bug713802 head/www/seamonkey/files/patch-bug753046 head/www/seamonkey/files/patch-bug784631 head/www/seamonkey/files/patch-bug786995 head/www/seamonkey/files/patch-bug787904 head/www/seamonkey/files/patch-bug788039 head/www/seamonkey/files/patch-bug788108 head/www/seamonkey/files/patch-bug789436 head/www/seamonkey/files/patch-bug789656 head/www/seamonkey/files/patch-bug789693 head/www/seamonkey/files/patch-bug791366 head/www/seamonkey/files/patch-bug799441 head/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h Modified: head/Mk/bsd.gecko.mk head/www/firefox-esr-i18n/Makefile head/www/firefox-esr-i18n/distinfo head/www/firefox-esr/Makefile head/www/firefox-esr/distinfo head/www/firefox-esr/files/patch-alsapulse (contents, props changed) head/www/firefox-esr/files/patch-bug753046 head/www/firefox-esr/files/patch-bug778078 (contents, props changed) head/www/firefox-esr/files/patch-bug781457 (contents, props changed) head/www/firefox-esr/files/patch-bug783463 (contents, props changed) head/www/firefox-esr/files/patch-bug788039 (contents, props changed) head/www/firefox-esr/files/patch-bug788108 head/www/firefox-esr/files/patch-bug789693 head/www/firefox-esr/files/patch-bug791366 head/www/firefox-esr/files/patch-bug799441 head/www/firefox-esr/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp head/www/firefox-esr/pkg-descr (contents, props changed) head/www/firefox-i18n/Makefile head/www/firefox-i18n/distinfo head/www/firefox/Makefile head/www/firefox/Makefile.options head/www/firefox/Makefile.webplugins head/www/firefox/distinfo head/www/firefox/files/extra-bug780531 head/www/firefox/files/patch-alsapulse head/www/firefox/files/patch-bug722975 (contents, props changed) head/www/firefox/files/patch-bug791305 head/www/firefox/files/patch-bug806139 head/www/firefox/files/patch-content-media-nsAudioStream.cpp head/www/seamonkey-i18n/Makefile head/www/seamonkey-i18n/distinfo head/www/seamonkey/Makefile head/www/seamonkey/distinfo head/www/seamonkey/files/extra-bug780531 head/www/seamonkey/files/patch-alsapulse head/www/seamonkey/files/patch-bug722975 (contents, props changed) head/www/seamonkey/files/patch-bug791305 head/www/seamonkey/files/patch-bug806139 head/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Thu Jan 10 21:24:53 2013 (r310206) +++ head/Mk/bsd.gecko.mk Thu Jan 10 22:29:23 2013 (r310207) @@ -179,9 +179,9 @@ Gecko_Pre_Include= bsd.gecko.mk # is given by the maintainer via the port or by the # user via defined variable try to find the highest # stable installed version. -# Available values: yes 10+ 17+ 10 17+ +# Available values: yes 17+ 18+ 17 18+ # NOTE: -# default value 10 is used in case of USE_FIREFOX=yes +# default value 17 is used in case of USE_FIREFOX=yes # # USE_FIREFOX_BUILD Add buildtime dependency on Firefox. # Available values: see USE_FIREFOX @@ -190,9 +190,9 @@ Gecko_Pre_Include= bsd.gecko.mk # version is given by the maintainer via the port # or by the user via defined variable try to find # the highest stable installed version. -# Available values: yes 14+ 14 +# Available values: yes 15+ 15 # NOTE: -# default value 14 is used in case of USE_SEAMONKEY=yes +# default value 15 is used in case of USE_SEAMONKEY=yes # # USE_SEAMONKEY_BUILD Add buildtime dependency on SeaMonkey. # Available values: see USE_SEAMONKEY @@ -203,7 +203,7 @@ Gecko_Pre_Include= bsd.gecko.mk # the highest stable installed version. # Available values: yes 10+ 17+ 10 17 # NOTE: -# default value 10 is used in case of USE_THUNDERBIRD=yes +# default value 17 is used in case of USE_THUNDERBIRD=yes # # USE_THUNDERBIRD_BUILD Add buildtime dependency on Thunderbird. # Available values: see USE_THUNDERBIRD @@ -220,13 +220,13 @@ USE_FIREFOX:= ${USE_FIREFOX_BUILD} _FIREFOX_BUILD_DEPENDS= yes .endif -_FIREFOX_DEFAULT_VERSION= 10 -_FIREFOX_VERSIONS= 10 17 -_FIREFOX_RANGE_VERSIONS= 10+ 17+ - -# For specifying [10, ..]+ -_FIREFOX_17P= 17 ${_FIREFOX_10P} -_FIREFOX_10P= 10 +_FIREFOX_DEFAULT_VERSION= 17 +_FIREFOX_VERSIONS= 17 18 +_FIREFOX_RANGE_VERSIONS= 17+ 18+ + +# For specifying [17, ..]+ +_FIREFOX_18P= 18 ${_FIREFOX_17P} +_FIREFOX_17P= 17 # Set the default Firefox version and check if USE_FIREFOX=yes was given .if ${USE_FIREFOX} == "yes" @@ -271,8 +271,8 @@ IGNORE= cannot install: unknown Firefo .endif # Dependence lines for different Firefox versions -10_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -17_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +17_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr +18_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox # Add dependencies .if defined(USE_FIREFOX) @@ -294,12 +294,12 @@ USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD _SEAMONKEY_BUILD_DEPENDS= yes .endif -_SEAMONKEY_DEFAULT_VERSION= 14 -_SEAMONKEY_VERSIONS= 14 -_SEAMONKEY_RANGE_VERSIONS= 14+ +_SEAMONKEY_DEFAULT_VERSION= 15 +_SEAMONKEY_VERSIONS= 15 +_SEAMONKEY_RANGE_VERSIONS= 15+ -# For specifying [14, ..]+ -_SEAMONKEY_14P= 14 +# For specifying [15, ..]+ +_SEAMONKEY_15P= 15 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given .if ${USE_SEAMONKEY} == "yes" @@ -341,7 +341,7 @@ IGNORE= cannot install: unknown SeaMon .endif # Dependence lines for different SeaMonkey versions -14_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey +15_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey # Add dependencies .if defined(USE_SEAMONKEY) Modified: head/www/firefox-esr-i18n/Makefile ============================================================================== --- head/www/firefox-esr-i18n/Makefile Thu Jan 10 21:24:53 2013 (r310206) +++ head/www/firefox-esr-i18n/Makefile Thu Jan 10 22:29:23 2013 (r310207) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 10.0.11 +PORTVERSION= 17.0.2 CATEGORIES= www MASTER_SITE_SUBDIR= firefox/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= @@ -14,7 +14,7 @@ COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USE_FIREFOX= 10 +USE_FIREFOX= 17 USE_XPI= firefox linux-firefox LATEST_LINK= firefox-esr-i18n @@ -86,7 +86,7 @@ post-patch: ${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/=4.8.8:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9.2:${PORTSDIR}/devel/nspr \ nss>=3.13.6_1:${PORTSDIR}/security/nss \ - sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.7.13:${PORTSDIR}/databases/sqlite3 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip USE_AUTOTOOLS= autoconf213:env +USE_PYTHON_BUILD=-2.7 LATEST_LINK= firefox-esr USE_GECKO= gecko -CONFLICTS= firefox-1[1-9].* +CONFLICTS= firefox-2[0-9].* firefox-1[1-689].* firefox-10.* MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= # empty MOZILLA_NAME= Firefox @@ -43,13 +45,16 @@ MOZ_OPTIONS= --program-transform-name='s --enable-application=browser \ --enable-official-branding -OPTIONS_DEFINE= PGO +OPTIONS_DEFINE= GSTREAMER PGO OPTIONS_DEFAULT=GIO .include "${.CURDIR}/../../www/firefox/Makefile.options" + +OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/} + .include -WRKSRC:= ${WRKDIR}/mozilla-esr10 +WRKSRC:= ${WRKDIR}/mozilla-esr17 .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} @@ -64,7 +69,6 @@ CFLAGS+= -mminimal-toc .if ${PORT_OPTIONS:MPGO} BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 -USE_PYTHON_BUILD= -2.7 USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" @@ -76,10 +80,6 @@ MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PY @MOZ_OBJDIR@/_profile/pgo/profileserver.py" .endif -.if !empty(CXX:M*clang++*) || (${CXX:Mc++} && ${OSVERSION} > 1000023) -CXXFLAGS+= -Wno-return-type-c-linkage -.endif - pre-extract: .if ${PORT_OPTIONS:MPGO} @${ECHO} "*****************************************************************" Modified: head/www/firefox-esr/distinfo ============================================================================== --- head/www/firefox-esr/distinfo Thu Jan 10 21:24:53 2013 (r310206) +++ head/www/firefox-esr/distinfo Thu Jan 10 22:29:23 2013 (r310207) @@ -1,2 +1,2 @@ -SHA256 (firefox-10.0.11esr.source.tar.bz2) = 94b4d5a339d97dc56fd349f93407c3af4f408a4a8409a64e3680d564d37594f8 -SIZE (firefox-10.0.11esr.source.tar.bz2) = 75444542 +SHA256 (firefox-17.0.2esr.source.tar.bz2) = 92bf717b3e3933b84fd37b0e5c5026868e139be828637cfcf4acdc83f7ccd886 +SIZE (firefox-17.0.2esr.source.tar.bz2) = 90828234 Added: head/www/firefox-esr/files/extra-bug780531 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/extra-bug780531 Thu Jan 10 22:29:23 2013 (r310207) @@ -0,0 +1,13 @@ +--- configure.in~ ++++ configure.in +@@ -5151,8 +5148,8 @@ fi + + AC_SUBST(MOZ_WEBRTC) + +-case "$target_cpu" in +-arm*) ++case "$target" in ++arm-*-linux*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) + MOZ_SAMPLE_TYPE_S16LE=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE) + AC_SUBST(MOZ_SAMPLE_TYPE_S16LE) Modified: head/www/firefox-esr/files/patch-alsapulse ============================================================================== --- head/www/firefox-esr/files/patch-alsapulse Thu Jan 10 21:24:53 2013 (r310206) +++ head/www/firefox-esr/files/patch-alsapulse Thu Jan 10 22:29:23 2013 (r310207) @@ -1,74 +1,65 @@ ---- config/autoconf.mk.in~ -+++ config/autoconf.mk.in -@@ -568,7 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF - 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@ ---- configure.in~ +diff --git configure.in configure.in +index 5980b76..11f5f77 100644 +--- configure.in +++ configure.in -@@ -5758,17 +5775,48 @@ dnl ==================================== +@@ -5600,13 +5600,25 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(alsa, -+[ --enable-alsa Enable Alsa support], ++[ --enable-alsa Enable Alsa support (default on Linux)], +MOZ_ALSA=1, +MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) + dnl If using sydneyaudio with Linux, ensure that the alsa library is available --if test -n "$MOZ_SYDNEYAUDIO"; then -+if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then - case "$target_os" in - linux*) -+ MOZ_ALSA=1 -+ ;; -+ esac +-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then ++ MOZ_ALSA=1 +fi + +if test -n "$MOZ_ALSA"; then - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , [echo "$MOZ_ALSA_PKG_ERRORS" AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) -- ;; -- esac fi -+AC_SUBST(MOZ_ALSA_CFLAGS) +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 -+ 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 Permissions System + dnl = Enable PulseAudio dnl ======================================================== ---- media/libsydneyaudio/src/Makefile.in~ +diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in +index 5ab4dd8..c8df26f 100644 +--- media/libcubeb/src/Makefile.in ++++ media/libcubeb/src/Makefile.in +@@ -24,10 +24,6 @@ endif + + ifeq ($(OS_TARGET),Android) + # No Android implementation of libcubeb yet. +-else ifeq ($(OS_TARGET),Linux) +-CSRCS = \ +- cubeb_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_TARGET),Darwin) +@@ -42,6 +38,12 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ cubeb_alsa.c \ ++ $(NULL) ++endif ++ + ifdef MOZ_PULSEAUDIO + CSRCS = \ + cubeb_pulse.c \ +diff --git media/libsydneyaudio/src/Makefile.in media/libsydneyaudio/src/Makefile.in +index 8dda8ce..b19641d 100644 +--- media/libsydneyaudio/src/Makefile.in +++ media/libsydneyaudio/src/Makefile.in @@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) CSRCS = \ @@ -100,20 +91,24 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += winmm.lib endif ---- toolkit/library/libxul-config.mk~ -+++ toolkit/library/libxul-config.mk -@@ -348,10 +348,12 @@ ifdef MOZ_NATIVE_LIBVPX - EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS) - endif +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 43384e9..e46a6e3 100644 +--- toolkit/library/Makefile.in ++++ toolkit/library/Makefile.in +@@ -370,14 +370,11 @@ endif + + EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) -ifdef MOZ_SYDNEYAUDIO -ifeq ($(OS_ARCH),Linux) ++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) +ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) endif -+ -+ifdef MOZ_PULSEAUDIO -+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) +-endif +- + ifdef MOZ_PULSEAUDIO +-ifdef MOZ_CUBEB + EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif endif - - ifdef HAVE_CLOCK_MONOTONIC Added: head/www/firefox-esr/files/patch-bug722975 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/patch-bug722975 Thu Jan 10 22:29:23 2013 (r310207) @@ -0,0 +1,61 @@ +# HG changeset patch +# Parent 9d3c9b863c697634e434b687d456bb82fa794ecf +# User Uli Schlachter +Bug 722975 - --enable-system-cairo build is broken after Bug 715658 fixed + + +diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp +--- gfx/thebes/gfxPlatform.cpp ++++ gfx/thebes/gfxPlatform.cpp +@@ -484,21 +484,19 @@ gfxPlatform::CreateDrawTargetForSurface( + + cairo_user_data_key_t kSourceSurface; + + void SourceBufferDestroy(void *srcBuffer) + { + static_cast(srcBuffer)->Release(); + } + +-void SourceSnapshotDetached(cairo_surface_t *nullSurf) ++void SourceSnapshotDetached(void *nullSurf) + { +- gfxImageSurface* origSurf = +- static_cast(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); +- ++ gfxImageSurface *origSurf = static_cast(nullSurf); + origSurf->SetData(&kSourceSurface, NULL, NULL); + } + + RefPtr + gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) + { + void *userData = aSurface->GetData(&kSourceSurface); + +@@ -588,24 +586,19 @@ gfxPlatform::GetSourceSurfaceForSurface( + } + + srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(), + imgSurface->Stride(), + size, format); + + } + +- cairo_surface_t *nullSurf = +- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); +- cairo_surface_set_user_data(nullSurf, +- &kSourceSurface, +- imgSurface, +- NULL); +- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); +- cairo_surface_destroy(nullSurf); ++ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", ++ (const unsigned char *) "data", 4, ++ SourceSnapshotDetached, imgSurface.get()); + } + + srcBuffer->AddRef(); + aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy); + + return srcBuffer; + } + Added: head/www/firefox-esr/files/patch-bug732340 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/patch-bug732340 Thu Jan 10 22:29:23 2013 (r310207) @@ -0,0 +1,13 @@ +--- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 ++++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 +@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t + GPOS::position_finish (buffer); + } + ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 ++template int SortedArrayOf >::search(unsigned int const &) const; ++template int SortedArrayOf >::search(unsigned int const &) const; ++template int SortedArrayOf >::search(unsigned int const &) const; ++template int SortedArrayOf::search(unsigned int const &) const; ++#endif + Modified: head/www/firefox-esr/files/patch-bug753046 ============================================================================== --- head/www/firefox-esr/files/patch-bug753046 Thu Jan 10 21:24:53 2013 (r310206) +++ head/www/firefox-esr/files/patch-bug753046 Thu Jan 10 22:29:23 2013 (r310207) @@ -56,7 +56,7 @@ $NetBSD: patch-ipc_chromium_Makefile.in, --- 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 @@ $NetBSD: patch-ipc_chromium_Makefile.in, + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -381,37 +380,29 @@ diff --git ipc/chromium/src/base/dir_rea index 9a34492..62b280c 100644 --- ipc/chromium/src/base/dir_reader_posix.h +++ ipc/chromium/src/base/dir_reader_posix.h -@@ -18,6 +18,8 @@ +@@ -18,16 +18,20 @@ + // seems worse than falling back to enumerating all file descriptors so we will + // probably never implement this on the Mac. - #if defined(OS_LINUX) +-#if defined(OS_LINUX) && !defined(OS_OPENBSD) ++#if defined(OS_LINUX) #include "base/dir_reader_linux.h" +#elif defined(OS_BSD) +#include "base/dir_reader_bsd.h" #else #include "base/dir_reader_fallback.h" #endif -@@ -26,6 +28,8 @@ - #if defined(OS_LINUX) + namespace base { + +-#if defined(OS_LINUX) && !defined(OS_OPENBSD) ++#if defined(OS_LINUX) typedef DirReaderLinux DirReaderPosix; +#elif defined(OS_BSD) +typedef DirReaderBSD DirReaderPosix; #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 @@ -469,7 +460,7 @@ $NetBSD: patch-ipc_chromium_src_base_pla --- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,23 @@ +@@ -9,16 +9,30 @@ #if defined(OS_MACOSX) #include @@ -477,9 +468,10 @@ $NetBSD: patch-ipc_chromium_src_base_pla +#include #elif defined(OS_LINUX) #include - #include -+#elif defined(OS_DRAGONFLY) -+#include +-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) + #include +-#elif !defined(__NetBSD__) +-#include +#elif defined(OS_FREEBSD) +#include +#if __FreeBSD_version > 802500 @@ -489,15 +481,24 @@ $NetBSD: patch-ipc_chromium_src_base_pla +extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") +#endif -+#include + #endif ++ ++#if !defined(OS_MACOSX) + #include #endif ++#if defined(OS_BSD) && !defined(OS_NETBSD) ++#include ++#endif ++ #if defined(OS_MACOSX) -@@ -38,9 +45,20 @@ + namespace base { + void InitThreading(); +@@ -38,9 +45,20 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); --#elif defined (__OpenBSD__) +-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#elif defined(OS_NETBSD) + return _lwp_self(); +#elif defined(OS_DRAGONFLY) @@ -517,6 +518,18 @@ $NetBSD: patch-ipc_chromium_src_base_pla #elif defined(OS_LINUX) return syscall(__NR_gettid); #endif +@@ -102,9 +102,9 @@ void PlatformThread::SetName(const char* name) { + // Note that glibc also has a 'pthread_setname_np' api, but it may not be + // available everywhere and it's only benefit over using prctl directly is + // that it can set the name of threads other than the current thread. +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) ++#if defined(OS_BSD) && !defined(OS_NETBSD) + pthread_set_name_np(pthread_self(), name); +-#elif defined(__NetBSD__) ++#elif defined(OS_NETBSD) + 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 $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -558,7 +571,7 @@ $NetBSD: patch-ipc_chromium_src_base_pro --- 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. @@ -593,6 +606,20 @@ $NetBSD: patch-ipc_chromium_src_base_pro +#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 @@ -641,6 +668,17 @@ $NetBSD: patch-ipc_chromium_src_base_pro + 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]; @@ -755,6 +793,17 @@ $NetBSD: patch-ipc_chromium_src_base_pro + 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; @@ -777,19 +826,32 @@ $NetBSD: patch-ipc_chromium_src_base_pro + + 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); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***