summaryrefslogtreecommitdiffstats
path: root/x11-toolkits/vte/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-03-13 14:27:52 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-03-13 14:27:52 +0800
commit60c53a51b194f5ccc564de7b45a3418ddb2e80be (patch)
tree729e4649027eaa4331306fcb2e2428f7f47e1bfe /x11-toolkits/vte/files
parent39b7337c93e8ea43f3d85e8b25c6cc7b895ba891 (diff)
downloadmarcuscom-ports-60c53a51b194f5ccc564de7b45a3418ddb2e80be.tar
marcuscom-ports-60c53a51b194f5ccc564de7b45a3418ddb2e80be.tar.gz
marcuscom-ports-60c53a51b194f5ccc564de7b45a3418ddb2e80be.tar.bz2
marcuscom-ports-60c53a51b194f5ccc564de7b45a3418ddb2e80be.tar.lz
marcuscom-ports-60c53a51b194f5ccc564de7b45a3418ddb2e80be.tar.xz
marcuscom-ports-60c53a51b194f5ccc564de7b45a3418ddb2e80be.tar.zst
marcuscom-ports-60c53a51b194f5ccc564de7b45a3418ddb2e80be.zip
Update to 0.12.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5895 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/vte/files')
-rw-r--r--x11-toolkits/vte/files/patch-04_dsp_non_alias12
-rw-r--r--x11-toolkits/vte/files/patch-07_set_backspace_to_utf814
-rw-r--r--x11-toolkits/vte/files/patch-configure31
-rw-r--r--x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in30
-rw-r--r--x11-toolkits/vte/files/patch-gnome-pty-helper_configure10
-rw-r--r--x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c26
-rw-r--r--x11-toolkits/vte/files/patch-src_keymap.c10
-rw-r--r--x11-toolkits/vte/files/patch-src_pty.c19
8 files changed, 152 insertions, 0 deletions
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-configure b/x11-toolkits/vte/files/patch-configure
new file mode 100644
index 000000000..424e74a57
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-configure
@@ -0,0 +1,31 @@
+--- configure.orig Tue Aug 23 20:29:13 2005
++++ configure Tue Aug 23 20:30:09 2005
+@@ -26765,10 +26765,6 @@
+ rm -f conftest*
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define _XOPEN_SOURCE_EXTENDED 1
+-_ACEOF
+-
+
+ cat >>confdefs.h <<\_ACEOF
+ #define _XOPEN_SOURCE 1
+@@ -27067,7 +27063,7 @@
+
+
+
+-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
+@@ -29400,7 +29396,7 @@
+
+
+ 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..c72b805b6
--- /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.7 2006-03-13 06:27:52 marcus Exp $"
+ #include "../config.h"
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
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);