[SVN-Commit] r1294 - in trunk: . Mk www/firefox www/firefox-nightly www/firefox-nightly/files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Tue Jul 30 09:33:05 UTC 2013 

Author: jbeich
Date: Tue Jul 30 09:32:51 2013
New Revision: 1294

Log:
update

Deleted:
   trunk/www/firefox-nightly/files/patch-bug803480
Modified:
   trunk/Gecko_TODO
   trunk/Mk/bsd.gecko.mk
   trunk/www/firefox-nightly/Makefile.hgrev
   trunk/www/firefox-nightly/distinfo
   trunk/www/firefox/Makefile
   trunk/www/firefox/distinfo

Modified: trunk/Gecko_TODO
==============================================================================
--- trunk/Gecko_TODO	Wed Jul 24 14:55:39 2013	(r1293)
+++ trunk/Gecko_TODO	Tue Jul 30 09:32:51 2013	(r1294)
@@ -4,8 +4,6 @@
 - media/webrtc/trunk/webrtc/system_wrappers/source/cpu.cc
 - toolkit/crashreporter
 - tools/profiler
-- netwerk/wifi backend can be based on
-  www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
 - libusbhid(3) for hal/linux/LinuxGamepad.cpp
 - OSS or GStreamer for
   * media/libcubeb

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Wed Jul 24 14:55:39 2013	(r1293)
+++ trunk/Mk/bsd.gecko.mk	Tue Jul 30 09:32:51 2013	(r1294)
@@ -679,7 +679,7 @@
 LIBS+=		-Wl,--as-needed,-lcxxrt,--no-as-needed
 .endif
 
-.if !exists(${FILESDIR}/patch-bug803480)
+.if ${MOZILLA_VER:R:R} < 25 && !exists(${FILESDIR}/patch-bug803480)
 MOZ_OPTIONS+=	--disable-necko-wifi
 .endif
 

Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev	Wed Jul 24 14:55:39 2013	(r1293)
+++ trunk/www/firefox-nightly/Makefile.hgrev	Tue Jul 30 09:32:51 2013	(r1294)
@@ -1 +1 @@
-HGREV=		138350:18467a85acf6
+HGREV=		140387:3d40d270c031

Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo	Wed Jul 24 14:55:39 2013	(r1293)
+++ trunk/www/firefox-nightly/distinfo	Tue Jul 30 09:32:51 2013	(r1294)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/18467a85acf6.tar.bz2) = 1df9e2ca1273b0699a4b538fed5968c5c072923ca5bba0f80294bb2e81b4a55f
-SIZE (firefox-nightly/18467a85acf6.tar.bz2) = 124287274
+SHA256 (firefox-nightly/3d40d270c031.tar.bz2) = ff15308e9df860e691a04fa45cb62d3cb5be70b31240fdd53ce6e60859885f4d
+SIZE (firefox-nightly/3d40d270c031.tar.bz2) = 125204643

Deleted: trunk/www/firefox-nightly/files/patch-bug803480
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug803480	Tue Jul 30 09:32:51 2013	(r1293)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,102 +0,0 @@
-diff --git configure.in configure.in
-index a0575dc..be327fd 100644
---- configure.in
-+++ configure.in
-@@ -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)
- 
--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])
--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)
- 
- dnl
- dnl option to disable cookies
-diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in
-index 26dbd79..4cbf912 100644
---- netwerk/wifi/Makefile.in
-+++ netwerk/wifi/Makefile.in
-@@ -20,7 +20,7 @@ ifeq ($(OS_ARCH),SunOS)
- OS_INCLUDES += $(GLIB_CFLAGS)
- endif
- 
--ifdef MOZ_ENABLE_DBUS
-+ifdef NECKO_WIFI_DBUS
- OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
- endif
- 
-diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build
-index 5e70211..07b01de 100644
---- netwerk/wifi/moz.build
-+++ netwerk/wifi/moz.build
-@@ -43,7 +43,7 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
-         'nsWifiScannerSolaris.cpp',
-     ]
- 
--if CONFIG['MOZ_ENABLE_DBUS']:
-+if CONFIG['NECKO_WIFI_DBUS']:
-     CPP_SOURCES += [
-         'nsWifiScannerDBus.cpp',
-     ]

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Wed Jul 24 14:55:39 2013	(r1293)
+++ trunk/www/firefox/Makefile	Tue Jul 30 09:32:51 2013	(r1294)
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $
 
 PORTNAME=	firefox
-DISTVERSION=	23.0b5
+DISTVERSION=	23.0b10
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source

Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo	Wed Jul 24 14:55:39 2013	(r1293)
+++ trunk/www/firefox/distinfo	Tue Jul 30 09:32:51 2013	(r1294)
@@ -1,2 +1,2 @@
-SHA256 (firefox-23.0b5.source.tar.bz2) = 145673113148caef5b00b98570a44c13d80f22fda330da4b5fccd89c00848e8b
-SIZE (firefox-23.0b5.source.tar.bz2) = 115978652
+SHA256 (firefox-23.0b10.source.tar.bz2) = f1dce0837f2e764cc3c6a5e9aac110dddf828b644e6e4c1e643c263985e05825
+SIZE (firefox-23.0b10.source.tar.bz2) = 115307376

More information about the freebsd-gecko mailing list