pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/vte Don't include <sys/types.h> until after config...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b115a49c834
branches:  trunk
changeset: 546225:3b115a49c834
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Sun Aug 24 10:04:49 2008 +0000

description:
Don't include <sys/types.h> until after config.h has had a chance to determine
which features will be exposed.  Fixes build on Linux.

<sys/types.h> is included immediately after config.h in the distribution code,
suggesting that the purged hunk in the patch is now obsolete.

The history of patch-aa reveals that the <sys/types.h> include was the very
original purpose of this patch, and predates the Solaris portion of the patch.
The Solaris hunks don't look like they would benefit from including
<sys/types.h>.

No PKGREVISION bump, this change should only affect platforms where the
package failed to build.

Closes PR pkg/36404 with the fix suggested by Ondrej Tuma (thanks!)

diffstat:

 x11/vte/distinfo         |   4 ++--
 x11/vte/patches/patch-aa |  11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diffs (46 lines):

diff -r 60cf2efe5459 -r 3b115a49c834 x11/vte/distinfo
--- a/x11/vte/distinfo  Sun Aug 24 09:10:52 2008 +0000
+++ b/x11/vte/distinfo  Sun Aug 24 10:04:49 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.29 2008/06/13 11:03:48 drochner Exp $
+$NetBSD: distinfo,v 1.30 2008/08/24 10:04:49 dsainty Exp $
 
 SHA1 (vte-0.16.14.tar.bz2) = 4d3ff513d4b0ebeb89babb284260b7fdc2dcd752
 RMD160 (vte-0.16.14.tar.bz2) = 8ac4cc778ebbc0c2831692ca251bc50d5db8d4e8
 Size (vte-0.16.14.tar.bz2) = 1120379 bytes
-SHA1 (patch-aa) = ce2d069774a885ad2218d0db4789e48835d594e3
+SHA1 (patch-aa) = 6b722ecbbd9face7152feca39f1d323870d2a69a
 SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d
 SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc
 SHA1 (patch-ah) = 28cee2661439d7d6f1959ebf3c7d1b7b3fe0a764
diff -r 60cf2efe5459 -r 3b115a49c834 x11/vte/patches/patch-aa
--- a/x11/vte/patches/patch-aa  Sun Aug 24 09:10:52 2008 +0000
+++ b/x11/vte/patches/patch-aa  Sun Aug 24 10:04:49 2008 +0000
@@ -1,16 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2007/04/11 22:40:14 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2008/08/24 10:04:49 dsainty Exp $
 
 Let's assume that if the macro CMSG_FIRSTHDR is not defined, that struct
 msghdr does not have the msg_control member, too. Needed for Solaris.
 
 --- src/pty.c.orig     2007-02-26 22:05:14.000000000 +0100
 +++ src/pty.c
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- /*
-  * Copyright (C) 2001,2002 Red Hat, Inc.
-  *
-@@ -659,12 +660,15 @@ _vte_pty_read_ptypair(int tunnel, int *p
+@@ -659,12 +659,15 @@ _vte_pty_read_ptypair(int tunnel, int *p
                msg.msg_namelen = 0;
                msg.msg_iov = &vec;
                msg.msg_iovlen = 1;
@@ -26,7 +21,7 @@
                for (cmsg = CMSG_FIRSTHDR(&msg);
                     cmsg != NULL;
                     cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-@@ -683,6 +687,7 @@ _vte_pty_read_ptypair(int tunnel, int *p
+@@ -683,6 +686,7 @@ _vte_pty_read_ptypair(int tunnel, int *p
                                }
                        }
                }



Home | Main Index | Thread Index | Old Index