From 213205395b002b1937e00105fe7db6f2e5034d36 Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 17 May 2006 14:48:35 +0000 Subject: Update to 0.13.1. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6286 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/vte/files/patch-04_dsp_non_alias | 12 +++++++++ .../vte/files/patch-07_set_backspace_to_utf8 | 14 ++++++++++ x11-toolkits/vte/files/patch-config.h.in | 12 +++++++++ x11-toolkits/vte/files/patch-configure | 20 +++++++++++++++ .../vte/files/patch-gnome-pty-helper_Makefile.in | 30 ++++++++++++++++++++++ .../vte/files/patch-gnome-pty-helper_configure | 10 ++++++++ .../patch-gnome-pty-helper_gnome-pty-helper.c | 26 +++++++++++++++++++ x11-toolkits/vte/files/patch-src_keymap.c | 10 ++++++++ x11-toolkits/vte/files/patch-src_pty.c | 19 ++++++++++++++ 9 files changed, 153 insertions(+) create mode 100644 x11-toolkits/vte/files/patch-04_dsp_non_alias create mode 100644 x11-toolkits/vte/files/patch-07_set_backspace_to_utf8 create mode 100644 x11-toolkits/vte/files/patch-config.h.in create mode 100644 x11-toolkits/vte/files/patch-configure create mode 100644 x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in create mode 100644 x11-toolkits/vte/files/patch-gnome-pty-helper_configure create mode 100644 x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c create mode 100644 x11-toolkits/vte/files/patch-src_keymap.c create mode 100644 x11-toolkits/vte/files/patch-src_pty.c (limited to 'x11-toolkits/vte/files') diff --git a/x11-toolkits/vte/files/patch-04_dsp_non_alias b/x11-toolkits/vte/files/patch-04_dsp_non_alias new file mode 100644 index 000000000..34e12ab63 --- /dev/null +++ b/x11-toolkits/vte/files/patch-04_dsp_non_alias @@ -0,0 +1,12 @@ +diff -urN vte-0.11.11.orig/src/vtefc.c vte-0.11.11/src/vtefc.c +--- src/vtefc.c 2004-05-11 09:03:59.000000000 +0000 ++++ src/vtefc.c 2004-05-11 09:05:48.000000000 +0000 +@@ -465,7 +465,7 @@ + tmp = FcFontRenderPrepare(NULL, + pattern, + fontset->fonts[i]); +- _vte_fc_defaults_from_gtk(widget, tmp, antialias); ++ FcConfigSubstitute (NULL, tmp, FcMatchPattern); + _vte_fc_set_antialias(tmp, antialias); + save = FcPatternDuplicate(tmp); + FcPatternDestroy(tmp); diff --git a/x11-toolkits/vte/files/patch-07_set_backspace_to_utf8 b/x11-toolkits/vte/files/patch-07_set_backspace_to_utf8 new file mode 100644 index 000000000..cf1d41e6b --- /dev/null +++ b/x11-toolkits/vte/files/patch-07_set_backspace_to_utf8 @@ -0,0 +1,14 @@ +--- src/vte.c.orig 2004-12-20 00:57:39 -0800 ++++ src/vte.c 2004-12-20 00:57:44 -0800 +@@ -7125,7 +7125,11 @@ + break; + default: + if (pid != 0) { ++ char *codeset; + terminal->pvt->pty_master = i; ++ g_get_charset(&codeset); ++ _vte_pty_set_utf8(terminal->pvt->pty_master, ++ (strcmp(codeset, "UTF-8") == 0)); + } + } + diff --git a/x11-toolkits/vte/files/patch-config.h.in b/x11-toolkits/vte/files/patch-config.h.in new file mode 100644 index 000000000..03db0e1c4 --- /dev/null +++ b/x11-toolkits/vte/files/patch-config.h.in @@ -0,0 +1,12 @@ +--- config.h.in.orig Wed May 17 10:45:57 2006 ++++ config.h.in Wed May 17 10:46:25 2006 +@@ -106,6 +106,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_GL_GLX_H + ++/* Define to 1 if you have the `posix_openpt' function. */ ++#undef HAVE_POSIX_OPENPT ++ + /* Define to 1 if you have the `grantpt' function. */ + #undef HAVE_GRANTPT + diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure new file mode 100644 index 000000000..d0f37c829 --- /dev/null +++ b/x11-toolkits/vte/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig Wed May 17 10:39:56 2006 ++++ configure Wed May 17 10:41:47 2006 +@@ -26463,7 +26463,7 @@ fi + + + +-for ac_func in cfmakeraw getpgid getpt grantpt unlockpt ptsname ptsname_r ++for ac_func in cfmakeraw getpgid getpt posix_openpt grantpt unlockpt ptsname ptsname_r + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -28777,7 +28777,7 @@ _ACEOF + + + cat >>confdefs.h <<_ACEOF +-#define LOCALEDIR "$mydatadir/locale" ++#define LOCALEDIR "$prefix/share/locale" + _ACEOF + + diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in new file mode 100644 index 000000000..fdb419f85 --- /dev/null +++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in @@ -0,0 +1,30 @@ +--- gnome-pty-helper/Makefile.in.orig Mon Jun 2 20:23:02 2003 ++++ gnome-pty-helper/Makefile.in Mon Jun 2 20:26:54 2003 +@@ -65,6 +65,7 @@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ ++BSD_PTHREAD_LIBS = @BSD_PTHREAD_LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +@@ -217,7 +218,7 @@ + -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) + gnome-pty-helper$(EXEEXT): $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_DEPENDENCIES) + @rm -f gnome-pty-helper$(EXEEXT) +- $(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) ++ $(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core +@@ -514,8 +515,8 @@ + + + install-exec-hook: +- chown root.utmp $(DESTDIR)$(libexecdir)/gnome-pty-helper || true +- chmod g+s $(DESTDIR)$(libexecdir)/gnome-pty-helper || true ++ chown root:wheel $(DESTDIR)$(libexecdir)/gnome-pty-helper || true ++ chmod u+s $(DESTDIR)$(libexecdir)/gnome-pty-helper || true + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure new file mode 100644 index 000000000..668f2a6db --- /dev/null +++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure @@ -0,0 +1,10 @@ +--- gnome-pty-helper/configure.orig Mon Jun 2 20:27:32 2003 ++++ gnome-pty-helper/configure Mon Jun 2 20:28:06 2003 +@@ -6318,6 +6318,7 @@ + s,@ECHO_N@,$ECHO_N,;t t + s,@ECHO_T@,$ECHO_T,;t t + s,@LIBS@,$LIBS,;t t ++s,@BSD_PTHREAD_LIBS@,$BSD_PTHREAD_LIBS,;t t + s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t + s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t + s,@INSTALL_DATA@,$INSTALL_DATA,;t t diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c b/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c new file mode 100644 index 000000000..6be543a31 --- /dev/null +++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c @@ -0,0 +1,26 @@ +--- gnome-pty-helper/gnome-pty-helper.c.orig Tue Feb 14 03:58:10 2006 ++++ gnome-pty-helper/gnome-pty-helper.c Sat Feb 25 16:38:04 2006 +@@ -95,12 +95,12 @@ static pty_info *pty_list; + #endif /* CMSG_DATA */ + + static struct cmsghdr *cmptr; +-static int CONTROLLEN; ++static socklen_t CONTROLLEN; + + static int + init_msg_pass (void) + { +- CONTROLLEN = (CMSG_DATA (cmptr) - (unsigned char *)cmptr) + sizeof(int); ++ CONTROLLEN = CMSG_SPACE (sizeof (int)); + cmptr = malloc (CONTROLLEN); + + if (cmptr) +@@ -128,7 +128,7 @@ pass_fd (int client_fd, int fd) + + cmptr->cmsg_level = SOL_SOCKET; + cmptr->cmsg_type = SCM_RIGHTS; +- cmptr->cmsg_len = CONTROLLEN; ++ cmptr->cmsg_len = CMSG_LEN (sizeof (fd)); + *(int *)CMSG_DATA (cmptr) = fd; + + if (sendmsg (client_fd, &msg, 0) != 1) diff --git a/x11-toolkits/vte/files/patch-src_keymap.c b/x11-toolkits/vte/files/patch-src_keymap.c new file mode 100644 index 000000000..56dd44954 --- /dev/null +++ b/x11-toolkits/vte/files/patch-src_keymap.c @@ -0,0 +1,10 @@ +--- src/keymap.c.orig Tue Oct 22 17:42:20 2002 ++++ src/keymap.c Tue Oct 22 17:42:33 2002 +@@ -18,6 +18,7 @@ + + #ident "$Id: patch-src_keymap.c,v 1.9 2006-05-17 14:48:35 marcus Exp $" + #include "../config.h" ++#include + #include + #include + #include 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..a31b1192b --- /dev/null +++ b/x11-toolkits/vte/files/patch-src_pty.c @@ -0,0 +1,19 @@ +--- src/pty.c.orig Tue Jun 3 15:54:15 2003 ++++ src/pty.c Wed Apr 7 02:55:57 2004 +@@ -45,6 +45,7 @@ + #include "pty.h" + + #ifdef VTE_USE_GNOME_PTY_HELPER ++#include "../gnome-pty-helper/config.h" + #include "../gnome-pty-helper/gnome-pty.h" + #endif + +@@ -709,6 +710,8 @@ + #ifdef HAVE_GETPT + /* Call the system's function for allocating a pty. */ + fd = getpt(); ++#elif defined(HAVE_POSIX_OPENPT) ++ fd = posix_openpt(O_RDWR | O_NOCTTY); + #else + /* Try to allocate a pty by accessing the pty master multiplex. */ + fd = open("/dev/ptmx", O_RDWR | O_NOCTTY); -- cgit v1.2.3