summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@herrb.eu>2023-06-03 12:15:32 +0200
committerMatthieu Herrb <matthieu@herrb.eu>2023-06-03 12:15:32 +0200
commit8c6f81904c92046e1c2d7737b8d0bf959cd91355 (patch)
treecba8804c29e97cd1e83163845dfd4bfc5ad28a1d /x11
parente27736b8ff620b7bf1ca4685ebc9e51d487c96d1 (diff)
x11/xterm: update to version 382
Switch MASTER_SITES to https while there
Diffstat (limited to 'x11')
-rw-r--r--x11/xterm/Makefile4
-rw-r--r--x11/xterm/distinfo4
-rw-r--r--x11/xterm/patches/patch-charproc_c6
-rw-r--r--x11/xterm/patches/patch-main_c8
-rw-r--r--x11/xterm/patches/patch-util_c2
-rw-r--r--x11/xterm/patches/patch-version_h2
-rw-r--r--x11/xterm/patches/patch-xterm_man6
7 files changed, 16 insertions, 16 deletions
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 13628ac..3fd6c02 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,5 +1,5 @@
COMMENT = terminal emulator for the X Window System.
-DISTNAME = xterm-378
+DISTNAME = xterm-382
CATEGORIES = x11
@@ -13,7 +13,7 @@ PERMIT_PACKAGE = Yes
WANTLIB = ICE X11 Xaw7 Xext Xft Xinerama Xmu Xpm Xt \
c curses fontconfig freetype util
-MASTER_SITES = ftp://ftp.invisible-island.net/xterm/
+MASTER_SITES = https://invisible-island.net/archives/xterm/
EXTRACT_SUFX = .tgz
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index 859dabc..33b6cd6 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xterm-378.tgz) = ZJ37/V7dDtnkfPjk2VO0sNPDC8KAFm38T/0Ulz/sPpI=
-SIZE (xterm-378.tgz) = 1529140
+SHA256 (xterm-382.tgz) = DNC889CqdGqEDqPxNm6imnQmNpTVNbXHd/J+tl1/zu0=
+SIZE (xterm-382.tgz) = 1536637
diff --git a/x11/xterm/patches/patch-charproc_c b/x11/xterm/patches/patch-charproc_c
index 5a7c50e..d8cb5ae 100644
--- a/x11/xterm/patches/patch-charproc_c
+++ b/x11/xterm/patches/patch-charproc_c
@@ -12,8 +12,8 @@ Index: charproc.c
+ Sres(XtNcursorBlink, XtCCursorBlink, screen.cursor_blink_s, "never"),
#endif
Bres(XtNcursorUnderLine, XtCCursorUnderLine, screen.cursor_underline, False),
-
-@@ -10225,7 +10225,7 @@ VTInitialize(Widget wrequest,
+ Bres(XtNcursorBar, XtCCursorBar, screen.cursor_bar, False),
+@@ -10319,7 +10319,7 @@ VTInitialize(Widget wrequest,
screen->allowPasteControls = screen->allowPasteControl0;
screen->allowSendEvents = screen->allowSendEvent0;
screen->allowColorOps = screen->allowColorOp0;
@@ -22,7 +22,7 @@ Index: charproc.c
screen->allowMouseOps = screen->allowMouseOp0;
screen->allowTcapOps = screen->allowTcapOp0;
screen->allowTitleOps = screen->allowTitleOp0;
-@@ -13287,7 +13287,7 @@ ReallyReset(XtermWidget xw, Bool full, Bool saved)
+@@ -13402,7 +13402,7 @@ ReallyReset(XtermWidget xw, Bool full, Bool saved)
InitCursorShape(screen, screen);
xtermSetCursorBox(screen);
#if OPT_BLINK_CURS
diff --git a/x11/xterm/patches/patch-main_c b/x11/xterm/patches/patch-main_c
index dbbcee3..135fad1 100644
--- a/x11/xterm/patches/patch-main_c
+++ b/x11/xterm/patches/patch-main_c
@@ -20,7 +20,7 @@ Index: main.c
#else
#define UTMP_FILENAME "/etc/utmp"
#endif
-@@ -2784,6 +2785,13 @@ main(int argc, char *argv[]ENVP_ARG)
+@@ -2838,6 +2839,13 @@ main(int argc, char *argv[]ENVP_ARG)
spawnXTerm(term, line_speed);
@@ -34,7 +34,7 @@ Index: main.c
#ifndef VMS
/* Child process is out there, let's catch its termination */
-@@ -2901,6 +2909,89 @@ main(int argc, char *argv[]ENVP_ARG)
+@@ -2955,6 +2963,89 @@ main(int argc, char *argv[]ENVP_ARG)
if (resource.maximized)
RequestMaximize(term, True);
#endif
@@ -124,7 +124,7 @@ Index: main.c
for (;;) {
#if OPT_TEK4014
if (TEK4014_ACTIVE(term))
-@@ -5447,10 +5538,12 @@ Exit(int n)
+@@ -5489,10 +5580,12 @@ Exit(int n)
if (!resource.utmpInhibit && added_utmp_entry &&
(am_slave < 0 && tslot > 0)) {
#if defined(USE_UTMP_SETGID)
@@ -140,7 +140,7 @@ Index: main.c
memset(&utmp, 0, sizeof(utmp));
lseek(wfd, (long) (tslot * sizeof(utmp)), 0);
IGNORE_RC(write(wfd, (char *) &utmp, sizeof(utmp)));
-@@ -5468,8 +5561,10 @@ Exit(int n)
+@@ -5510,8 +5603,10 @@ Exit(int n)
}
#endif /* WTMP */
#ifdef USE_UTMP_SETGID
diff --git a/x11/xterm/patches/patch-util_c b/x11/xterm/patches/patch-util_c
index 0a87e1f..4cd4cde 100644
--- a/x11/xterm/patches/patch-util_c
+++ b/x11/xterm/patches/patch-util_c
@@ -6,7 +6,7 @@ The final form of the diff follows a suggestion from tedu@.
Index: util.c
--- util.c.orig
+++ util.c
-@@ -5447,6 +5447,10 @@ systemWcwidthOk(int samplesize, int samplepass)
+@@ -5593,6 +5593,10 @@ systemWcwidthOk(int samplesize, int samplepass)
wchar_t n;
int oops = 0;
diff --git a/x11/xterm/patches/patch-version_h b/x11/xterm/patches/patch-version_h
index b0a351e..ad116e0 100644
--- a/x11/xterm/patches/patch-version_h
+++ b/x11/xterm/patches/patch-version_h
@@ -4,7 +4,7 @@ Index: version.h
--- version.h.orig
+++ version.h
@@ -42,7 +42,7 @@
- #define XTERM_DATE 2022-11-25
+ #define XTERM_DATE 2023-05-30
#ifndef __vendorversion__
-#define __vendorversion__ "XTerm"
diff --git a/x11/xterm/patches/patch-xterm_man b/x11/xterm/patches/patch-xterm_man
index 2105a65..1035ea1 100644
--- a/x11/xterm/patches/patch-xterm_man
+++ b/x11/xterm/patches/patch-xterm_man
@@ -3,7 +3,7 @@ Document OpenBSD specifics
Index: xterm.man
--- xterm.man.orig
+++ xterm.man
-@@ -2262,7 +2262,7 @@ The default is \*(``true\*(''.
+@@ -2274,7 +2274,7 @@ The default is \*(``true\*(''.
.B "allowMouseOps\fP (class\fB AllowMouseOps\fP)"
Specifies whether control sequences that enable \fI\*n\fP to send
escape sequences to the host on mouse-clicks and movement.
@@ -12,7 +12,7 @@ Index: xterm.man
.TP 8
.B "allowPasteControls\fP (class\fB AllowPasteControls\fP)"
If true, allow control characters such as BEL and CAN to be pasted.
-@@ -4531,11 +4531,11 @@ or clicks one of its buttons.
+@@ -4570,11 +4570,11 @@ or clicks one of its buttons.
.RS
.TP 3
0
@@ -26,7 +26,7 @@ Index: xterm.man
.TP 3
2
always.
-@@ -8983,3 +8983,58 @@ Ross Combs,
+@@ -9023,3 +9023,58 @@ Ross Combs,
Stephen P.\& Wall,
David Wexelblat, and
Thomas Dickey (invisible\-island.net).