diff options
author | ryoon <ryoon@pkgsrc.org> | 2012-08-31 11:52:13 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2012-08-31 11:52:13 +0000 |
commit | 0cbeb89a925b268f28442cf5e97b34fb04ce18c5 (patch) | |
tree | 73f17f7f3f6d7b9a68497db36ee316274a2618ef /devel/xulrunner | |
parent | 104ae59a221331e27d3d65bba57a181edd408513 (diff) | |
download | pkgsrc-0cbeb89a925b268f28442cf5e97b34fb04ce18c5.tar.gz |
Add one more patch from https://bugzilla.mozilla.org/show_bug.cgi?id=753046,
mainly improve OpenBSD build.
Diffstat (limited to 'devel/xulrunner')
-rw-r--r-- | devel/xulrunner/distinfo | 4 | ||||
-rw-r--r-- | devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index 8a830d2b853..7229e853bb9 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.75 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: distinfo,v 1.76 2012/08/31 11:52:13 ryoon Exp $ SHA1 (firefox-15.0.source.tar.bz2) = a5e6067cf3fb7741818b630d90778928873a2b04 RMD160 (firefox-15.0.source.tar.bz2) = e70629dbd92db68e39707e28fbe53df7f0946c36 @@ -47,7 +47,7 @@ SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = c53a8962a197a3160087ad31e1 SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 1f6eb9d0da16b415df6c2ced4e507d1cbf7dfdae SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 771bcb1d149b5bdaf1c94bd231ccc8c032721a80 SHA1 (patch-ipc_chromium_src_base_process__util.h) = f0e705d9e7951d12225ad132f462527651d3b1be -SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 4d2d66b37452134148e6a726117fce6ff4569798 +SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 1cb9b20816fc749f4f376cd98383ec0a7575c6f3 SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 4644a4a2f37fae689b5997eda1c9b548372fa252 SHA1 (patch-ipc_chromium_src_base_ref__counted.h) = 89d6be3faaed51c7ed2e49ee8698d730916ce12f SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = ce9b899f181d8339110d3a9a151bff9ab734df42 diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc index 5e73922d5d1..67117b9fbed 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc @@ -1,4 +1,4 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.7 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.8 2012/08/31 11:52:13 ryoon Exp $ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-08-28 18:53:59.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc @@ -11,7 +11,7 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.7 2012/08/28 23:2 + +#include "base/process_util.h" + -+#include <sys/types.h> ++#include <sys/param.h> +#include <sys/sysctl.h> +#include <sys/wait.h> +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) @@ -32,14 +32,10 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.7 2012/08/28 23:2 +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 -+#define HAVE_POSIX_SPAWN 1 -+#elif defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 599006500 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 +#endif -+#endif + +#ifndef __dso_public +# ifdef __exported @@ -291,7 +287,11 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.7 2012/08/28 23:2 +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue; |