Re: CVS commit: pkgsrc/devel/xulrunner

[Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>]

Hi,

From: John Marino <mfl-commissioner%marino.st@localhost>, Date: Sat, 01 Sep 
2012 08:24:46 +0200

> On 8/31/2012 13:52, Ryo ONODERA wrote:
>> Module Name: pkgsrc
>> Committed By:        ryoon
>> Date:                Fri Aug 31 11:52:13 UTC 2012
>>
>> Modified Files:
>>      pkgsrc/devel/xulrunner: distinfo
>>      pkgsrc/devel/xulrunner/patches:
>>          patch-ipc_chromium_src_base_process__util__bsd.cc
>>
>> Log Message:
>> Add one more patch from
>> https://bugzilla.mozilla.org/show_bug.cgi?id=753046,
>> mainly improve OpenBSD build.
> 
> 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.

--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3

Index: devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h
===================================================================
RCS file: 
/cvsroot/pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ipc_chromium_src_base_dir__reader__bsd.h
--- devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h      
28 Aug 2012 23:27:10 -0000      1.2
+++ devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h      
31 Aug 2012 22:26:29 -0000
@@ -2,7 +2,7 @@ $NetBSD: patch-ipc_chromium_src_base_dir
 
 --- 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
-@@ -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
 +  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_)