[packages/screen] drop patches commented out for more than 15 years
atler
atler at pld-linux.org
Thu May 15 23:42:44 CEST 2025
commit 6cb394333ec76b12b4215f9ff1073d1c785615cc
Author: Jan Palus <atler at pld-linux.org>
Date: Thu May 15 23:30:46 2025 +0200
drop patches commented out for more than 15 years
screen-home_etc.patch | 58 ---------------
screen-no_hardcoded_term_sequences.patch | 117 -------------------------------
screen-osc.patch | 85 ----------------------
screen.spec | 9 ---
4 files changed, 269 deletions(-)
---
diff --git a/screen.spec b/screen.spec
index dbdf55a..25f3168 100644
--- a/screen.spec
+++ b/screen.spec
@@ -22,10 +22,7 @@ Source2: %{name}.pamd
Source3: %{name}rc
Patch2: %{name}-manual.patch
Patch4: %{name}-info.patch
-Patch7: %{name}-no_hardcoded_term_sequences.patch
-Patch8: %{name}-home_etc.patch
Patch12: %{name}-screenrc.patch
-Patch13: %{name}-osc.patch
Patch18: %{name}-4.1.0-suppress_remap.patch
URL: http://www.gnu.org/software/screen/
BuildRequires: autoconf >= 2.71
@@ -94,13 +91,7 @@ Screen корисний користувачам, які заходять на
%setup -q
%patch -P2 -p1
%patch -P4 -p1
-# DON'T ENABLE IT UNLESS YOU REALLY FIX IT
-# (it's heavily broken - note that some sequences should be get for
-# $TERM before running screen instance, and others for TERM=screen!)
-###%%patch -P7 -p1
-#%%patch -P8 -p1
%patch -P12 -p1
-#%%patch -P13 -p1 # my brain farted here, see if you have better luck
%patch -P18 -p1
%build
diff --git a/screen-home_etc.patch b/screen-home_etc.patch
deleted file mode 100644
index dfea31c..0000000
--- a/screen-home_etc.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ruN screen-3.9.10.org/fileio.c screen-3.9.10/fileio.c
---- screen-3.9.10.org/fileio.c Thu May 3 16:43:24 2001
-+++ screen-3.9.10/fileio.c Sun Jun 2 01:23:37 2002
-@@ -112,7 +112,14 @@
- rc = SaveStr(p);
- }
- else
-- {
-+ if (getenv("CONFIG_DIR")) {
-+ debug(" ...nothing in $SCREENRC, defaulting $HOME/$CONFIG_DIR/screen/screenrc\n");
-+ if ((strlen(home)+strlen(getenv("CONFIG_DIR"))+7) > sizeof(buf) - 12)
-+ Panic(0, "Rc: home too large");
-+ sprintf(buf, "%s/%s/screen/screenrc", home, getenv("CONFIG_DIR"));
-+ rc = SaveStr(buf);
-+ }
-+ else {
- debug(" ...nothing in $SCREENRC, defaulting $HOME/.screenrc\n");
- if (strlen(home) > sizeof(buf) - 12)
- Panic(0, "Rc: home too large");
-diff -ruN screen-3.9.10.org/screen.c screen-3.9.10/screen.c
---- screen-3.9.10.org/screen.c Sun Jun 2 01:08:28 2002
-+++ screen-3.9.10/screen.c Sun Jun 2 01:27:43 2002
-@@ -882,7 +882,10 @@
- #endif /* DEBUG */
- }
-
-- snprintf(bufferfile,sizeof(bufferfile),"%s/.screen-exchange", home);
-+ if (getenv("CONFIG_DIR"))
-+ snprintf(bufferfile,sizeof(bufferfile),"%s/%s/screen/exchange", home, getenv("CONFIG_DIR"));
-+ else
-+ snprintf(bufferfile,sizeof(bufferfile),"%s/.screen-exchange", home);
- BufferFile = SaveStr(bufferfile);
- #ifdef _MODE_T
- oumask = umask(0); /* well, unsigned never fails? jw. */
-@@ -904,7 +907,10 @@
- if (multiattach)
- {
- # ifndef SOCKDIR
-- sprintf(SockPath, "%s/.screen", multi_home);
-+ if (getenv("CONFIG_DIR"))
-+ sprintf(SockPath, "%s/%s/screen/sockets", multi_home, getenv("CONFIG_DIR"));
-+ else
-+ sprintf(SockPath, "%s/.screen", multi_home);
- SockDir = SockPath;
- # else
- SockDir = SOCKDIR;
-@@ -917,7 +923,10 @@
- #ifndef SOCKDIR
- if (SockDir == 0)
- {
-- sprintf(SockPath, "%s/.screen", home);
-+ if (getenv("CONFIG_DIR"))
-+ sprintf(SockPath, "%s/%s/screen/sockets", home, getenv("CONFIG_DIR"));
-+ else
-+ sprintf(SockPath, "%s/.screen", home);
- SockDir = SockPath;
- }
- #endif
diff --git a/screen-no_hardcoded_term_sequences.patch b/screen-no_hardcoded_term_sequences.patch
deleted file mode 100644
index 46da98f..0000000
--- a/screen-no_hardcoded_term_sequences.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- screen-3.9.9/term.c~ Sat Apr 28 15:26:43 2001
-+++ screen-3.9.9/term.c Mon Jul 23 05:44:45 2001
-@@ -175,19 +175,19 @@
- /* keycaps */
- /* define T_CAPS */
- /* nolist */
-- { "k0", T_STR }, KMAPDEF("\033[10~")
-- { "k1", T_STR }, KMAPDEF("\033OP")
-- { "k2", T_STR }, KMAPDEF("\033OQ")
-- { "k3", T_STR }, KMAPDEF("\033OR")
-- { "k4", T_STR }, KMAPDEF("\033OS")
-- { "k5", T_STR }, KMAPDEF("\033[15~")
-- { "k6", T_STR }, KMAPDEF("\033[17~")
-- { "k7", T_STR }, KMAPDEF("\033[18~")
-- { "k8", T_STR }, KMAPDEF("\033[19~")
-- { "k9", T_STR }, KMAPDEF("\033[20~")
-- { "k;", T_STR }, KMAPDEF("\033[21~")
-- { "F1", T_STR }, KMAPDEF("\033[23~")
-- { "F2", T_STR }, KMAPDEF("\033[24~")
-+ { "k0", T_STR },
-+ { "k1", T_STR },
-+ { "k2", T_STR },
-+ { "k3", T_STR },
-+ { "k4", T_STR },
-+ { "k5", T_STR },
-+ { "k6", T_STR },
-+ { "k7", T_STR },
-+ { "k8", T_STR },
-+ { "k9", T_STR },
-+ { "k;", T_STR },
-+ { "F1", T_STR },
-+ { "F2", T_STR },
- /* extra keys for vt220 (David.Leonard at it.uq.edu.au) */
- { "F3", T_STR },
- { "F4", T_STR },
-@@ -210,51 +210,51 @@
- { "kB", T_STR },
- { "kC", T_STR },
- { "kE", T_STR },
-- { "kF", T_STR }, KMAPMDEF("\004")
-+ { "kF", T_STR },
- { "kL", T_STR },
- { "kM", T_STR },
-- { "kR", T_STR }, KMAPMDEF("\025")
-+ { "kR", T_STR },
- { "kS", T_STR },
- { "kT", T_STR },
- { "kt", T_STR },
-
- /* keys above the cursor */
- /* define T_NAVIGATE */
-- { "kh", T_STR }, KMAPDEF("\033[1~") KMAPMDEF("\201")
-+ { "kh", T_STR },
- { "@1", T_STR },
-- { "kH", T_STR }, KMAPDEF("\033[4~") KMAPMDEF("\205")
-+ { "kH", T_STR },
- { "@7", T_STR },
-- { "kN", T_STR }, KMAPDEF("\033[6~") KMAPMDEF("\006")
-- { "kP", T_STR }, KMAPDEF("\033[5~") KMAPMDEF("\002")
-- { "kI", T_STR }, KMAPDEF("\033[2~")
-+ { "kN", T_STR },
-+ { "kP", T_STR },
-+ { "kI", T_STR },
- /* define T_NAVIGATE_DELETE */
-- { "kD", T_STR }, KMAPDEF("\033[3~")
-+ { "kD", T_STR },
-
- /* keys that can have two bindings */
- /* define T_CURSOR */
-- { "ku", T_STR }, KMAPDEF("\033[A") KMAPADEF("\033OA") KMAPMDEF("\220")
-- { "kd", T_STR }, KMAPDEF("\033[B") KMAPADEF("\033OB") KMAPMDEF("\216")
-- { "kr", T_STR }, KMAPDEF("\033[C") KMAPADEF("\033OC") KMAPMDEF("\206")
-- { "kl", T_STR }, KMAPDEF("\033[D") KMAPADEF("\033OD") KMAPMDEF("\202")
-+ { "ku", T_STR },
-+ { "kd", T_STR },
-+ { "kr", T_STR },
-+ { "kl", T_STR },
- /* define T_KEYPAD */
-- { "f0", T_STR }, KMAPDEF("0") KMAPADEF("\033Op")
-- { "f1", T_STR }, KMAPDEF("1") KMAPADEF("\033Oq")
-- { "f2", T_STR }, KMAPDEF("2") KMAPADEF("\033Or")
-- { "f3", T_STR }, KMAPDEF("3") KMAPADEF("\033Os")
-- { "f4", T_STR }, KMAPDEF("4") KMAPADEF("\033Ot")
-- { "f5", T_STR }, KMAPDEF("5") KMAPADEF("\033Ou")
-- { "f6", T_STR }, KMAPDEF("6") KMAPADEF("\033Ov")
-- { "f7", T_STR }, KMAPDEF("7") KMAPADEF("\033Ow")
-- { "f8", T_STR }, KMAPDEF("8") KMAPADEF("\033Ox")
-- { "f9", T_STR }, KMAPDEF("9") KMAPADEF("\033Oy")
-- { "f+", T_STR }, KMAPDEF("+") KMAPADEF("\033Ok")
-- { "f-", T_STR }, KMAPDEF("-") KMAPADEF("\033Om")
-- { "f*", T_STR }, KMAPDEF("*") KMAPADEF("\033Oj")
-- { "f/", T_STR }, KMAPDEF("/") KMAPADEF("\033Oo")
-- { "fq", T_STR }, KMAPDEF("=") KMAPADEF("\033OX")
-- { "f.", T_STR }, KMAPDEF(".") KMAPADEF("\033On")
-- { "f,", T_STR }, KMAPDEF(",") KMAPADEF("\033Ol")
-- { "fe", T_STR }, KMAPDEF("\015") KMAPADEF("\033OM")
-+ { "f0", T_STR },
-+ { "f1", T_STR },
-+ { "f2", T_STR },
-+ { "f3", T_STR },
-+ { "f4", T_STR },
-+ { "f5", T_STR },
-+ { "f6", T_STR },
-+ { "f7", T_STR },
-+ { "f8", T_STR },
-+ { "f9", T_STR },
-+ { "f+", T_STR },
-+ { "f-", T_STR },
-+ { "f*", T_STR },
-+ { "f/", T_STR },
-+ { "fq", T_STR },
-+ { "f.", T_STR },
-+ { "f,", T_STR },
-+ { "fe", T_STR },
- /* other things related to keycaps */
- /* define T_OCAPS */
- { "km", T_FLG },
diff --git a/screen-osc.patch b/screen-osc.patch
deleted file mode 100644
index 2bdd8b5..0000000
--- a/screen-osc.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-; support OSC 10 and 11 commands for xterm default fg/bg colour
-; http://www.xfree86.org/current/ctlseqs.html
-; P s = 1 0 → Change VT100 text foreground color to P t
-; P s = 1 1 → Change VT100 text background color to P t
---- screen-4.1/ansi.c~ 2010-02-24 15:33:05.000000000 +0200
-+++ screen-4.1/ansi.c 2010-02-24 15:42:23.596133932 +0200
-@@ -1530,12 +1530,14 @@
- }
- #endif
- #ifdef RXVT_OSC
-- if (typ == 0 || typ == 1 || typ == 2 || typ == 20 || typ == 39 || typ == 49)
-+ if (typ == 0 || typ == 1 || typ == 2 || typ == 20 || typ == 39 || typ == 49 || typ == 10 || typ == 11 )
- {
- int typ2;
- typ2 = typ / 10;
- if (--typ2 < 0)
- typ2 = 0;
-+ if (typ == 10) typ2 = 4;
-+ if (typ == 11) typ2 = 5;
- if (strcmp(curr->w_xtermosc[typ2], p))
- {
- strncpy(curr->w_xtermosc[typ2], p, sizeof(curr->w_xtermosc[typ2]) - 1);
-@@ -1513,7 +1516,7 @@
- continue;
- if (D_forecv->c_layer->l_bottom == &curr->w_layer)
- SetXtermOSC(typ2, curr->w_xtermosc[typ2]);
-- if ((typ2 == 2 || typ2 == 3) && D_xtermosc[typ2])
-+ if ((typ2 == 2 || typ2 == 3 || typ2 == 4 || typ2 == 5) && D_xtermosc[typ2])
- Redisplay(0);
- }
- }
---- screen-4.0.3/display.c 2003-12-05 14:45:41.000000000 +0100
-+++ screen-4.0.3.wiget/display.c 2008-03-21 22:21:46.000000000 +0100
-@@ -3053,7 +3053,7 @@
- int i;
- char *s;
- {
-- static char oscs[] = "1;\000\00020;\00039;\00049;\000";
-+ static char oscs[] = "1;\000\00020;\00039;\00049;\00010;\00011;\000";
-
- ASSERT(display);
- if (!D_CXT)
-@@ -3066,22 +3066,26 @@
- s = "screen"; /* always set icon name */
- if (i == 1 && !*s)
- s = ""; /* no background */
-- if (i == 2 && !*s)
-+ if ((i == 2 || i == 4) && !*s)
- s = "black"; /* black text */
-- if (i == 3 && !*s)
-+ if ((i == 3 || i == 5) && !*s)
- s = "white"; /* on white background */
- D_xtermosc[i] = 1;
- AddStr("\033]");
- AddStr(oscs + i * 4);
- AddStr(s);
-- AddChar(7);
-+ if ((i == 4) || (i == 5)) {
-+ AddStr("\033\\");
-+ } else {
-+ AddChar(7);
-+ }
- }
-
- void
- ClearAllXtermOSC()
- {
- int i;
-- for (i = 3; i >= 0; i--)
-+ for (i = 5; i >= 0; i--)
- SetXtermOSC(i, 0);
- }
- #endif
-Tylko w screen-4.0.3.wiget: display.c~
---- screen-4.0.3/display.h 2003-07-01 16:01:42.000000000 +0200
-+++ screen-4.0.3.wiget/display.h 2008-03-21 22:08:44.000000000 +0100
-@@ -113,7 +113,7 @@
- int d_lp_missing; /* last character on bot line missing */
- int d_mouse; /* mouse mode */
- #ifdef RXVT_OSC
-- int d_xtermosc[4]; /* osc used */
-+ int d_xtermosc[6]; /* osc used */
- #endif
- struct mchar d_lpchar; /* missing char */
- struct timeval d_status_time; /* time of status display */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/screen.git/commitdiff/6bd81da9dc7887cf1150ca7337c8ea5cb29b6896
More information about the pld-cvs-commit
mailing list