From 6a97090963c2e9312d9312c6f4afa075fec6642d Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Mon, 25 May 2020 20:46:38 -0700
Subject: [PATCH] guile: update to 3.0.2.

---
 common/shlibs                             |  2 ++
 srcpkgs/guile/patches/musl-longlong.patch | 13 --------
 srcpkgs/guile/patches/non-static.patch    | 40 -----------------------
 srcpkgs/guile/template                    | 14 ++++----
 4 files changed, 9 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/guile/patches/musl-longlong.patch
 delete mode 100644 srcpkgs/guile/patches/non-static.patch

diff --git a/common/shlibs b/common/shlibs
index f18df7266ff..16be27cefde 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3889,3 +3889,5 @@ libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
 libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile-3.0.2_1
+guile-readline.so.0 libguile-3.0.2_1
diff --git a/srcpkgs/guile/patches/musl-longlong.patch b/srcpkgs/guile/patches/musl-longlong.patch
deleted file mode 100644
index 0e968058a09..00000000000
--- a/srcpkgs/guile/patches/musl-longlong.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libguile/fports.c.orig	2017-02-12 22:06:33.000000000 +0100
-+++ libguile/fports.c	2017-10-26 19:09:26.425213055 +0200
-@@ -66,8 +66,8 @@
- #define OFF_T_MAX  LONG_MAX
- #define OFF_T_MIN  LONG_MIN
- #elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
--#define OFF_T_MAX  LONG_LONG_MAX
--#define OFF_T_MIN  LONG_LONG_MIN
-+#define OFF_T_MAX  LLONG_MAX
-+#define OFF_T_MIN  LLONG_MIN
- #else
- #error Oops, unknown OFF_T size
- #endif
diff --git a/srcpkgs/guile/patches/non-static.patch b/srcpkgs/guile/patches/non-static.patch
deleted file mode 100644
index 8896762df89..00000000000
--- a/srcpkgs/guile/patches/non-static.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libguile/finalizers.c	2014-05-02 15:15:57.000000000 +0200
-+++ libguile/finalizers.c	2019-01-04 14:32:52.336586516 +0100
-@@ -164,7 +164,7 @@
- 
- 
- #ifndef HAVE_GC_SET_FINALIZER_NOTIFIER
--static void
-+void
- GC_set_finalizer_notifier (void (*notifier) (void))
- {
-   GC_finalizer_notifier = notifier;
---- libguile/gc.c	2016-12-15 01:03:33.000000000 +0100
-+++ libguile/gc.c	2019-01-04 14:35:56.357579179 +0100
-@@ -196,7 +196,7 @@
- /* Compatibility.  */
- 
- #ifndef HAVE_GC_GET_HEAP_USAGE_SAFE
--static void
-+void
- GC_get_heap_usage_safe (GC_word *pheap_size, GC_word *pfree_bytes,
-                         GC_word *punmapped_bytes, GC_word *pbytes_since_gc,
-                         GC_word *ptotal_bytes)
-@@ -214,7 +214,7 @@
- #endif
- 
- #ifndef HAVE_GC_GET_FREE_SPACE_DIVISOR
--static GC_word
-+GC_word
- GC_get_free_space_divisor (void)
- {
-   return GC_free_space_divisor;
-@@ -586,7 +586,7 @@
- }
- 
- #ifndef HAVE_GC_SET_FINALIZE_ON_DEMAND
--static void
-+void
- GC_set_finalize_on_demand (int foo)
- {
-   GC_finalize_on_demand = foo;
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index ffea17c3846..3611de15f27 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,18 +1,18 @@
 # Template file for 'guile'
 pkgname=guile
-version=2.0.14
-revision=9
+version=3.0.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-error-on-warning"
 hostmakedepends="pkg-config texinfo"
 makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
  libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi<anjan@momi.ca>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="http://www.gnu.org/software/${pkgname}"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
 subpackages="libguile guile-devel"
 
 if [ "$CROSS_BUILD" ]; then
@@ -30,8 +30,8 @@ pre_configure() {
 libguile_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/libguilereadline*.so"
+		vmove "usr/lib/libguile*.so.*"
+		vmove "usr/lib/guile/3.0/extensions/guile-readline.so.*"
 		vmkdir usr/share/gdb/auto-load/usr/lib
 		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
 	}