Date: Mon, 11 Feb 2019 18:31:24 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492707 - in head/x11/sterm: . files Message-ID: <201902111831.x1BIVOXY035746@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Feb 11 18:31:23 2019 New Revision: 492707 URL: https://svnweb.freebsd.org/changeset/ports/492707 Log: x11/sterm: update to 0.8.2 PR: 235667 Submitted by: Piotr Kubaj <pkubaj@anongoth.pl> (maintainer) Modified: head/x11/sterm/Makefile (contents, props changed) head/x11/sterm/distinfo (contents, props changed) head/x11/sterm/files/extra-scrollback-patch-config.def.h head/x11/sterm/files/extra-solarized-patch-config.def.h head/x11/sterm/files/extra-solarized-patch-x.c Modified: head/x11/sterm/Makefile ============================================================================== --- head/x11/sterm/Makefile Mon Feb 11 18:24:42 2019 (r492706) +++ head/x11/sterm/Makefile Mon Feb 11 18:31:23 2019 (r492707) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sterm -DISTVERSION= 0.8.1 +DISTVERSION= 0.8.2 CATEGORIES= x11 MASTER_SITES= http://dl.suckless.org/st/ DISTNAME= st-${PORTVERSION} Modified: head/x11/sterm/distinfo ============================================================================== --- head/x11/sterm/distinfo Mon Feb 11 18:24:42 2019 (r492706) +++ head/x11/sterm/distinfo Mon Feb 11 18:31:23 2019 (r492707) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521664450 -SHA256 (st-0.8.1.tar.gz) = c4fb0fe2b8d2d3bd5e72763e80a8ae05b7d44dbac8f8e3bb18ef0161c7266926 -SIZE (st-0.8.1.tar.gz) = 45423 +TIMESTAMP = 1549877374 +SHA256 (st-0.8.2.tar.gz) = aeb74e10aa11ed364e1bcc635a81a523119093e63befd2f231f8b0705b15bf35 +SIZE (st-0.8.2.tar.gz) = 44788 Modified: head/x11/sterm/files/extra-scrollback-patch-config.def.h ============================================================================== --- head/x11/sterm/files/extra-scrollback-patch-config.def.h Mon Feb 11 18:24:42 2019 (r492706) +++ head/x11/sterm/files/extra-scrollback-patch-config.def.h Mon Feb 11 18:31:23 2019 (r492707) @@ -1,9 +1,9 @@ ---- config.def.h.orig 2018-06-18 05:54:16 UTC -+++ config.def.h -@@ -178,6 +178,8 @@ static Shortcut shortcuts[] = { +--- config.def.h.orig 2019-02-09 12:50:41.000000000 +0100 ++++ config.def.h 2019-02-11 14:03:37.626887000 +0100 +@@ -178,6 +178,8 @@ { TERMMOD, XK_Y, selpaste, {.i = 0} }, + { ShiftMask, XK_Insert, selpaste, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, - { TERMMOD, XK_I, iso14755, {.i = 0} }, + { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, + { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, }; Modified: head/x11/sterm/files/extra-solarized-patch-config.def.h ============================================================================== --- head/x11/sterm/files/extra-solarized-patch-config.def.h Mon Feb 11 18:24:42 2019 (r492706) +++ head/x11/sterm/files/extra-solarized-patch-config.def.h Mon Feb 11 18:31:23 2019 (r492707) @@ -1,6 +1,6 @@ ---- config.def.h.orig 2018-03-20 20:29:59 UTC -+++ config.def.h -@@ -84,31 +84,44 @@ unsigned int tabspaces = 8; +--- config.def.h.orig 2019-02-09 12:50:41.000000000 +0100 ++++ config.def.h 2019-02-11 13:45:28.209172000 +0100 +@@ -84,31 +84,44 @@ /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { @@ -70,7 +70,7 @@ }; -@@ -116,10 +129,10 @@ static const char *colorname[] = { +@@ -116,10 +129,10 @@ * Default colors (colorname index) * foreground, background, cursor, reverse cursor */ @@ -85,10 +85,10 @@ /* * Default shape of cursor -@@ -178,6 +191,7 @@ static Shortcut shortcuts[] = { +@@ -178,6 +191,7 @@ { TERMMOD, XK_Y, selpaste, {.i = 0} }, + { ShiftMask, XK_Insert, selpaste, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, - { TERMMOD, XK_I, iso14755, {.i = 0} }, + { XK_ANY_MOD, XK_F6, swapcolors, {.i = 0} }, }; Modified: head/x11/sterm/files/extra-solarized-patch-x.c ============================================================================== --- head/x11/sterm/files/extra-solarized-patch-x.c Mon Feb 11 18:24:42 2019 (r492706) +++ head/x11/sterm/files/extra-solarized-patch-x.c Mon Feb 11 18:31:23 2019 (r492707) @@ -1,6 +1,6 @@ ---- x.c.orig 2018-03-20 20:29:59 UTC -+++ x.c -@@ -53,6 +53,7 @@ static void clipcopy(const Arg *); +--- x.c.orig 2019-02-09 12:50:41.000000000 +0100 ++++ x.c 2019-02-11 14:02:22.026884000 +0100 +@@ -53,6 +53,7 @@ static void clippaste(const Arg *); static void numlock(const Arg *); static void selpaste(const Arg *); @@ -8,7 +8,7 @@ static void zoom(const Arg *); static void zoomabs(const Arg *); static void zoomreset(const Arg *); -@@ -240,6 +241,8 @@ static char *opt_title = NULL; +@@ -240,6 +241,8 @@ static int oldbutton = 3; /* button event on startup: 3 = release */ @@ -17,7 +17,7 @@ void clipcopy(const Arg *dummy) { -@@ -279,6 +282,14 @@ numlock(const Arg *dummy) +@@ -279,6 +282,14 @@ } void @@ -32,7 +32,7 @@ zoom(const Arg *arg) { Arg larg; -@@ -700,6 +711,11 @@ sixd_to_16bit(int x) +@@ -702,6 +713,11 @@ return x == 0 ? 0 : 0x3737 + 0x2828 * x; } @@ -44,7 +44,7 @@ int xloadcolor(int i, const char *name, Color *ncolor) { -@@ -718,7 +734,7 @@ xloadcolor(int i, const char *name, Colo +@@ -720,7 +736,7 @@ return XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, ncolor); } else @@ -53,27 +53,25 @@ } return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor); -@@ -731,7 +747,7 @@ xloadcols(void) - static int loaded; - Color *cp; +@@ -737,14 +753,14 @@ + for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp) + XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); + } else { +- dc.collen = MAX(LEN(colorname), 256); ++ dc.collen = MAX(LEN(colorname), LEN(altcolorname)); + dc.col = xmalloc(dc.collen * sizeof(Color)); + } -- dc.collen = MAX(LEN(colorname), 256); -+ dc.collen = MAX(LEN(colorname), LEN(altcolorname)); - dc.col = xmalloc(dc.collen * sizeof(Color)); - - if (loaded) { -@@ -741,8 +757,8 @@ xloadcols(void) - for (i = 0; i < dc.collen; i++) if (!xloadcolor(i, NULL, &dc.col[i])) { - if (colorname[i]) -- die("Could not allocate color '%s'\n", colorname[i]); +- die("could not allocate color '%s'\n", colorname[i]); + if (getcolorname(i)) -+ die("Could not allocate color '%s'\n", getcolorname(i)); ++ die("could not allocate color '%s'\n", getcolorname(i)); else - die("Could not allocate color %d\n", i); + die("could not allocate color %d\n", i); } -@@ -1079,13 +1095,13 @@ xinit(int cols, int rows) +@@ -1082,13 +1098,13 @@ cursor = XCreateFontCursor(xw.dpy, mouseshape); XDefineCursor(xw.dpy, xw.win, cursor); @@ -89,7 +87,7 @@ xmousebg.red = 0x0000; xmousebg.green = 0x0000; xmousebg.blue = 0x0000; -@@ -1295,7 +1311,7 @@ xdrawglyphfontspecs(const XftGlyphFontSp +@@ -1298,7 +1314,7 @@ /* Change basic system colors [0-7] to bright system colors [8-15] */ if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902111831.x1BIVOXY035746>