diff options
author | Florian Smeets <flo@FreeBSD.org> | 2013-08-08 18:42:03 +0000 |
---|---|---|
committer | Florian Smeets <flo@FreeBSD.org> | 2013-08-08 18:42:03 +0000 |
commit | 48f9528b90d58ac57bc0dcf8b05e939026b26799 (patch) | |
tree | e865dbceb17400d2f950e44a8979cf576a6eee98 /www/seamonkey/files/patch-bug803480 | |
parent | A library, client, and some examples written in Python to access the (diff) |
- update firefox to 23.0
- update firefox-esr, thunderbird and libxul to 17.0.8
- update seamonkey to 2.20
- fix plist for *-i18n
Security: 0998e79d-0055-11e3-905b-0025905a4771
In collaboration with: Jan Beich <jbeich@tormail.org>
Notes
Notes:
svn path=/head/; revision=324409
Diffstat (limited to 'www/seamonkey/files/patch-bug803480')
-rw-r--r-- | www/seamonkey/files/patch-bug803480 | 135 |
1 files changed, 71 insertions, 64 deletions
diff --git a/www/seamonkey/files/patch-bug803480 b/www/seamonkey/files/patch-bug803480 index 7ccbe5181a10..3a3788b171d7 100644 --- a/www/seamonkey/files/patch-bug803480 +++ b/www/seamonkey/files/patch-bug803480 @@ -1,49 +1,55 @@ diff --git configure.in configure.in -index fa283d0..936b6e0 100644 ---- configure.in -+++ configure.in -@@ -8229,16 +8229,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi, - NECKO_WIFI=, - NECKO_WIFI=1) - --if test "$OS_ARCH" = "OS2"; then -- dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566 -- NECKO_WIFI= --fi --if test "$NECKO_WIFI" -a \ -- "$OS_ARCH" != "Linux" -a \ -- "$OS_ARCH" != "Darwin" -a \ -- "$OS_ARCH" != "SunOS" -a \ -- "$OS_ARCH" != "WINNT"; then -- AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi]) -+if test "$NECKO_WIFI"; then -+ case "$OS_TARGET" in -+ Android) -+ ;; -+ Darwin) -+ ;; -+ SunOS) -+ ;; -+ WINNT) -+ ;; -+ OS2) -+ dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566 -+ NECKO_WIFI= -+ ;; -+ *) -+ if test -z "$MOZ_ENABLE_DBUS"; then -+ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi]) -+ fi -+ ;; -+ esac - fi - - if test "$NECKO_WIFI"; then -diff --git configure.in configure.in -index fa283d0..936b6e0 100644 +index a0575dc..be327fd 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -8229,16 +8229,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi, +@@ -4306,7 +4306,6 @@ NS_PRINTING=1 + MOZ_PDF_PRINTING= + MOZ_DISABLE_CRYPTOLEGACY= + NSS_DISABLE_DBM= +-NECKO_WIFI=1 + NECKO_COOKIES=1 + NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource websocket wyciwyg device" + USE_ARM_KUSER= +@@ -4336,11 +4335,6 @@ case "${target}" in + fi + + NSS_DISABLE_DBM=1 +- if test -z "$gonkdir"; then +- NECKO_WIFI= +- else +- NECKO_WIFI=1 +- fi + MOZ_THEME_FASTSTRIPE=1 + MOZ_TREE_FREETYPE=1 + MOZ_MEMORY=1 +@@ -8485,28 +8479,39 @@ done + dnl + dnl option to disable necko's wifi scanner + dnl ++ ++case "$OS_TARGET" in ++ OS2) ++ dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566 ++ ;; ++ Android) ++ if test -n "$gonkdir"; then ++ NECKO_WIFI=1 ++ fi ++ ;; ++ Darwin|SunOS|WINNT) ++ NECKO_WIFI=1 ++ ;; ++ Linux) ++ if test -z "$MOZ_ENABLE_DBUS"; then ++ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi]) ++ fi ++ NECKO_WIFI=1 ++ NECKO_WIFI_DBUS=1 ++ ;; ++esac ++ + MOZ_ARG_DISABLE_BOOL(necko-wifi, + [ --disable-necko-wifi Disable necko wifi scanner], NECKO_WIFI=, NECKO_WIFI=1) @@ -57,26 +63,27 @@ index fa283d0..936b6e0 100644 - "$OS_ARCH" != "SunOS" -a \ - "$OS_ARCH" != "WINNT"; then - AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi]) -+if test "$NECKO_WIFI"; then -+ case "$OS_TARGET" in -+ Android) -+ ;; -+ Darwin) -+ ;; -+ SunOS) -+ ;; -+ WINNT) -+ ;; -+ OS2) -+ dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566 -+ NECKO_WIFI= -+ ;; -+ *) -+ if test -z "$MOZ_ENABLE_DBUS"; then -+ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi]) -+ fi -+ ;; -+ esac +-fi +- + if test "$NECKO_WIFI"; then + AC_DEFINE(NECKO_WIFI) + _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI" fi + AC_SUBST(NECKO_WIFI) ++AC_SUBST(NECKO_WIFI_DBUS) - if test "$NECKO_WIFI"; then + dnl + dnl option to disable cookies +diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in +index 39d7364..e8d276b 100644 +--- mozilla/netwerk/wifi/Makefile.in ++++ mozilla/netwerk/wifi/Makefile.in +@@ -41,7 +41,7 @@ CPPSRCS += nsWifiScannerSolaris.cpp + OS_INCLUDES += $(GLIB_CFLAGS) + endif + +-ifdef MOZ_ENABLE_DBUS ++ifdef NECKO_WIFI_DBUS + CPPSRCS += nsWifiScannerDBus.cpp + OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS) + endif |