diff options
| author | recht <recht@pkgsrc.org> | 2004-06-02 12:48:17 +0000 |
|---|---|---|
| committer | recht <recht@pkgsrc.org> | 2004-06-02 12:48:17 +0000 |
| commit | ad928000a360bf13643517df1af897e71afae9ca (patch) | |
| tree | 0aa44841d884b2e96203a121ed2a987905c5cbc9 /x11/aterm | |
| parent | eb37209ba5b60842aebde1246e1ba1e5aebe4344 (diff) | |
| download | pkgsrc-ad928000a360bf13643517df1af897e71afae9ca.tar.gz | |
Fix a problem that pasting a selection from an aterm running on a 64bit
platform into an application running on a 32bit platform doesn't always work.
Patch by Joachim Kuebart in PR 25750 .
Bump PKGREVISION to 5.
Diffstat (limited to 'x11/aterm')
| -rw-r--r-- | x11/aterm/Makefile | 4 | ||||
| -rw-r--r-- | x11/aterm/distinfo | 5 | ||||
| -rw-r--r-- | x11/aterm/patches/patch-ae | 35 |
3 files changed, 36 insertions, 8 deletions
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 12a9595c52a..026adc6fb73 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2004/04/21 04:19:45 snj Exp $ +# $NetBSD: Makefile,v 1.16 2004/06/02 12:48:17 recht Exp $ # DISTNAME= aterm-0.4.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aterm/} diff --git a/x11/aterm/distinfo b/x11/aterm/distinfo index 2611c020359..21bef4e7cc0 100644 --- a/x11/aterm/distinfo +++ b/x11/aterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/08/25 21:52:30 jlam Exp $ +$NetBSD: distinfo,v 1.7 2004/06/02 12:48:18 recht Exp $ SHA1 (aterm-0.4.2.tar.gz) = 8ce3f1fcdc12805068ff5acde6f130a22e1f5b9b Size (aterm-0.4.2.tar.gz) = 312730 bytes @@ -6,4 +6,5 @@ SHA1 (patch-aa) = 59cf8fe42bf4291b2a98c0d95170a02308197645 SHA1 (patch-ab) = 9b4e6785912de338db958e9ad48c4cafcb344270 SHA1 (patch-ac) = 28c79343079680251a013ec3fe364b01f5a5ccac SHA1 (patch-ad) = 0c87ee69672e98189afa2cfdcdd9691a1571f354 -SHA1 (patch-ae) = b4bbe033f29a8ee24cfff511fb59739d3582341d +SHA1 (patch-ae) = cc35107d24362f8bf31badb7aa9e4aec069171b2 +SHA1 (patch-af) = e8e41fbc9837e87bc6bc495b4b698617bd1ea2ea diff --git a/x11/aterm/patches/patch-ae b/x11/aterm/patches/patch-ae index f4d91f2708e..aa335684551 100644 --- a/x11/aterm/patches/patch-ae +++ b/x11/aterm/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.2 2002/08/25 21:52:31 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2004/06/02 12:48:18 recht Exp $ ---- src/command.c.orig Thu Sep 6 18:38:07 2001 -+++ src/command.c +--- src/command.c.orig 2004-05-20 12:10:08.000000000 +0200 ++++ src/command.c 2004-05-20 12:09:37.000000000 +0200 @@ -1146,6 +1146,11 @@ num_fds = getdtablesize(); #endif @@ -14,7 +14,34 @@ $NetBSD: patch-ae,v 1.2 2002/08/25 21:52:31 jlam Exp $ #ifdef META8_OPTION meta_char = (Options & Opt_meta8 ? 0x80 : 033); if (rs_modifier -@@ -2024,7 +2029,7 @@ +@@ -1763,16 +1768,21 @@ + } + break; + ++ case XK_F1: /* "\033OP" */ ++ case XK_F2: /* "\033OQ" */ ++ case XK_F3: /* "\033OR" */ ++ case XK_F4: /* "\033OS" */ ++ len = 3; ++ STRCPY(kbuf, "\033OP"); ++ kbuf[2] += (keysym - XK_F1); ++ break; ++ + #define FKEY(n, fkey) \ + len = 5; \ + sprintf((char *) kbuf,"\033[%02d~", (int)((n) + (keysym - fkey))) + +- case XK_F1: /* "\033[11~" */ +- case XK_F2: /* "\033[12~" */ +- case XK_F3: /* "\033[13~" */ +- case XK_F4: /* "\033[14~" */ + case XK_F5: /* "\033[15~" */ +- FKEY(11, XK_F1); ++ FKEY(15, XK_F5); + break; + + case XK_F6: /* "\033[17~" */ +@@ -2024,7 +2034,7 @@ #endif /* See if we can read from the application */ |