From 276ca2281713490ababc4695e31d6157ac64a1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?= <karasz@jpi.io>
Date: Fri, 1 Apr 2016 12:34:57 +0300
Subject: [PATCH] readline: removed old redundant patch and aknowledged the
 fact that bash is not broken

---
 base/readline/install-no_rm.patch | 65 -------------------------------
 base/readline/readline.conf       |  8 +---
 2 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 base/readline/install-no_rm.patch

diff --git a/base/readline/install-no_rm.patch b/base/readline/install-no_rm.patch
deleted file mode 100644
index 0d50053e6..000000000
--- a/base/readline/install-no_rm.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../readline/install-no_rm.patch
-# Copyright (C) 2006 - 2010 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-diff -ruN readline-6.1-orig/Makefile.in readline-6.1/Makefile.in
---- readline-6.1-orig/Makefile.in	2009-04-19 18:14:24.000000000 +0200
-+++ readline-6.1/Makefile.in	2010-09-01 12:32:47.084140034 +0200
-@@ -222,10 +222,8 @@
- maybe-uninstall-headers: uninstall-headers
- 
- install-static: installdirs $(STATIC_LIBS) install-headers install-doc install-examples
--	-$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
- 	$(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a
- 	-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a
--	-$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old
- 	$(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a
- 	-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a
- 
-diff -ruN readline-6.1-orig/support/shlib-install readline-6.1/support/shlib-install
---- readline-6.1-orig/support/shlib-install	2009-10-28 14:30:18.000000000 +0100
-+++ readline-6.1/support/shlib-install	2010-09-01 12:34:40.772101116 +0200
-@@ -44,16 +44,7 @@
- OLDSUFF=old
- MV=mv
- RM="rm -f"
--LN="ln -s"
--
--# pre-install
--
--if [ -z "$uninstall" ]; then
--	${echo} $RM ${INSTALLDIR}/${LIBNAME}.${OLDSUFF}
--	if [ -f "$INSTALLDIR/$LIBNAME" ]; then
--		${echo} $MV $INSTALLDIR/$LIBNAME ${INSTALLDIR}/${LIBNAME}.${OLDSUFF}
--	fi
--fi
-+LN="ln -sf"
- 
- # install/uninstall
- 
-@@ -119,13 +110,11 @@
- case "$host_os-$host_vendor" in
- *linux*|freebsd*-gentoo)
- 	# libname.so.M -> libname.so.M.N
--	${echo} ${RM} ${INSTALLDIR}/$LINK2
- 	if [ -z "$uninstall" ]; then
- 		eval $INSTALL_LINK2
- 	fi
- 
- 	# libname.so -> libname.so.M
--	${echo} ${RM} ${INSTALLDIR}/$LINK1
- 	if [ -z "$uninstall" ]; then
- 		${echo} cd $INSTALLDIR && ${echo} ${LN} $LINK2 $LINK1
- 	fi
diff --git a/base/readline/readline.conf b/base/readline/readline.conf
index 585e7f548..6e05ee69f 100644
--- a/base/readline/readline.conf
+++ b/base/readline/readline.conf
@@ -27,13 +27,7 @@ pkg_readline_preconf() {
 
 hook_add preconf 5 "pkg_readline_preconf"
 
-# link against libtinfo from ncurses avoiding undefined references in
-# third party applications which link against libreadline
-if pkginstalled ncurses; then
-	var_append GCC_WRAPPER_INSERT ' ' "-L$( pkgprefix -r libdir ncurses ) -ltinfo"
-fi
-
 # https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00049.html
 if atstage cross; then
-	var_append configcache ' ' 'bash_cv_wcwidth_broken=yes'
+	var_append configcache ' ' 'bash_cv_wcwidth_broken=no'
 fi