diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2016-06-03 10:52:44 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2016-06-03 10:52:44 +0000 |
commit | f24d27910f57cabd31c3f1548066f19cc2553473 (patch) | |
tree | 93614db74786adbd4b3b2235b850c350ac69d67a /www/firefox | |
parent | Update databases/elixir-timex_ecto to version 1.1.1. (diff) |
www/firefox: update to 47.0 (rc2) / 45.2esr
- Adjust firefox-esr-i18n for linux-firefox after r414580
- Unbreak DTRACE=on + DEBUG=on [1]
- Unbreak FFMPEG=off [2]
Changes: https://www.mozilla.org/firefox/47.0/releasenotes/
Changes: https://www.mozilla.org/firefox/45.2.0/releasenotes/
Security: 8065d37b-8e7c-4707-a608-1b0a2b8509c3
PR: 200845, 209952 [1], 209308 [2]
MFH: 2016Q2
Notes
Notes:
svn path=/head/; revision=416309
Diffstat (limited to 'www/firefox')
-rw-r--r-- | www/firefox/Makefile | 14 | ||||
-rw-r--r-- | www/firefox/distinfo | 4 | ||||
-rw-r--r-- | www/firefox/files/patch-bug1021761 | 6 | ||||
-rw-r--r-- | www/firefox/files/patch-bug1239550 | 144 | ||||
-rw-r--r-- | www/firefox/files/patch-bug1242132 | 13 | ||||
-rw-r--r-- | www/firefox/files/patch-bug1243312 | 21 | ||||
-rw-r--r-- | www/firefox/files/patch-bug1252246 | 44 | ||||
-rw-r--r-- | www/firefox/files/patch-bug1269165 | 24 | ||||
-rw-r--r-- | www/firefox/files/patch-bug826985 | 8 | ||||
-rw-r--r-- | www/firefox/files/patch-bug847568 | 16 | ||||
-rw-r--r-- | www/firefox/files/patch-ijg-libjpeg | 6 | ||||
-rw-r--r-- | www/firefox/files/patch-sample-type | 4 | ||||
-rw-r--r-- | www/firefox/files/patch-z-bug517422 | 16 |
13 files changed, 37 insertions, 283 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 809bfbdc8fed..8dc176018eb5 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,26 +2,26 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 46.0.1 +DISTVERSION= 47.0 DISTVERSIONSUFFIX=.source PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.12:devel/nspr \ - nss>=3.22.3:security/nss \ + nss>=3.23:security/nss \ libevent2>=2.0.21_2:devel/libevent2 \ soundtouch>=1.9.0:audio/soundtouch \ - harfbuzz>=1.1.3:print/harfbuzz \ - graphite2>=1.3.7:graphics/graphite2 \ - png>=1.6.19:graphics/png \ + harfbuzz>=1.2.2:print/harfbuzz \ + graphite2>=1.3.8:graphics/graphite2 \ + png>=1.6.21:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ - sqlite3>=3.10.2:databases/sqlite3 \ + sqlite3>=3.11.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index f4fe4a386b75..7ebefd94c6d3 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-46.0.1.source.tar.xz) = 98b8292a31b7e3e426f3204de1fed2a6ab38dcf64dd27bdfae556b407a198bf9 -SIZE (firefox-46.0.1.source.tar.xz) = 187160976 +SHA256 (firefox-47.0.source.tar.xz) = c05fee5f1645f1b125b245d2ac1a3dc4fcb2e68f9c72a3f04c0eb5c8b9b92423 +SIZE (firefox-47.0.source.tar.xz) = 188683544 diff --git a/www/firefox/files/patch-bug1021761 b/www/firefox/files/patch-bug1021761 index 743606fd1a8e..3d1cd0cfb0e9 100644 --- a/www/firefox/files/patch-bug1021761 +++ b/www/firefox/files/patch-bug1021761 @@ -1,7 +1,7 @@ -diff --git configure.in configure.in +diff --git old-configure.in configure.in index 48e60c0..ec08417 100644 ---- configure.in -+++ configure.in +--- old-configure.in ++++ old-configure.in @@ -5591,6 +5591,67 @@ fi AC_SUBST(MOZ_WEBM_ENCODER) diff --git a/www/firefox/files/patch-bug1239550 b/www/firefox/files/patch-bug1239550 deleted file mode 100644 index 8dc3a94661ad..000000000000 --- a/www/firefox/files/patch-bug1239550 +++ /dev/null @@ -1,144 +0,0 @@ -diff --git a/media/ffvpx/config.asm b/media/ffvpx/config.asm ---- media/ffvpx/config.asm -+++ media/ffvpx/config.asm -@@ -192,7 +192,6 @@ - %define HAVE_MACH_MACH_TIME_H 0 - %define HAVE_MACHINE_IOCTL_BT848_H 0 - %define HAVE_MACHINE_IOCTL_METEOR_H 0 --%define HAVE_MALLOC_H 1 - %define HAVE_OPENJPEG_1_5_OPENJPEG_H 0 - %define HAVE_OPENGL_GL3_H 0 - %define HAVE_POLL_H 1 -@@ -268,18 +267,15 @@ - %define HAVE_ISATTY 1 - %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0 - %define HAVE_KBHIT 0 --%define HAVE_LOCALTIME_R 1 - %define HAVE_LSTAT 1 - %define HAVE_LZO1X_999_COMPRESS 0 - %define HAVE_MACH_ABSOLUTE_TIME 0 - %define HAVE_MAPVIEWOFFILE 0 --%define HAVE_MEMALIGN 1 - %define HAVE_MKSTEMP 1 - %define HAVE_MMAP 1 - %define HAVE_MPROTECT 1 - %define HAVE_NANOSLEEP 1 - %define HAVE_PEEKNAMEDPIPE 0 --%define HAVE_POSIX_MEMALIGN 1 - %define HAVE_PTHREAD_CANCEL 1 - %define HAVE_SCHED_GETAFFINITY 1 - %define HAVE_SETCONSOLETEXTATTRIBUTE 0 -diff --git a/media/ffvpx/config_unix32.h b/media/ffvpx/config_unix32.h ---- media/ffvpx/config_unix32.h -+++ media/ffvpx/config_unix32.h -@@ -216,7 +216,6 @@ - #define HAVE_MACH_MACH_TIME_H 0 - #define HAVE_MACHINE_IOCTL_BT848_H 0 - #define HAVE_MACHINE_IOCTL_METEOR_H 0 --#define HAVE_MALLOC_H 1 - #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0 - #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0 - #define HAVE_OPENJPEG_1_5_OPENJPEG_H 0 -@@ -269,7 +268,6 @@ - #define HAVE_TRUNCF 1 - #define HAVE_ACCESS 1 - #define HAVE_ALIGNED_MALLOC 0 --#define HAVE_ARC4RANDOM 0 - #define HAVE_CLOCK_GETTIME 1 - #define HAVE_CLOSESOCKET 0 - #define HAVE_COMMANDLINETOARGVW 0 -@@ -295,18 +293,15 @@ - #define HAVE_ISATTY 1 - #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0 - #define HAVE_KBHIT 0 --#define HAVE_LOCALTIME_R 1 - #define HAVE_LSTAT 1 - #define HAVE_LZO1X_999_COMPRESS 0 - #define HAVE_MACH_ABSOLUTE_TIME 0 - #define HAVE_MAPVIEWOFFILE 0 --#define HAVE_MEMALIGN 0 - #define HAVE_MKSTEMP 1 - #define HAVE_MMAP 1 - #define HAVE_MPROTECT 1 - #define HAVE_NANOSLEEP 1 - #define HAVE_PEEKNAMEDPIPE 0 --#define HAVE_POSIX_MEMALIGN 0 - #define HAVE_PTHREAD_CANCEL 1 - #define HAVE_SCHED_GETAFFINITY 1 - #define HAVE_SETCONSOLETEXTATTRIBUTE 0 -diff --git a/media/ffvpx/config_unix64.asm b/media/ffvpx/config_unix64.asm ---- media/ffvpx/config_unix64.asm -+++ media/ffvpx/config_unix64.asm -@@ -200,7 +200,6 @@ - %define HAVE_MACH_MACH_TIME_H 0 - %define HAVE_MACHINE_IOCTL_BT848_H 0 - %define HAVE_MACHINE_IOCTL_METEOR_H 0 --%define HAVE_MALLOC_H 1 - %define HAVE_OPENJPEG_2_1_OPENJPEG_H 0 - %define HAVE_OPENJPEG_2_0_OPENJPEG_H 0 - %define HAVE_OPENJPEG_1_5_OPENJPEG_H 0 -@@ -253,7 +252,6 @@ - %define HAVE_TRUNCF 1 - %define HAVE_ACCESS 1 - %define HAVE_ALIGNED_MALLOC 0 --%define HAVE_ARC4RANDOM 0 - %define HAVE_CLOCK_GETTIME 1 - %define HAVE_CLOSESOCKET 0 - %define HAVE_COMMANDLINETOARGVW 0 -@@ -279,18 +277,15 @@ - %define HAVE_ISATTY 1 - %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0 - %define HAVE_KBHIT 0 --%define HAVE_LOCALTIME_R 1 - %define HAVE_LSTAT 1 - %define HAVE_LZO1X_999_COMPRESS 0 - %define HAVE_MACH_ABSOLUTE_TIME 0 - %define HAVE_MAPVIEWOFFILE 0 --%define HAVE_MEMALIGN 1 - %define HAVE_MKSTEMP 1 - %define HAVE_MMAP 1 - %define HAVE_MPROTECT 1 - %define HAVE_NANOSLEEP 1 - %define HAVE_PEEKNAMEDPIPE 0 --%define HAVE_POSIX_MEMALIGN 1 - %define HAVE_PTHREAD_CANCEL 1 - %define HAVE_SCHED_GETAFFINITY 1 - %define HAVE_SETCONSOLETEXTATTRIBUTE 0 -diff --git a/media/ffvpx/config_unix64.h b/media/ffvpx/config_unix64.h ---- media/ffvpx/config_unix64.h -+++ media/ffvpx/config_unix64.h -@@ -216,7 +216,6 @@ - #define HAVE_MACH_MACH_TIME_H 0 - #define HAVE_MACHINE_IOCTL_BT848_H 0 - #define HAVE_MACHINE_IOCTL_METEOR_H 0 --#define HAVE_MALLOC_H 1 - #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0 - #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0 - #define HAVE_OPENJPEG_1_5_OPENJPEG_H 0 -@@ -269,7 +268,6 @@ - #define HAVE_TRUNCF 1 - #define HAVE_ACCESS 1 - #define HAVE_ALIGNED_MALLOC 0 --#define HAVE_ARC4RANDOM 0 - #define HAVE_CLOCK_GETTIME 1 - #define HAVE_CLOSESOCKET 0 - #define HAVE_COMMANDLINETOARGVW 0 -@@ -295,18 +293,15 @@ - #define HAVE_ISATTY 1 - #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0 - #define HAVE_KBHIT 0 --#define HAVE_LOCALTIME_R 1 - #define HAVE_LSTAT 1 - #define HAVE_LZO1X_999_COMPRESS 0 - #define HAVE_MACH_ABSOLUTE_TIME 0 - #define HAVE_MAPVIEWOFFILE 0 --#define HAVE_MEMALIGN 1 - #define HAVE_MKSTEMP 1 - #define HAVE_MMAP 1 - #define HAVE_MPROTECT 1 - #define HAVE_NANOSLEEP 1 - #define HAVE_PEEKNAMEDPIPE 0 --#define HAVE_POSIX_MEMALIGN 1 - #define HAVE_PTHREAD_CANCEL 1 - #define HAVE_SCHED_GETAFFINITY 1 - #define HAVE_SETCONSOLETEXTATTRIBUTE 0 diff --git a/www/firefox/files/patch-bug1242132 b/www/firefox/files/patch-bug1242132 deleted file mode 100644 index 2a228cd466a1..000000000000 --- a/www/firefox/files/patch-bug1242132 +++ /dev/null @@ -1,13 +0,0 @@ -# nss-config --cflags returns multiple flags, don't treat them as one string - ---- python/mozbuild/mozbuild/frontend/gyp_reader.py~ -+++ python/mozbuild/mozbuild/frontend/gyp_reader.py -@@ -217,7 +217,7 @@ def read_from_gyp(config, path, output, - # We may be getting make variable references out of the - # gyp data, and we don't want those in emitted data, so - # substitute them with their actual value. -- f = expand_variables(f, config.substs) -+ f = expand_variables(f, config.substs).split() - if not f: - continue - # the result may be a string or a list. diff --git a/www/firefox/files/patch-bug1243312 b/www/firefox/files/patch-bug1243312 deleted file mode 100644 index 29ddf7bf47fc..000000000000 --- a/www/firefox/files/patch-bug1243312 +++ /dev/null @@ -1,21 +0,0 @@ -commit a5c6f19 -Author: Dragana Damjanovic <dd.mozilla@gmail.com> -Date: Wed Jan 27 01:47:00 2016 +0100 - - Bug 1243312 - nsNetCID is missing in toolkit/system/unixproxy/nsLibProxySettings.cpp. r=jduell ---- - toolkit/system/unixproxy/nsLibProxySettings.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git toolkit/system/unixproxy/nsLibProxySettings.cpp toolkit/system/unixproxy/nsLibProxySettings.cpp -index f6ec377..e9179c1 100644 ---- toolkit/system/unixproxy/nsLibProxySettings.cpp -+++ toolkit/system/unixproxy/nsLibProxySettings.cpp -@@ -9,6 +9,7 @@ - #include "nsIURI.h" - #include "nsString.h" - #include "nsCOMPtr.h" -+#include "nsNetCID.h" - #include "nspr.h" - - extern "C" { diff --git a/www/firefox/files/patch-bug1252246 b/www/firefox/files/patch-bug1252246 deleted file mode 100644 index 429391f0dc15..000000000000 --- a/www/firefox/files/patch-bug1252246 +++ /dev/null @@ -1,44 +0,0 @@ -# Prefer PTHREAD_PROCESS_SHARED on FreeBSD 11.0 or later - -diff --git a/ipc/glue/CrossProcessMutex.h b/ipc/glue/CrossProcessMutex.h ---- ipc/glue/CrossProcessMutex.h -+++ ipc/glue/CrossProcessMutex.h -@@ -9,7 +9,7 @@ - #include "base/process.h" - #include "mozilla/Mutex.h" - --#if defined(OS_LINUX) || defined(XP_DARWIN) -+#if !defined(OS_WIN) && !defined(OS_NETBSD) && !defined(OS_OPENBSD) - #include <pthread.h> - #include "SharedMemoryBasic.h" - #include "mozilla/Atomics.h" -@@ -34,7 +34,7 @@ struct ParamTraits; - namespace mozilla { - #if defined(OS_WIN) - typedef HANDLE CrossProcessMutexHandle; --#elif defined(OS_LINUX) || defined(OS_MACOSX) -+#elif !defined(OS_NETBSD) && !defined(OS_OPENBSD) - typedef mozilla::ipc::SharedMemoryBasic::Handle CrossProcessMutexHandle; - #else - // Stub for other platforms. We can't use uintptr_t here since different -@@ -100,7 +100,7 @@ private: - - #if defined(OS_WIN) - HANDLE mMutex; --#elif defined(OS_LINUX) || defined(OS_MACOSX) -+#elif !defined(OS_NETBSD) && !defined(OS_OPENBSD) - RefPtr<mozilla::ipc::SharedMemoryBasic> mSharedBuffer; - pthread_mutex_t* mMutex; - mozilla::Atomic<int32_t>* mCount; -diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build ---- ipc/glue/moz.build -+++ ipc/glue/moz.build -@@ -61,7 +61,7 @@ if CONFIG['OS_ARCH'] == 'WINNT': - SOURCES += [ - 'CrossProcessMutex_windows.cpp', - ] --elif CONFIG['OS_ARCH'] in ('Linux', 'Darwin'): -+elif not CONFIG['OS_ARCH'] in ('NetBSD', 'OpenBSD'): - UNIFIED_SOURCES += [ - 'CrossProcessMutex_posix.cpp', - ] diff --git a/www/firefox/files/patch-bug1269165 b/www/firefox/files/patch-bug1269165 deleted file mode 100644 index f88f018866a5..000000000000 --- a/www/firefox/files/patch-bug1269165 +++ /dev/null @@ -1,24 +0,0 @@ -# getUserMedia fails to enumerate ALSA plugins - ---- media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.orig 2016-04-22 00:37:17 UTC -+++ media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc -@@ -1752,7 +1752,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices - // Don't use snd_device_name_hint(-1,..) since there is a access violation - // inside this ALSA API with libasound.so.2.0.0. - int card = -1; -+#ifdef WEBRTC_LINUX - while (!(LATE(snd_card_next)(&card)) && (card >= 0) && keepSearching) { -+#endif - void **hints; - err = LATE(snd_device_name_hint)(card, "pcm", &hints); - if (err != 0) -@@ -1878,7 +1880,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices - LATE(snd_strerror)(err)); - // Continue and return true anyway, since we did get the whole list. - } -+#ifdef WEBRTC_LINUX - } -+#endif - - if (FUNC_GET_NUM_OF_DEVICE == function) - { diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985 index 8d6602d449f4..7d742174c750 100644 --- a/www/firefox/files/patch-bug826985 +++ b/www/firefox/files/patch-bug826985 @@ -5,7 +5,7 @@ Date: Fri Jan 4 13:49:22 2013 +0100 Bug 826985 - Support more video formats for WebRTC via libv4l2 on Linux. --- config/system-headers | 1 + - configure.in | 7 +++++++ + old-configure.in | 7 +++++++ media/webrtc/signaling/test/Makefile.in | 1 + .../modules/video_capture/linux/device_info_linux.cc | 17 +++++++++++++++++ .../modules/video_capture/linux/video_capture_linux.cc | 16 +++++++++++++++- @@ -25,10 +25,10 @@ index 55e4cd1..76567b3 100644 limits limits.h link.h -diff --git configure.in configure.in +diff --git old-configure.in configure.in index 55e4cd1..76567b3 100644 ---- configure.in -+++ configure.in +--- old-configure.in ++++ old-configure.in @@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VP8_ENCODER=1 MOZ_VP8_ERROR_CONCEALMENT=1 diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568 index fa8c7f3b8353..d6d5373e9609 100644 --- a/www/firefox/files/patch-bug847568 +++ b/www/firefox/files/patch-bug847568 @@ -29,10 +29,10 @@ index 18e8703..bdc5f82 100644 +harfbuzz/hb-ot.h +harfbuzz/hb.h +#endif -diff --git configure.in configure.in +diff --git old-configure.in configure.in index ac38f40..87536b7 100644 ---- configure.in -+++ configure.in +--- old-configure.in ++++ old-configure.in @@ -7989,6 +7989,49 @@ if test "$USE_FC_FREETYPE"; then fi @@ -46,7 +46,7 @@ index ac38f40..87536b7 100644 +MOZ_NATIVE_HARFBUZZ=) + +if test -n "$MOZ_NATIVE_HARFBUZZ"; then -+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.1.3) ++ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.2.2) +fi + +AC_SUBST(MOZ_NATIVE_HARFBUZZ) @@ -70,7 +70,7 @@ index ac38f40..87536b7 100644 + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,7) ++ #if !GR2_VERSION_REQUIRE(1,3,8) + #error "Insufficient graphite2 version." + #endif + ], [], @@ -115,7 +115,7 @@ index f3d76ea..a9e7fb6 100644 +# chase version for --with-system-graphite2 +perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ -+ if /GR2_VERSION_REQUIRE/" configure.in ++ if /GR2_VERSION_REQUIRE/" old-configure.in + # summarize what's been touched echo Updated to $RELEASE. @@ -123,7 +123,7 @@ index f3d76ea..a9e7fb6 100644 echo -hg stat gfx/graphite2 -+hg stat configure.in gfx/graphite2 ++hg stat old-configure.in gfx/graphite2 echo echo If gfx/graphite2/src/files.mk has changed, please make corresponding @@ -137,7 +137,7 @@ index ca57d16..1ce21fe 100644 specific makefile that is maintained by hand. + +The in-tree copy may be omitted during build by --with-system-harfbuzz. -+Make sure to keep pkg-config version check within configure.in in sync ++Make sure to keep pkg-config version check within old-configure.in in sync +with checkout version or increment latest tag by one if it's not based +on upstream release. diff --git gfx/moz.build gfx/moz.build diff --git a/www/firefox/files/patch-ijg-libjpeg b/www/firefox/files/patch-ijg-libjpeg index 074297aaa618..6129b21bc016 100644 --- a/www/firefox/files/patch-ijg-libjpeg +++ b/www/firefox/files/patch-ijg-libjpeg @@ -1,9 +1,9 @@ # Partially revert bug 791305 to allow building with system IJG jpeg library -diff --git configure.in configure.in +diff --git old-configure.in configure.in index f0aeb5d..1c01010 100644 ---- configure.in -+++ configure.in +--- old-configure.in ++++ old-configure.in @@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG diff --git a/www/firefox/files/patch-sample-type b/www/firefox/files/patch-sample-type index 980bde629d2a..cf460a0f84dc 100644 --- a/www/firefox/files/patch-sample-type +++ b/www/firefox/files/patch-sample-type @@ -1,7 +1,7 @@ # Let ports handle default sample type ---- configure.in~ -+++ configure.in +--- old-configure.in~ ++++ old-configure.in @@ -5144,7 +5144,7 @@ dnl Use integers over floats for audio o dnl (regarless of the CPU architecture, because audio dnl backends for those platforms don't support floats. We also diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422 index 7e2ec5eac0b3..ae9385072ae7 100644 --- a/www/firefox/files/patch-z-bug517422 +++ b/www/firefox/files/patch-z-bug517422 @@ -79,10 +79,10 @@ index bef567c..9807c29 100644 +#if MOZ_NATIVE_TREMOR==1 +tremor/ivorbiscodec.h +#endif -diff --git configure.in configure.in +diff --git old-configure.in configure.in index 87db361..7947626 100644 ---- configure.in -+++ configure.in +--- old-configure.in ++++ old-configure.in @@ -5401,6 +5401,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then fi fi @@ -297,7 +297,7 @@ index 0833e4d..7ece97b 100644 449754 + +The in-tree copy may be omitted during build by --with-system-ogg. -+Keep version in configure.in in sync on updates. ++Keep version in old-configure.in in sync on updates. diff --git media/libsoundtouch/README_MOZILLA media/libsoundtouch/README_MOZILLA index bfd4b1a..15b158d 100644 --- media/libsoundtouch/README_MOZILLA @@ -307,7 +307,7 @@ index bfd4b1a..15b158d 100644 the patch `moz-libsoundtouch.patch`. We also use a custom soundtouch_config.h. +The in-tree copy may be omitted during build by --with-system-soundtouch. -+Keep version in configure.in in sync on updates. ++Keep version in old-configure.in in sync on updates. diff --git media/libsoundtouch/src/soundtouch_perms.h media/libsoundtouch/src/soundtouch_perms.h index 0af2fe6..d80c145 100644 --- media/libsoundtouch/src/soundtouch_perms.h @@ -332,7 +332,7 @@ index d48dbfa..f08a2ed 100644 The subversion revision used was r17578. + +The in-tree copy may be omitted during build by --with-system-theora. -+Keep version in configure.in in sync on updates. ++Keep version in old-configure.in in sync on updates. diff --git media/libtheora/moz.build media/libtheora/moz.build index 14265b1..3069e99 100644 --- media/libtheora/moz.build @@ -357,7 +357,7 @@ index ee67b53..3f34a09 100644 The subversion revision used was r17547. + +The in-tree copy may be omitted during build by --with-system-tremor. -+Keep version in configure.in in sync on updates. ++Keep version in old-configure.in in sync on updates. diff --git media/libtremor/moz.build media/libtremor/moz.build index 31831ba..a03d576 100644 --- media/libtremor/moz.build @@ -378,7 +378,7 @@ index 7c7454c..55baedd 100644 file names with other Mozilla libraries. + +The in-tree copy may be omitted during build by --with-system-vorbis. -+Keep version in configure.in in sync on updates. ++Keep version in old-configure.in in sync on updates. diff --git media/libvorbis/moz.build media/libvorbis/moz.build index 919b99e..cc776f7 100644 --- media/libvorbis/moz.build |