Subject: [PATCH 1/2] main/guile: add readline support

From: Wolf <[email-masked]>
Date: Wed, 20 Jul 2022 02:13:41 +0200

---
 main/guile/APKBUILD | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index 9c863c9106..032b636712 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -6,15 +6,15 @@
 
 pkgname=guile
 pkgver=3.0.8
-pkgrel=0
+pkgrel=1
 pkgdesc="portable, embeddable Scheme implementation written in C"
 url="https://www.gnu.org/software/guile/"
 arch="all"
 options="!check" # Requires LC_COLLATE & LC_MONETARY, failed w/ musl-locales.
 license="LGPL-3.0-or-later AND GPL-3.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-readline"
 makedepends="gmp-dev libtool ncurses-dev texinfo libunistring-dev libffi-dev
-	gc-dev"
+	gc-dev readline-dev"
 depends_dev="guile gc-dev"
 source="https://ftp.gnu.org/gnu/guile/guile-$pkgver.tar.gz
 	0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
@@ -44,6 +44,21 @@ doc() {
 	license="GFDL-1.3-or-later"
 }
 
+readline() {
+	install -d "$subpkgdir"/usr/lib/guile/3.0/ccache/ice-9
+	install -d "$subpkgdir"/usr/lib/guile/3.0/extensions
+	install -d "$subpkgdir"/usr/share/guile/3.0/ice-9
+
+	for f in usr/lib/guile/3.0/ccache/ice-9/readline.go \
+	         usr/lib/guile/3.0/extensions/guile-readline.so \
+	         usr/lib/guile/3.0/extensions/guile-readline.so.0 \
+	         usr/lib/guile/3.0/extensions/guile-readline.so.0.0.0 \
+	         usr/share/guile/3.0/ice-9/readline.scm
+	do
+		mv "$pkgdir/$f" "$subpkgdir/$f"
+	done
+}
+
 sha512sums="
 7b2728e849a3ee482fe9a167dd76cc4835e911cc94ca0724dd51e8a813a240c6b5d2de84de16b46469ab24305b5b153a3c812fec942e007d3310bba4d1cf947d  guile-3.0.8.tar.gz
 54a9fe0fa2ea83da7ae61f96612e3e653ec80f60ab41d1995dc44bd05c7ff68cc4fab36a655e8835c4ab1cf0966765a299ef2d73cb9f69d3ef955e6aeaa8062d  0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
-- 
2.36.2

---

From: Wolf <[email-masked]>
Date: Wed, 20 Jul 2022 02:13:42 +0200

---
 main/guile/APKBUILD | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index 032b636712..af5721f4fc 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -6,15 +6,15 @@
 
 pkgname=guile
 pkgver=3.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="portable, embeddable Scheme implementation written in C"
 url="https://www.gnu.org/software/guile/"
 arch="all"
 options="!check" # Requires LC_COLLATE & LC_MONETARY, failed w/ musl-locales.
 license="LGPL-3.0-or-later AND GPL-3.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-readline"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-readline $pkgname-tags"
 makedepends="gmp-dev libtool ncurses-dev texinfo libunistring-dev libffi-dev
-	gc-dev readline-dev"
+	gc-dev readline-dev emacs-nox"
 depends_dev="guile gc-dev"
 source="https://ftp.gnu.org/gnu/guile/guile-$pkgver.tar.gz
 	0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
@@ -33,6 +33,7 @@ build() {
 		--disable-error-on-warning \
 		--disable-static
 	make
+	make tags
 }
 
 package() {
@@ -59,6 +60,10 @@ readline() {
 	done
 }
 
+tags() {
+	install -Dt "$subpkgdir"/usr/share/guile/3.0 "$builddir"/module/TAGS
+}
+
 sha512sums="
 7b2728e849a3ee482fe9a167dd76cc4835e911cc94ca0724dd51e8a813a240c6b5d2de84de16b46469ab24305b5b153a3c812fec942e007d3310bba4d1cf947d  guile-3.0.8.tar.gz
 54a9fe0fa2ea83da7ae61f96612e3e653ec80f60ab41d1995dc44bd05c7ff68cc4fab36a655e8835c4ab1cf0966765a299ef2d73cb9f69d3ef955e6aeaa8062d  0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
-- 
2.36.2