From owner-freebsd-gecko@FreeBSD.ORG Tue Jul 3 18:24:20 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DB8EF106566C for ; Tue, 3 Jul 2012 18:24:20 +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 6AFE68FC19 for ; Tue, 3 Jul 2012 18:24:20 +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 q63IOJY4013385 for ; Tue, 3 Jul 2012 18:24:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q63IOEov012926 for freebsd-gecko@freebsd.org; Tue, 3 Jul 2012 18:24:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 3 Jul 2012 18:24:14 GMT Message-Id: <201207031824.q63IOEov012926@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] r837 - branches/experimental/www/firefox-nightly/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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jul 2012 18:24:20 -0000 Author: jbeich Date: Tue Jul 3 18:24:14 2012 New Revision: 837 Log: correct hunk offsets Reported by: AN Modified: branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Modified: branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Tue Jul 3 16:47:45 2012 (r836) +++ branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Tue Jul 3 18:24:14 2012 (r837) @@ -1,14 +1,5 @@ --- toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 +++ toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 -@@ -132,7 +132,7 @@ else - SDK_LIBRARY = $(SHARED_LIBRARY) - endif - --EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo - - ifndef MOZ_ENABLE_LIBXUL - EXTRA_DSO_LDOPTS += \ @@ -387,6 +387,10 @@ ifdef HAVE_CLOCK_MONOTONIC EXTRA_DSO_LDOPTS += $(REALTIME_LIBS) endif @@ -20,3 +11,12 @@ ifeq (android,$(MOZ_WIDGET_TOOLKIT)) OS_LIBS += -lGLESv2 endif +@@ -445,7 +449,7 @@ endif + endif + endif + +-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo + + DEFINES += -DIMPL_XREAPI +