From owner-freebsd-gecko@FreeBSD.ORG Tue Jul 24 12:55:34 2012 Return-Path: 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 AB3B0106566B for ; Tue, 24 Jul 2012 12:55: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 353038FC1B for ; Tue, 24 Jul 2012 12:55: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 q6OCtQxq023400 for ; Tue, 24 Jul 2012 12:55: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 q6OCtL6L023139 for freebsd-gecko@freebsd.org; Tue, 24 Jul 2012 12:55:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 24 Jul 2012 12:55:21 GMT Message-Id: <201207241255.q6OCtL6L023139@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] r889 - branches/experimental/www/libxul/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, 24 Jul 2012 12:55:34 -0000 Author: jbeich Date: Tue Jul 24 12:55:21 2012 New Revision: 889 Log: oops, use firefox-esr patch Modified: branches/experimental/www/libxul/files/patch-bug753046 Modified: branches/experimental/www/libxul/files/patch-bug753046 ============================================================================== --- branches/experimental/www/libxul/files/patch-bug753046 Mon Jul 23 22:39:50 2012 (r888) +++ branches/experimental/www/libxul/files/patch-bug753046 Tue Jul 24 12:55:21 2012 (r889) @@ -363,23 +363,18 @@ index 9a34492..62b280c 100644 --- ipc/chromium/src/base/dir_reader_posix.h +++ ipc/chromium/src/base/dir_reader_posix.h -@@ -18,16 +18,20 @@ - // seems worse than falling back to enumerating all file descriptors so we will - // probably never implement this on the Mac. +@@ -18,6 +18,8 @@ --#if defined(OS_LINUX) && !defined(OS_OPENBSD) -+#if defined(OS_LINUX) + #if defined(OS_LINUX) #include "base/dir_reader_linux.h" +#elif defined(OS_BSD) +#include "base/dir_reader_bsd.h" #else #include "base/dir_reader_fallback.h" #endif +@@ -26,6 +28,8 @@ - namespace base { - --#if defined(OS_LINUX) && !defined(OS_OPENBSD) -+#if defined(OS_LINUX) + #if defined(OS_LINUX) typedef DirReaderLinux DirReaderPosix; +#elif defined(OS_BSD) +typedef DirReaderBSD DirReaderPosix; @@ -1220,11 +1215,11 @@ nsCString path; greDir->GetNativePath(path); -# ifdef OS_LINUX --# ifdef MOZ_WIDGET_ANDROID +-# ifdef ANDROID +# if defined(OS_LINUX) || defined(OS_BSD) -+# if defined(MOZ_WIDGET_ANDROID) || defined(OS_BSD) ++# if defined(ANDROID) || defined(OS_BSD) path += "/lib"; - # endif // MOZ_WIDGET_ANDROID + # endif // ANDROID const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH"); @@ -557,7 +557,7 @@ childArgv.push_back(pidstring);