From owner-freebsd-gecko@FreeBSD.ORG Wed Mar 13 22:48:28 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 207EB4E7 for ; Wed, 13 Mar 2013 22:48:28 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id BB2B7773 for ; Wed, 13 Mar 2013 22:48:27 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r2DMmQqW099037 for ; Wed, 13 Mar 2013 22:48:26 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r2DMmLDZ098024 for freebsd-gecko@freebsd.org; Wed, 13 Mar 2013 22:48:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 13 Mar 2013 22:48:21 GMT Message-Id: <201303132248.r2DMmLDZ098024@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1213 - in trunk: Mk www/firefox-nightly/files www/firefox/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Mar 2013 22:48:28 -0000 Author: jbeich Date: Wed Mar 13 22:48:21 2013 New Revision: 1213 Log: if we ever have NetworkManager pick up geolocation from it NeckoWifi depends on a subset of http://projects.gnome.org/NetworkManager/developers/api/07/spec-07.html Added: trunk/www/firefox-nightly/files/patch-bug803480 trunk/www/firefox/files/patch-bug803480 trunk/www/seamonkey/files/patch-bug803480 Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Mar 13 22:48:10 2013 (r1212) +++ trunk/Mk/bsd.gecko.mk Wed Mar 13 22:48:21 2013 (r1213) @@ -671,7 +671,6 @@ --disable-gtktest \ --disable-freetypetest \ --disable-installer \ - --disable-necko-wifi \ --disable-updater \ --disable-pedantic @@ -679,6 +678,10 @@ LIBS+= -Wl,--as-needed,-lcxxrt,--no-as-needed .endif +.if !exists(${FILESDIR}/patch-bug803480) || ! ${PORT_OPTIONS:MDBUS} +MOZ_OPTIONS+= --disable-necko-wifi +.endif + .if ${MOZ_TOOLKIT:Mcairo-qt} # don't use - transparent backgrounds (bug 521582), USE_MOZILLA+= -cairo # ports/169343 Added: trunk/www/firefox-nightly/files/patch-bug803480 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug803480 Wed Mar 13 22:48:21 2013 (r1213) @@ -0,0 +1,41 @@ +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 Added: trunk/www/firefox/files/patch-bug803480 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug803480 Wed Mar 13 22:48:21 2013 (r1213) @@ -0,0 +1,41 @@ +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 Added: trunk/www/seamonkey/files/patch-bug803480 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug803480 Wed Mar 13 22:48:21 2013 (r1213) @@ -0,0 +1,82 @@ +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 +--- mozilla/configure.in ++++ mozilla/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