Update to vte 0.20.1, tested by jasper@ in a bulk build.
ok jasper@
This commit is contained in:
landry
parent
2c1e5de196
commit
e803a37402
@ -1,14 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.39 2009/03/28 15:36:54 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.40 2009/04/17 08:34:41 landry Exp $
|
||||
|
||||
COMMENT-main= terminal emulation library
|
||||
COMMENT-python= python bindings for vte
|
||||
|
||||
GNOME_PROJECT= vte
|
||||
GNOME_VERSION= 0.17.4
|
||||
PKGNAME-main= ${DISTNAME}p0
|
||||
PKGNAME-python= py-${DISTNAME}p0
|
||||
GNOME_VERSION= 0.20.1
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
PKGNAME-python= py-${DISTNAME}
|
||||
CATEGORIES= devel
|
||||
SHARED_LIBS+= vte 12.0 # .12.3
|
||||
SHARED_LIBS+= vte 13.0 # .14.0
|
||||
|
||||
HOMEPAGE= http://www.gnome.org/
|
||||
|
||||
@ -29,13 +29,12 @@ WANTLIB-main= ${WANTLIB-python} util c
|
||||
LIB_DEPENDS-main= ${LIB_DEPENDS} \
|
||||
gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2
|
||||
|
||||
WANTLIB-python= ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes \
|
||||
Xft Xi Xinerama Xcomposite Xrandr Xrender \
|
||||
WANTLIB-python= X11 Xau Xcursor Xdmcp Xext Xfixes \
|
||||
Xi Xinerama Xcomposite Xrandr Xrender \
|
||||
Xdamage atk-1.0 cairo expat fontconfig \
|
||||
freetype m z gio-2.0 glib-2.0 glitz gmodule-2.0 \
|
||||
gobject-2.0 ncurses pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 pangox-1.0 pangoxft-1.0 pcre \
|
||||
pixman-1 png z
|
||||
pangoft2-1.0 pcre pixman-1 png z
|
||||
|
||||
BUILD_DEPENDS= ${RUN_DEPENDS-python}
|
||||
LIB_DEPENDS-python= ${LIB_DEPENDS-main} \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (vte-0.17.4.tar.bz2) = 7GyyZo23FG6ufPxIr5jz7Q==
|
||||
RMD160 (vte-0.17.4.tar.bz2) = j6PMw1vJ74wgSwWLGA9TK6b+eho=
|
||||
SHA1 (vte-0.17.4.tar.bz2) = /ko+xHbJfQ84UknuYO2xKIe2lXU=
|
||||
SHA256 (vte-0.17.4.tar.bz2) = UK4Qrqf6mcmuKWAxeCwYrBVmPoTrbs2UzQoYx4Q5h9I=
|
||||
SIZE (vte-0.17.4.tar.bz2) = 1084847
|
||||
MD5 (vte-0.20.1.tar.bz2) = wP6QOJeOrrcKvxbNf3kXUg==
|
||||
RMD160 (vte-0.20.1.tar.bz2) = utyU1/fqRDb7KABZNiQyg31lTHU=
|
||||
SHA1 (vte-0.20.1.tar.bz2) = knFcv1pR7EIhb9z26EoyIXtyygA=
|
||||
SHA256 (vte-0.20.1.tar.bz2) = ZKSgXTByxsE7R7nSWljt17F0wUUlQKzWpN+tzVhO4Kw=
|
||||
SIZE (vte-0.20.1.tar.bz2) = 1090308
|
||||
|
||||
@ -1,101 +0,0 @@
|
||||
$OpenBSD: patch-gnome-pty-helper_gnome-pty-helper_c,v 1.3 2008/11/27 18:22:53 jasper Exp $
|
||||
|
||||
Patch to fix 64-bit issues where gnome-pty-helper would eat up 100% CPU usage.
|
||||
From chpe@gnome.org Bugzilla: #562385
|
||||
|
||||
--- gnome-pty-helper/gnome-pty-helper.c.orig Thu Jun 26 19:49:45 2008
|
||||
+++ gnome-pty-helper/gnome-pty-helper.c Thu Nov 27 13:21:41 2008
|
||||
@@ -95,27 +95,25 @@ static pty_info *pty_list;
|
||||
#endif
|
||||
#endif /* CMSG_DATA */
|
||||
|
||||
-static struct cmsghdr *cmptr;
|
||||
-static int CONTROLLEN;
|
||||
+/* Solaris doesn't define these */
|
||||
+#ifndef CMSG_ALIGN
|
||||
+#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) & (size_t) ~(sizeof (size_t) - 1))
|
||||
+#endif
|
||||
+#ifndef CMSG_SPACE
|
||||
+#define CMSG_SPACE(len) (CMSG_ALIGN (len) + CMSG_ALIGN (sizeof (struct cmsghdr)))
|
||||
+#endif
|
||||
+#ifndef CMSG_LEN
|
||||
+#define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
|
||||
+#endif
|
||||
|
||||
static int
|
||||
-init_msg_pass (void)
|
||||
-{
|
||||
- CONTROLLEN = (CMSG_DATA (cmptr) - (unsigned char *)cmptr) + sizeof(int);
|
||||
- cmptr = malloc (CONTROLLEN);
|
||||
-
|
||||
- if (cmptr)
|
||||
- return 0;
|
||||
-
|
||||
- return -1;
|
||||
-}
|
||||
-
|
||||
-static int
|
||||
pass_fd (int client_fd, int fd)
|
||||
{
|
||||
struct iovec iov[1];
|
||||
struct msghdr msg;
|
||||
char buf [1];
|
||||
+ char cmsgbuf[CMSG_SPACE(sizeof(int))];
|
||||
+ struct cmsghdr *cmptr;
|
||||
|
||||
iov [0].iov_base = buf;
|
||||
iov [0].iov_len = 1;
|
||||
@@ -124,12 +122,13 @@ pass_fd (int client_fd, int fd)
|
||||
msg.msg_iovlen = 1;
|
||||
msg.msg_name = NULL;
|
||||
msg.msg_namelen = 0;
|
||||
- msg.msg_control = (caddr_t) cmptr;
|
||||
- msg.msg_controllen = CONTROLLEN;
|
||||
-
|
||||
+ msg.msg_control = (caddr_t) cmsgbuf;
|
||||
+ msg.msg_controllen = sizeof(cmsgbuf);
|
||||
+
|
||||
+ cmptr = CMSG_FIRSTHDR(&msg);
|
||||
cmptr->cmsg_level = SOL_SOCKET;
|
||||
cmptr->cmsg_type = SCM_RIGHTS;
|
||||
- cmptr->cmsg_len = CONTROLLEN;
|
||||
+ cmptr->cmsg_len = CMSG_LEN(sizeof(int));
|
||||
*(int *)CMSG_DATA (cmptr) = fd;
|
||||
|
||||
if (sendmsg (client_fd, &msg, 0) != 1)
|
||||
@@ -154,12 +153,6 @@ pass_fd (int client_fd, int fd)
|
||||
#include <sys/uio.h>
|
||||
|
||||
static int
|
||||
-init_msg_pass ()
|
||||
-{
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-static int
|
||||
pass_fd (int client_fd, int fd)
|
||||
{
|
||||
struct iovec iov[1];
|
||||
@@ -185,12 +178,6 @@ pass_fd (int client_fd, int fd)
|
||||
#else
|
||||
#include <stropts.h>
|
||||
#ifdef I_SENDFD
|
||||
-static int
|
||||
-init_msg_pass ()
|
||||
-{
|
||||
- /* nothing */
|
||||
- return 0;
|
||||
-}
|
||||
|
||||
int
|
||||
pass_fd (int client_fd, int fd)
|
||||
@@ -707,9 +694,6 @@ main (int argc, char *argv [])
|
||||
/* Make sure we clean up utmp/wtmp even under vncserver */
|
||||
signal (SIGHUP, exit_handler);
|
||||
signal (SIGTERM, exit_handler);
|
||||
-
|
||||
- if (init_msg_pass () == -1)
|
||||
- exit (1);
|
||||
|
||||
while (!done) {
|
||||
res = n_read (STDIN_FILENO, &op, sizeof (op));
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.8 2008/11/27 12:41:19 jasper Exp $
|
||||
--- src/Makefile.in.orig Tue Sep 23 00:25:20 2008
|
||||
+++ src/Makefile.in Thu Nov 27 13:12:45 2008
|
||||
@@ -381,7 +381,7 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
||||
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
||||
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
||||
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
||||
-LDFLAGS = @LDFLAGS@
|
||||
+LDFLAGS = -L./.libs @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
@@ -544,7 +544,7 @@ AM_CPPFLAGS = -DDATADIR='"$(datadir)"' \
|
||||
-DLOCALEDIR='"$(localedir)"' \
|
||||
-DVTE_COMPILATION
|
||||
|
||||
-AM_LDFLAGS = $(LDFLAGS)
|
||||
+AM_LDFLAGS =
|
||||
EXTRA_libvte_la_SOURCES = keysyms.c
|
||||
libvte_la_SOURCES = buffer.c buffer.h caps.c caps.h debug.c debug.h \
|
||||
iso2022.c iso2022.h keymap.c keymap.h marshal.c marshal.h \
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-src_pty_c,v 1.5 2008/07/08 12:02:19 jasper Exp $
|
||||
--- src/pty.c.orig Mon Jun 2 21:54:24 2008
|
||||
+++ src/pty.c Tue Jul 8 13:19:26 2008
|
||||
@@ -57,6 +57,7 @@
|
||||
#ifdef HAVE_SYS_UN_H
|
||||
#include <sys/un.h>
|
||||
#endif
|
||||
+#include "../gnome-pty-helper/config.h"
|
||||
#include "../gnome-pty-helper/gnome-pty.h"
|
||||
static gboolean _vte_pty_helper_started = FALSE;
|
||||
static pid_t _vte_pty_helper_pid = -1;
|
||||
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.3 2008/11/10 09:02:30 landry Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.4 2009/04/17 08:34:41 landry Exp $
|
||||
@pkgpath devel/vte
|
||||
bin/vte
|
||||
@bin bin/vte
|
||||
include/vte/
|
||||
include/vte/pty.h
|
||||
include/vte/reaper.h
|
||||
@ -13,14 +13,9 @@ lib/libvte.la
|
||||
lib/pkgconfig/vte.pc
|
||||
lib/vte/
|
||||
lib/vte/decset
|
||||
lib/vte/interpret
|
||||
lib/vte/iso8859mode
|
||||
lib/vte/nativeecho
|
||||
@bin lib/vte/interpret
|
||||
lib/vte/osc
|
||||
lib/vte/slowcat
|
||||
lib/vte/utf8echo
|
||||
lib/vte/utf8mode
|
||||
lib/vte/vterdb
|
||||
@bin lib/vte/slowcat
|
||||
lib/vte/window
|
||||
@mode g+s
|
||||
@group utmp
|
||||
@ -28,7 +23,6 @@ libexec/gnome-pty-helper
|
||||
@mode
|
||||
@group
|
||||
share/gtk-doc/html/vte/
|
||||
share/gtk-doc/html/vte/VteReaper.html
|
||||
share/gtk-doc/html/vte/VteTerminal.html
|
||||
share/gtk-doc/html/vte/VteTerminalAccessible.html
|
||||
share/gtk-doc/html/vte/ch01.html
|
||||
@ -44,6 +38,7 @@ share/gtk-doc/html/vte/vte.devhelp2
|
||||
share/locale/am/LC_MESSAGES/vte.mo
|
||||
share/locale/ang/LC_MESSAGES/vte.mo
|
||||
share/locale/ar/LC_MESSAGES/vte.mo
|
||||
share/locale/as/LC_MESSAGES/vte.mo
|
||||
share/locale/az/LC_MESSAGES/vte.mo
|
||||
share/locale/be/LC_MESSAGES/vte.mo
|
||||
share/locale/be@latin/LC_MESSAGES/vte.mo
|
||||
|
||||
@ -1,7 +1,12 @@
|
||||
@comment $OpenBSD: PLIST-python,v 1.2 2008/07/08 12:02:19 jasper Exp $
|
||||
@comment $OpenBSD: PLIST-python,v 1.3 2009/04/17 08:34:41 landry Exp $
|
||||
%%SHARED%%
|
||||
lib/pkgconfig/pyvte.pc
|
||||
lib/python${MODPY_VERSION}/
|
||||
lib/python${MODPY_VERSION}/site-packages/
|
||||
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/
|
||||
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/vtemodule.a
|
||||
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/vtemodule.la
|
||||
share/pygtk/
|
||||
share/pygtk/2.0/
|
||||
share/pygtk/2.0/defs/
|
||||
share/pygtk/2.0/defs/vte.defs
|
||||
|
||||
Loading…
Reference in New Issue
Block a user