diff options
| author | sbd <sbd> | 2012-05-20 02:02:36 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2012-05-20 02:02:36 +0000 |
| commit | ceb046c6d3e101dafe19bbff0666354cfb26bd75 (patch) | |
| tree | ce10876d87e1d6103db977365ac673ce940df6d7 /devel/xulrunner/patches | |
| parent | b66398ad118cca6e274dc9b976573b46f82ea0a9 (diff) | |
| download | pkgsrc-ceb046c6d3e101dafe19bbff0666354cfb26bd75.tar.gz | |
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.
Diffstat (limited to 'devel/xulrunner/patches')
| -rw-r--r-- | devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h | 18 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-mm | 14 |
2 files changed, 16 insertions, 16 deletions
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 |