From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 22 11:36:23 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3F8C3F9 for ; Sat, 22 Nov 2014 11:36:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E86A694 for ; Sat, 22 Nov 2014 11:36:22 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id sAMBaKIh073521 for ; Sat, 22 Nov 2014 11:36:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id sAMBaFrF072965 for freebsd-gecko@freebsd.org; Sat, 22 Nov 2014 11:36:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 22 Nov 2014 11:36:15 GMT Message-Id: <201411221136.sAMBaFrF072965@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] r1771 - in trunk/www/firefox-nightly: . files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 11:36:24 -0000 Author: jbeich Date: Sat Nov 22 11:36:15 2014 New Revision: 1771 Log: update just Nightly to pick up bug 1097592 Deleted: trunk/www/firefox-nightly/files/patch-bug1063726 Modified: trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Sat Nov 22 11:29:52 2014 (r1770) +++ trunk/www/firefox-nightly/Makefile.hgrev Sat Nov 22 11:36:15 2014 (r1771) @@ -1 +1 @@ -HGREV= 216336:20065dfb6476 +HGREV= 216988:ac55dd11daec Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Sat Nov 22 11:29:52 2014 (r1770) +++ trunk/www/firefox-nightly/distinfo Sat Nov 22 11:36:15 2014 (r1771) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/20065dfb6476.tar.bz2) = 1ba878b151604490970897b1b387a937702fe596f424317f42d1f0a1488ce648 -SIZE (firefox-nightly/20065dfb6476.tar.bz2) = 174587296 +SHA256 (firefox-nightly/ac55dd11daec.tar.bz2) = e44f77973bece68be7cb2b8720369ef81124a235bd1817374957dffd220810f4 +SIZE (firefox-nightly/ac55dd11daec.tar.bz2) = 175046048 Deleted: trunk/www/firefox-nightly/files/patch-bug1063726 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug1063726 Sat Nov 22 11:36:15 2014 (r1770) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,41 +0,0 @@ -diff --git js/src/configure.in js/src/configure.in -index 75177dd..1051ba2 100644 ---- js/src/configure.in -+++ js/src/configure.in -@@ -3913,7 +3913,17 @@ dnl ======================================================== - dnl JavaScript shell - dnl ======================================================== - --AC_CHECK_HEADERS(malloc.h malloc/malloc.h) -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" -+MALLOC_H= -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break -+ fi -+done -+ - AC_CHECK_FUNCS(setlocale localeconv malloc_size malloc_usable_size) - - AC_SUBST(MOZILLA_VERSION) -diff --git js/src/shell/js.cpp js/src/shell/js.cpp -index 866522a..b0b475f 100644 ---- js/src/shell/js.cpp -+++ js/src/shell/js.cpp -@@ -22,11 +22,8 @@ - # include /* for isatty() */ - #endif - #include --#ifdef HAVE_MALLOC_H /* for malloc_usable_size on Linux, _msize on Windows */ --#include --#endif --#ifdef HAVE_MALLOC_MALLOC_H --#include /* for malloc_size on OSX */ -+#if defined(MALLOC_H) -+#include MALLOC_H /* for malloc_usable_size, malloc_size, _msize */ - #endif - #include - #include