From ae3f7a857962a758a7783cb4d343760a9582478d Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 30 Jan 2020 08:38:21 +0000
Subject: system/libedit: Bugfix bump to 20191231.3.1

---
 system/libedit/APKBUILD    |  9 +++------
 system/libedit/tinfo.patch | 30 ------------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 system/libedit/tinfo.patch

(limited to 'system')

diff --git a/system/libedit/APKBUILD b/system/libedit/APKBUILD
index 63e80b875..77d98a701 100644
--- a/system/libedit/APKBUILD
+++ b/system/libedit/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libedit
-pkgver=20191025.3.1
+pkgver=20191231.3.1
 _realver="${pkgver%%.*}-${pkgver#*.}"
 pkgrel=0
 pkgdesc="Library providing line editing, history, and tokenisation functions"
@@ -12,9 +12,7 @@ depends=""
 depends_dev="ncurses-dev"  # XXX is this always unconditionally needed?
 makedepends="$depends_dev autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://thrysoee.dk/editline/libedit-$_realver.tar.gz
-	tinfo.patch
-	"
+source="https://thrysoee.dk/editline/libedit-$_realver.tar.gz"
 builddir="$srcdir/$pkgname-$_realver"
 
 prepare() {
@@ -41,5 +39,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9f475249b984e02ece0af3a0efe353233fef644ecf37482e28597a3ce552ca5a07678939b2c4ecbe3d2b14761fa67f23d2e839a322b94c0feeeba9e403b2be00  libedit-20191025-3.1.tar.gz
-b9cfb07733d14339cfb053b5c4249b74486268005474f65f377e412e5cccbe29d3ce55663a9795db0b682155084cca5a9424de348c7defdc8698dea042c2a674  tinfo.patch"
+sha512sums="1df2eced98e8db1bb0af940678c154d87e3b11dd21e65a903682367f5feace5112f9a543b8e0cb04bbfeaaf73729f808db2d9c302637fc063e81c0a37777ac2c  libedit-20191231-3.1.tar.gz"
diff --git a/system/libedit/tinfo.patch b/system/libedit/tinfo.patch
deleted file mode 100644
index 597529ca8..000000000
--- a/system/libedit/tinfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7aa660fd9d446567d3280765ba2a50a46b2a9159 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 12 Jun 2017 21:36:54 +0200
-Subject: [PATCH] configure: Support -ltinfo as split in newer ncurses
-
-The newer versions of ncurses support building terminfo routines
-as a split -ltinfo library. Account for that by adding this library
-to the search list.
----
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9a571b2..5d714b5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -49,7 +49,9 @@ EL_MANTYPE
- AC_CHECK_LIB(ncurses, tgetent,,
-   [AC_CHECK_LIB(curses, tgetent,,
-     [AC_CHECK_LIB(termcap, tgetent,,
--      [AC_MSG_ERROR([libncurses, libcurses, or libtermcap is required!])]
-+      [AC_CHECK_LIB(tinfo, tgetent,,
-+        [AC_MSG_ERROR([libncurses, libcurses, libtermcap, or libtinfo is required!])]
-+      )]
-     )]
-   )]
- )
--- 
-2.13.1
-
-- 
cgit v1.2.3-70-g09d2