summaryrefslogtreecommitdiff
path: root/www/firefox/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox/patches/patch-aa')
-rw-r--r--www/firefox/patches/patch-aa66
1 files changed, 40 insertions, 26 deletions
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 5dc4dc84198..17e957ec11f 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
+$NetBSD: patch-aa,v 1.15 2013/09/19 12:37:49 ryoon Exp $
---- configure.in.orig 2013-07-30 00:57:59.000000000 +0000
+--- configure.in.orig 2013-09-10 03:43:23.000000000 +0000
+++ configure.in
-@@ -1411,6 +1411,17 @@ if test "$GNU_CC"; then
+@@ -1370,6 +1370,17 @@ if test "$GNU_CC"; then
CFLAGS=$_SAVE_CFLAGS
AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1)
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
# Turn on GNU-specific warnings:
# -Wall - turn on a lot of warnings
# -Wpointer-arith - good to have
-@@ -2088,6 +2099,9 @@ ia64*-hpux*)
+@@ -2047,6 +2058,9 @@ ia64*-hpux*)
if test -z "$MC"; then
MC=mc.exe
fi
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
;;
*-mingw*)
DSO_CFLAGS=
-@@ -2887,6 +2901,7 @@ EOF
+@@ -2843,6 +2857,7 @@ EOF
#pragma GCC visibility push(hidden)
#pragma GCC visibility push(default)
#include <string.h>
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
#pragma GCC visibility pop
__attribute__ ((visibility ("default"))) void Func() {
-@@ -2895,7 +2910,7 @@ __attribute__ ((visibility ("default")))
+@@ -2851,7 +2866,7 @@ __attribute__ ((visibility ("default")))
}
EOF
ac_cv_have_visibility_builtin_bug=no
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
ac_cv_have_visibility_builtin_bug=yes
else
if test `grep -c "@PLT" conftest.S` = 0; then
-@@ -3057,6 +3072,9 @@ dnl ====================================
+@@ -3017,6 +3032,9 @@ dnl ====================================
case $target in
*-hpux11.*)
;;
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
*)
AC_CHECK_LIB(c_r, gethostbyname_r)
;;
-@@ -3358,6 +3376,9 @@ AC_CACHE_CHECK(
+@@ -3319,6 +3337,9 @@ AC_CACHE_CHECK(
#ifdef linux
#define _BSD_SOURCE 1
#endif
@@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
#include <resolv.h>
],
[int foo = res_ninit(&_res);],
-@@ -4012,6 +4033,14 @@ if test -n "$YASM"; then
+@@ -3973,6 +3994,14 @@ if test -n "$YASM"; then
_YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
fi
@@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
-@@ -4039,11 +4068,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -4000,11 +4029,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
#include <jpeglib.h> ],
[ #if JPEG_LIB_VERSION < $MOZJPEG
#error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -95,7 +95,30 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
MOZ_NATIVE_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi
-@@ -5270,7 +5295,7 @@ dnl --enable-webrtc to override. Can di
+@@ -4139,6 +4164,22 @@ if test -n "$MOZ_NATIVE_FFI"; then
+ fi
+
+ dnl ========================================================
++dnl system icu support
++dnl ========================================================
++MOZ_NATIVE_ICU=
++MOZ_ARG_WITH_BOOL(system-icu,
++[ --with-system-icu
++ Use system icu (located with pkgconfig)],
++ MOZ_NATIVE_ICU=1)
++
++if test -n "$MOZ_NATIVE_ICU"; then
++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
++ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
++fi
++
++AC_SUBST(MOZ_NATIVE_ICU)
++
++dnl ========================================================
+ dnl Java SDK support
+ dnl ========================================================
+
+@@ -5297,7 +5338,7 @@ dnl --enable-webrtc to override. Can di
dnl the master list above.
if test -n "$MOZ_WEBRTC"; then
case "$target" in
@@ -104,7 +127,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
dnl Leave enabled
;;
*)
-@@ -5323,6 +5348,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5353,6 +5394,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VP8_ENCODER=1
MOZ_VP8_ERROR_CONCEALMENT=1
@@ -114,7 +137,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
dnl enable once Signaling lands
MOZ_WEBRTC_SIGNALING=1
AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5349,15 +5377,18 @@ AC_SUBST(MOZ_SRTP)
+@@ -5379,15 +5423,18 @@ AC_SUBST(MOZ_SRTP)
dnl Use integers over floats for audio on B2G and Android, because audio
dnl backends for those platforms don't support floats.
@@ -136,7 +159,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
dnl ========================================================
dnl = Disable Speech API code
-@@ -5707,7 +5738,7 @@ MOZ_ALSA=)
+@@ -5737,7 +5784,7 @@ MOZ_ALSA=)
if test -n "$MOZ_ALSA"; then
AC_DEFINE(MOZ_CUBEB)
@@ -145,16 +168,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
[echo "$MOZ_ALSA_PKG_ERRORS"
AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])])
fi
-@@ -6410,7 +6441,7 @@ MOZ_ARG_ENABLE_BOOL(gtest,
- MOZ_ENABLE_GTEST= )
-
- if test -n "$MOZ_ENABLE_GTEST"; then
-- if test "${OS_TARGET}" = "WINNT" -o "${OS_TARGET}" = "Darwin" -o "${OS_TARGET}" = "Linux" -o "${OS_TARGET}" = "Android"; then
-+ if test "${OS_TARGET}" = "WINNT" -o "${OS_TARGET}" = "Darwin" -o "${OS_TARGET}" = "Linux" -o "${OS_TARGET}" = "Android" -o "${OS_TARGET}" = "NetBSD"; then
- MOZ_ENABLE_GTEST=1
- GTEST_HAS_RTTI=0
- AC_DEFINE(MOZ_ENABLE_GTEST)
-@@ -8330,7 +8361,7 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8385,7 +8432,7 @@ if test "$MOZ_ENABLE_SKIA"; then
AC_DEFINE(GR_DLL)
fi
@@ -163,7 +177,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
MOZ_ENABLE_SKIA_GPU=1
AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
-@@ -8411,16 +8442,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
+@@ -8466,16 +8513,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
NECKO_WIFI=,
NECKO_WIFI=1)
@@ -200,7 +214,7 @@ $NetBSD: patch-aa,v 1.14 2013/08/07 12:17:54 ryoon Exp $
fi
if test "$NECKO_WIFI"; then
-@@ -9114,6 +9155,27 @@ if test -z "$HAVE_TOOLCHAIN_SUPPORT_MSSE
+@@ -9186,6 +9243,27 @@ if test -z "$HAVE_TOOLCHAIN_SUPPORT_SSSE
EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D yuv_disable_asm=1"
fi