summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2015-02-15 02:08:29 +0000
committerryoon <ryoon@pkgsrc.org>2015-02-15 02:08:29 +0000
commitc2e7d9cb16ba2f1145245a059c0bc9250601ba33 (patch)
tree33490597ef0bb9382dc20cafff121ad858ca44a2
parenta0139b26e3202604347d2269b23f6afcad4c4a46 (diff)
downloadpkgsrc-c2e7d9cb16ba2f1145245a059c0bc9250601ba33.tar.gz
Fix build under netbsd-6.
* Remove -Werror=char-subscripts from js/src
-rw-r--r--www/firefox/distinfo4
-rw-r--r--www/firefox/patches/patch-as26
2 files changed, 23 insertions, 7 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index da9d4a02dc3..08b4e36e773 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.185 2015/02/14 07:59:24 martin Exp $
+$NetBSD: distinfo,v 1.186 2015/02/15 02:08:29 ryoon Exp $
SHA1 (firefox-35.0.1.source.tar.bz2) = cf256ee1491ee502eb4432ade5a879104ebceede
RMD160 (firefox-35.0.1.source.tar.bz2) = ca4dc6f6c5de1e6e69133de3b8b502991d519fa7
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = f493d2eda255a9337487a3ba9b3fd442942a0312
SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc
SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
-SHA1 (patch-as) = 29fb927a05b53922c8559bb15af2916a1459e9b9
+SHA1 (patch-as) = 5b360bfa035dd4ce036afc194dd9129ac3b45efd
SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
SHA1 (patch-browser_app_nsBrowserApp.cpp) = 18f29d7a41ba088e332915e7f81b8fcccd95f673
diff --git a/www/firefox/patches/patch-as b/www/firefox/patches/patch-as
index 1fb6aed1a40..7288a565054 100644
--- a/www/firefox/patches/patch-as
+++ b/www/firefox/patches/patch-as
@@ -1,10 +1,26 @@
-$NetBSD: patch-as,v 1.14 2015/01/16 22:42:09 ryoon Exp $
+$NetBSD: patch-as,v 1.15 2015/02/15 02:08:29 ryoon Exp $
Treat DragonFly like FreeBSD.
---- js/src/configure.in.orig 2015-01-09 04:38:17.000000000 +0000
+--- js/src/configure.in.orig 2015-01-23 05:59:58.000000000 +0000
+++ js/src/configure.in
-@@ -2180,8 +2180,7 @@ AC_LANG_CPLUSPLUS
+@@ -1200,7 +1200,6 @@ if test "$GNU_CC"; then
+
+ # Treat some warnings as errors:
+ _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=address"
+- _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=char-subscripts"
+ _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=comment"
+ _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=empty-body"
+ _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=endif-labels"
+@@ -1299,7 +1298,6 @@ if test "$GNU_CXX"; then
+ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wtype-limits"
+
+ # Treat some warnings as errors:
+- _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=char-subscripts"
+ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=comment"
+ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=empty-body"
+ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=endif-labels"
+@@ -2180,8 +2178,7 @@ AC_LANG_CPLUSPLUS
MOZ_CXX11
@@ -14,7 +30,7 @@ Treat DragonFly like FreeBSD.
dnl ===============================================================
if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -3095,7 +3094,7 @@ if test "$MOZ_MEMORY"; then
+@@ -3095,7 +3092,7 @@ if test "$MOZ_MEMORY"; then
*-darwin*)
AC_DEFINE(MOZ_MEMORY_DARWIN)
;;
@@ -23,7 +39,7 @@ Treat DragonFly like FreeBSD.
AC_DEFINE(MOZ_MEMORY_BSD)
;;
*-android*|*-linuxandroid*)
-@@ -3989,6 +3988,16 @@ MOZ_SUBCONFIGURE_ICU()
+@@ -3989,6 +3986,16 @@ MOZ_SUBCONFIGURE_ICU()
dnl ========================================================
dnl JavaScript shell
dnl ========================================================