ping On Sat, May 23, 2020 at 08:12:11PM -0500, Matthew Martin wrote: > No change in symbols and the diff doesn't seem to touch any public > functions. Only bumped minor because upstream did. > > neovim and vis run fine with this. The new patch allows the vis test > suite to run without the TEST_ENV = TERM=${TERM} hack. I'll ask upstream > about adding the patch, but libtermkey is deprecated in favor of > libtickit (will send that port after the 0.4.0 release). > > 0.22 - changes: bugfixes for unit tests on BSD platforms > 0.21.1 - changes: internal bugfixes, valgrind neatness >
diff --git Makefile Makefile index e5bd66764f9..2ea5107ffc2 100644 --- Makefile +++ Makefile @@ -1,10 +1,9 @@ # $OpenBSD: Makefile,v 1.4 2019/07/12 20:44:40 sthen Exp $ COMMENT = library for processing of keyboard entry from a terminal -DISTNAME = libtermkey-0.20 -REVISION = 0 +DISTNAME = libtermkey-0.22 -SHARED_LIBS += termkey 0.1 # 15.0 +SHARED_LIBS += termkey 0.2 # 15.2 CATEGORIES = devel HOMEPAGE = http://www.leonerd.org.uk/code/libtermkey/ diff --git distinfo distinfo index 522108c35ed..81ce3702ceb 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (libtermkey-0.20.tar.gz) = bA2HyUq5kV527NMTuuwI3t871W3oN0PZqpI6CBk10vU= -SIZE (libtermkey-0.20.tar.gz) = 45167 +SHA256 (libtermkey-0.22.tar.gz) = aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA= +SIZE (libtermkey-0.22.tar.gz) = 46147 diff --git patches/patch-Makefile patches/patch-Makefile index aee3dddc084..4ef14700525 100644 --- patches/patch-Makefile +++ patches/patch-Makefile @@ -3,9 +3,10 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2017/01/19 20:34:04 edd Exp $ Don't compresss manuals and remove odd symlinking scheme to alias man pages. As it happens mandoc is clever enough to figure out the aliases. ---- Makefile.orig Fri Dec 16 16:08:07 2016 -+++ Makefile Tue Jan 17 23:15:29 2017 -@@ -120,12 +120,9 @@ install-man: +Index: Makefile +--- Makefile.orig ++++ Makefile +@@ -122,12 +122,9 @@ install-man: install -d $(DESTDIR)$(MAN3DIR) install -d $(DESTDIR)$(MAN7DIR) for F in man/*.3; do \ diff --git patches/patch-termkey_c patches/patch-termkey_c new file mode 100644 index 00000000000..a6a94f6feac --- /dev/null +++ patches/patch-termkey_c @@ -0,0 +1,17 @@ +$OpenBSD$ + +unibi_from_term requires term to be non-NULL + +Index: termkey.c +--- termkey.c.orig ++++ termkey.c +@@ -420,6 +420,9 @@ TermKey *termkey_new(int fd, int flags) + termkey_set_flags(tk, flags); + + const char *term = getenv("TERM"); ++ if (!term) { ++ term = "xterm"; ++ } + + if(!termkey_init(tk, term)) + goto abort;