Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Sep 2012 00:12:59 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r971 - in trunk: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/files
Message-ID:  <201209010012.q810Cx8r029211@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Sep  1 00:12:59 2012
New Revision: 971

Log:
unbreak IPC on DragonFly

Keep changes within patch-bug753046, it's used by PkgSrc folks.

PR:	http://gnats.netbsd.org/46876

Modified:
   trunk/mail/thunderbird-esr/files/patch-bug753046
   trunk/mail/thunderbird/files/patch-bug753046
   trunk/www/firefox-esr/files/patch-bug753046
   trunk/www/firefox/files/patch-bug753046
   trunk/www/libxul/files/patch-bug753046
   trunk/www/seamonkey/files/patch-bug753046

Modified: trunk/mail/thunderbird-esr/files/patch-bug753046
==============================================================================
--- trunk/mail/thunderbird-esr/files/patch-bug753046	Fri Aug 31 18:39:24 2012	(r970)
+++ trunk/mail/thunderbird-esr/files/patch-bug753046	Sat Sep  1 00:12:59 2012	(r971)
@@ -264,7 +264,7 @@
 index 0000000..3fc1a87
 --- /dev/null
 +++ mozilla/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.
@@ -316,7 +316,11 @@
 +  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_)

Modified: trunk/mail/thunderbird/files/patch-bug753046
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug753046	Fri Aug 31 18:39:24 2012	(r970)
+++ trunk/mail/thunderbird/files/patch-bug753046	Sat Sep  1 00:12:59 2012	(r971)
@@ -264,7 +264,7 @@
 index 0000000..3fc1a87
 --- /dev/null
 +++ mozilla/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.
@@ -316,7 +316,11 @@
 +  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_)

Modified: trunk/www/firefox-esr/files/patch-bug753046
==============================================================================
--- trunk/www/firefox-esr/files/patch-bug753046	Fri Aug 31 18:39:24 2012	(r970)
+++ trunk/www/firefox-esr/files/patch-bug753046	Sat Sep  1 00:12:59 2012	(r971)
@@ -264,7 +264,7 @@
 index 0000000..3fc1a87
 --- /dev/null
 +++ 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.
@@ -316,7 +316,11 @@
 +  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_)

Modified: trunk/www/firefox/files/patch-bug753046
==============================================================================
--- trunk/www/firefox/files/patch-bug753046	Fri Aug 31 18:39:24 2012	(r970)
+++ trunk/www/firefox/files/patch-bug753046	Sat Sep  1 00:12:59 2012	(r971)
@@ -264,7 +264,7 @@
 index 0000000..3fc1a87
 --- /dev/null
 +++ 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.
@@ -316,7 +316,11 @@
 +  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_)

Modified: trunk/www/libxul/files/patch-bug753046
==============================================================================
--- trunk/www/libxul/files/patch-bug753046	Fri Aug 31 18:39:24 2012	(r970)
+++ trunk/www/libxul/files/patch-bug753046	Sat Sep  1 00:12:59 2012	(r971)
@@ -264,7 +264,7 @@
 index 0000000..3fc1a87
 --- /dev/null
 +++ 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.
@@ -316,7 +316,11 @@
 +  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_)

Modified: trunk/www/seamonkey/files/patch-bug753046
==============================================================================
--- trunk/www/seamonkey/files/patch-bug753046	Fri Aug 31 18:39:24 2012	(r970)
+++ trunk/www/seamonkey/files/patch-bug753046	Sat Sep  1 00:12:59 2012	(r971)
@@ -264,7 +264,7 @@
 index 0000000..3fc1a87
 --- /dev/null
 +++ mozilla/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.
@@ -316,7 +316,11 @@
 +  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_)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209010012.q810Cx8r029211>