3 files changed, 27 insertions, 24 deletions
diff --git a/perl/perl6-Readline/ncurses.patch b/perl/perl6-Readline/ncurses.patch
index 3f6eba9cf90e7..ea103ee2d9c0e 100644
--- a/perl/perl6-Readline/ncurses.patch
+++ b/perl/perl6-Readline/ncurses.patch
@@ -3,17 +3,23 @@ From: https://github.com/drforr/perl6-readline/issues/23
 On Slackware 14.2, symbols from ncurses need to be loaded before symbols from
 readline can be used.
 
---- lib/Readline.pm.orig	2017-09-21 10:14:05.000000000 +0200
-+++ lib/Readline.pm	2018-07-02 22:14:26.473664202 +0200
-@@ -1,5 +1,11 @@
- use v6;
- use NativeCall;
+diff --git a/lib/Readline.pm b/lib/Readline.pm
+index 6001792..94db447 100644
+--- a/lib/Readline.pm
++++ b/lib/Readline.pm
+@@ -711,6 +711,15 @@ class Readline:ver<0.1.4> {
+       last;
+     }
+ 
++    given $*DISTRO.name {
++      when 'slackware' {
++        if $version ~~ v6 {
++          my sub tgetnum(Str --> int32) is native('ncurses') { * }
++          tgetnum('');
++        }
++      }
++    }
 +
-+INIT {
-+    my sub tgetnum(Str) returns int32 is native('ncurses') { * }
-+    tgetnum('');
-+}
-+
- #
- # XXX &cglobal.signature -> (Any $libname, Any $symbol, Any $target-type)
- #
+     ( $library, $version )
+   }
+ 
diff --git a/perl/perl6-Readline/perl6-Readline.SlackBuild b/perl/perl6-Readline/perl6-Readline.SlackBuild
index fd12dc53c23a4..0c28d9e85c8ec 100644
--- a/perl/perl6-Readline/perl6-Readline.SlackBuild
+++ b/perl/perl6-Readline/perl6-Readline.SlackBuild
@@ -17,12 +17,11 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=perl6-Readline
-VERSION=${VERSION:-0.0.2+e2cf431}
+VERSION=${VERSION:-0.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=perl6-readline
-GITREF=${GITREF:-e2cf431a87c36d420a3f2737b2cbc160efeb9233}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -56,9 +55,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$GITREF
-tar xvf $CWD/$SRCNAM-$GITREF.tar.gz
-cd $SRCNAM-$GITREF
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -66,9 +65,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ "$(readlink /usr/lib${LIBDIRSUFFIX}/libreadline.so)" = "libreadline.so.6" ]; then
-  patch -b -p0 < $CWD/ncurses.patch
-fi
+patch -b -p1 < $CWD/ncurses.patch
 
 if [ "${MAKETEST:-no}" = "yes" ]; then
   env PERL6LIB=lib prove -e perl6
diff --git a/perl/perl6-Readline/perl6-Readline.info b/perl/perl6-Readline/perl6-Readline.info
index e02677683369d..c4ce92789f41b 100644
--- a/perl/perl6-Readline/perl6-Readline.info
+++ b/perl/perl6-Readline/perl6-Readline.info
@@ -1,8 +1,8 @@
 PRGNAM="perl6-Readline"
-VERSION="0.0.2+e2cf431"
+VERSION="0.1.4"
 HOMEPAGE="https://github.com/drforr/perl6-readline"
-DOWNLOAD="https://github.com/drforr/perl6-readline/archive/e2cf431/perl6-readline-e2cf431a87c36d420a3f2737b2cbc160efeb9233.tar.gz"
-MD5SUM="b43e7c8947b2c6506bcf84827a3bff2f"
+DOWNLOAD="https://github.com/drforr/perl6-readline/archive/0.1.4/perl6-readline-0.1.4.tar.gz"
+MD5SUM="7e827ad1ac9c7498f1b7f2fbebb05e11"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rakudo"