Attachment #162779 for bug #204277




.elif ${gecko_ARGS:Mfirefox}

_GECKO_DEFAULT_VERSION=	38
_GECKO_VERSIONS=		38 42
_GECKO_TYPE=	firefox

# Dependence lines for different Firefox versions
38_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
42_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox

.if exists(${LOCALBASE}/bin/firefox)
_GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null




# $FreeBSD$

PORTNAME=	firefox
DISTVERSION=	42.0
DISTVERSIONSUFFIX=.source
PORTEPOCH=	1
CATEGORIES=	www ipv6

MAINTAINER=	gecko@FreeBSD.org
COMMENT=	Web browser based on the browser portion of Mozilla

BUILD_DEPENDS=	nspr>=4.10.10:${PORTSDIR}/devel/nspr \
		nss>=3.19.2:${PORTSDIR}/security/nss \
		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \

		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
		zip:${PORTSDIR}/archivers/zip \
		unzip:${PORTSDIR}/archivers/unzip \
		libav>0:${PORTSDIR}/multimedia/libav

LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l


QT_NONSTANDARD=	yes
USE_GL=		gl
USES=		dos2unix tar:xz

DOS2UNIX_FILES=	media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp

FIREFOX_ICON=		${MOZILLA}.png

FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
		--enable-application=browser \
		--enable-official-branding --with-system-av

OPTIONS_EXCLUDE=	LOGGING
OPTIONS_DEFAULT=	GTK2

.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>

WRKSRC:=	${WRKDIR}/${PORTNAME}-${PORTVERSION}

.if ${PORT_OPTIONS:MALSA}
RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib

Lines 1-2 Link Here

(-)www/firefox/distinfo (-2 / +2 lines)
1	SHA256 (firefox-41.0.2.source.tar.xz) = ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e	1	SHA256 (firefox-42.0.source.tar.xz) = 994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae
2	SIZE (firefox-41.0.2.source.tar.xz) = 159761468	2	SIZE (firefox-42.0.source.tar.xz) = 165766832

Lines 1-6 Link Here

(-)www/firefox/files/patch-browser-app-nsBrowserApp.cpp (-1 / +1 lines)
1	--- browser/app/nsBrowserApp.cpp~	1	--- browser/app/nsBrowserApp.cpp~
2	+++ browser/app/nsBrowserApp.cpp	2	+++ browser/app/nsBrowserApp.cpp
3	@@ -417,6 +417,8 @@ int main(int argc, char* argv[])	3	@@ -338,6 +338,8 @@ int main(int argc, char* argv[])
4	TriggerQuirks();	4	TriggerQuirks();
5	#endif	5	#endif
6		6




--- dom/mobilemessage/MobileMessageManager.h.orig	2015-09-17 22:13:25 UTC
+++ dom/mobilemessage/MobileMessageManager.h
@@ -14,11 +14,11 @@
 class nsISmsService;
 class nsIDOMMozSmsMessage;
 class nsIDOMMozMmsMessage;
-class Promise;
 
 namespace mozilla {
 namespace dom {
 
+class Promise;
 class DOMRequest;
 class DOMCursor;
 struct MmsParameters;




--- mfbt/Alignment.h.orig	2015-10-29 22:17:54.000000000 +0000
+++ mfbt/Alignment.h	2015-11-03 21:24:20.123910000 +0000
@@ -44,7 +45,10 @@
+++ mfbt/Alignment.h
@@ -9,11 +9,20 @@
 #ifndef mozilla_Alignment_h
 #define mozilla_Alignment_h
 
+#include "mozilla/Attributes.h"
+
 #include <stddef.h>
 #include <stdint.h>
 
 namespace mozilla {
 
+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
+#define MOZ_ALIGNOF(T) alignof(T)
+#elif defined(__GNUC__)
+#define MOZ_ALIGNOF(T) __alignof__(T)
+#elif defined(_MSC_VER)
+#define MOZ_ALIGNOF(T) __alignof(T)
+#else
 /*
  * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
  * bytes of alignment a given type needs.
@@ -32,6 +41,7 @@ public:
 };
 
 #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
+#endif
 
 /*
  * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
@@ -43,7 +53,10 @@ public:
  * will declare a two-character array |arr| aligned to 8 bytes.
  */
 

 #  define MOZ_ALIGNED_DECL(_type, _align) \
      _type __attribute__((aligned(_align)))
 #elif defined(_MSC_VER)
diff --git mfbt/Attributes.h mfbt/Attributes.h
index d317766..ddb13da 100644
--- mfbt/Attributes.h
+++ mfbt/Attributes.h
@@ -50,6 +50,7 @@
  * don't indicate support for them here, due to
  * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
  */
+#  define MOZ_HAVE_CXX11_ALIGNAS
 #  define MOZ_HAVE_NEVER_INLINE          __declspec(noinline)
 #  define MOZ_HAVE_NORETURN              __declspec(noreturn)
 #  ifdef __clang__
@@ -70,6 +71,9 @@
 #  ifndef __has_extension
 #    define __has_extension __has_feature /* compatibility, for older versions of clang */
 #  endif
+#  if __has_extension(cxx_alignas)
+#    define MOZ_HAVE_CXX11_ALIGNAS
+#  endif
 #  if __has_extension(cxx_constexpr)
 #    define MOZ_HAVE_CXX11_CONSTEXPR
 #  endif
@@ -86,6 +90,7 @@
 #  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
 #    define MOZ_HAVE_CXX11_CONSTEXPR
 #    if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
+#      define MOZ_HAVE_CXX11_ALIGNAS
 #      define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
 #    endif
 #    define MOZ_HAVE_EXPLICIT_CONVERSION

Lines 174-180 Link Here

(-)www/firefox/files/patch-bug847568 (-1 / +1 lines)
174	index 1d0c2f9..adb8941 100644	174	index 1d0c2f9..adb8941 100644
175	--- gfx/skia/moz.build	175	--- gfx/skia/moz.build
176	+++ gfx/skia/moz.build	176	+++ gfx/skia/moz.build
177	@@ -970,6 +970,9 @@ if CONFIG['GNU_CXX']:	177	@@ -675,6 +675,9 @@ if CONFIG['GNU_CXX']:
178	if CONFIG['CPU_ARCH'] == 'arm':	178	if CONFIG['CPU_ARCH'] == 'arm':
179	SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']	179	SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
180		180




--- dom/system/OSFileConstants.cpp.orig	2015-10-29 22:17:58.000000000 +0000
+++ dom/system/OSFileConstants.cpp	2015-11-03 21:39:09.106304000 +0000
@@ -662,7 +662,7 @@
+++ dom/system/OSFileConstants.cpp
@@ -596,7 +596,7 @@ static const dom::ConstantSpec gLibcProperties[] =
 
   { "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) },
 
-  { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) },
+  { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) },
   { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) },
 
 #endif // defined(XP_UNIX)
diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
index b59fca4..0cf220b 100644
--- toolkit/components/osfile/modules/osfile_unix_back.jsm
+++ toolkit/components/osfile/modules/osfile_unix_back.jsm
@@ -228,8 +228,8 @@
          let statvfs = new SharedAll.HollowStructure("statvfs",
            Const.OSFILE_SIZEOF_STATVFS);
 
-         statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
-                        "f_bsize", Type.unsigned_long.implementation);
+         statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
+                        "f_frsize", Type.unsigned_long.implementation);
          statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
                         "f_bavail", Type.fsblkcnt_t.implementation);
 
diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm
index 99e5e9b..de642c5 100644
--- toolkit/components/osfile/modules/osfile_unix_front.jsm
+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
@@ -373,7 +373,7 @@
        throw_on_negative("statvfs",  UnixFile.statvfs(sourcePath, fileSystemInfoPtr));
 
        let bytes = new Type.uint64_t.implementation(
-                        fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
+                        fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
 
        return bytes.value;
      };

Lines 1-10 Link Here

(-)www/firefox/files/patch-memory-jemalloc-Makefile.in (-6 / +7 lines)
1	--- memory/jemalloc/Makefile.in~	1	--- memory/mozjemalloc/Makefile.in.orig 2015-11-03 22:02:29.393485000 +0000
2	+++ memory/jemalloc/Makefile.in	2	+++ memory/mozjemalloc/Makefile.in 2015-11-03 22:02:40.241624000 +0000
3	@@ -7,3 +7,7 @@ include $(topsrcdir)/config/rules.mk	3	@@ -17,3 +17,8 @@ endif
4	ifdef GNU_CC
5	CFLAGS += -std=gnu99
6	endif	4	endif
7	+	5	endif
		6
		7	+include $(topsrcdir)/config/config.mk
		8	+
8	+# XXX startup crash workaround for gcc47 on amd64	9	+# XXX startup crash workaround for gcc47 on amd64
9	+jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS))	10	+jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS))
10	+jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=	11	+jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=




--- configure.in
+++ configure.in
@@ -6404,74 +6404,6 @@ elif test -n "$MOZ_LIBJPEG_TURBO"; then
 fi
 
 dnl ========================================================
-dnl = libav-fft configuration
-dnl ========================================================
-
-MOZ_LIBAV_FFT=
-
-dnl Turn on libav-fft for 32-bit windows, and all 64-bit supported platforms.
-dnl 32-bit linux/os x have text relocation issues.
-
-case "$OS_ARCH:$CPU_ARCH" in
-  WINNT:x86)
-      MOZ_LIBAV_FFT=1
-  ;;
-  *:x86_64)
-      MOZ_LIBAV_FFT=1
-  ;;
-esac
-
-dnl Detect if we can use yasm to compile libav's assembly
-
-if test -n "$MOZ_LIBAV_FFT"; then
-  AC_DEFINE(MOZ_LIBAV_FFT)
-  dnl Do we support libav-fft on this platform?
-  case "$OS_ARCH:$CPU_ARCH" in
-  Darwin:x86_64)
-    LIBAV_FFT_ASFLAGS="-f macho64 -rnasm -pnasm -D__x86_64__ -DPIC -DMACHO"
-  ;;
-  WINNT:x86)
-    LIBAV_FFT_ASFLAGS="-f win32 -rnasm -pnasm -DPIC -DWIN32"
-  ;;
-  WINNT:x86_64)
-    LIBAV_FFT_ASFLAGS="-f win64 -rnasm -pnasm -D__x86_64__ -DPIC -DWIN64 -DMSVC"
-  ;;
-  *:x86_64)
-    if $CC -E -dM -</dev/null | grep -q __ELF__; then
-      LIBAV_FFT_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
-    fi
-  ;;
-  *)
-    AC_MSG_ERROR([libav's FFT routines are only available for 32-bit windows or 64-bit x86 based platforms.])
-  ;;
-  esac
-fi
-
-if test -n "$LIBAV_FFT_ASFLAGS"; then
-  dnl If we're on an x86 or x64 system which supports libav-fft's asm routines
-  dnl check for Yasm, and error out if it doesn't exist or we have too old of a
-  dnl version.
-  LIBAV_FFT_AS=$YASM
-  if test -z "$LIBAV_FFT_AS" ; then
-    AC_MSG_ERROR([Yasm is required to build with libav's optimized FFT routines, but you do not appear to have Yasm installed. See https://developer.mozilla.org/en/YASM for more details.])
-  fi
-  dnl Check that we have the right yasm version.  We require 1.0.1 or newer
-  dnl on Linux and 1.1 or newer everywhere else.
-  if test "$OS_ARCH" = "Linux" ; then
-    if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -eq "0" -a "$_YASM_RELEASE" -lt "1" \) ; then
-      AC_MSG_ERROR([Yasm 1.0.1 or greater is required to build with libav's optimized FFT routines, but you do not appear to have Yasm installed.  See https://developer.mozilla.org/en/YASM for more details.])
-    fi
-  else
-    if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then
-      AC_MSG_ERROR([Yasm 1.1 or greater is required to build with libav's optimized FFT routines, but you do not appear to have Yasm installed.  See https://developer.mozilla.org/en/YASM for more details.])
-    fi
-  fi
-elif test -n "$MOZ_LIBAV_FFT" -a "${CPU_ARCH}" != "arm"; then
-  dnl Warn if we're not building either libav or opendl-max optimized routines.
-  AC_MSG_WARN([No assembler or assembly support for libav-fft.  Using unoptimized C routines.])
-fi
-
-dnl ========================================================
 dnl = Enable compilation of specific extension modules
 dnl ========================================================
 

Line 0 Link Here

(-)www/firefox/files/patch-nslib (+10 lines)
	1	--- toolkit/system/unixproxy/nsLibProxySettings.cpp.orig 2015-11-04 09:28:20.503528000 +0100
	2	+++ toolkit/system/unixproxy/nsLibProxySettings.cpp 2015-11-04 09:28:48.544958000 +0100
	3	@@ -9,6 +9,7 @@
	4	#include "nsIURI.h"
	5	#include "nsString.h"
	6	#include "nsCOMPtr.h"
	7	+#include "nsNetCID.h"
	8	#include "nspr.h"
	9
	10	extern "C" {




--- ./dom/media/AudioStream.cpp.orig	2015-10-29 22:17:56.000000000 +0000
+++ ./dom/media/AudioStream.cpp	2015-11-04 04:07:11.782776000 +0000
@@ -129,7 +129,6 @@ AudioStream::AudioStream()
   , mOutChannels(0)
   , mWritten(0)
   , mAudioClock(this)
-  , mTimeStretcher(nullptr)
   , mLatencyRequest(HighLatency)
   , mReadPoint(0)
   , mDumpFile(nullptr)
@@ -152,9 +151,6 @@ AudioStream::~AudioStream()
   if (mDumpFile) {
     fclose(mDumpFile);
   }
-  if (mTimeStretcher) {
-    soundtouch::destroySoundTouchObj(mTimeStretcher);
-  }
 }
 
 size_t
@@ -177,7 +173,7 @@ nsresult AudioStream::EnsureTimeStretche
 {
   mMonitor.AssertCurrentThreadOwns();
   if (!mTimeStretcher) {
-    mTimeStretcher = soundtouch::createSoundTouchObj();
+    mTimeStretcher = new soundtouch::SoundTouch();
     mTimeStretcher->setSampleRate(mInRate);
     mTimeStretcher->setChannels(mOutChannels);
     mTimeStretcher->setPitch(1.0);
--- ./dom/media/AudioStream.h.orig	2015-10-29 22:17:56.000000000 +0000
+++ ./dom/media/AudioStream.h	2015-11-04 04:07:11.783405000 +0000
@@ -15,7 +15,7 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
 #include "CubebUtils.h"
-#include "soundtouch/SoundTouchFactory.h"
+#include "soundtouch/SoundTouch.h"
 
 namespace mozilla {
 
@@ -329,7 +329,7 @@ private:
   // Number of frames written to the buffers.
   int64_t mWritten;
   AudioClock mAudioClock;
-  soundtouch::SoundTouch* mTimeStretcher;
+  nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
   nsRefPtr<AsyncLatencyLogger> mLatencyLog;
 
   // copy of Latency logger's starting time for offset calculations
--- ./media/libsoundtouch/src/SoundTouchFactory.cpp.orig	2015-10-29 22:17:50.000000000 +0000
+++ ./media/libsoundtouch/src/SoundTouchFactory.cpp	2015-11-04 04:07:11.783823000 +0000
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include <soundtouch/SoundTouch.h>
-
-namespace soundtouch
-{
-
-EXPORT
-soundtouch::SoundTouch*
-createSoundTouchObj()
-{
-  return new soundtouch::SoundTouch();
-}
-
-EXPORT
-void
-destroySoundTouchObj(soundtouch::SoundTouch* aObj)
-{
-  // SoundTouch runs deletes in its destructor, meaning they need to be run in
-  // the DLL context. Gecko should send its SoundTouch obj pointers here to be
-  // cleaned up.
-  if (aObj) {
-    delete aObj;
-  }
-}
-
-}
--- ./media/libsoundtouch/src/SoundTouchFactory.h.orig	2015-10-29 22:17:50.000000000 +0000
+++ ./media/libsoundtouch/src/SoundTouchFactory.h	2015-11-04 04:07:11.784212000 +0000
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// Code for dealing with creating/deleting SoundTouch objects across DLL
-// boundaries.
-
-#include <soundtouch/STTypes.h>
-#include <soundtouch/SoundTouch.h>
-
-namespace soundtouch
-{
-EXPORT
-soundtouch::SoundTouch*
-createSoundTouchObj();
-
-EXPORT
-void
-destroySoundTouchObj(soundtouch::SoundTouch* aObj);
-}
--- ./media/libsoundtouch/src/moz.build.orig	2015-10-29 22:17:50.000000000 +0000
+++ ./media/libsoundtouch/src/moz.build	2015-11-04 04:07:11.784640000 +0000
@@ -8,7 +8,6 @@ EXPORTS.soundtouch += [
     'FIFOSamplePipe.h',
     'SoundTouch.h',
     'soundtouch_config.h',
-    'SoundTouchFactory.h',
     'STTypes.h',
 ]
 
@@ -22,7 +21,6 @@ UNIFIED_SOURCES += [
     'InterpolateShannon.cpp',
     'RateTransposer.cpp',
     'SoundTouch.cpp',
-    'SoundTouchFactory.cpp',
     'TDStretch.cpp',
 ]
 
--- ./media/libsoundtouch/src/soundtouch_perms.h.orig	2015-10-29 22:17:50.000000000 +0000
+++ ./media/libsoundtouch/src/soundtouch_perms.h	2015-11-04 04:07:11.785026000 +0000
@@ -12,7 +12,6 @@
 
 #pragma GCC visibility push(default)
 #include "SoundTouch.h"
-#include "SoundTouchFactory.h"
 #pragma GCC visibility pop
 
 #endif // MOZILLA_SOUNDTOUCH_PERMS_H




 ]
 
 DIRS += ['../../' + i for i in external_dirs]
diff --git config/system-headers config/system-headers
index bef567c..9807c29 100644
--- config/system-headers
+++ config/system-headers
@@ -1257,8 +1257,6 @@ X11/Xlocale.h
 X11/Xos.h
 X11/Xutil.h
 zmouse.h
-soundtouch/SoundTouch.h
-soundtouch/SoundTouchFactory.h
 #if MOZ_LIBAV_FFT==1
 libavcodec/avfft.h
 #endif
@@ -1323,6 +1321,7 @@ vorbis/codec.h
 theora/theoradec.h
 tremor/ivorbiscodec.h
 speex/speex_resampler.h

 ogg/ogg.h
 ogg/os_types.h
 nestegg/nestegg.h
@@ -1364,3 +1363,35 @@ graphite2/Segment.h
 harfbuzz/hb-ot.h
 harfbuzz/hb.h
 #endif

 dnl = Disable VP8 decoder support
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(webm,
diff --git dom/media/AudioStream.h dom/media/AudioStream.h
index 085676d..00c54fb 100644
--- dom/media/AudioStream.h
+++ dom/media/AudioStream.h
@@ -17,7 +17,7 @@
 #include "CubebUtils.h"
 
 namespace soundtouch {
-class SoundTouch;
+class MOZ_IMPORT_API SoundTouch;
 }
 
 namespace mozilla {
diff --git dom/media/moz.build dom/media/moz.build
index 7526cff..e0a0ca0 100644
--- dom/media/moz.build

Lines 2-8 Link Here

(-)www/firefox-i18n/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox-i18n	4	PORTNAME= firefox-i18n
5	PORTVERSION= 41.0.2	5	PORTVERSION= 42.0
6	CATEGORIES= www	6	CATEGORIES= www
7	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-i686/xpi \	7	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-i686/xpi \
8	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi	8	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
Lines 15-21 Link Here
15		15
16	EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip	16	EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip
17		17
18	USES= zip:infozip gecko:firefox,41,build	18	USES= zip:infozip gecko:firefox,42,build
19	USE_XPI= firefox linux-firefox	19	USE_XPI= firefox linux-firefox
20		20
21	NO_ARCH= yes	21	NO_ARCH= yes




SHA256 (xpi/firefox-i18n-42.0/ach.xpi) = 80b7f285d462ea72b49e482519c8d6265ad4767e89b1bfdc2e2d82eabff45be8
SIZE (xpi/firefox-i18n-42.0/ach.xpi) = 484101
SHA256 (xpi/firefox-i18n-42.0/af.xpi) = 087fc72613b98336eefc5db701b361188d7e3950365650651c2b53ced362eea6
SIZE (xpi/firefox-i18n-42.0/af.xpi) = 491004
SHA256 (xpi/firefox-i18n-42.0/an.xpi) = 7b99498a270e20066f9791e92841ee61a1da88b883c36e611cfe79a4abeb7285
SIZE (xpi/firefox-i18n-42.0/an.xpi) = 469526
SHA256 (xpi/firefox-i18n-42.0/ar.xpi) = c4bd2e007fffa25743e8f20f70baf3abcef6aee59b82fc1360a9a2ebf120da69
SIZE (xpi/firefox-i18n-42.0/ar.xpi) = 527045
SHA256 (xpi/firefox-i18n-42.0/as.xpi) = 397f51b49a9a5c754079561e5245e2e61508e61b1f1386e80fb9aaa91b4424c8
SIZE (xpi/firefox-i18n-42.0/as.xpi) = 516804
SHA256 (xpi/firefox-i18n-42.0/ast.xpi) = a6dd8e3b2439f047c8aa929050df202b1128f54a01c7d55e86a0d582c4372096
SIZE (xpi/firefox-i18n-42.0/ast.xpi) = 409860
SHA256 (xpi/firefox-i18n-42.0/az.xpi) = fe56a7bd0694dd42946cfc1723c4c7d2075f2588baff2ca742afd2761df434d0
SIZE (xpi/firefox-i18n-42.0/az.xpi) = 498264
SHA256 (xpi/firefox-i18n-42.0/be.xpi) = 0fb8d84bbe69b6402847fe9be3392e50f867a8949b3597947287d1cb5723e40d
SIZE (xpi/firefox-i18n-42.0/be.xpi) = 458684
SHA256 (xpi/firefox-i18n-42.0/bg.xpi) = 68f2334cbd91976b12de4d489d46f0a1a02720a02b848d0f1ead2d1475f94b35
SIZE (xpi/firefox-i18n-42.0/bg.xpi) = 497770
SHA256 (xpi/firefox-i18n-42.0/bn-BD.xpi) = c49c4df26fa1396efec68ddecde3947204baf7f5040c4380e4ab0742592db27e
SIZE (xpi/firefox-i18n-42.0/bn-BD.xpi) = 545583
SHA256 (xpi/firefox-i18n-42.0/bn-IN.xpi) = 5b91351ccdcf064eb22f8d3077573d94ed2005e434885535a6018532ca67dfba
SIZE (xpi/firefox-i18n-42.0/bn-IN.xpi) = 537276
SHA256 (xpi/firefox-i18n-42.0/br.xpi) = 5372bf36dbad0f368c6e1926c8c9d6ca40136f25c7dd818d933ca5568f3a1e9f
SIZE (xpi/firefox-i18n-42.0/br.xpi) = 449190
SHA256 (xpi/firefox-i18n-42.0/bs.xpi) = 78784ccf40c531ebecf58bedf96db046a9eed42062ca05c80c5ecc5d5dbb6f48
SIZE (xpi/firefox-i18n-42.0/bs.xpi) = 488131
SHA256 (xpi/firefox-i18n-42.0/ca.xpi) = f60be77d1edc340303d0580d6da07812e5b536223859226cb26adc4b837fa5e9
SIZE (xpi/firefox-i18n-42.0/ca.xpi) = 465823
SHA256 (xpi/firefox-i18n-42.0/cs.xpi) = ff4f81fbc34e17b6c742a20927a8dee0dc7cdf8743d6c5219f898ffd0d750ba6
SIZE (xpi/firefox-i18n-42.0/cs.xpi) = 455106
SHA256 (xpi/firefox-i18n-42.0/cy.xpi) = 3d01d9210c7bd2708f99add6299c089654030a8b47e87e9a6debb9d58ab2eeeb
SIZE (xpi/firefox-i18n-42.0/cy.xpi) = 451680
SHA256 (xpi/firefox-i18n-42.0/da.xpi) = af056943a836fb36b8433e64e9b3003452280787ae155518559b1525d3566368
SIZE (xpi/firefox-i18n-42.0/da.xpi) = 458413
SHA256 (xpi/firefox-i18n-42.0/de.xpi) = 0301696932c69da60274dc19de58d50cc6a8beabb0387ad4d4526bdba1557790
SIZE (xpi/firefox-i18n-42.0/de.xpi) = 460744
SHA256 (xpi/firefox-i18n-42.0/dsb.xpi) = b6a5a998fad95e082b4c94b69c36680de7c5908efb85e222c4f9448f233458ee
SIZE (xpi/firefox-i18n-42.0/dsb.xpi) = 479637
SHA256 (xpi/firefox-i18n-42.0/el.xpi) = 93479275cc21ce09597de19b841642120100ab00916f23ed9bfd71bb67cfd9b6
SIZE (xpi/firefox-i18n-42.0/el.xpi) = 505735
SHA256 (xpi/firefox-i18n-42.0/en-GB.xpi) = e282b2425bbbb60a3eebfa3e16cb6d747a72da505ee2a48378ee2d08dba6ab57
SIZE (xpi/firefox-i18n-42.0/en-GB.xpi) = 443856
SHA256 (xpi/firefox-i18n-42.0/en-US.xpi) = 9bf74eaccbe740c513be7e406f582907c578838b6d0f14e4c346689490517167
SIZE (xpi/firefox-i18n-42.0/en-US.xpi) = 475844
SHA256 (xpi/firefox-i18n-42.0/en-ZA.xpi) = 0ea29117a55aca8acab2df176790c1024510ac5db23b61ccccb14223fbd12b3d
SIZE (xpi/firefox-i18n-42.0/en-ZA.xpi) = 449903
SHA256 (xpi/firefox-i18n-42.0/eo.xpi) = f4c24c83b2dd4ece852d4bba0ce902233408eaf45aed5185b9f462d737d6d527
SIZE (xpi/firefox-i18n-42.0/eo.xpi) = 491605
SHA256 (xpi/firefox-i18n-42.0/es-AR.xpi) = 92fc906a1957ca00d8bdfde61fcc59feb367338857b3f2740ac15ae6931c2127
SIZE (xpi/firefox-i18n-42.0/es-AR.xpi) = 459408
SHA256 (xpi/firefox-i18n-42.0/es-CL.xpi) = 776b59c03dbabda037e65902b1a87c6634beca0449cd9c35f300db64d88d5fc9
SIZE (xpi/firefox-i18n-42.0/es-CL.xpi) = 386944
SHA256 (xpi/firefox-i18n-42.0/es-ES.xpi) = 1abbe63ebcd37cf44ad6d60759916d81f272910b9edcda0e36ab16090ba2e629
SIZE (xpi/firefox-i18n-42.0/es-ES.xpi) = 373753
SHA256 (xpi/firefox-i18n-42.0/es-MX.xpi) = 041dcad0d1840f79ae1f4769796aa080c9834261ede4e55f55300411808b940b
SIZE (xpi/firefox-i18n-42.0/es-MX.xpi) = 465414
SHA256 (xpi/firefox-i18n-42.0/et.xpi) = af4b17647e9e88652b352aa40b3aae87c254d025e8fd488c08b0f96d82176e07
SIZE (xpi/firefox-i18n-42.0/et.xpi) = 450258
SHA256 (xpi/firefox-i18n-42.0/eu.xpi) = cfe32d285ffe379aa7307d4de3fb639ffb961b1ebba857406f12cc15e7f61b64
SIZE (xpi/firefox-i18n-42.0/eu.xpi) = 474713
SHA256 (xpi/firefox-i18n-42.0/fa.xpi) = 5c0dbc5f709145ca93e89e0ad67c688821a3080476f5202c987d9d2b035800ce
SIZE (xpi/firefox-i18n-42.0/fa.xpi) = 526702
SHA256 (xpi/firefox-i18n-42.0/ff.xpi) = d43f31eae539b6616f88e7dc0023eef4e4e64940ca4f625ab983fc52e7135321
SIZE (xpi/firefox-i18n-42.0/ff.xpi) = 461016
SHA256 (xpi/firefox-i18n-42.0/fi.xpi) = 6db03ffb84a02132ad852a9e6a223834ba00182ce34fab5e19b7c16dad6d2269
SIZE (xpi/firefox-i18n-42.0/fi.xpi) = 452032
SHA256 (xpi/firefox-i18n-42.0/fr.xpi) = 8eeec5d50b169f4102921941dfd43c8bb02f82e82c8f6a38a291c322914f17ce
SIZE (xpi/firefox-i18n-42.0/fr.xpi) = 470271
SHA256 (xpi/firefox-i18n-42.0/fy-NL.xpi) = 2471d52f5bfeb516e7569b8fd0167109d46ec4c2fc774f8c93bca2809f3dc47f
SIZE (xpi/firefox-i18n-42.0/fy-NL.xpi) = 463484
SHA256 (xpi/firefox-i18n-42.0/ga-IE.xpi) = fa5cda49e9284d9dae817132cdbfee504078e2140b4bfe18ead9089dce790f37
SIZE (xpi/firefox-i18n-42.0/ga-IE.xpi) = 476090
SHA256 (xpi/firefox-i18n-42.0/gd.xpi) = a41b6b5a51cd8dfab903a74086c26c8b6c2c05705d256b801f40530575e5d5a0
SIZE (xpi/firefox-i18n-42.0/gd.xpi) = 462140
SHA256 (xpi/firefox-i18n-42.0/gl.xpi) = fc16ccf790b551df573b9de347eeb36719fdb98af44f9afa4ebd2c67853e1587
SIZE (xpi/firefox-i18n-42.0/gl.xpi) = 451687
SHA256 (xpi/firefox-i18n-42.0/gu-IN.xpi) = 28e86b4cdbb7c1af4a00b7968a1c79005f594af9f44c4ff940686cecea8ea9cb
SIZE (xpi/firefox-i18n-42.0/gu-IN.xpi) = 492282
SHA256 (xpi/firefox-i18n-42.0/he.xpi) = c86ff630372f014409b8ff97ba10eed5b267cb90f74fca5958c3d988c00f96ff
SIZE (xpi/firefox-i18n-42.0/he.xpi) = 481468
SHA256 (xpi/firefox-i18n-42.0/hi-IN.xpi) = 4bf1ebfd071d5393b9cc8503732bbf5e6afd7534f7bf5b1e67a105cf8882a602
SIZE (xpi/firefox-i18n-42.0/hi-IN.xpi) = 515516
SHA256 (xpi/firefox-i18n-42.0/hr.xpi) = f60a9effb51f85d798528ef947c37dd40e9e11f4c7081371ef1a2c184d51fbd7
SIZE (xpi/firefox-i18n-42.0/hr.xpi) = 486308
SHA256 (xpi/firefox-i18n-42.0/hsb.xpi) = ba43533196c1de882708e3f2c5f33508bdbedbf3987a060e51891b3cbdfdb5df
SIZE (xpi/firefox-i18n-42.0/hsb.xpi) = 477291
SHA256 (xpi/firefox-i18n-42.0/hu.xpi) = d6e158f3b5c4fe9745feed9be76276898c4d06a34c6af41e9d6f7d9574c1cb02
SIZE (xpi/firefox-i18n-42.0/hu.xpi) = 461934
SHA256 (xpi/firefox-i18n-42.0/hy-AM.xpi) = 20d38d82634a0f7fac0aba10cd33def9bd07860343f50b51b977e9ba9d4298e0
SIZE (xpi/firefox-i18n-42.0/hy-AM.xpi) = 544379
SHA256 (xpi/firefox-i18n-42.0/id.xpi) = a9b186a33c58dc26eacfd23b77eb3fb07a4169a65043ae6454f53a3076c8f361
SIZE (xpi/firefox-i18n-42.0/id.xpi) = 438845
SHA256 (xpi/firefox-i18n-42.0/is.xpi) = 36d483f995a23672548076cf493bb5d74067194e45357fcdaa8ccf89f081e54e
SIZE (xpi/firefox-i18n-42.0/is.xpi) = 493033
SHA256 (xpi/firefox-i18n-42.0/it.xpi) = 12f52bcd404059126fd5291e185e152b65a22cc80562c736cf441088ea7e8659
SIZE (xpi/firefox-i18n-42.0/it.xpi) = 367659
SHA256 (xpi/firefox-i18n-42.0/ja.xpi) = 836403f5c69d4ce9304d123de794acfb297870b5dea084c8c5dc1f2d2fa88ba8
SIZE (xpi/firefox-i18n-42.0/ja.xpi) = 488656
SHA256 (xpi/firefox-i18n-42.0/kk.xpi) = c956039afb31cdbc87177e9da7604dea5f396971cc005ba2b2f39bcccd07f0c9
SIZE (xpi/firefox-i18n-42.0/kk.xpi) = 513387
SHA256 (xpi/firefox-i18n-42.0/km.xpi) = 831517e7a4526a8fe66bed319f07f3043a2b59d8f335e087468be241ee73d055
SIZE (xpi/firefox-i18n-42.0/km.xpi) = 578547
SHA256 (xpi/firefox-i18n-42.0/kn.xpi) = 85f1b02e7dad0eff2df2d42f0f48ac7c87ee4ae3074304a07dbf72826de3fff5
SIZE (xpi/firefox-i18n-42.0/kn.xpi) = 544136
SHA256 (xpi/firefox-i18n-42.0/ko.xpi) = 5ba6764e73adbd14eea69b6fdef7bed1302ae79a3fbefc84a99846f6c8424277
SIZE (xpi/firefox-i18n-42.0/ko.xpi) = 474547
SHA256 (xpi/firefox-i18n-42.0/lij.xpi) = 7b926543d7ba6e3ba3bcd62846715f88ba2b08ccb069174e1c93817c4ed30270
SIZE (xpi/firefox-i18n-42.0/lij.xpi) = 456396
SHA256 (xpi/firefox-i18n-42.0/lt.xpi) = 9cea89aec036c26dbb25ac560045ea31014bfdc799735894439ef081c84e724d
SIZE (xpi/firefox-i18n-42.0/lt.xpi) = 495227
SHA256 (xpi/firefox-i18n-42.0/lv.xpi) = dead267a4f72a36ce73119f9d37cd62ee8c9aca800886c744ce3a7b871d232b5
SIZE (xpi/firefox-i18n-42.0/lv.xpi) = 475294
SHA256 (xpi/firefox-i18n-42.0/mai.xpi) = 8fc086207679c75f6d4165d4a12333871078e60aa0476249409fcf3ac05ed284
SIZE (xpi/firefox-i18n-42.0/mai.xpi) = 523801
SHA256 (xpi/firefox-i18n-42.0/mk.xpi) = 5dabd571b25070ba83b7bc539a150714001339e7a986df8b364424b1312109d1
SIZE (xpi/firefox-i18n-42.0/mk.xpi) = 535199
SHA256 (xpi/firefox-i18n-42.0/ml.xpi) = 7345b33597ecad8e9306f5f483b872d4d62c86561b3bfd7eb514853f67f9a86a
SIZE (xpi/firefox-i18n-42.0/ml.xpi) = 533776
SHA256 (xpi/firefox-i18n-42.0/mr.xpi) = 734a252d6a87a468568ac8ebdf9cf2e2ddb692997b67890ba846001cbacfe1f8
SIZE (xpi/firefox-i18n-42.0/mr.xpi) = 522304
SHA256 (xpi/firefox-i18n-42.0/ms.xpi) = cf16f7c807915297a132ad8d71fe20012c54eb82f8153f66b954b71a143cccc7
SIZE (xpi/firefox-i18n-42.0/ms.xpi) = 497644
SHA256 (xpi/firefox-i18n-42.0/nb-NO.xpi) = f18376647b559b56b94dd54a92c4589dd4313e18870f7c5ccde520ab5baaaac2
SIZE (xpi/firefox-i18n-42.0/nb-NO.xpi) = 453245
SHA256 (xpi/firefox-i18n-42.0/nl.xpi) = a2470132d8b8a80b71471527a4c2468e7cd9e2440e1666950c591e09f78138bd
SIZE (xpi/firefox-i18n-42.0/nl.xpi) = 451272
SHA256 (xpi/firefox-i18n-42.0/nn-NO.xpi) = 4bff7cf5b4178a6d85da579ad1356af88d332d9b48cfbfaa067d51c8f190dd27
SIZE (xpi/firefox-i18n-42.0/nn-NO.xpi) = 447406
SHA256 (xpi/firefox-i18n-42.0/or.xpi) = c3f211d325a7bac64c71b239ccc95918153f5d5ae987b29031245bf7475eb329
SIZE (xpi/firefox-i18n-42.0/or.xpi) = 533314
SHA256 (xpi/firefox-i18n-42.0/pa-IN.xpi) = af2e3dec61be29064b9a72846fd1148f0ff02e7e2290a3ed60077e932cdb614a
SIZE (xpi/firefox-i18n-42.0/pa-IN.xpi) = 507205
SHA256 (xpi/firefox-i18n-42.0/pl.xpi) = 34498568481fc7d720742e2add62e0ea55c6150bf90abc3040186ca5d26881f2
SIZE (xpi/firefox-i18n-42.0/pl.xpi) = 403227
SHA256 (xpi/firefox-i18n-42.0/pt-BR.xpi) = b0c9a80cd76142fd9886fd70a141dc0d8e4203e8fbdb72b649c84ee3b0d373bf
SIZE (xpi/firefox-i18n-42.0/pt-BR.xpi) = 468096
SHA256 (xpi/firefox-i18n-42.0/pt-PT.xpi) = 63b5e59bd240b67fe683618b9be9d824ae8f77133d8345889b32ba0930d77687
SIZE (xpi/firefox-i18n-42.0/pt-PT.xpi) = 448920
SHA256 (xpi/firefox-i18n-42.0/rm.xpi) = d5ab15132c13db755ec05efbf255a53ae4411d2724ecc5ecc5bda08c4eef5681
SIZE (xpi/firefox-i18n-42.0/rm.xpi) = 454529
SHA256 (xpi/firefox-i18n-42.0/ro.xpi) = d62cff13bc6ae437f1a224ad2e11e8d4de338f8b6b3e405baa1d8c0764b7edef
SIZE (xpi/firefox-i18n-42.0/ro.xpi) = 502634
SHA256 (xpi/firefox-i18n-42.0/ru.xpi) = ac454a85ea58c5a3297550fe7a10eef8487f37bb0310df4a5a9fb533d7c1c712
SIZE (xpi/firefox-i18n-42.0/ru.xpi) = 416137
SHA256 (xpi/firefox-i18n-42.0/si.xpi) = 763543a1f7433309be01d89e30436b7bff4fcd2b50e8f496f54be26f0c730688
SIZE (xpi/firefox-i18n-42.0/si.xpi) = 543889
SHA256 (xpi/firefox-i18n-42.0/sk.xpi) = beb7004124240fd83f64841ff415cb692aab327b5ac925e6db27e4b9ba7f01ca
SIZE (xpi/firefox-i18n-42.0/sk.xpi) = 477255
SHA256 (xpi/firefox-i18n-42.0/sl.xpi) = 0079e2ca640efe4d2c7dd29a570634cc5072f632bf064149bf9b9d8f3aa518d8
SIZE (xpi/firefox-i18n-42.0/sl.xpi) = 450532
SHA256 (xpi/firefox-i18n-42.0/son.xpi) = 811356dfb2552f5c2d2832b7a208233e27eeab1e064d694cf36532ddcbfc458d
SIZE (xpi/firefox-i18n-42.0/son.xpi) = 457298
SHA256 (xpi/firefox-i18n-42.0/sq.xpi) = fabeef51543439772b6ef5643d0ac57ec196d64c6ef83e75ddcd275dc6624a81
SIZE (xpi/firefox-i18n-42.0/sq.xpi) = 494612
SHA256 (xpi/firefox-i18n-42.0/sr.xpi) = 692019f3542e0da8ff64589b488eab0d7e6d16906655d5a86ebcc53c00731edc
SIZE (xpi/firefox-i18n-42.0/sr.xpi) = 486210
SHA256 (xpi/firefox-i18n-42.0/sv-SE.xpi) = 6e7e0eff3c480a302fa0ed1a4ed720ac432f0819c55549afc6bda028ea1b23a5
SIZE (xpi/firefox-i18n-42.0/sv-SE.xpi) = 460188
SHA256 (xpi/firefox-i18n-42.0/ta.xpi) = 542761640fbe8dd6cf3e60be45a12735bbfe6c38c96b0073833544c85c5cf10a
SIZE (xpi/firefox-i18n-42.0/ta.xpi) = 515601
SHA256 (xpi/firefox-i18n-42.0/te.xpi) = 7287fc6577b0892df46ea1fc2f185fc73ad94c4d8050cdd3a4be47150f1f7a2e
SIZE (xpi/firefox-i18n-42.0/te.xpi) = 532920
SHA256 (xpi/firefox-i18n-42.0/th.xpi) = f254f7c40a194ae3c082d9b77f155fc290b0e6abe969d7c06788ea7abe4039ad
SIZE (xpi/firefox-i18n-42.0/th.xpi) = 542239
SHA256 (xpi/firefox-i18n-42.0/tr.xpi) = f343c4f3b2cb5541fc9f98d5953101f5e5d1ee1d5c30968d6564828c5701119b
SIZE (xpi/firefox-i18n-42.0/tr.xpi) = 489512
SHA256 (xpi/firefox-i18n-42.0/uk.xpi) = 88c881749bae293d9614a77ed9458345399573a6ab5583626ef98041ae78da32
SIZE (xpi/firefox-i18n-42.0/uk.xpi) = 505718
SHA256 (xpi/firefox-i18n-42.0/uz.xpi) = faeacd2ec9af20cde5032415f0bbeba487ed4d276f778672ae6a340615099725
SIZE (xpi/firefox-i18n-42.0/uz.xpi) = 505180
SHA256 (xpi/firefox-i18n-42.0/vi.xpi) = 1481521a62561266ea14389cdb579b1757e791a5473c981e399aa9bff14ddcdd
SIZE (xpi/firefox-i18n-42.0/vi.xpi) = 472290
SHA256 (xpi/firefox-i18n-42.0/xh.xpi) = 1a1776e5770dd361d0adc85ed80bb1e81dd5436a0727009b91cb89e92e4d381e
SIZE (xpi/firefox-i18n-42.0/xh.xpi) = 455527
SHA256 (xpi/firefox-i18n-42.0/zh-CN.xpi) = 46bb4b1b67494004441135dbf3051501e0580fb8da29548de73f2e0fe12f7834
SIZE (xpi/firefox-i18n-42.0/zh-CN.xpi) = 491278
SHA256 (xpi/firefox-i18n-42.0/zh-TW.xpi) = ef4e9b5e01b85564b935a5f9bc663ffac61ce0f3ca166c316b1aee648832d458
SIZE (xpi/firefox-i18n-42.0/zh-TW.xpi) = 482387

Return to bug 204277

Lines 37-48 Link Here

(-)Mk/Uses/gecko.mk (-2 / +2 lines)
37	.elif ${gecko_ARGS:Mfirefox}	37	.elif ${gecko_ARGS:Mfirefox}
38		38
39	_GECKO_DEFAULT_VERSION= 38	39	_GECKO_DEFAULT_VERSION= 38
40	_GECKO_VERSIONS= 38 41	40	_GECKO_VERSIONS= 38 42
41	_GECKO_TYPE= firefox	41	_GECKO_TYPE= firefox
42		42
43	# Dependence lines for different Firefox versions	43	# Dependence lines for different Firefox versions
44	38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr	44	38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
45	41_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox	45	42_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
46		46
47	.if exists(${LOCALBASE}/bin/firefox)	47	.if exists(${LOCALBASE}/bin/firefox)
48	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null	48	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null

Lines 2-8 Link Here

(-)www/firefox/Makefile (-6 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 41.0.2	5	DISTVERSION= 42.0
6	DISTVERSIONSUFFIX=.source	6	DISTVERSIONSUFFIX=.source
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= www ipv6	8	CATEGORIES= www ipv6
Lines 12-18 Link Here
12	MAINTAINER= gecko@FreeBSD.org	12	MAINTAINER= gecko@FreeBSD.org
13	COMMENT= Web browser based on the browser portion of Mozilla	13	COMMENT= Web browser based on the browser portion of Mozilla
14		14
15	BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \	15	BUILD_DEPENDS= nspr>=4.10.10:${PORTSDIR}/devel/nspr \
16	nss>=3.19.2:${PORTSDIR}/security/nss \	16	nss>=3.19.2:${PORTSDIR}/security/nss \
17	libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \	17	libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
18	soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \	18	soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
Lines 25-32 Link Here
25	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \	25	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
26	autoconf-2.13:${PORTSDIR}/devel/autoconf213 \	26	autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
27	zip:${PORTSDIR}/archivers/zip \	27	zip:${PORTSDIR}/archivers/zip \
28	unzip:${PORTSDIR}/archivers/unzip	28	unzip:${PORTSDIR}/archivers/unzip \
29	# opus>=1.1:${PORTSDIR}/audio/opus \	29	libav>0:${PORTSDIR}/multimedia/libav
30		30
31	LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l	31	LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
32		32
Lines 40-45 Link Here
40	QT_NONSTANDARD= yes	40	QT_NONSTANDARD= yes
41	USE_GL= gl	41	USE_GL= gl
42	USES= dos2unix tar:xz	42	USES= dos2unix tar:xz
		43
43	DOS2UNIX_FILES= media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	44	DOS2UNIX_FILES= media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
44		45
45	FIREFOX_ICON= ${MOZILLA}.png	46	FIREFOX_ICON= ${MOZILLA}.png
Lines 46-52 Link Here
46	FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png	47	FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
47	MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \	48	MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
48	--enable-application=browser \	49	--enable-application=browser \
49	--enable-official-branding	50	--enable-official-branding --with-system-av
50		51
51	OPTIONS_EXCLUDE= LOGGING	52	OPTIONS_EXCLUDE= LOGGING
52	OPTIONS_DEFAULT= GTK2	53	OPTIONS_DEFAULT= GTK2
Lines 57-63 Link Here
57	.include "${.CURDIR}/../../www/firefox/Makefile.options"	58	.include "${.CURDIR}/../../www/firefox/Makefile.options"
58	.include <bsd.port.pre.mk>	59	.include <bsd.port.pre.mk>
59		60
60	WRKSRC:= ${WRKDIR}/mozilla-release	61	WRKSRC:= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
61		62
62	.if ${PORT_OPTIONS:MALSA}	63	.if ${PORT_OPTIONS:MALSA}
63	RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib	64	RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib

Lines 1-15 Link Here

(-)www/firefox/files/patch-bug1181382 (-15 lines)
1	--- dom/mobilemessage/MobileMessageManager.h.orig 2015-09-17 22:13:25 UTC
2	+++ dom/mobilemessage/MobileMessageManager.h
3	@@ -14,11 +14,11 @@
4	class nsISmsService;
5	class nsIDOMMozSmsMessage;
6	class nsIDOMMozMmsMessage;
7	-class Promise;
8
9	namespace mozilla {
10	namespace dom {
11
12	+class Promise;
13	class DOMRequest;
14	class DOMCursor;
15	struct MmsParameters;

Lines 1-37 Link Here

(-)www/firefox/files/patch-bug779713 (-64 / +3 lines)
1	diff --git mfbt/Alignment.h mfbt/Alignment.h	1	--- mfbt/Alignment.h.orig 2015-10-29 22:17:54.000000000 +0000
2	index e0843ca..353ec36 100644	2	+++ mfbt/Alignment.h 2015-11-03 21:24:20.123910000 +0000
3	--- mfbt/Alignment.h	3	@@ -44,7 +45,10 @@
4	+++ mfbt/Alignment.h
5	@@ -9,11 +9,20 @@
6	#ifndef mozilla_Alignment_h
7	#define mozilla_Alignment_h
8
9	+#include "mozilla/Attributes.h"
10	+
11	#include <stddef.h>
12	#include <stdint.h>
13
14	namespace mozilla {
15
16	+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
17	+#define MOZ_ALIGNOF(T) alignof(T)
18	+#elif defined(__GNUC__)
19	+#define MOZ_ALIGNOF(T) __alignof__(T)
20	+#elif defined(_MSC_VER)
21	+#define MOZ_ALIGNOF(T) __alignof(T)
22	+#else
23	/*
24	* This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
25	* bytes of alignment a given type needs.
26	@@ -32,6 +41,7 @@ public:
27	};
28
29	#define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
30	+#endif
31
32	/*
33	* Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
34	@@ -43,7 +53,10 @@ public:
35	* will declare a two-character array \|arr\| aligned to 8 bytes.	4	* will declare a two-character array \|arr\| aligned to 8 bytes.
36	*/	5	*/
37		6
Lines 43-75 Link Here
43	# define MOZ_ALIGNED_DECL(_type, _align) \	12	# define MOZ_ALIGNED_DECL(_type, _align) \
44	_type __attribute__((aligned(_align)))	13	_type __attribute__((aligned(_align)))
45	#elif defined(_MSC_VER)	14	#elif defined(_MSC_VER)
46	diff --git mfbt/Attributes.h mfbt/Attributes.h
47	index d317766..ddb13da 100644
48	--- mfbt/Attributes.h
49	+++ mfbt/Attributes.h
50	@@ -50,6 +50,7 @@
51	* don't indicate support for them here, due to
52	* http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
53	*/
54	+# define MOZ_HAVE_CXX11_ALIGNAS
55	# define MOZ_HAVE_NEVER_INLINE __declspec(noinline)
56	# define MOZ_HAVE_NORETURN __declspec(noreturn)
57	# ifdef __clang__
58	@@ -70,6 +71,9 @@
59	# ifndef __has_extension
60	# define __has_extension __has_feature /* compatibility, for older versions of clang */
61	# endif
62	+# if __has_extension(cxx_alignas)
63	+# define MOZ_HAVE_CXX11_ALIGNAS
64	+# endif
65	# if __has_extension(cxx_constexpr)
66	# define MOZ_HAVE_CXX11_CONSTEXPR
67	# endif
68	@@ -86,6 +90,7 @@
69	# if defined(__GXX_EXPERIMENTAL_CXX0X__) \|\| __cplusplus >= 201103L
70	# define MOZ_HAVE_CXX11_CONSTEXPR
71	# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
72	+# define MOZ_HAVE_CXX11_ALIGNAS
73	# define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
74	# endif
75	# define MOZ_HAVE_EXPLICIT_CONVERSION

Lines 1-41 Link Here

(-)www/firefox/files/patch-bug981348 (-37 / +7 lines)
1	diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp	1	--- dom/system/OSFileConstants.cpp.orig 2015-10-29 22:17:58.000000000 +0000
2	index 4b21361..cb3be32 100644	2	+++ dom/system/OSFileConstants.cpp 2015-11-03 21:39:09.106304000 +0000
3	--- dom/system/OSFileConstants.cpp	3	@@ -662,7 +662,7 @@
4	+++ dom/system/OSFileConstants.cpp
5	@@ -596,7 +596,7 @@ static const dom::ConstantSpec gLibcProperties[] =
6		4
7	{ "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },	5	{ "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) },
8		6
9	- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },	7	- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) },
10	+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },	8	+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) },
11	{ "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },	9	{ "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) },
12		10
13	#endif // defined(XP_UNIX)	11	#endif // defined(XP_UNIX)
14	diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
15	index b59fca4..0cf220b 100644
16	--- toolkit/components/osfile/modules/osfile_unix_back.jsm
17	+++ toolkit/components/osfile/modules/osfile_unix_back.jsm
18	@@ -228,8 +228,8 @@
19	let statvfs = new SharedAll.HollowStructure("statvfs",
20	Const.OSFILE_SIZEOF_STATVFS);
21
22	- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
23	- "f_bsize", Type.unsigned_long.implementation);
24	+ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
25	+ "f_frsize", Type.unsigned_long.implementation);
26	statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
27	"f_bavail", Type.fsblkcnt_t.implementation);
28
29	diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm
30	index 99e5e9b..de642c5 100644
31	--- toolkit/components/osfile/modules/osfile_unix_front.jsm
32	+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
33	@@ -373,7 +373,7 @@
34	throw_on_negative("statvfs", UnixFile.statvfs(sourcePath, fileSystemInfoPtr));
35
36	let bytes = new Type.uint64_t.implementation(
37	- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
38	+ fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
39
40	return bytes.value;
41	};

Line 0 Link Here

(-)www/firefox/files/patch-noyasm (+77 lines)
		1	--- configure.in
		2	+++ configure.in
		3	@@ -6404,74 +6404,6 @@ elif test -n "$MOZ_LIBJPEG_TURBO"; then
		4	fi
		5
		6	dnl ========================================================
		7	-dnl = libav-fft configuration
		8	-dnl ========================================================
		9	-
		10	-MOZ_LIBAV_FFT=
		11	-
		12	-dnl Turn on libav-fft for 32-bit windows, and all 64-bit supported platforms.
		13	-dnl 32-bit linux/os x have text relocation issues.
		14	-
		15	-case "$OS_ARCH:$CPU_ARCH" in
		16	- WINNT:x86)
		17	- MOZ_LIBAV_FFT=1
		18	- ;;
		19	- *:x86_64)
		20	- MOZ_LIBAV_FFT=1
		21	- ;;
		22	-esac
		23	-
		24	-dnl Detect if we can use yasm to compile libav's assembly
		25	-
		26	-if test -n "$MOZ_LIBAV_FFT"; then
		27	- AC_DEFINE(MOZ_LIBAV_FFT)
		28	- dnl Do we support libav-fft on this platform?
		29	- case "$OS_ARCH:$CPU_ARCH" in
		30	- Darwin:x86_64)
		31	- LIBAV_FFT_ASFLAGS="-f macho64 -rnasm -pnasm -D__x86_64__ -DPIC -DMACHO"
		32	- ;;
		33	- WINNT:x86)
		34	- LIBAV_FFT_ASFLAGS="-f win32 -rnasm -pnasm -DPIC -DWIN32"
		35	- ;;
		36	- WINNT:x86_64)
		37	- LIBAV_FFT_ASFLAGS="-f win64 -rnasm -pnasm -D__x86_64__ -DPIC -DWIN64 -DMSVC"
		38	- ;;
		39	- *:x86_64)
		40	- if $CC -E -dM -</dev/null \| grep -q __ELF__; then
		41	- LIBAV_FFT_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
		42	- fi
		43	- ;;
		44	- *)
		45	- AC_MSG_ERROR([libav's FFT routines are only available for 32-bit windows or 64-bit x86 based platforms.])
		46	- ;;
		47	- esac
		48	-fi
		49	-
		50	-if test -n "$LIBAV_FFT_ASFLAGS"; then
		51	- dnl If we're on an x86 or x64 system which supports libav-fft's asm routines
		52	- dnl check for Yasm, and error out if it doesn't exist or we have too old of a
		53	- dnl version.
		54	- LIBAV_FFT_AS=$YASM
		55	- if test -z "$LIBAV_FFT_AS" ; then
		56	- AC_MSG_ERROR([Yasm is required to build with libav's optimized FFT routines, but you do not appear to have Yasm installed. See https://developer.mozilla.org/en/YASM for more details.])
		57	- fi
		58	- dnl Check that we have the right yasm version. We require 1.0.1 or newer
		59	- dnl on Linux and 1.1 or newer everywhere else.
		60	- if test "$OS_ARCH" = "Linux" ; then
		61	- if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -eq "0" -a "$_YASM_RELEASE" -lt "1" \) ; then
		62	- AC_MSG_ERROR([Yasm 1.0.1 or greater is required to build with libav's optimized FFT routines, but you do not appear to have Yasm installed. See https://developer.mozilla.org/en/YASM for more details.])
		63	- fi
		64	- else
65	- if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then
66	- AC_MSG_ERROR([Yasm 1.1 or greater is required to build with libav's optimized FFT routines, but you do not appear to have Yasm installed. See https://developer.mozilla.org/en/YASM for more details.])
67	- fi
68	- fi
69	-elif test -n "$MOZ_LIBAV_FFT" -a "${CPU_ARCH}" != "arm"; then
70	- dnl Warn if we're not building either libav or opendl-max optimized routines.
71	- AC_MSG_WARN([No assembler or assembly support for libav-fft. Using unoptimized C routines.])
72	-fi
73	-
74	-dnl ========================================================
75	dnl = Enable compilation of specific extension modules
76	dnl ========================================================
77

Line 0 Link Here

(-)www/firefox/files/patch-soundtouch-revert (+136 lines)
		1	--- ./dom/media/AudioStream.cpp.orig 2015-10-29 22:17:56.000000000 +0000
		2	+++ ./dom/media/AudioStream.cpp 2015-11-04 04:07:11.782776000 +0000
		3	@@ -129,7 +129,6 @@ AudioStream::AudioStream()
		4	, mOutChannels(0)
		5	, mWritten(0)
		6	, mAudioClock(this)
		7	- , mTimeStretcher(nullptr)
		8	, mLatencyRequest(HighLatency)
		9	, mReadPoint(0)
		10	, mDumpFile(nullptr)
		11	@@ -152,9 +151,6 @@ AudioStream::~AudioStream()
		12	if (mDumpFile) {
		13	fclose(mDumpFile);
		14	}
		15	- if (mTimeStretcher) {
		16	- soundtouch::destroySoundTouchObj(mTimeStretcher);
		17	- }
		18	}
		19
		20	size_t
		21	@@ -177,7 +173,7 @@ nsresult AudioStream::EnsureTimeStretche
		22	{
		23	mMonitor.AssertCurrentThreadOwns();
		24	if (!mTimeStretcher) {
		25	- mTimeStretcher = soundtouch::createSoundTouchObj();
		26	+ mTimeStretcher = new soundtouch::SoundTouch();
		27	mTimeStretcher->setSampleRate(mInRate);
		28	mTimeStretcher->setChannels(mOutChannels);
		29	mTimeStretcher->setPitch(1.0);
		30	--- ./dom/media/AudioStream.h.orig 2015-10-29 22:17:56.000000000 +0000
		31	+++ ./dom/media/AudioStream.h 2015-11-04 04:07:11.783405000 +0000
		32	@@ -15,7 +15,7 @@
		33	#include "mozilla/RefPtr.h"
		34	#include "mozilla/UniquePtr.h"
		35	#include "CubebUtils.h"
		36	-#include "soundtouch/SoundTouchFactory.h"
		37	+#include "soundtouch/SoundTouch.h"
		38
		39	namespace mozilla {
		40
		41	@@ -329,7 +329,7 @@ private:
		42	// Number of frames written to the buffers.
		43	int64_t mWritten;
		44	AudioClock mAudioClock;
		45	- soundtouch::SoundTouch* mTimeStretcher;
		46	+ nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
		47	nsRefPtr<AsyncLatencyLogger> mLatencyLog;
		48
		49	// copy of Latency logger's starting time for offset calculations
		50	--- ./media/libsoundtouch/src/SoundTouchFactory.cpp.orig 2015-10-29 22:17:50.000000000 +0000
		51	+++ ./media/libsoundtouch/src/SoundTouchFactory.cpp 2015-11-04 04:07:11.783823000 +0000
		52	@@ -1,31 +0,0 @@
		53	-/* -- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -- */
		54	-/* vim:set ts=2 sw=2 sts=2 et cindent: */
		55	-/* This Source Code Form is subject to the terms of the Mozilla Public
		56	- * License, v. 2.0. If a copy of the MPL was not distributed with this
		57	- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
		58	-
		59	-#include <soundtouch/SoundTouch.h>
		60	-
		61	-namespace soundtouch
		62	-{
		63	-
		64	-EXPORT
65	-soundtouch::SoundTouch*
66	-createSoundTouchObj()
67	-{
68	- return new soundtouch::SoundTouch();
69	-}
70	-
71	-EXPORT
72	-void
73	-destroySoundTouchObj(soundtouch::SoundTouch* aObj)
74	-{
75	- // SoundTouch runs deletes in its destructor, meaning they need to be run in
76	- // the DLL context. Gecko should send its SoundTouch obj pointers here to be
77	- // cleaned up.
78	- if (aObj) {
79	- delete aObj;
80	- }
81	-}
82	-
83	-}
84	--- ./media/libsoundtouch/src/SoundTouchFactory.h.orig 2015-10-29 22:17:50.000000000 +0000
85	+++ ./media/libsoundtouch/src/SoundTouchFactory.h 2015-11-04 04:07:11.784212000 +0000
86	@@ -1,22 +0,0 @@
87	-/* -- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -- */
88	-/* vim:set ts=2 sw=2 sts=2 et cindent: */
89	-/* This Source Code Form is subject to the terms of the Mozilla Public
90	- * License, v. 2.0. If a copy of the MPL was not distributed with this
91	- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
92	-
93	-// Code for dealing with creating/deleting SoundTouch objects across DLL
94	-// boundaries.
95	-
96	-#include <soundtouch/STTypes.h>
97	-#include <soundtouch/SoundTouch.h>
98	-
99	-namespace soundtouch
100	-{
101	-EXPORT
102	-soundtouch::SoundTouch*
103	-createSoundTouchObj();
104	-
105	-EXPORT
106	-void
107	-destroySoundTouchObj(soundtouch::SoundTouch* aObj);
108	-}
109	--- ./media/libsoundtouch/src/moz.build.orig 2015-10-29 22:17:50.000000000 +0000
110	+++ ./media/libsoundtouch/src/moz.build 2015-11-04 04:07:11.784640000 +0000
111	@@ -8,7 +8,6 @@ EXPORTS.soundtouch += [
112	'FIFOSamplePipe.h',
113	'SoundTouch.h',
114	'soundtouch_config.h',
115	- 'SoundTouchFactory.h',
116	'STTypes.h',
117	]
118
119	@@ -22,7 +21,6 @@ UNIFIED_SOURCES += [
120	'InterpolateShannon.cpp',
121	'RateTransposer.cpp',
122	'SoundTouch.cpp',
123	- 'SoundTouchFactory.cpp',
124	'TDStretch.cpp',
125	]
126
127	--- ./media/libsoundtouch/src/soundtouch_perms.h.orig 2015-10-29 22:17:50.000000000 +0000
128	+++ ./media/libsoundtouch/src/soundtouch_perms.h 2015-11-04 04:07:11.785026000 +0000
129	@@ -12,7 +12,6 @@
130
131	#pragma GCC visibility push(default)
132	#include "SoundTouch.h"
133	-#include "SoundTouchFactory.h"
134	#pragma GCC visibility pop
135
136	#endif // MOZILLA_SOUNDTOUCH_PERMS_H

Lines 67-85 Link Here

(-)www/firefox/files/patch-z-bug517422 (-20 / +6 lines)
67	]	67	]
68		68
69	DIRS += ['../../' + i for i in external_dirs]	69	DIRS += ['../../' + i for i in external_dirs]
70	diff --git config/system-headers config/system-headers
71	index bef567c..9807c29 100644
72	--- config/system-headers	70	--- config/system-headers
73	+++ config/system-headers	71	+++ config/system-headers
74	@@ -1263,7 +1263,6 @@ X11/Xlocale.h	72	@@ -1257,8 +1257,6 @@ X11/Xlocale.h
75	X11/Xos.h	73	X11/Xos.h
76	X11/Xutil.h	74	X11/Xutil.h
77	zmouse.h	75	zmouse.h
78	-soundtouch/SoundTouch.h	76	-soundtouch/SoundTouch.h
79	#if MOZ_NATIVE_PNG==1	77	-soundtouch/SoundTouchFactory.h
80	png.h	78	#if MOZ_LIBAV_FFT==1
		79	libavcodec/avfft.h
81	#endif	80	#endif
82	@@ -1325,6 +1324,7 @@ vorbis/codec.h	81	@@ -1323,6 +1321,7 @@ vorbis/codec.h
83	theora/theoradec.h	82	theora/theoradec.h
84	tremor/ivorbiscodec.h	83	tremor/ivorbiscodec.h
85	speex/speex_resampler.h	84	speex/speex_resampler.h
Lines 87-93 Link Here
87	ogg/ogg.h	86	ogg/ogg.h
88	ogg/os_types.h	87	ogg/os_types.h
89	nestegg/nestegg.h	88	nestegg/nestegg.h
90	@@ -1365,3 +1365,35 @@ graphite2/Segment.h	89	@@ -1364,3 +1363,35 @@ graphite2/Segment.h
91	harfbuzz/hb-ot.h	90	harfbuzz/hb-ot.h
92	harfbuzz/hb.h	91	harfbuzz/hb.h
93	#endif	92	#endif
Lines 285-303 Link Here
285	dnl = Disable VP8 decoder support	284	dnl = Disable VP8 decoder support
286	dnl ========================================================	285	dnl ========================================================
287	MOZ_ARG_DISABLE_BOOL(webm,	286	MOZ_ARG_DISABLE_BOOL(webm,
288	diff --git dom/media/AudioStream.h dom/media/AudioStream.h
289	index 085676d..00c54fb 100644
290	--- dom/media/AudioStream.h
291	+++ dom/media/AudioStream.h
292	@@ -17,7 +17,7 @@
293	#include "CubebUtils.h"
294
295	namespace soundtouch {
296	-class SoundTouch;
297	+class MOZ_IMPORT_API SoundTouch;
298	}
299
300	namespace mozilla {
301	diff --git dom/media/moz.build dom/media/moz.build	287	diff --git dom/media/moz.build dom/media/moz.build
302	index 7526cff..e0a0ca0 100644	288	index 7526cff..e0a0ca0 100644
303	--- dom/media/moz.build	289	--- dom/media/moz.build