Two Linux build fixes:

* Don't remove <dirent.h> in ipc/chromium/src/base/process_util.h
* Add -lnssutil3 to EXTRA_DSO_LDOPTS when building libxul.

3 files changed, 19 insertions, 19 deletions

diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 1a57ecf34ad..dd3d32bfd7a 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2012/05/08 23:44:31 abs Exp $
+$NetBSD: distinfo,v 1.70 2012/05/20 02:02:36 sbd Exp $
 
 SHA1 (firefox-12.0.source.tar.bz2) = 0177185e54b7d63dc36bd5bd5c80ba6afd52e199
 RMD160 (firefox-12.0.source.tar.bz2) = d83eb97543fc09f84b30a46ba8217c17f30bd572
@@ -45,7 +45,7 @@ SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = e13494489a76369638f83b3a06
 SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = f25a4e2d0d97b212e982598a71be6360011c152f
 SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 16cee55721718669e87de5a59fab923683febbcd
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 0b75eb1324c41b8e00d576f2632f852f593a4eec
-SHA1 (patch-ipc_chromium_src_base_process__util.h) = 66585119cf29e2b69ad8e3093f44afdcf0fde59b
+SHA1 (patch-ipc_chromium_src_base_process__util.h) = 675ad50bf1a09d7928b426fab6e34beeccc541e7
 SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 7c04ac831689f454e5bb5cde27595ac1f21f08ba
 SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = e72765ffa99b21efaa3df7863ce253e3fade28d0
 SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 54fd1aa5b4d8f7d4fc1ccb8a3437e15b7732b33d
@@ -73,7 +73,7 @@ SHA1 (patch-mi) = 1a031ea9be110822995094c84f77c3c68f5c2a39
 SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
 SHA1 (patch-mk) = 5020178423260e37aa736f4fa4d5ec46ed48b7ea
 SHA1 (patch-ml) = ffec4dcae4a4e3683eebfc3e8aaafe15fa27443e
-SHA1 (patch-mm) = 59a2c116f74db483cf1f1bbc003da541b5d1ee60
+SHA1 (patch-mm) = a8051b564f82602d0c8324ded959188ec1fd7f3e
 SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203
 SHA1 (patch-mp) = 18d2490b6bcd4f017cbf2734a920c3830bfe8856
 SHA1 (patch-netwerk_protocol_http_HttpChannelParent.cpp) = d6b370377d5c397eda9b79bf2093066e9af9a35b
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h
index 338ef9250b3..bd7ed2fb424 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h
@@ -1,18 +1,10 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.2 2012/05/08 19:29:36 martin Exp $
+$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.3 2012/05/20 02:02:36 sbd Exp $
 
 # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046
 
---- ipc/chromium/src/base/process_util.h.orig	2011-12-21 00:28:19.000000000 +0100
-+++ ipc/chromium/src/base/process_util.h	2012-01-31 13:14:54.000000000 +0100
-@@ -14,7 +14,6 @@
- #include <windows.h>
- #include <tlhelp32.h>
- #elif defined(OS_LINUX)
--#include <dirent.h>
- #include <limits.h>
- #include <sys/types.h>
- #elif defined(OS_MACOSX)
-@@ -280,6 +279,7 @@
+--- ipc/chromium/src/base/process_util.h.orig	2012-04-20 22:03:52.000000000 +0000
++++ ipc/chromium/src/base/process_util.h
+@@ -280,6 +280,7 @@ class NamedProcessIterator {
    const ProcessEntry* NextProcessEntry();
  
   private:
@@ -20,7 +12,7 @@ $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.2 2012/05/08 19:29:36 m
    // Determines whether there's another process (regardless of executable)
    // left in the list of all processes.  Returns true and sets entry_ to
    // that process's info if there is one, false otherwise.
-@@ -292,18 +292,24 @@
+@@ -292,18 +293,24 @@ class NamedProcessIterator {
    void InitProcessEntry(ProcessEntry* entry);
  
    std::wstring executable_name_;
diff --git a/devel/xulrunner/patches/patch-mm b/devel/xulrunner/patches/patch-mm
index 05c9646b9df..38ba8f11697 100644
--- a/devel/xulrunner/patches/patch-mm
+++ b/devel/xulrunner/patches/patch-mm
@@ -1,8 +1,16 @@
-$NetBSD: patch-mm,v 1.11 2012/04/26 13:30:30 ryoon Exp $
+$NetBSD: patch-mm,v 1.12 2012/05/20 02:02:36 sbd Exp $
 
---- toolkit/library/Makefile.in.orig	2012-04-04 04:25:46.000000000 +0000
+--- toolkit/library/Makefile.in.orig	2012-04-20 22:04:09.000000000 +0000
 +++ toolkit/library/Makefile.in
-@@ -549,6 +549,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -155,6 +155,7 @@ STATIC_LIBS += ipdlunittest_s
+ endif
+ 
+ ifeq (Linux,$(OS_ARCH))
++EXTRA_DSO_LDOPTS += -lnssutil3
+ ifneq (Android,$(OS_TARGET))
+ OS_LIBS += -lrt
+ endif
+@@ -549,6 +550,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
  endif
  endif