diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-10-10 13:37:02 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-10-10 13:37:02 +0800 |
commit | b2afcb5aa2ddb5d67f30646a86db04d697e88965 (patch) | |
tree | a62b99f311d398c8afba54bb13cde783dfcecc28 /x11-toolkits/vte/files | |
parent | a78bfd40c5f12a5be8b456620958a18983442315 (diff) | |
download | marcuscom-ports-b2afcb5aa2ddb5d67f30646a86db04d697e88965.tar marcuscom-ports-b2afcb5aa2ddb5d67f30646a86db04d697e88965.tar.gz marcuscom-ports-b2afcb5aa2ddb5d67f30646a86db04d697e88965.tar.bz2 marcuscom-ports-b2afcb5aa2ddb5d67f30646a86db04d697e88965.tar.lz marcuscom-ports-b2afcb5aa2ddb5d67f30646a86db04d697e88965.tar.xz marcuscom-ports-b2afcb5aa2ddb5d67f30646a86db04d697e88965.tar.zst marcuscom-ports-b2afcb5aa2ddb5d67f30646a86db04d697e88965.zip |
Add vte.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@47 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/vte/files')
-rw-r--r-- | x11-toolkits/vte/files/patch-configure | 18 | ||||
-rw-r--r-- | x11-toolkits/vte/files/patch-src_pty.c | 23 | ||||
-rw-r--r-- | x11-toolkits/vte/files/patch-src_vte.c | 51 |
3 files changed, 92 insertions, 0 deletions
diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure new file mode 100644 index 000000000..5695da107 --- /dev/null +++ b/x11-toolkits/vte/files/patch-configure @@ -0,0 +1,18 @@ +--- configure.orig Wed Sep 11 02:36:11 2002 ++++ configure Sat Oct 5 21:12:04 2002 +@@ -8137,6 +8137,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -12188,6 +12189,7 @@ + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" ++#include <wchar.h> + $ac_includes_default + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus diff --git a/x11-toolkits/vte/files/patch-src_pty.c b/x11-toolkits/vte/files/patch-src_pty.c new file mode 100644 index 000000000..29dbb1a75 --- /dev/null +++ b/x11-toolkits/vte/files/patch-src_pty.c @@ -0,0 +1,23 @@ +--- src/pty.c.orig Wed Sep 11 02:10:46 2002 ++++ src/pty.c Sat Oct 5 21:07:48 2002 +@@ -19,9 +19,10 @@ + #ident "$Id: patch-src_pty.c,v 1.1 2002-10-10 05:37:02 marcus Exp $" + #include "../config.h" + #include <sys/ioctl.h> +-#include <sys/socket.h> + #include <sys/types.h> ++#include <sys/socket.h> + #include <sys/wait.h> ++#include <sys/uio.h> + #include <errno.h> + #include <fcntl.h> + #include <limits.h> +@@ -525,7 +526,7 @@ + msg.msg_iovlen = 1; + msg.msg_control = control; + msg.msg_controllen = sizeof(control); +- ret = recvmsg(tunnel, &msg, MSG_NOSIGNAL); ++ ret = recvmsg(tunnel, &msg, 0); + if (ret == -1) { + return; + } diff --git a/x11-toolkits/vte/files/patch-src_vte.c b/x11-toolkits/vte/files/patch-src_vte.c new file mode 100644 index 000000000..5b10c2da6 --- /dev/null +++ b/x11-toolkits/vte/files/patch-src_vte.c @@ -0,0 +1,51 @@ +--- src/vte.c.orig Sat Oct 5 21:26:51 2002 ++++ src/vte.c Sat Oct 5 21:27:06 2002 +@@ -472,48 +472,7 @@ + static wchar_t + vte_wc_from_unichar(VteTerminal *terminal, gunichar c) + { +-#ifdef __STDC_ISO_10646__ + return (wchar_t) c; +-#else +- gpointer original, result; +- char *local, utf8_buf[VTE_UTF8_BPC]; +- const char *localr; +- wchar_t wc_buf[VTE_UTF8_BPC]; +- int ret; +- gsize length, bytes_read, bytes_written; +- mbstate_t state; +- GError *error = NULL; +- /* Check the cache. */ +- if (g_tree_lookup_extended(terminal->pvt->unichar_wc_map, +- GINT_TO_POINTER(c), +- &original, +- &result)) { +- return GPOINTER_TO_INT(c); +- } +- /* Convert the character to a locally-encoded mbs. */ +- length = g_unichar_to_utf8(c, utf8_buf); +- local = g_locale_from_utf8(utf8_buf, length, +- &bytes_read, &bytes_written, &error); +- if (error == NULL) { +- /* Convert from an mbs to a (single-character) wcs. */ +- memset(&state, 0, sizeof(state)); +- localr = local; +- ret = mbsrtowcs(wc_buf, &localr, bytes_written, &state); +- if (ret == 1) { +- g_tree_insert(terminal->pvt->unichar_wc_map, +- GINT_TO_POINTER(c), +- GINT_TO_POINTER(wc_buf[0])); +- return wc_buf[0]; +- } +- } +- /* Punt. */ +- if (error != NULL) { +- g_printerr("g_locale_from_utf8(%d): %s", error->code, +- error->message); +- g_error_free(error); +- } +- return (wchar_t) c; +-#endif + } + + #ifdef VTE_PREFER_PANGOX |