cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to vte3-0.32.0.

Browse Source
This commit is contained in:
ajacoutot 2012-03-23 13:25:00 +00:00
parent 82d32e5490
commit bfa789b82c
5 changed files with 12 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devel/vte3/Makefile
View File

@ -1,18 +1,17 @@
# $OpenBSD: Makefile,v 1.13 2012/03/09 06:45:16 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.14 2012/03/23 13:25:00 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= terminal emulation library
GNOME_PROJECT= vte
GNOME_VERSION= 0.30.1
GNOME_VERSION= 0.32.0
PKGNAME= vte3-${GNOME_VERSION}
REVISION= 4
SHARED_LIBS += vte2_90 1.0 # 3009.0
CATEGORIES= devel
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org/
@ -36,15 +35,12 @@ WANTLIB += gthread-2.0 gtk-3 m ncurses pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += stdc++ util xcb xcb-render xcb-shm z
LIB_DEPENDS= x11/gtk+3
LIB_DEPENDS= x11/gtk+3>=3.3.18
MODGNOME_TOOLS= goi
AUTOCONF_VERSION= 2.68
AUTOMAKE_VERSION= 1.11
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= --disable-Bsymbolic \
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-Bsymbolic \
--disable-gnome-pty-helper
.include <bsd.port.mk>

10
devel/vte3/distinfo
View File

@ -1,5 +1,5 @@
MD5 (vte-0.30.1.tar.xz) = UU9ING8Xb5EpdzH2/bHP/A==
RMD160 (vte-0.30.1.tar.xz) = 9N4s+aH961g8uEnu09IxroRQNpw=
SHA1 (vte-0.30.1.tar.xz) = 6NSJTzrLVyUZ5ZuvYhhW5/+z4fo=
SHA256 (vte-0.30.1.tar.xz) = u+Qh3jAVk1wi9oXuoOuL4sH+zVAhwfgimWuPCigva2Q=
SIZE (vte-0.30.1.tar.xz) = 951688
MD5 (vte-0.32.0.tar.xz) = 2PeWzsokMnzLiWNIbXrWzA==
RMD160 (vte-0.32.0.tar.xz) = yBF3pY4ZtQBQg+6isfyJ/0ZaAhY=
SHA1 (vte-0.32.0.tar.xz) = LiLXf9Q90PdYuCWPJa7ILcHDgjI=
SHA256 (vte-0.32.0.tar.xz) = n9oldiZdnK1D+W3VX1iJtLuaLICk/4cKEhn9PhcbBYM=
SIZE (vte-0.32.0.tar.xz) = 974736

36
devel/vte3/patches/patch-configure_in
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-configure_in,v 1.2 2012/03/09 06:45:16 ajacoutot Exp $
From 116fe70d32c810ccd0bb226fc0c06c74e28db075 Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@openbsd.org>
Date: Thu, 08 Mar 2012 20:53:52 +0000
Subject: pty: Support allocating PTYs through openpty on BSD
--- configure.in.orig Fri Mar 9 07:27:29 2012
+++ configure.in Fri Mar 9 07:28:53 2012
@@ -313,7 +313,7 @@ AC_SUBST(VTE_DEFAULT_EMULATION)
AM_CONDITIONAL(VTE_DEFAULT_EMULATION, [test "$emulation" != xterm])
# Check for headers.
-AC_CHECK_HEADERS(sys/select.h sys/syslimits.h sys/termios.h sys/un.h sys/wait.h stropts.h termios.h wchar.h)
+AC_CHECK_HEADERS(sys/select.h sys/syslimits.h sys/termios.h sys/un.h sys/wait.h stropts.h termios.h util.h wchar.h)
AC_HEADER_TIOCGWINSZ
# Check for PTY handling functions.
@@ -324,6 +324,7 @@ AC_CHECK_FUNCS([cfmakeraw fork setsid setpgid getpgid
AC_CHECK_FUNC(socket,[have_socket=1],AC_CHECK_LIB(socket,socket,[have_socket=1; LIBS="$LIBS -lsocket"]))
AC_CHECK_FUNC(socketpair,[have_socketpair=1],AC_CHECK_LIB(socket,socketpair,[have_socketpair=1; LIBS="$LIBS -lsocket"]))
AC_CHECK_FUNC(recvmsg,[have_recvmsg=1],AC_CHECK_LIB(socket,recvmsg,[have_recvmsg=1; LIBS="$LIBS -lsocket -lnsl"]))
+AC_CHECK_FUNC(openpty,[have_openpty=1],AC_CHECK_LIB(util,openpty,[have_openpty=1; LIBS="$LIBS -lutil"]))
if test x$have_socket = x1 ; then
AC_DEFINE(HAVE_SOCKET,1,[Define if you have the socket function.])
fi
@@ -332,6 +333,9 @@ if test x$have_socketpair = x1 ; then
fi
if test x$have_recvmsg = x1 ; then
AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
+fi
+if test x$have_openpty = x1 ; then
+ AC_DEFINE(HAVE_OPENPTY,1,[Define if you have the openpty function.])
fi
AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
AC_CHECK_FUNCS([ceil floor])

109
devel/vte3/patches/patch-src_pty_c
View File

@ -1,109 +0,0 @@
$OpenBSD: patch-src_pty_c,v 1.3 2012/03/09 06:45:16 ajacoutot Exp $
From 116fe70d32c810ccd0bb226fc0c06c74e28db075 Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@openbsd.org>
Date: Thu, 08 Mar 2012 20:53:52 +0000
Subject: pty: Support allocating PTYs through openpty on BSD
--- src/pty.c.orig Mon Sep 26 14:32:16 2011
+++ src/pty.c Fri Mar 9 07:28:53 2012
@@ -54,6 +54,9 @@
#include <termios.h>
#endif
#include <unistd.h>
+#ifdef HAVE_UTIL_H
+#include <util.h>
+#endif
#ifdef HAVE_STROPTS_H
#include <stropts.h>
#endif
@@ -81,6 +84,12 @@ static pid_t _vte_pty_helper_pid = -1;
static int _vte_pty_helper_tunnel = -1;
#endif
+#if defined(HAVE_PTSNAME_R) || defined(HAVE_PTSNAME) || defined(TIOCGPTN)
+#define HAVE_UNIX98_PTY
+#else
+#undef HAVE_UNIX98_PTY
+#endif
+
/* Reset the handlers for all known signals to their defaults. The parent
* (or one of the libraries it links to) may have changed one to be ignored. */
static void
@@ -734,6 +743,8 @@ vte_pty_get_size(VtePty *pty,
}
}
+#if defined(HAVE_UNIX98_PTY)
+
/*
* _vte_pty_ptsname:
* @master: file descriptor to the PTY master
@@ -951,6 +962,44 @@ _vte_pty_open_unix98(VtePty *pty,
return TRUE;
}
+#elif defined(HAVE_OPENPTY)
+
+/*
+ * _vte_pty_open_bsd:
+ * @pty: a #VtePty
+ * @error: a location to store a #GError, or %NULL
+ *
+ * Opens new file descriptors to a new PTY master and slave.
+ *
+ * Returns: %TRUE on success, %FALSE on failure with @error filled in
+ */
+static gboolean
+_vte_pty_open_bsd(VtePty *pty,
+ GError **error)
+{
+ VtePtyPrivate *priv = pty->priv;
+ int parentfd, childfd;
+
+ if (openpty(&parentfd, &childfd, NULL, NULL, NULL) != 0) {
+ int errsv = errno;
+ g_set_error(error, VTE_PTY_ERROR, VTE_PTY_ERROR_PTY98_FAILED,
+ "%s failed: %s", "openpty", g_strerror(errsv));
+ errno = errsv;
+ return FALSE;
+ }
+
+ priv->pty_fd = parentfd;
+ priv->child_setup_data.mode = TTY_OPEN_BY_FD;
+ priv->child_setup_data.tty.fd = childfd;
+ priv->using_helper = FALSE;
+
+ return TRUE;
+}
+
+#else
+#error Have neither UNIX98 PTY nor BSD openpty!
+#endif /* HAVE_UNIX98_PTY */
+
#ifdef VTE_USE_GNOME_PTY_HELPER
#ifdef HAVE_RECVMSG
static void
@@ -1511,7 +1560,7 @@ vte_pty_initable_init (GInitable *initable,
}
g_error_free(err);
- /* Fall back to unix98 PTY */
+ /* Fall back to unix98 or bsd PTY */
}
#else
if (priv->flags & VTE_PTY_NO_FALLBACK) {
@@ -1521,7 +1570,13 @@ vte_pty_initable_init (GInitable *initable,
}
#endif /* VTE_USE_GNOME_PTY_HELPER */
+#if defined(HAVE_UNIX98_PTY)
ret = _vte_pty_open_unix98(pty, error);
+#elif defined(HAVE_OPENPTY)
+ ret = _vte_pty_open_bsd(pty, error);
+#else
+#error Have neither UNIX98 PTY nor BSD openpty!
+#endif
out:
_vte_debug_print(VTE_DEBUG_PTY,

6
devel/vte3/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2012/03/09 06:45:16 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.10 2012/03/23 13:25:00 ajacoutot Exp $
@conflict vte-<0.28.2p3
@conflict vte-ptyhelper-*
@bin bin/vte2_90
@ -44,7 +44,6 @@ share/gtk-doc/html/vte-2.90/pt01.html
share/gtk-doc/html/vte-2.90/right.png
share/gtk-doc/html/vte-2.90/style.css
share/gtk-doc/html/vte-2.90/up.png
share/gtk-doc/html/vte-2.90/vte-2.90.devhelp
share/gtk-doc/html/vte-2.90/vte-2.90.devhelp2
share/gtk-doc/html/vte-2.90/vte-Version-Information.html
share/gtk-doc/html/vte-2.90/vte-Vte-PTY.html
@ -139,6 +138,3 @@ share/locale/xh/LC_MESSAGES/vte-2.90.mo
share/locale/zh_CN/LC_MESSAGES/vte-2.90.mo
share/locale/zh_HK/LC_MESSAGES/vte-2.90.mo
share/locale/zh_TW/LC_MESSAGES/vte-2.90.mo
share/vte/
share/vte/termcap-2.90/
share/vte/termcap-2.90/xterm