From owner-freebsd-gecko@FreeBSD.ORG  Sun Jun  3 13:07:34 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6664D1065673
	for <freebsd-gecko@freebsd.org>; Sun,  3 Jun 2012 13:07:34 +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 CCB408FC15
	for <freebsd-gecko@freebsd.org>; Sun,  3 Jun 2012 13:07:33 +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 q53D7WCo096288
	for <freebsd-gecko@freebsd.org>; Sun, 3 Jun 2012 13:07:32 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q53D7Rqx095692
	for freebsd-gecko@freebsd.org; Sun, 3 Jun 2012 13:07:27 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sun, 3 Jun 2012 13:07:27 GMT
Message-Id: <201206031307.q53D7Rqx095692@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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r715 - in branches/experimental: Mk
	www/firefox-beta/files
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jun 2012 13:07:34 -0000

Author: beat
Date: Sun Jun  3 13:07:26 2012
New Revision: 715

Log:
- Unbreak on CURRENT after r236444

PR:		ports/163454
Submitted by:	Jan Beich <jbeich AT tormail.net>

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Thu May 31 21:11:52 2012	(r714)
+++ branches/experimental/Mk/bsd.gecko.mk	Sun Jun  3 13:07:26 2012	(r715)
@@ -811,6 +811,7 @@
 	@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
 		${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
 		${ECHO_CMD} "pthread_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
+		${ECHO_CMD} "unwind.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
 	fi
 .endfor
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \

Modified: branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp	Thu May 31 21:11:52 2012	(r714)
+++ branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp	Sun Jun  3 13:07:26 2012	(r715)
@@ -1,11 +1,19 @@
---- xpcom/base/nsStackWalk.cpp.orig	2010-12-15 02:03:41.000000000 +0100
-+++ xpcom/base/nsStackWalk.cpp	2010-12-15 11:28:20.000000000 +0100
-@@ -1137,7 +1137,7 @@
- #define __USE_GNU
- #endif
+--- xpcom/base/nsStackWalk.cpp.orig	2012-05-29 00:57:31.000000000 +0200
++++ xpcom/base/nsStackWalk.cpp	2012-06-03 12:33:40.000000000 +0200
+@@ -57,7 +57,7 @@
+ };
+ static CriticalAddress gCriticalAddress;
  
 -#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
 +#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__)
  #include <dlfcn.h>
  #endif
  
+@@ -1155,6 +1155,7 @@
+ 
+ #elif defined(HAVE__UNWIND_BACKTRACE)
+ 
++#define _GNU_SOURCE
+ // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
+ #include <unwind.h>
+