commit ddacfaacd329f12bc5c4b1372dad50c76c673c2b Author: Steffen Nurpmeso <steffen@sdaoden.eu> Date: Sat Jan 8 22:36:11 2022 +0100 st: 0.8.5 diff --git a/st/.signature b/st/.signature index df118ca55..427cc44fb 100644 --- a/st/.signature +++ b/st/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xe7jBX4/URoyn9uy5QUD21gvgRT4PWrnJ1er2KrCTeFKdsjcgNKKFH/0XZeWaN/7rr0m4q0fft+cDaMSWPIWgA= -SHA256 (Pkgfile) = 651ebce312ddac549efaca02519df75e0926b24c6b41b8eaaf98fb0f9d201fb8 +RWSagIOpLGJF383QGBX2oGBvMLcghMI9B1wjePNpSWnZrSVogmtlj++000pPh4xPJrkLLx/YC+JZtaBEEXhjhKlbTeL/zPi8Og8= +SHA256 (Pkgfile) = b0d5872515e6475c1482d7dccecc8dccf1046bee6437104e85817dea3d8c0052 SHA256 (.footprint) = 691a6289f6a50fbf5ac809a9575739a0cf939045f0b1b24f28847765a13a620b -SHA256 (st-0.8.4.tar.gz) = d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6 -SHA256 (xrdb-plus.patch) = fde468790e3574f1ebfc9e56742e17e5eca33ee94e6b093b58f2e61457c9938c +SHA256 (st-0.8.5.tar.gz) = ea6832203ed02ff74182bcb8adaa9ec454c8f989e79232cb859665e2f544ab37 +SHA256 (xrdb-plus.patch) = a42b7172431660b3a5ea152019e1893e2453fb0b32a17d0abc7f4470bb53b008 diff --git a/st/Pkgfile b/st/Pkgfile index 23fd66bd8..2b26ed00d 100644 --- a/st/Pkgfile +++ b/st/Pkgfile @@ -4,8 +4,8 @@ # Depends on: fontconfig freetype xorg-libx11 xorg-libxext xorg-libxft name=st -version=0.8.4 -release=2 +version=0.8.5 +release=1 realn=st source=( https://dl.suckless.org/${realn}/${realn}-${version}.tar.gz diff --git a/st/xrdb-plus.patch b/st/xrdb-plus.patch index 9a7fddfb7..a6b809d6b 100644 --- a/st/xrdb-plus.patch +++ b/st/xrdb-plus.patch @@ -1,28 +1,8 @@ diff --git a/config.def.h b/config.def.h -index 6f05dce..b1c2ccc 100644 +index 91ab8cab2c..d3f9f00cbc 100644 --- a/config.def.h +++ b/config.def.h -@@ -120,6 +120,8 @@ static const char *colorname[] = { - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", - "#555555", -+ "gray90", -+ "black" - }; - - -@@ -127,8 +129,8 @@ static const char *colorname[] = { - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ --unsigned int defaultfg = 7; --unsigned int defaultbg = 0; -+unsigned int defaultfg = 258; -+unsigned int defaultbg = 259; - static unsigned int defaultcs = 256; - static unsigned int defaultrcs = 257; - -@@ -168,6 +170,42 @@ static unsigned int defaultattr = 11; +@@ -170,6 +170,42 @@ static unsigned int defaultattr = 11; */ static uint forcemousemod = ShiftMask; @@ -65,7 +45,7 @@ index 6f05dce..b1c2ccc 100644 /* * Internal mouse shortcuts. * Beware that overloading Button1 will disable the selection. -@@ -175,10 +213,12 @@ static uint forcemousemod = ShiftMask; +@@ -177,10 +213,12 @@ static uint forcemousemod = ShiftMask; static MouseShortcut mshortcuts[] = { /* mask button function argument release */ { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, @@ -79,7 +59,7 @@ index 6f05dce..b1c2ccc 100644 /* Internal keyboard shortcuts. */ diff --git a/x.c b/x.c -index 210f184..76f167f 100644 +index 8a16faaad0..2cce27d1c9 100644 --- a/x.c +++ b/x.c @@ -14,6 +14,7 @@ @@ -110,7 +90,7 @@ index 210f184..76f167f 100644 /* X modifiers */ #define XK_ANY_MOD UINT_MAX #define XK_NO_MOD 0 -@@ -828,8 +842,8 @@ xclear(int x1, int y1, int x2, int y2) +@@ -843,8 +857,8 @@ xclear(int x1, int y1, int x2, int y2) void xhints(void) { @@ -121,7 +101,7 @@ index 210f184..76f167f 100644 XWMHints wm = {.flags = InputHint, .input = 1}; XSizeHints *sizeh; -@@ -1104,8 +1118,6 @@ xinit(int cols, int rows) +@@ -1119,8 +1133,6 @@ xinit(int cols, int rows) pid_t thispid = getpid(); XColor xmousefg, xmousebg; @@ -130,7 +110,7 @@ index 210f184..76f167f 100644 xw.scr = XDefaultScreen(xw.dpy); xw.vis = XDefaultVisual(xw.dpy, xw.scr); -@@ -1964,6 +1976,59 @@ run(void) +@@ -1995,6 +2007,59 @@ run(void) } } @@ -190,7 +170,7 @@ index 210f184..76f167f 100644 void usage(void) { -@@ -2037,6 +2102,11 @@ run: +@@ -2068,6 +2133,11 @@ run: setlocale(LC_CTYPE, ""); XSetLocaleModifiers("");