From 175353073d416cbfc9fb8ca13249df0df2c0e2d0 Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Fri, 25 Jul 2025 14:44:27 +0300
Subject: [PATCH] Update package version to 8.3.1

---
 check-version.sh                    | 14 ++++++++++++
 pkg.info                            |  3 +--
 source-files/8.3.0-event-hook.patch | 33 -----------------------------
 source.sh                           | 13 +++++++++---
 4 files changed, 25 insertions(+), 38 deletions(-)
 create mode 100644 check-version.sh
 delete mode 100644 source-files/8.3.0-event-hook.patch

diff --git a/check-version.sh b/check-version.sh
new file mode 100644
index 0000000..5ee51b2
--- /dev/null
+++ b/check-version.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+URL="https://tiswww.case.edu/php/chet/readline/rltop.html"
+
+# Get version number from tag name
+VERSION=$(curl -s -L "$URL" | grep -A1 'The current version of readline is' | grep -o -E '([0-9]\.[0-9]*)' | head -n1)
+
+# Get patch number
+PATCH=$(curl -s --list-only ftp://ftp.gnu.org/gnu/readline/readline-${VERSION}-patches/ | grep -v '.sig' | wc -l)
+
+# Append patch number to version
+VERSION="${VERSION}.${PATCH}"
+
+echo "$VERSION"
diff --git a/pkg.info b/pkg.info
index a890fb6..d7bf974 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,7 +1,6 @@
 name: readline
 description: GNU readline library
-version: 8.3
-revision: 2
+version: 8.3.1
 url: https://tiswww.case.edu/php/chet/readline/rltop.html
 license: GPL3-only
 architecture: any
diff --git a/source-files/8.3.0-event-hook.patch b/source-files/8.3.0-event-hook.patch
deleted file mode 100644
index 25e60a3..0000000
--- a/source-files/8.3.0-event-hook.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-*** ../readline-8.3/input.c	Fri May  2 09:29:05 2025
---- input.c	Tue Jul  8 15:37:13 2025
-***************
-*** 262,266 ****
-    tty = fileno (rl_instream);
-  
-!   /* Move this up here to give it first shot, but it can't set chars_avail */
-    /* XXX - need rl_chars_available_hook? */
-    if (rl_input_available_hook)
---- 262,267 ----
-    tty = fileno (rl_instream);
-  
-!   /* Move this up here to give it first shot, but it can't set chars_avail,
-!      so we assume a single character is available. */
-    /* XXX - need rl_chars_available_hook? */
-    if (rl_input_available_hook)
-***************
-*** 269,272 ****
---- 270,275 ----
-        if (result == 0)
-          result = -1;
-+       else
-+         chars_avail = 1;
-      }
-  
-***************
-*** 286,289 ****
---- 289,293 ----
-        if (result <= 0)
-  	return 0;	/* Nothing to read. */
-+       result = -1;	/* there is something, so check how many chars below */
-      }
-  #endif
diff --git a/source.sh b/source.sh
index a6c9847..0d671be 100644
--- a/source.sh
+++ b/source.sh
@@ -2,7 +2,8 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://ftp.gnu.org/gnu/readline/readline-${BPM_PKG_VERSION}.tar.gz"
+DOWNLOAD="https://ftp.gnu.org/gnu/readline/readline-${BPM_PKG_VERSION%.*}.tar.gz"
+DOWNLOAD_PATCH_BASE="https://ftp.gnu.org/gnu/readline/readline-${BPM_PKG_VERSION%.*}-patches/readline$(echo ${BPM_PKG_VERSION%.*} | tr -d '.')"
 FILENAME="${DOWNLOAD##*/}"
 
 # The prepare function is executed in the root of the temp directory
@@ -11,10 +12,16 @@ prepare() {
   wget "$DOWNLOAD"
   tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
 
-  # Apply patches
+  # Download and apply official patches
   cd "$BPM_SOURCE"
+  for patch in $(seq "${BPM_PKG_VERSION##*.}"); do
+    wget -O "${patch}.patch" "${DOWNLOAD_PATCH_BASE}-$(printf '%03d' ${patch})"
+    patch -Np0 -i "${patch}.patch"
+  done
+
+  # Apply local patches
   patch -Np2 < "$BPM_WORKDIR"/8.3.0-display-null-prompt.patch
-  patch -Np2 < "$BPM_WORKDIR"/8.3.0-event-hook.patch
+
   autoconf -fiv
 }