Re: CVS commit: pkgsrc/devel/xulrunner

[John Marino <mfl-commissioner%marino.st@localhost>]

On 9/1/2012 08:42, Ryo ONODERA wrote:
> Hi,
>
> From: John Marino<mfl-commissioner%marino.st@localhost>, Date: Sat, 01 Sep 2012 
> 08:24:46 +0200
> > devel/xulrunner is now broke on DragonFly due to an incompatible
> > dirent structure (see error below).  I want to say the member is
> > called d_namlen on DragonFly but I'd have to look closer to confirm.
>
> I have be given a patch to fix this problem from Jan Beich.
> See attached patch.
> But my DragonFly pkgsrc environment is broken now
> due to gettext problem.
> I cannot confirm the patch yet.
>
> Sorry for inconvenience.
>
> --

No problem!
I confirm this patch will fix DragonFly build.
I had to incorporate it into an existing patch and regenerate distinfo 
because I was building it in a bulk environment.  I have attached the 
patch I used for the source package and you should be able to commit it.

Thanks,
John

diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 8a830d2..3df24fa 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -39,7 +39,7 @@ SHA1 (patch-ipc_chromium_Makefile.in) = 
4fbd046e80824669547d5dcb809a3126ce2b96b8
 SHA1 (patch-ipc_chromium_chromium-config.mk) = 
24b1fe7cc7f3f14dd8a79f8eedf6f3638c304020
 SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 
0b8e231055cde854f31b9aa44392692a53d806f0
 SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 
46bf793870b4fbc2c8594186eea6bd3c7db885e9
-SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 
26257fc46798b00c469875cf249a23c4a45e631e
+SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 
4d1f36c4326646efc9cc4c636773739bc6579fa5
 SHA1 (patch-ipc_chromium_src_base_dir__reader__posix.h) = 
d6dd15f644de3fa755f8c9be9190eb4092295091
 SHA1 (patch-ipc_chromium_src_base_file__util__linux.cc) = 
f5a4b391c5c21708c51ad94d6cd02156be78c999
 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 
96a5a0d4b61ec69b80db3c9ff212d7a7a3d506f6
diff --git 
a/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h 
b/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h
index bd06668..ec0b36d 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-ipc_chromium_src_base_dir__reader__bsd.h,v 1.2 2012/08/28 
23:27:10 ryoon Exp $
+$NetBSD$
 
---- ipc/chromium/src/base/dir_reader_bsd.h.orig        2012-08-28 
18:53:58.000000000 +0000
+--- ipc/chromium/src/base/dir_reader_bsd.h.orig        2012-09-01 
07:12:52.000000000 +0000
 +++ ipc/chromium/src/base/dir_reader_bsd.h
-@@ -0,0 +1,108 @@
+@@ -0,0 +1,112 @@
 +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -54,7 +54,11 @@ $NetBSD: patch-ipc_chromium_src_base_dir__reader__bsd.h,v 
1.2 2012/08/28 23:27:1
 +  bool Next() {
 +    if (size_) {
 +      struct dirent* dirent = reinterpret_cast<struct 
dirent*>(&buf_[offset_]);
++#ifdef OS_DRAGONFLY
++      offset_ += _DIRENT_DIRSIZ(dirent);
++#else
 +      offset_ += dirent->d_reclen;
++#endif
 +    }
 +
 +    if (offset_ != size_)