diff options
| author | Milan P. Stanić <mps@arvanta.net> | 2020-09-19 07:25:13 +0000 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-09-19 11:25:24 +0000 |
| commit | 8becfb63ed6104292f3488735998987e5f451ad6 (patch) | |
| tree | 52d009f572286d1312743501c483bec04de3955e /main/ncurses | |
| parent | 82ab1519d654049e1001cd7f1c188f1598e4e102 (diff) | |
main/ncurses: upgrade to 6.2_p20200918
remove fix-setupterm.patch, applied upstream
Diffstat (limited to 'main/ncurses')
| -rw-r--r-- | main/ncurses/APKBUILD | 8 | ||||
| -rw-r--r-- | main/ncurses/fix-setupterm.patch | 16 |
2 files changed, 3 insertions, 21 deletions
diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD index 611db91b495..1bc43364fd7 100644 --- a/main/ncurses/APKBUILD +++ b/main/ncurses/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ncurses -pkgver=6.2_p20200906 +pkgver=6.2_p20200918 _ver=${pkgver/_p/-} pkgrel=1 pkgdesc="Console display library" @@ -11,8 +11,7 @@ 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 - fix-setupterm.patch" +source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz" builddir="$srcdir"/ncurses-$_ver # secfixes: @@ -111,5 +110,4 @@ static() { mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/ } -sha512sums="3c6991fa6b850460ce2556f825292d0f8919a272e37405f827aff63f55b380a0c818f3aa7ba8117f5dd3b542c28633a91286702261c6858c368ba135c85eab2e ncurses-6.2-20200906.tgz -bac58ea6e3c18d3ef0e8eacb853851129f41b0df696cb2a7de638f64981f507683f56e3f21a323958cd54b1a3bc0dcbb16c9776b06996e7eba46072612b00929 fix-setupterm.patch" +sha512sums="3c7f8e27a2ad67119a9f2e457fdbf7a47b2df663750d2db24803ffc59818784e1288d9c325c1bc0a08931082da1c327584722d613ed6722de5332d480c69d4e9 ncurses-6.2-20200918.tgz" diff --git a/main/ncurses/fix-setupterm.patch b/main/ncurses/fix-setupterm.patch deleted file mode 100644 index a095a99069a..00000000000 --- a/main/ncurses/fix-setupterm.patch +++ /dev/null @@ -1,16 +0,0 @@ -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"); - } |