aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2020-07-03 18:22:18 +0200
committerMilan P. Stanić <mps@arvanta.net>2020-07-03 18:24:00 +0200
commit8ea373e41f80bed37ebd1e72520c8704141c7cbc (patch)
tree6a10f3ba2d22e75fd52f4161be1abf447ce914f2
parentc54ea0185018ba42da363e81bc606896a7e966d8 (diff)
downloadaports-8ea373e41f80bed37ebd1e72520c8704141c7cbc.tar.gz
aports-8ea373e41f80bed37ebd1e72520c8704141c7cbc.tar.bz2
aports-8ea373e41f80bed37ebd1e72520c8704141c7cbc.tar.xz
testing/st-xrdb: upgrade to 0.8.4
replace previous st-xrdb.patch with new from upstream site
-rw-r--r--testing/st-xrdb/APKBUILD9
-rw-r--r--testing/st-xrdb/st-xresources-20200604-9ba7ecf.patch (renamed from testing/st-xrdb/st-xrdb.patch)83
2 files changed, 34 insertions, 58 deletions
diff --git a/testing/st-xrdb/APKBUILD b/testing/st-xrdb/APKBUILD
index 568739b368..f0185c3734 100644
--- a/testing/st-xrdb/APKBUILD
+++ b/testing/st-xrdb/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer:
pkgname=st-xrdb
pkgname_base=st
-pkgver=0.8.2
+pkgver=0.8.4
pkgrel=0
pkgdesc="Simple terminal emulator for X, with X resource support"
url="https://st.suckless.org"
@@ -12,7 +12,8 @@ license="MIT"
depends="ncurses-terminfo"
makedepends="fontconfig-dev freetype-dev libx11-dev libxext-dev libxft-dev"
subpackages="$pkgname-doc $pkgname-dbg"
-source="https://dl.suckless.org/$pkgname_base/$pkgname_base-$pkgver.tar.gz st-xrdb.patch"
+source="https://dl.suckless.org/$pkgname_base/$pkgname_base-$pkgver.tar.gz
+ st-xresources-20200604-9ba7ecf.patch"
options="!check"
builddir="$srcdir/$pkgname_base-$pkgver"
@@ -32,5 +33,5 @@ package() {
make install PREFIX=/usr DESTDIR="$pkgdir"
}
-sha512sums="eaaf5f2fe050ee768d16a9c8c295ba13315775b3a8a3201e020237a3dd217bfb811832d58477249000596289a6cb3287fbb39d6327fc90986af1c363e4b5bf8d st-0.8.2.tar.gz
-1b21e819d187eb186f940d92dd9055de5259bf18bc9c798b10884fde949ff3ab6b9ecf428c85ccd0bc0e20ddf42cc9d015535b36deb839a616d25ae2a047fe27 st-xrdb.patch"
+sha512sums="f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a st-0.8.4.tar.gz
+1d3a9e780e76b19ea123948973d80d8c1f5a691c31c3e45ac62813d7d6b1c82fc3c170e7437615b4555d078835bc8065a06b758a9177b327119cf645f5d05736 st-xresources-20200604-9ba7ecf.patch"
diff --git a/testing/st-xrdb/st-xrdb.patch b/testing/st-xrdb/st-xresources-20200604-9ba7ecf.patch
index f953028bc1..78ba00aecb 100644
--- a/testing/st-xrdb/st-xrdb.patch
+++ b/testing/st-xrdb/st-xresources-20200604-9ba7ecf.patch
@@ -1,39 +1,20 @@
+From 2752a599ee01305a435729bfacf43b1dde7cf0ef Mon Sep 17 00:00:00 2001
+From: Benji Encalada Mora <benji@encalada.dev>
+Date: Thu, 4 Jun 2020 00:41:10 -0500
+Subject: [PATCH] fix: replace xfps and actionfps variables
+
+---
+ config.def.h | 36 ++++++++++++++++++++++++
+ x.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 110 insertions(+), 4 deletions(-)
+
diff --git a/config.def.h b/config.def.h
-index 0e01717..6a33ef7 100644
+index 6f05dce..9b99782 100644
--- a/config.def.h
+++ b/config.def.h
-@@ -60,7 +60,7 @@ static unsigned int cursorthickness = 2;
- * bell volume. It must be a value between -100 and 100. Use 0 for disabling
- * it
+@@ -168,6 +168,42 @@ static unsigned int defaultattr = 11;
*/
--static int bellvolume = 0;
-+static int bellvolume = 100;
-
- /* default TERM value */
- char *termname = "st-256color";
-@@ -109,6 +109,8 @@ static const char *colorname[] = {
- /* more colors can be added after 255 to use with DefaultXX */
- "#cccccc",
- "#555555",
-+ "gray90",
-+ "black"
- };
-
-
-@@ -116,8 +118,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;
-
-@@ -150,14 +152,51 @@ static unsigned int mousebg = 0;
- */
- static unsigned int defaultattr = 11;
+ static uint forcemousemod = ShiftMask;
+/*
+ * Xresources preferences to load at startup
@@ -56,16 +37,17 @@ index 0e01717..6a33ef7 100644
+ { "color13", STRING, &colorname[13] },
+ { "color14", STRING, &colorname[14] },
+ { "color15", STRING, &colorname[15] },
-+ { "background", STRING, &colorname[259] },
-+ { "foreground", STRING, &colorname[258] },
-+ { "cursorColor", STRING, &colorname[256] },
++ { "background", STRING, &colorname[256] },
++ { "foreground", STRING, &colorname[257] },
++ { "cursorColor", STRING, &colorname[258] },
+ { "termname", STRING, &termname },
+ { "shell", STRING, &shell },
-+ { "xfps", INTEGER, &xfps },
-+ { "actionfps", INTEGER, &actionfps },
++ { "minlatency", INTEGER, &minlatency },
++ { "maxlatency", INTEGER, &maxlatency },
+ { "blinktimeout", INTEGER, &blinktimeout },
+ { "bellvolume", INTEGER, &bellvolume },
+ { "tabspaces", INTEGER, &tabspaces },
++ { "borderpx", INTEGER, &borderpx },
+ { "cwscale", FLOAT, &cwscale },
+ { "chscale", FLOAT, &chscale },
+};
@@ -73,18 +55,8 @@ index 0e01717..6a33ef7 100644
/*
* Internal mouse shortcuts.
* Beware that overloading Button1 will disable the selection.
- */
- static MouseShortcut mshortcuts[] = {
- /* button mask string */
-+ /*
- { Button4, XK_ANY_MOD, "\031" },
- { Button5, XK_ANY_MOD, "\005" },
-+ */
- };
-
- /* Internal keyboard shortcuts. */
diff --git a/x.c b/x.c
-index 5828a3b..90f3614 100644
+index 210f184..76f167f 100644
--- a/x.c
+++ b/x.c
@@ -14,6 +14,7 @@
@@ -93,9 +65,9 @@ index 5828a3b..90f3614 100644
#include <X11/XKBlib.h>
+#include <X11/Xresource.h>
- static char *argv0;
+ char *argv0;
#include "arg.h"
-@@ -43,6 +44,19 @@ typedef struct {
+@@ -45,6 +46,19 @@ typedef struct {
signed char appcursor; /* application cursor */
} Key;
@@ -115,7 +87,7 @@ index 5828a3b..90f3614 100644
/* X modifiers */
#define XK_ANY_MOD UINT_MAX
#define XK_NO_MOD 0
-@@ -786,8 +800,8 @@ xclear(int x1, int y1, int x2, int y2)
+@@ -828,8 +842,8 @@ xclear(int x1, int y1, int x2, int y2)
void
xhints(void)
{
@@ -126,7 +98,7 @@ index 5828a3b..90f3614 100644
XWMHints wm = {.flags = InputHint, .input = 1};
XSizeHints *sizeh;
-@@ -1045,8 +1059,6 @@ xinit(int cols, int rows)
+@@ -1104,8 +1118,6 @@ xinit(int cols, int rows)
pid_t thispid = getpid();
XColor xmousefg, xmousebg;
@@ -135,7 +107,7 @@ index 5828a3b..90f3614 100644
xw.scr = XDefaultScreen(xw.dpy);
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-@@ -1901,6 +1913,59 @@ run(void)
+@@ -1964,6 +1976,59 @@ run(void)
}
}
@@ -195,7 +167,7 @@ index 5828a3b..90f3614 100644
void
usage(void)
{
-@@ -1974,6 +2039,11 @@ run:
+@@ -2037,6 +2102,11 @@ run:
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
@@ -207,3 +179,6 @@ index 5828a3b..90f3614 100644
cols = MAX(cols, 1);
rows = MAX(rows, 1);
tnew(cols, rows);
+--
+2.26.2
+