update to 6.2

3 files changed, 79 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b401a74c632..a816ac1ac3d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ncurses-nohex
 	pkgdesc = System V Release 4.0 curses emulation library. Patch disables hexadecimal in infocmp.
-	pkgver = 6.1
-	pkgrel = 6
+	pkgver = 6.2
+	pkgrel = 1
 	url = https://invisible-island.net/ncurses/ncurses.html
 	arch = x86_64
 	license = MIT
@@ -14,20 +14,20 @@ pkgbase = ncurses-nohex
 	provides = libpanelw.so
 	provides = libncursesw.so
 	conflicts = ncurses
-	source = https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.1.tar.gz
-	source = https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.1.tar.gz.sig
+	source = https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.2.tar.gz
+	source = https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.2.tar.gz.sig
 	source = nohex.patch::https://github.com/mbloms/ncurses/commit/2e8af507b9ea61ca9f70e023e89faa16aa01c8b1.patch
 	source = README.md
 	validpgpkeys = C52048C0C0748FEE227D47A2702353E0F7E48EDB
-	md5sums = 98c889aaf8d23910d2b92d65be2e737a
+	md5sums = e812da327b1c2214ac1aed440ea3ae8d
 	md5sums = SKIP
 	md5sums = ba2cd274835935bf83bf3859a131fd1e
 	md5sums = 0fd492d6811b9f520fdfd6188f290069
-	sha1sums = 57acf6bc24cacd651d82541929f726f4def780cc
+	sha1sums = 56e410fb77f2b5501a0b2f6a995376f3cefe1097
 	sha1sums = SKIP
 	sha1sums = 5fb4b04bd1c2c3ce89f140fffa6769dfd2e3f741
 	sha1sums = 0abec6eae58208ad167753fee41c63b130c16f0d
-	sha256sums = aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17
+	sha256sums = 30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d
 	sha256sums = SKIP
 	sha256sums = c59a4209ea84a31bba0ea5721ce1ed32252a951270dda3f932cfc6ab4ca821b8
 	sha256sums = 77aaa2c490d561955c1e28ab7fe32976553771e6bfe1ce0ffc57848ce4edb605
diff --git a/PKGBUILD b/PKGBUILD
index 0ee37b3b724d..cf1e56031ce8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Mikael Blomstrand <mbloms ÅT kth DÖT se>
+# Maintainer: Mikael Blomstrand <gmail: chawlindel>
 
 # PKGBUILD based on community/ncurses:
 # Contributor:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
@@ -7,8 +7,8 @@
 
 pkgname=('ncurses-nohex' 'infocmp-nohex')
 conflicts=(ncurses)
-pkgver=6.1
-pkgrel=6
+pkgver=6.2
+pkgrel=1
 pkgdesc="System V Release 4.0 curses emulation library. Patch disables hexadecimal in infocmp."
 arch=(x86_64)
 url='https://invisible-island.net/ncurses/ncurses.html'
@@ -18,15 +18,15 @@ provides=(ncurses libncurses++w.so libformw.so libmenuw.so libpanelw.so libncurs
 source=(https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$pkgver.tar.gz{,.sig}
   nohex.patch::https://github.com/mbloms/ncurses/commit/2e8af507b9ea61ca9f70e023e89faa16aa01c8b1.patch
   README.md)
-md5sums=('98c889aaf8d23910d2b92d65be2e737a'
+md5sums=('e812da327b1c2214ac1aed440ea3ae8d'
          'SKIP'
          'ba2cd274835935bf83bf3859a131fd1e'
          '0fd492d6811b9f520fdfd6188f290069')
-sha1sums=('57acf6bc24cacd651d82541929f726f4def780cc'
+sha1sums=('56e410fb77f2b5501a0b2f6a995376f3cefe1097'
           'SKIP'
           '5fb4b04bd1c2c3ce89f140fffa6769dfd2e3f741'
           '0abec6eae58208ad167753fee41c63b130c16f0d')
-sha256sums=('aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17'
+sha256sums=('30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d'
             'SKIP'
             'c59a4209ea84a31bba0ea5721ce1ed32252a951270dda3f932cfc6ab4ca821b8'
             '77aaa2c490d561955c1e28ab7fe32976553771e6bfe1ce0ffc57848ce4edb605')
diff --git a/nohex.patch b/nohex.patch
new file mode 100644
index 000000000000..50159e4f7d67
--- /dev/null
+++ b/nohex.patch
@@ -0,0 +1,66 @@
+From 2e8af507b9ea61ca9f70e023e89faa16aa01c8b1 Mon Sep 17 00:00:00 2001
+From: Mikael Blomstrand <mbloms@kth.se>
+Date: Sat, 7 Apr 2018 13:22:16 +0200
+Subject: [PATCH] revert number_format in patch 20170506
+
+    - modify tic/infocmp display of numeric values to use hexadecimal when
+      they are "close" to a power of two, making the result more readable.
+
+This patch fixes problems with i.a. earlier versions of jline and sbt<0.13.16.
+
+* jline issue: jline/jline2#281
+* sbt issue: sbt/sbt#3240
+---
+ progs/dump_entry.c | 31 +------------------------------
+ 1 file changed, 1 insertion(+), 30 deletions(-)
+
+diff --git a/progs/dump_entry.c b/progs/dump_entry.c
+index 3b1fcb1e..d0345c13 100644
+--- a/progs/dump_entry.c
++++ b/progs/dump_entry.c
+@@ -842,30 +842,6 @@ fmt_complex(TERMTYPE2 *tterm, const char *capability, char *src, int level)
+     return src;
+ }
+ 
+-/*
+- * Make "large" numbers a little easier to read by showing them in hexadecimal
+- * if they are "close" to a power of two.
+- */
+-static const char *
+-number_format(int value)
+-{
+-    const char *result = "%d";
+-    if ((outform != F_TERMCAP) && (value > 255)) {
+-	unsigned long lv = (unsigned long) value;
+-	unsigned long mm;
+-	int bits = sizeof(unsigned long) * 8;
+-	int nn;
+-	for (nn = 8; nn < bits; ++nn) {
+-	    mm = 1UL << nn;
+-	    if ((mm - 16) <= lv && (mm + 16) > lv) {
+-		result = "%#x";
+-		break;
+-	    }
+-	}
+-    }
+-    return result;
+-}
+-
+ #define SAME_CAP(n,cap) (&tterm->Strings[n] == &cap)
+ #define EXTRA_CAP 20
+ 
+@@ -961,13 +937,8 @@ fmt_entry(TERMTYPE2 *tterm,
+ 		_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+ 			    "%s@", name);
+ 	    } else {
+-		size_t nn;
+ 		_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+-			    "%s#", name);
+-		nn = strlen(buffer);
+-		_nc_SPRINTF(buffer + nn, _nc_SLIMIT(sizeof(buffer) - nn)
+-			    number_format(tterm->Numbers[i]),
+-			    tterm->Numbers[i]);
++			    "%s#%d", name, tterm->Numbers[i]);
+ 		if (i + 1 > num_values)
+ 		    num_values = i + 1;
+ 	    }