diff options
| author | dsainty <dsainty@pkgsrc.org> | 2008-08-24 10:04:49 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2008-08-24 10:04:49 +0000 |
| commit | 1663b4131a803fb283c6e82b536a18bd8ee1a519 (patch) | |
| tree | f81c53ba31b5333ed57b53d303b801e57007c44a | |
| parent | 1f65f1b313d1b6f1276fcafb3cbc321c8f9bf591 (diff) | |
| download | pkgsrc-1663b4131a803fb283c6e82b536a18bd8ee1a519.tar.gz | |
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!)
| -rw-r--r-- | x11/vte/distinfo | 4 | ||||
| -rw-r--r-- | x11/vte/patches/patch-aa | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/x11/vte/distinfo b/x11/vte/distinfo index 8f822a72d02..7d7bce4c2b2 100644 --- a/x11/vte/distinfo +++ b/x11/vte/distinfo @@ -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 --git a/x11/vte/patches/patch-aa b/x11/vte/patches/patch-aa index d3a54e81cb8..5628b47d706 100644 --- a/x11/vte/patches/patch-aa +++ b/x11/vte/patches/patch-aa @@ -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 @@ msghdr does not have the msg_control member, too. Needed for Solaris. 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 } } } |