diff options
| author | rillig <rillig@pkgsrc.org> | 2006-07-13 23:36:18 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-07-13 23:36:18 +0000 |
| commit | 591bf39c233ac6efdc0bb72697af903c8a4380a4 (patch) | |
| tree | e80a90df0352a3cef1f706baa79134ac25576882 /x11 | |
| parent | 354706327a97633d53e2b78cae0cf13ea6c5bb6c (diff) | |
| download | pkgsrc-591bf39c233ac6efdc0bb72697af903c8a4380a4.tar.gz | |
Added a patch to make the package build on Solaris, which does not have
struct msghdr.msg_control and CMSG_FIRSTHDR. While here, removed
BROKEN_IN, since the package works on NetBSD 3.0 and fixed some pkglint
warnings.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/vte/Makefile | 8 | ||||
| -rw-r--r-- | x11/vte/distinfo | 4 | ||||
| -rw-r--r-- | x11/vte/patches/patch-aa | 33 |
3 files changed, 35 insertions, 10 deletions
diff --git a/x11/vte/Makefile b/x11/vte/Makefile index aee4368f248..dae32a48253 100644 --- a/x11/vte/Makefile +++ b/x11/vte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2006/07/05 05:37:47 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2006/07/13 23:36:18 rillig Exp $ # DISTNAME= vte-0.12.2 @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Terminal widget with improved accessibility and I18N support -BROKEN_IN= pkgsrc-2006Q1 - USE_DIRS+= gnome2-1.2 USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes @@ -23,10 +21,10 @@ CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ARGS+= --with-ft-exec-prefix=${BUILDLINK_PREFIX.freetype2} -PKGCONFIG_OVERRIDE+= vte.pc.in +PKGCONFIG_OVERRIDE+= vte.pc.in # for FC_WIDTH -BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.1.93 +BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.1.93 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" diff --git a/x11/vte/distinfo b/x11/vte/distinfo index 7cbe102e25d..c0f647ff8ac 100644 --- a/x11/vte/distinfo +++ b/x11/vte/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.13 2006/07/04 16:03:51 drochner Exp $ +$NetBSD: distinfo,v 1.14 2006/07/13 23:36:18 rillig Exp $ SHA1 (vte-0.12.2.tar.bz2) = cc76a380dfe23cfc8aba606b146015a6954d67ae RMD160 (vte-0.12.2.tar.bz2) = 5ef474f9d4150df1f87459657a446b0d0fcfb32b Size (vte-0.12.2.tar.bz2) = 974551 bytes -SHA1 (patch-aa) = 9b4961c056c3bf46332490fc7f30ff3540f2dbd3 +SHA1 (patch-aa) = 1ec8b2ec123b1a6024279b6ece69d8562a6e73be SHA1 (patch-ab) = 8c9c3189b53a87aa198fcb8b11f43a9aa5255eaf SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d SHA1 (patch-ae) = 7bc19459ab99bc71f0bc0e9fa36bcde49a512395 diff --git a/x11/vte/patches/patch-aa b/x11/vte/patches/patch-aa index 3b9e70e66a3..e52d58ac8cc 100644 --- a/x11/vte/patches/patch-aa +++ b/x11/vte/patches/patch-aa @@ -1,9 +1,36 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/12/13 17:54:15 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2006/07/13 23:36:18 rillig Exp $ ---- src/pty.c.orig 2003-06-03 12:54:15.000000000 -0700 -+++ src/pty.c 2003-11-29 01:07:59.000000000 -0800 +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 2004-05-01 09:12:51.000000000 +0200 ++++ src/pty.c 2006-07-14 01:17:28.073815601 +0200 @@ -1,3 +1,4 @@ +#include <sys/types.h> /* * Copyright (C) 2001,2002 Red Hat, Inc. * +@@ -837,12 +838,15 @@ _vte_pty_read_ptypair(int tunnel, int *p + msg.msg_namelen = 0; + msg.msg_iov = &vec; + msg.msg_iovlen = 1; ++#if defined(CMSG_FIRSTHDR) + msg.msg_control = control; + msg.msg_controllen = sizeof(control); ++#endif + ret = recvmsg(tunnel, &msg, PTY_RECVMSG_FLAGS); + if (ret == -1) { + return; + } ++#if defined(CMSG_FIRSTHDR) + for (cmsg = CMSG_FIRSTHDR(&msg); + cmsg != NULL; + cmsg = CMSG_NXTHDR(&msg, cmsg)) { +@@ -861,6 +865,7 @@ _vte_pty_read_ptypair(int tunnel, int *p + } + } + } ++#endif + } + } + #else |