From bb24ac83a1a5b3160c175db83553d9c6f107cac3 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 1 Dec 2020 16:56:16 -0600 Subject: [PATCH] xst: update to 0.8.4.1 Closes #27070 --- srcpkgs/xst/patches/xrdb_cursor.patch | 40 +++++++++++++++++++++++++++ srcpkgs/xst/template | 4 +-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/xst/patches/xrdb_cursor.patch diff --git a/srcpkgs/xst/patches/xrdb_cursor.patch b/srcpkgs/xst/patches/xrdb_cursor.patch new file mode 100644 index 00000000000..7a34296365b --- /dev/null +++ b/srcpkgs/xst/patches/xrdb_cursor.patch @@ -0,0 +1,40 @@ +From a0894b52af4ee6cba42e93a2a756a2092ee46e48 Mon Sep 17 00:00:00 2001 +From: Yauhen Kirylau +Date: Fri, 11 Dec 2020 22:41:07 +0100 +Subject: [PATCH] fix(x: main): do xrdb_load before setting cursor shape (fixes + #127) (#129) + +* fix(x: main): do xrdb_load before setting cursor shape (fixes #127) + +* fix(x: main): do xrdb_load and xsetcursor after parsing cli args +--- + x.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git x.c x.c +index 4dcb168..5367d05 100644 +--- x.c ++++ x.c +@@ -2111,7 +2111,6 @@ main(int argc, char *argv[]) + { + xw.l = xw.t = 0; + xw.isfixed = False; +- xsetcursor(cursorshape); + + ARGBEGIN { + case 'a': +@@ -2167,12 +2166,13 @@ main(int argc, char *argv[]) + if (!opt_title) + opt_title = (opt_line || !opt_cmd) ? "xst" : opt_cmd[0]; + ++ xrdb_load(); ++ xsetcursor(cursorshape); + setlocale(LC_CTYPE, ""); + XSetLocaleModifiers(""); + cols = MAX(cols, 1); + rows = MAX(rows, 1); + tnew(cols, rows); +- xrdb_load(); + xinit(cols, rows); + xsetenv(); + selinit(); diff --git a/srcpkgs/xst/template b/srcpkgs/xst/template index ecb7d2dce1b..bcde262a116 100644 --- a/srcpkgs/xst/template +++ b/srcpkgs/xst/template @@ -1,6 +1,6 @@ # Template file for 'xst' pkgname=xst -version=0.8.4 +version=0.8.4.1 revision=1 build_style=gnu-makefile make_use_env=compliant @@ -12,7 +12,7 @@ maintainer="Nathan " license="MIT" homepage="https://github.com/neeasade/xst" distfiles="https://github.com/neeasade/xst/archive/v${version}.tar.gz" -checksum=0fb8dd47b018fe6b46a654b4d6bf69ab0785ae6fbb6a0965e38ad86382fec369 +checksum=cbeb2da6c289415d1168559c6f58b4ce47fd266edefbabc38fd59e8b7c87226d do_install() { vbin xst