Sun Sep 2 05:45:29 2012 UTC ()
Add one more patch from Jan Beich,
mainly fix DragonFly build.


(ryoon)
diff -r1.76 -r1.77 pkgsrc/devel/xulrunner/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h
cvs diff -r1.76 -r1.77 pkgsrc/devel/xulrunner/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/distinfo 2012/08/31 11:52:13 1.76
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2012/09/02 05:45:29 1.77
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.76 2012/08/31 11:52:13 ryoon Exp $ 1$NetBSD: distinfo,v 1.77 2012/09/02 05:45:29 ryoon Exp $
2 2
3SHA1 (firefox-15.0.source.tar.bz2) = a5e6067cf3fb7741818b630d90778928873a2b04 3SHA1 (firefox-15.0.source.tar.bz2) = a5e6067cf3fb7741818b630d90778928873a2b04
4RMD160 (firefox-15.0.source.tar.bz2) = e70629dbd92db68e39707e28fbe53df7f0946c36 4RMD160 (firefox-15.0.source.tar.bz2) = e70629dbd92db68e39707e28fbe53df7f0946c36
5Size (firefox-15.0.source.tar.bz2) = 83713360 bytes 5Size (firefox-15.0.source.tar.bz2) = 83713360 bytes
6SHA1 (patch-aa) = 2c9a546ae951630e07668c9875d20041a6e5adac 6SHA1 (patch-aa) = 2c9a546ae951630e07668c9875d20041a6e5adac
7SHA1 (patch-ab) = b0d7975a291c63e07773e13b023f71e88c883128 7SHA1 (patch-ab) = b0d7975a291c63e07773e13b023f71e88c883128
8SHA1 (patch-ac) = 18640ddf00b7da9276fd67d95bd6f1b191a99d4f 8SHA1 (patch-ac) = 18640ddf00b7da9276fd67d95bd6f1b191a99d4f
9SHA1 (patch-ad) = cf84430cb1d9c22caf6beaa89288f90577ae6352 9SHA1 (patch-ad) = cf84430cb1d9c22caf6beaa89288f90577ae6352
10SHA1 (patch-ae) = 2d1ffba3f41564d672d05968ff09b188c904fd73 10SHA1 (patch-ae) = 2d1ffba3f41564d672d05968ff09b188c904fd73
11SHA1 (patch-af) = 3dc276155f456a66ce0db9d1a0427d8f11cb74aa 11SHA1 (patch-af) = 3dc276155f456a66ce0db9d1a0427d8f11cb74aa
12SHA1 (patch-ag) = c236c83c7b6a64c19c01010d19cad0120250047c 12SHA1 (patch-ag) = c236c83c7b6a64c19c01010d19cad0120250047c
13SHA1 (patch-ai) = ec2a8bce48ec8a27066667d367cf1bac4874462b 13SHA1 (patch-ai) = ec2a8bce48ec8a27066667d367cf1bac4874462b
14SHA1 (patch-aj) = 25008e1761306f90a31b4e2bff4dc52b2d8167de 14SHA1 (patch-aj) = 25008e1761306f90a31b4e2bff4dc52b2d8167de
@@ -29,27 +29,27 @@ SHA1 (patch-ba) = 6a5ae4c5251aea60650c3a @@ -29,27 +29,27 @@ SHA1 (patch-ba) = 6a5ae4c5251aea60650c3a
29SHA1 (patch-bd) = c8ed2110c8b699d6880723dccf62e6976edfa65e 29SHA1 (patch-bd) = c8ed2110c8b699d6880723dccf62e6976edfa65e
30SHA1 (patch-bf) = 7d18ec3cad441174a71770e7fa22b1cd2029d55b 30SHA1 (patch-bf) = 7d18ec3cad441174a71770e7fa22b1cd2029d55b
31SHA1 (patch-bg) = a629ee2d31aefb366ed50a1e7bd5dba51a39dc68 31SHA1 (patch-bg) = a629ee2d31aefb366ed50a1e7bd5dba51a39dc68
32SHA1 (patch-bi) = cba9c0dbea450201f349e912462c7ae1ed0793e8 32SHA1 (patch-bi) = cba9c0dbea450201f349e912462c7ae1ed0793e8
33SHA1 (patch-build_autoconf_nss.m4) = b4da991ed606fcadcb6582b4c7213e1c83ee811f 33SHA1 (patch-build_autoconf_nss.m4) = b4da991ed606fcadcb6582b4c7213e1c83ee811f
34SHA1 (patch-config_system-headers) = d7d4b5ba0677cbb92dc2ca70cd387b7d88b79f63 34SHA1 (patch-config_system-headers) = d7d4b5ba0677cbb92dc2ca70cd387b7d88b79f63
35SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 50da056101c2719b46fd13ee4028f1a6582c2c97 35SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 50da056101c2719b46fd13ee4028f1a6582c2c97
36SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = cba2ea71973b3717b29052e131eb278cec972ebd 36SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = cba2ea71973b3717b29052e131eb278cec972ebd
37SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 775c13ca6a77b3f39f23e15fbbcf4b1cae4e9478 37SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 775c13ca6a77b3f39f23e15fbbcf4b1cae4e9478
38SHA1 (patch-ipc_chromium_Makefile.in) = 4fbd046e80824669547d5dcb809a3126ce2b96b8 38SHA1 (patch-ipc_chromium_Makefile.in) = 4fbd046e80824669547d5dcb809a3126ce2b96b8
39SHA1 (patch-ipc_chromium_chromium-config.mk) = 24b1fe7cc7f3f14dd8a79f8eedf6f3638c304020 39SHA1 (patch-ipc_chromium_chromium-config.mk) = 24b1fe7cc7f3f14dd8a79f8eedf6f3638c304020
40SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 0b8e231055cde854f31b9aa44392692a53d806f0 40SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 0b8e231055cde854f31b9aa44392692a53d806f0
41SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 46bf793870b4fbc2c8594186eea6bd3c7db885e9 41SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 46bf793870b4fbc2c8594186eea6bd3c7db885e9
42SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 26257fc46798b00c469875cf249a23c4a45e631e 42SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 767160e3099d7bd4eb58dc24ed207417acdf098a
43SHA1 (patch-ipc_chromium_src_base_dir__reader__posix.h) = d6dd15f644de3fa755f8c9be9190eb4092295091 43SHA1 (patch-ipc_chromium_src_base_dir__reader__posix.h) = d6dd15f644de3fa755f8c9be9190eb4092295091
44SHA1 (patch-ipc_chromium_src_base_file__util__linux.cc) = f5a4b391c5c21708c51ad94d6cd02156be78c999 44SHA1 (patch-ipc_chromium_src_base_file__util__linux.cc) = f5a4b391c5c21708c51ad94d6cd02156be78c999
45SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 96a5a0d4b61ec69b80db3c9ff212d7a7a3d506f6 45SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 96a5a0d4b61ec69b80db3c9ff212d7a7a3d506f6
46SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = c53a8962a197a3160087ad31e1a55f647a8d8fc8 46SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = c53a8962a197a3160087ad31e1a55f647a8d8fc8
47SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 1f6eb9d0da16b415df6c2ced4e507d1cbf7dfdae 47SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 1f6eb9d0da16b415df6c2ced4e507d1cbf7dfdae
48SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 771bcb1d149b5bdaf1c94bd231ccc8c032721a80 48SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 771bcb1d149b5bdaf1c94bd231ccc8c032721a80
49SHA1 (patch-ipc_chromium_src_base_process__util.h) = f0e705d9e7951d12225ad132f462527651d3b1be 49SHA1 (patch-ipc_chromium_src_base_process__util.h) = f0e705d9e7951d12225ad132f462527651d3b1be
50SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 1cb9b20816fc749f4f376cd98383ec0a7575c6f3 50SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 1cb9b20816fc749f4f376cd98383ec0a7575c6f3
51SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 4644a4a2f37fae689b5997eda1c9b548372fa252 51SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 4644a4a2f37fae689b5997eda1c9b548372fa252
52SHA1 (patch-ipc_chromium_src_base_ref__counted.h) = 89d6be3faaed51c7ed2e49ee8698d730916ce12f 52SHA1 (patch-ipc_chromium_src_base_ref__counted.h) = 89d6be3faaed51c7ed2e49ee8698d730916ce12f
53SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = ce9b899f181d8339110d3a9a151bff9ab734df42 53SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = ce9b899f181d8339110d3a9a151bff9ab734df42
54SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 73969db2001bb9178fcfe6df73afd2b9dbd3b21d 54SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 73969db2001bb9178fcfe6df73afd2b9dbd3b21d
55SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prtime.cc) = 9a897d9828dc5d93807d578ab8526facc846c263 55SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prtime.cc) = 9a897d9828dc5d93807d578ab8526facc846c263
cvs diff -r1.2 -r1.3 pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_dir__reader__bsd.h (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_dir__reader__bsd.h 2012/08/28 23:27:10 1.2
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_dir__reader__bsd.h 2012/09/02 05:45:29 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ipc_chromium_src_base_dir__reader__bsd.h,v 1.2 2012/08/28 23:27:10 ryoon Exp $ 1$NetBSD: patch-ipc_chromium_src_base_dir__reader__bsd.h,v 1.3 2012/09/02 05:45:29 ryoon Exp $
2 2
3--- ipc/chromium/src/base/dir_reader_bsd.h.orig 2012-08-28 18:53:58.000000000 +0000 3--- ipc/chromium/src/base/dir_reader_bsd.h.orig 2012-08-28 18:53:58.000000000 +0000
4+++ ipc/chromium/src/base/dir_reader_bsd.h 4+++ ipc/chromium/src/base/dir_reader_bsd.h
5@@ -0,0 +1,108 @@ 5@@ -0,0 +1,112 @@
6+// Copyright (c) 2010 The Chromium Authors. All rights reserved. 6+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
7+// Use of this source code is governed by a BSD-style license that can be 7+// Use of this source code is governed by a BSD-style license that can be
8+// found in the LICENSE file. 8+// found in the LICENSE file.
9+ 9+
10+// derived from dir_reader_linux.h 10+// derived from dir_reader_linux.h
11+ 11+
12+#ifndef BASE_DIR_READER_BSD_H_ 12+#ifndef BASE_DIR_READER_BSD_H_
13+#define BASE_DIR_READER_BSD_H_ 13+#define BASE_DIR_READER_BSD_H_
14+#pragma once 14+#pragma once
15+ 15+
16+#include <dirent.h> 16+#include <dirent.h>
17+#include <errno.h> 17+#include <errno.h>
18+#include <fcntl.h> 18+#include <fcntl.h>
@@ -44,27 +44,31 @@ $NetBSD: patch-ipc_chromium_src_base_dir @@ -44,27 +44,31 @@ $NetBSD: patch-ipc_chromium_src_base_dir
44+ if (HANDLE_EINTR(close(fd_))) 44+ if (HANDLE_EINTR(close(fd_)))
45+ DLOG(ERROR) << "Failed to close directory handle"; 45+ DLOG(ERROR) << "Failed to close directory handle";
46+ } 46+ }
47+ } 47+ }
48+ 48+
49+ bool IsValid() const { 49+ bool IsValid() const {
50+ return fd_ >= 0; 50+ return fd_ >= 0;
51+ } 51+ }
52+ 52+
53+ // Move to the next entry returning false if the iteration is complete. 53+ // Move to the next entry returning false if the iteration is complete.
54+ bool Next() { 54+ bool Next() {
55+ if (size_) { 55+ if (size_) {
56+ struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]); 56+ struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]);
 57+#ifdef OS_DRAGONFLY
 58+ offset_ += _DIRENT_DIRSIZ(dirent);
 59+#else
57+ offset_ += dirent->d_reclen; 60+ offset_ += dirent->d_reclen;
 61+#endif
58+ } 62+ }
59+ 63+
60+ if (offset_ != size_) 64+ if (offset_ != size_)
61+ return true; 65+ return true;
62+ 66+
63+#ifdef OS_OPENBSD 67+#ifdef OS_OPENBSD
64+ const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); 68+ const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_);
65+#else 69+#else
66+ const int r = getdents(fd_, buf_, sizeof(buf_)); 70+ const int r = getdents(fd_, buf_, sizeof(buf_));
67+#endif 71+#endif
68+ if (r == 0) 72+ if (r == 0)
69+ return false; 73+ return false;
70+ if (r == -1) { 74+ if (r == -1) {