diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2020-09-07 19:33:02 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+alpine@soeren-tempel.net> | 2020-09-07 13:26:46 +0000 |
| commit | 2126313cdd13cf2f91a86c1ed9cfc41b8941e315 (patch) | |
| tree | 37042b2a77030fd72a0f6a49940ea7c28e0978b4 | |
| parent | d7612f63e3829bebe81aef0c9e2c8f8b26887ae7 (diff) | |
main/ncurses: fix setupterm function
| -rw-r--r-- | main/ncurses/APKBUILD | 8 | ||||
| -rw-r--r-- | main/ncurses/fix-setupterm.patch | 16 |
2 files changed, 21 insertions, 3 deletions
diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD index d7ace4728e5..611db91b495 100644 --- a/main/ncurses/APKBUILD +++ b/main/ncurses/APKBUILD @@ -2,7 +2,7 @@ pkgname=ncurses pkgver=6.2_p20200906 _ver=${pkgver/_p/-} -pkgrel=0 +pkgrel=1 pkgdesc="Console display library" url="https://invisible-island.net/ncurses/" arch="all" @@ -11,7 +11,8 @@ license="MIT" makedepends_build="ncurses" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch" -source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz" +source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz + fix-setupterm.patch" builddir="$srcdir"/ncurses-$_ver # secfixes: @@ -110,4 +111,5 @@ static() { mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/ } -sha512sums="3c6991fa6b850460ce2556f825292d0f8919a272e37405f827aff63f55b380a0c818f3aa7ba8117f5dd3b542c28633a91286702261c6858c368ba135c85eab2e ncurses-6.2-20200906.tgz" +sha512sums="3c6991fa6b850460ce2556f825292d0f8919a272e37405f827aff63f55b380a0c818f3aa7ba8117f5dd3b542c28633a91286702261c6858c368ba135c85eab2e ncurses-6.2-20200906.tgz +bac58ea6e3c18d3ef0e8eacb853851129f41b0df696cb2a7de638f64981f507683f56e3f21a323958cd54b1a3bc0dcbb16c9776b06996e7eba46072612b00929 fix-setupterm.patch" diff --git a/main/ncurses/fix-setupterm.patch b/main/ncurses/fix-setupterm.patch new file mode 100644 index 00000000000..a095a99069a --- /dev/null +++ b/main/ncurses/fix-setupterm.patch @@ -0,0 +1,16 @@ +The CHECK_TERM_ENV macro returns !NonEmpty(term_env), i.e. true if +term_env **is** empty. Negating the return value again causes setupterm +to mailfunction. + +diff -upr ncurses-6.2-20200906.orig/ncurses/tinfo/lib_setup.c ncurses-6.2-20200906/ncurses/tinfo/lib_setup.c +--- ncurses-6.2-20200906.orig/ncurses/tinfo/lib_setup.c 2020-09-07 11:28:05.041642395 +0200 ++++ ncurses-6.2-20200906/ncurses/tinfo/lib_setup.c 2020-09-07 11:28:32.087989409 +0200 +@@ -667,7 +667,7 @@ TINFO_SETUP_TERM(TERMINAL **tp, + if (!NonEmpty(tname)) + tname = "unknown"; + #else +- if (!CHECK_TERM_ENV(tname, NO_TERMINAL)) { ++ if (CHECK_TERM_ENV(tname, NO_TERMINAL)) { + T(("Failure with TERM=%s", tname)); + ret_error0(TGETENT_ERR, "TERM environment variable not set.\n"); + } |