[SVN-Commit] r889 - branches/experimental/www/libxul/files

[svn-freebsd-gecko at chruetertee.ch]

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);