From b914bb0c76d97875ff1517369ae24947b4cf01e3 Mon Sep 17 00:00:00 2001 From: jmmv Date: Fri, 7 May 2004 11:13:16 +0000 Subject: Update to 0.11.11: - Add APIs for setting font with/without antialiasing, cursor color, hilite color, and a forkpty()-alike. Fix meta-space. Use glib 2.4's child watch API if available. - Add a configure switch for setting the default emulation instead of hard-coding it to be "xterm". - Tweak autowrapping of text to handle cases where the terminal has both LP and xn capabilities. - Truncate empty lines when copying text to mimic xterm. - Internally abstract out matching APIs, though we still use POSIX regex. - Try to set UTF8 line editing mode under sufficiently-new Linux. - Obey Pango's specified attributes when displaying pre-edit text. - Never steal modifier keys which might affect the input method from the input methods. - Fix python binding so that help() lists the terminal class. --- x11/vte/Makefile | 11 +++-------- x11/vte/PLIST | 23 ++++++++++++++++++----- x11/vte/buildlink3.mk | 15 ++------------- x11/vte/distinfo | 10 ++++++---- x11/vte/patches/patch-ae | 19 +++++++++++++------ x11/vte/patches/patch-af | 13 +++++++++++++ x11/vte/patches/patch-ag | 20 ++++++++++++++++++++ 7 files changed, 75 insertions(+), 36 deletions(-) create mode 100644 x11/vte/patches/patch-af create mode 100644 x11/vte/patches/patch-ag (limited to 'x11') diff --git a/x11/vte/Makefile b/x11/vte/Makefile index 9f4b3fabcf1..bf063589765 100644 --- a/x11/vte/Makefile +++ b/x11/vte/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2004/05/07 01:14:51 xtraeme Exp $ +# $NetBSD: Makefile,v 1.11 2004/05/07 11:13:16 jmmv Exp $ # -DISTNAME= vte-0.11.10 -PKGREVISION= 2 +DISTNAME= vte-0.11.11 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.11/} EXTRACT_SUFX= .tar.bz2 @@ -23,16 +22,12 @@ USE_X11= yes CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --disable-python -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc PKGCONFIG_OVERRIDE+= vte.pc.in .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} != "FreeBSD" -CPPFLAGS+= -D_XOPEN_SOURCE_EXTENDED=1 -.endif - .include "../../devel/pkgconfig/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libzvt/buildlink3.mk" diff --git a/x11/vte/PLIST b/x11/vte/PLIST index 79f10ae2155..d739dd00606 100644 --- a/x11/vte/PLIST +++ b/x11/vte/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/13 17:54:14 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/05/07 11:13:16 jmmv Exp $ bin/vte include/vte/pty.h include/vte/reaper.h @@ -7,8 +7,8 @@ include/vte/vteaccess.h lib/libvte.a lib/libvte.la lib/libvte.so -lib/libvte.so.5 -lib/libvte.so.5.1 +lib/libvte.so.8 +lib/libvte.so.8.0 lib/pkgconfig/vte.pc lib/vte/decset lib/vte/interpret @@ -22,6 +22,7 @@ lib/vte/vterdb lib/vte/window libexec/gnome-pty-helper ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/vte.mo @@ -32,11 +33,18 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/et/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/vte.mo @@ -44,13 +52,17 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/vte.mo @@ -65,12 +77,13 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/vte.mo +${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/vte.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/vte.mo share/vte/termcap/xterm @dirrm share/vte/termcap @dirrm share/vte -@exec ${MKDIR} %D/share/doc/html/vte -@dirrm share/doc/html/vte +@exec ${MKDIR} %D/share/doc/vte +@dirrm share/doc/vte @dirrm lib/vte @dirrm include/vte diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk index 33a24e5f666..46374ebc770 100644 --- a/x11/vte/buildlink3.mk +++ b/x11/vte/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:49:52 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/05/07 11:13:16 jmmv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ VTE_BUILDLINK3_MK:= ${VTE_BUILDLINK3_MK}+ @@ -11,19 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvte} BUILDLINK_PACKAGES+= vte .if !empty(VTE_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.vte+= vte>=0.11.10nb2 +BUILDLINK_DEPENDS.vte+= vte>=0.11.11 BUILDLINK_PKGSRCDIR.vte?= ../../x11/vte - -BUILDLINK_FILES.vte+= lib/vte/decset -BUILDLINK_FILES.vte+= lib/vte/interpret -BUILDLINK_FILES.vte+= lib/vte/iso8859mode -BUILDLINK_FILES.vte+= lib/vte/nativeecho -BUILDLINK_FILES.vte+= lib/vte/osc -BUILDLINK_FILES.vte+= lib/vte/slowcat -BUILDLINK_FILES.vte+= lib/vte/utf8echo -BUILDLINK_FILES.vte+= lib/vte/utf8mode -BUILDLINK_FILES.vte+= lib/vte/vterdb -BUILDLINK_FILES.vte+= lib/vte/window .endif # VTE_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/vte/distinfo b/x11/vte/distinfo index 7c162d73217..b6d19b90843 100644 --- a/x11/vte/distinfo +++ b/x11/vte/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.3 2004/04/15 11:32:50 xtraeme Exp $ +$NetBSD: distinfo,v 1.4 2004/05/07 11:13:16 jmmv Exp $ -SHA1 (vte-0.11.10.tar.bz2) = 10fb64a786e925b45aa7c919595212d56441dd23 -Size (vte-0.11.10.tar.bz2) = 855466 bytes +SHA1 (vte-0.11.11.tar.bz2) = 655a7e2a4310a13caf3853dc51f07ee3b8fe3622 +Size (vte-0.11.11.tar.bz2) = 888405 bytes SHA1 (patch-aa) = 9b4961c056c3bf46332490fc7f30ff3540f2dbd3 SHA1 (patch-ab) = 8c9c3189b53a87aa198fcb8b11f43a9aa5255eaf SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d SHA1 (patch-ad) = 6afc6ed139346d5e7effeb07c0f3e84c3e772d77 -SHA1 (patch-ae) = 4cafe1b6236a0c0339ae500ce28c96c58c60572c +SHA1 (patch-ae) = 7bc19459ab99bc71f0bc0e9fa36bcde49a512395 +SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc +SHA1 (patch-ag) = a87e379e0ddc728bcd2db41856d669644be43bdc diff --git a/x11/vte/patches/patch-ae b/x11/vte/patches/patch-ae index bb0bc66222b..28caacde3ac 100644 --- a/x11/vte/patches/patch-ae +++ b/x11/vte/patches/patch-ae @@ -1,13 +1,20 @@ -$NetBSD: patch-ae,v 1.1 2004/04/15 11:32:50 xtraeme Exp $ +$NetBSD: patch-ae,v 1.2 2004/05/07 11:13:16 jmmv Exp $ ---- configure.orig Thu Apr 15 13:18:01 2004 -+++ configure Thu Apr 15 13:18:55 2004 -@@ -23733,7 +23733,7 @@ +--- configure.orig 2004-05-02 08:44:03.000000000 +0200 ++++ configure +@@ -25114,6 +25114,7 @@ fi + rm -f conftest* ++if false; then cat >>confdefs.h <<\_ACEOF --#define _XOPEN_SOURCE_EXTENDED 1 -+#undef _XOPEN_SOURCE_EXTENDED + #define _XOPEN_SOURCE_EXTENDED 1 _ACEOF +@@ -25127,6 +25128,7 @@ _ACEOF + cat >>confdefs.h <<\_ACEOF + #define __EXTENSIONS__ 1 + _ACEOF ++fi + # Check whether --enable-deprecation or --disable-deprecation was given. diff --git a/x11/vte/patches/patch-af b/x11/vte/patches/patch-af new file mode 100644 index 00000000000..560844a250d --- /dev/null +++ b/x11/vte/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2004/05/07 11:13:16 jmmv Exp $ + +--- src/slowcat.c.orig 2004-04-27 22:48:17.000000000 +0200 ++++ src/slowcat.c +@@ -81,6 +81,8 @@ main(int argc, char **argv) + int i, c; + long delay = 200000, chunksize = 1, tmp; + char *p; ++ extern char *optarg; ++ extern int optind; + GList *files = NULL, *file; + + while ((c = getopt(argc, argv, "t:c:")) != -1) { diff --git a/x11/vte/patches/patch-ag b/x11/vte/patches/patch-ag new file mode 100644 index 00000000000..b17211bba62 --- /dev/null +++ b/x11/vte/patches/patch-ag @@ -0,0 +1,20 @@ +$NetBSD: patch-ag,v 1.1 2004/05/07 11:13:16 jmmv Exp $ + +--- gnome-pty-helper/configure.orig 2004-05-02 08:44:08.000000000 +0200 ++++ gnome-pty-helper/configure +@@ -6269,6 +6269,7 @@ fi + rm -f conftest* + + ++if false; then + cat >>confdefs.h <<\_ACEOF + #define _XOPEN_SOURCE_EXTENDED 1 + _ACEOF +@@ -6282,6 +6283,7 @@ _ACEOF + cat >>confdefs.h <<\_ACEOF + #define __EXTENSIONS__ 1 + _ACEOF ++fi + + + ac_config_headers="$ac_config_headers config.h" -- cgit v1.2.3