diff options
| -rw-r--r-- | accessibility/svkbd/README | 3 | ||||
| -rw-r--r-- | accessibility/svkbd/old_fontconfig.diff | 29 | ||||
| -rw-r--r-- | accessibility/svkbd/svkbd.SlackBuild | 12 | ||||
| -rw-r--r-- | accessibility/svkbd/svkbd.info | 6 |
4 files changed, 7 insertions, 43 deletions
diff --git a/accessibility/svkbd/README b/accessibility/svkbd/README index 42c6b6af5541b..f0775df1f6551 100644 --- a/accessibility/svkbd/README +++ b/accessibility/svkbd/README @@ -11,7 +11,8 @@ The key layouts are set with the environment variable LAYOUTS, which can be set to a space-separated list of one or more of: mobile-intl - Multilayer international (QWERTY) -mobule-plain - Non-layered international (QWERTY) +mobule-plain - Two-layered international (QWERTY) +mobile-simple - Two-layered minimalistic (QWERTY) arrows - Arrow keys only en - English (QWERTY) de - German (QWERTZ) diff --git a/accessibility/svkbd/old_fontconfig.diff b/accessibility/svkbd/old_fontconfig.diff deleted file mode 100644 index a07622751220c..0000000000000 --- a/accessibility/svkbd/old_fontconfig.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur svkbd-0.2.1/drw.c svkbd-0.2.1.patched/drw.c ---- svkbd-0.2.1/drw.c 2020-09-18 07:02:35.000000000 -0400 -+++ svkbd-0.2.1.patched/drw.c 2020-11-02 12:45:36.377138299 -0500 -@@ -133,6 +133,7 @@ - die("no font specified."); - } - -+#ifdef FC_COLOR - /* Do not allow using color fonts. This is a workaround for a BadLength - * error from Xft with color glyphs. Modelled on the Xterm workaround. See - * https://bugzilla.redhat.com/show_bug.cgi?id=1498269 -@@ -145,6 +146,7 @@ - XftFontClose(drw->dpy, xfont); - return NULL; - } -+#endif - - font = ecalloc(1, sizeof(Fnt)); - font->xfont = xfont; -@@ -351,7 +353,9 @@ - fcpattern = FcPatternDuplicate(drw->fonts->pattern); - FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); - FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); -+#ifdef FC_COLOR - FcPatternAddBool(fcpattern, FC_COLOR, FcFalse); -+#endif - - FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); - FcDefaultSubstitute(fcpattern); diff --git a/accessibility/svkbd/svkbd.SlackBuild b/accessibility/svkbd/svkbd.SlackBuild index e3648f9ab2a3c..e49fb41b71e5c 100644 --- a/accessibility/svkbd/svkbd.SlackBuild +++ b/accessibility/svkbd/svkbd.SlackBuild @@ -6,6 +6,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20210802 bkw: updated for v0.4 and -current. # 20210219 bkw: updated for v0.2.2. # 20201102 bkw: # - updated for v0.2.1. @@ -17,7 +18,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=svkbd -VERSION=${VERSION:-0.2.2} +VERSION=${VERSION:-0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -30,9 +31,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -68,12 +66,6 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -# 20201102 bkw: newer fontconfigs support color fonts, but there is a -# bug that causes security issues when they're used. svkbd contains -# code to disable color fonts... which we don't need (and can't use) -# because our fontconfig in 14.2 is too old to support color anyway. -patch -p1 < $CWD/old_fontconfig.diff - [ -e $CWD/config.h ] && cat $CWD/config.h > config.def.h LAYOUTS="${LAYOUTS:-en mobile-intl}" diff --git a/accessibility/svkbd/svkbd.info b/accessibility/svkbd/svkbd.info index 5b4dca175143a..0bc97216c77da 100644 --- a/accessibility/svkbd/svkbd.info +++ b/accessibility/svkbd/svkbd.info @@ -1,8 +1,8 @@ PRGNAM="svkbd" -VERSION="0.2.2" +VERSION="0.4" HOMEPAGE="https://tools.suckless.org/x/svkbd" -DOWNLOAD="https://dl.suckless.org/tools/svkbd-0.2.2.tar.gz" -MD5SUM="a9f7f9cade4a4882cb816c42d9144632" +DOWNLOAD="https://dl.suckless.org/tools/svkbd-0.4.tar.gz" +MD5SUM="3689960e9d259c0d33932c182264b10a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |