diff --git a/packages/addons/addon-depends/system-tools-depends/st/package.mk b/packages/addons/addon-depends/system-tools-depends/st/package.mk index d12eefc8fc..0aab7ff31a 100644 --- a/packages/addons/addon-depends/system-tools-depends/st/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/st/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="st" -PKG_VERSION="0.8.4" -PKG_SHA256="d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6" +PKG_VERSION="0.8.5" +PKG_SHA256="ea6832203ed02ff74182bcb8adaa9ec454c8f989e79232cb859665e2f544ab37" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://st.suckless.org/" diff --git a/packages/addons/addon-depends/system-tools-depends/st/patches/st-001-le_fixes.patch b/packages/addons/addon-depends/system-tools-depends/st/patches/st-001-le_fixes.patch index cee317c7f5..3b82ba79e2 100644 --- a/packages/addons/addon-depends/system-tools-depends/st/patches/st-001-le_fixes.patch +++ b/packages/addons/addon-depends/system-tools-depends/st/patches/st-001-le_fixes.patch @@ -4,7 +4,7 @@ --- a/x.c 2020-06-19 11:29:45.000000000 +0200 +++ b/x.c 2020-06-26 01:07:13.000000000 +0200 -@@ -752,6 +752,7 @@ +@@ -754,6 +754,7 @@ xloadcolor(int i, const char *name, Color *ncolor) { XRenderColor color = { .alpha = 0xffff }; @@ -12,7 +12,7 @@ if (!name) { if (BETWEEN(i, 16, 255)) { /* 256 color */ -@@ -769,6 +770,14 @@ +@@ -771,6 +772,14 @@ name = colorname[i]; } @@ -27,16 +27,3 @@ return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor); } -@@ -1585,8 +1594,10 @@ - XTextProperty prop; - DEFAULT(p, opt_title); - -- Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, -- &prop); -+ if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, -+ &prop) < 0) -+ return; -+ - XSetWMName(xw.dpy, xw.win, &prop); - XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname); - XFree(prop.value); diff --git a/packages/addons/addon-depends/system-tools-depends/st/patches/st-002-scrollback-20200419-72e3f6c.patch b/packages/addons/addon-depends/system-tools-depends/st/patches/st-002-scrollback-20200419-72e3f6c.patch index e72999c1ef..b0cbfc29bd 100644 --- a/packages/addons/addon-depends/system-tools-depends/st/patches/st-002-scrollback-20200419-72e3f6c.patch +++ b/packages/addons/addon-depends/system-tools-depends/st/patches/st-002-scrollback-20200419-72e3f6c.patch @@ -51,8 +51,8 @@ index 0ce6ac2..641edc0 100644 -static void tscrolldown(int, int); +static void tscrollup(int, int, int); +static void tscrolldown(int, int, int); - static void tsetattr(int *, int); - static void tsetchar(Rune, Glyph *, int, int); + static void tsetattr(const int *, int); + static void tsetchar(Rune, const Glyph *, int, int); static void tsetdirt(int, int); @@ -415,10 +422,10 @@ tlinelen(int y) {