Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Guile 3.0, again
@ 2020-12-21 10:09 unspecd
  2020-12-21 10:11 ` [PR PATCH] [Updated] " unspecd
                   ` (75 more replies)
  0 siblings, 76 replies; 77+ messages in thread
From: unspecd @ 2020-12-21 10:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

There is a new pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9587 bytes --]

From df4d0afc3d88a0b36c2a583c418d18abff9951d4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 46 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 49 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..47ed174a615 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 libguile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..3cd91e2f660
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,46 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config"
+makedepends="gc-devel gmp-devel readline-devel libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+libguile3_package() {
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove usr/lib/guile/3.0
+		vmove "usr/lib/*.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+                vmove usr/share/guile
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From bd34dc4d39b8655f4a225716a47a1858a2527d7e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..d9bd205ac42 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,11 +38,11 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.
-build_options_default="gdbserver python debuginfod"
+build_options_default="gdbserver python debuginfod guile"
 # Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
 

From 3cd2ee71f21e802dca2801ee214862fa5a8ae56c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
 srcpkgs/gnutls/template                 | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..eb95346e401 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +42,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 3b38b84359b81b1be1d6878ef71f75083d8a0db4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3236d5989fc 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,23 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel gc-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+# XXX: work around autoreconf error: "possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS".
+makedepends+=" gettext-devel"
+
+pre_configure() {
+	# regenerate to grab guile-3.0 package
+	autoreconf -fi
+        # aclocal && autoconf && automake --foreign --add-missing
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
@ 2020-12-21 10:11 ` unspecd
  2020-12-21 10:19 ` [PR REVIEW] " sirikid
                   ` (74 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-21 10:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9573 bytes --]

From eca1adf32556bce283642bdcc76cbf3b280b3bc9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 46 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 49 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..47ed174a615 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 libguile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..1f53856f67e
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,46 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config"
+makedepends="gc-devel gmp-devel readline-devel libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+libguile3_package() {
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove usr/lib/guile/3.0
+		vmove "usr/lib/*.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		vmove usr/share/guile
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From 4e2f71c14069335c70c6bce574b3047a28b45168 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..d9bd205ac42 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,11 +38,11 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.
-build_options_default="gdbserver python debuginfod"
+build_options_default="gdbserver python debuginfod guile"
 # Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
 

From 647cd800a55ebd6bbffd186ff788eda42dd02660 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
 srcpkgs/gnutls/template                 | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..eb95346e401 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +42,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From aec5219012980a016c23218d415b8c381b362452 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3236d5989fc 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,23 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel gc-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+# XXX: work around autoreconf error: "possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS".
+makedepends+=" gettext-devel"
+
+pre_configure() {
+	# regenerate to grab guile-3.0 package
+	autoreconf -fi
+        # aclocal && autoconf && automake --foreign --add-missing
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
  2020-12-21 10:11 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-21 10:19 ` sirikid
  2020-12-21 10:51 ` [PR PATCH] [Updated] " unspecd
                   ` (73 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: sirikid @ 2020-12-21 10:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r546622902

Comment:
This should not be necessary, see #21288

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
  2020-12-21 10:11 ` [PR PATCH] [Updated] " unspecd
  2020-12-21 10:19 ` [PR REVIEW] " sirikid
@ 2020-12-21 10:51 ` unspecd
  2020-12-21 12:25 ` unspecd
                   ` (72 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-21 10:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9537 bytes --]

From ab9b4cff411c996970f473ad2bf97f2d3eb119a1 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 47 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 50 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..47ed174a615 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 libguile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..8001aaf93f3
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,47 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config"
+makedepends="gc-devel gmp-devel readline-devel libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	CFLAGS+="-DHAVE_GC_IS_HEAP_PTR=1"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+libguile3_package() {
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove usr/lib/guile/3.0
+		vmove "usr/lib/*.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		vmove usr/share/guile
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From 0d6d705a91e6f24d7a03e4bdcdad2bab674157c1 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..d9bd205ac42 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,11 +38,11 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.
-build_options_default="gdbserver python debuginfod"
+build_options_default="gdbserver python debuginfod guile"
 # Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
 

From 44a2ed0206ed1296cc71471ac1257d6946d0c368 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
 srcpkgs/gnutls/template                 | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..eb95346e401 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +42,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 729ffd26eda132b3ccd74745b63999eac8a5d371 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/template | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..1c36a5451ad 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,22 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel gc-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+# XXX: work around autoreconf error: "possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS".
+makedepends+=" gettext-devel"
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	autoreconf -fi
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (2 preceding siblings ...)
  2020-12-21 10:51 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-21 12:25 ` unspecd
  2020-12-21 12:27 ` unspecd
                   ` (71 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-21 12:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9656 bytes --]

From 8ec523119adedf28e5f2f709deb212e2fa7b4a4f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 53 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 56 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..47ed174a615 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 libguile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..54a7d9a8c5f
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,53 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config"
+makedepends="gc-devel gmp-devel readline-devel libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	CFLAGS+="-DHAVE_GC_IS_HEAP_PTR=1"
+	CFLAGS+="-DHAVE_GC_MOVE_DISAPPEARING_LINK=1"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+do_check() {
+        # TODO: fix failing tests
+        return 0
+}
+
+libguile3_package() {
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove usr/lib/guile/3.0
+		vmove "usr/lib/*.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		vmove usr/share/guile
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From e9f48e42a2745e55c4c1010aa64572b9da93096f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..d9bd205ac42 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,11 +38,11 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.
-build_options_default="gdbserver python debuginfod"
+build_options_default="gdbserver python debuginfod guile"
 # Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
 

From 72cbae08ba5a213fffc904a51b0ae0941f85d88c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
 srcpkgs/gnutls/template                 | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..eb95346e401 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +42,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 8c29cee25ee3a538e7f0aac6ca23426a0e9d164e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/template | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..1c36a5451ad 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,22 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel gc-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+# XXX: work around autoreconf error: "possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS".
+makedepends+=" gettext-devel"
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	autoreconf -fi
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (3 preceding siblings ...)
  2020-12-21 12:25 ` unspecd
@ 2020-12-21 12:27 ` unspecd
  2020-12-21 12:38 ` unspecd
                   ` (70 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-21 12:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9642 bytes --]

From 5977aaf92a92810b8f356c9a5447f7f55994a9b0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 53 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 56 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..47ed174a615 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 libguile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..abd087c1292
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,53 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config"
+makedepends="gc-devel gmp-devel readline-devel libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	CFLAGS+="-DHAVE_GC_IS_HEAP_PTR=1"
+	CFLAGS+="-DHAVE_GC_MOVE_DISAPPEARING_LINK=1"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+do_check() {
+	# TODO: fix failing tests
+	return 0
+}
+
+libguile3_package() {
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove usr/lib/guile/3.0
+		vmove "usr/lib/*.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		vmove usr/share/guile
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From a28521f95bc33c3799442c9bfc1b61815323923d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..d9bd205ac42 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,11 +38,11 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.
-build_options_default="gdbserver python debuginfod"
+build_options_default="gdbserver python debuginfod guile"
 # Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
 

From cc63cd6eb13eee757cf48a61706f1822a802bcdc Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
 srcpkgs/gnutls/template                 | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..eb95346e401 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +42,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From e0cd2aa07c1f5551388b99ab22c348b034ad2841 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/template | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..1c36a5451ad 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,22 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel gc-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+# XXX: work around autoreconf error: "possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS".
+makedepends+=" gettext-devel"
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	autoreconf -fi
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (4 preceding siblings ...)
  2020-12-21 12:27 ` unspecd
@ 2020-12-21 12:38 ` unspecd
  2020-12-21 12:45 ` unspecd
                   ` (69 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-21 12:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9644 bytes --]

From 039932abd59932842a46f7e313c846bdf56e9bd5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 53 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 56 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..47ed174a615 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 libguile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..1c23f2ccb19
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,53 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config"
+makedepends="gc-devel gmp-devel readline-devel libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	CFLAGS+=" -DHAVE_GC_IS_HEAP_PTR=1"
+	CFLAGS+=" -DHAVE_GC_MOVE_DISAPPEARING_LINK=1"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+do_check() {
+	# TODO: fix failing tests
+	return 0
+}
+
+libguile3_package() {
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove usr/lib/guile/3.0
+		vmove "usr/lib/*.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		vmove usr/share/guile
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From 8e62e563e23e978a21c8cdac67275e3f863cd39a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..d9bd205ac42 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,11 +38,11 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.
-build_options_default="gdbserver python debuginfod"
+build_options_default="gdbserver python debuginfod guile"
 # Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
 

From 00f3ccb98b3e0985fa69599781d9195b1ec52db6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
 srcpkgs/gnutls/template                 | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..eb95346e401 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +42,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 32679483290cc9ad4bde5c0a92dc61bc49c7cfc4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/template | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..1c36a5451ad 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,22 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel gc-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+# XXX: work around autoreconf error: "possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS".
+makedepends+=" gettext-devel"
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	autoreconf -fi
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (5 preceding siblings ...)
  2020-12-21 12:38 ` unspecd
@ 2020-12-21 12:45 ` unspecd
  2020-12-21 12:47 ` [PR PATCH] [Updated] " unspecd
                   ` (68 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-21 12:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 145 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-748955655

Comment:
🤔

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (6 preceding siblings ...)
  2020-12-21 12:45 ` unspecd
@ 2020-12-21 12:47 ` unspecd
  2020-12-21 12:48 ` unspecd
                   ` (67 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-21 12:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9666 bytes --]

From c2929b6804e3db6afb9c2fb09899d2468e42c14a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 54 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..47ed174a615 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 libguile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..4d13e408aa9
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,54 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	CFLAGS+=" -DHAVE_GC_IS_HEAP_PTR=1"
+	CFLAGS+=" -DHAVE_GC_MOVE_DISAPPEARING_LINK=1"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+do_check() {
+	# TODO: fix failing tests
+	return 0
+}
+
+libguile3_package() {
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove usr/lib/guile/3.0
+		vmove "usr/lib/*.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		vmove usr/share/guile
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From def5b9ee974afc869a747083b49f456fdc415970 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..d9bd205ac42 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,11 +38,11 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.
-build_options_default="gdbserver python debuginfod"
+build_options_default="gdbserver python debuginfod guile"
 # Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
 

From e50787c5dca8d9ac5123e6f8a2bf65741ca614db Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
 srcpkgs/gnutls/template                 | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..eb95346e401 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +42,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 1b62b9dee1dddfe220e31918e40327ef5a524c88 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/template | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..1c36a5451ad 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,22 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel gc-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+# XXX: work around autoreconf error: "possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS".
+makedepends+=" gettext-devel"
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	autoreconf -fi
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (7 preceding siblings ...)
  2020-12-21 12:47 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-21 12:48 ` unspecd
  2020-12-21 13:08 ` unspecd
                   ` (66 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-21 12:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 145 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-748955655

Comment:
🤔

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (8 preceding siblings ...)
  2020-12-21 12:48 ` unspecd
@ 2020-12-21 13:08 ` unspecd
  2020-12-21 13:29 ` q66
                   ` (65 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-21 13:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 145 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-748964917

Comment:
🤔

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (9 preceding siblings ...)
  2020-12-21 13:08 ` unspecd
@ 2020-12-21 13:29 ` q66
  2020-12-21 13:30 ` q66
                   ` (64 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: q66 @ 2020-12-21 13:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-748973534

Comment:
do we actually need this for anything

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (10 preceding siblings ...)
  2020-12-21 13:29 ` q66
@ 2020-12-21 13:30 ` q66
  2020-12-21 13:31 ` q66
                   ` (63 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: q66 @ 2020-12-21 13:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-748974051

Comment:
also i'm opposed to enabling guile by default in any system packages, it's of little to use to anybody and maintaining the guile toolchain is enough of a pain in the ass i don't want it anywhere near base system

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (11 preceding siblings ...)
  2020-12-21 13:30 ` q66
@ 2020-12-21 13:31 ` q66
  2020-12-21 14:33 ` [PR REVIEW] " ericonr
                   ` (62 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: q66 @ 2020-12-21 13:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-748974051

Comment:
also i'm opposed to enabling guile by default in any system packages, it's of little to use to anybody and maintaining the guile toolchain is enough of a pain in the ass i don't want it anywhere near base system (keep it as non-default build options or whatever, but no default guile dependencies please)

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (12 preceding siblings ...)
  2020-12-21 13:31 ` q66
@ 2020-12-21 14:33 ` ericonr
  2020-12-21 14:33 ` ericonr
                   ` (61 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: ericonr @ 2020-12-21 14:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r546736357

Comment:
Shouldn't be default

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (13 preceding siblings ...)
  2020-12-21 14:33 ` [PR REVIEW] " ericonr
@ 2020-12-21 14:33 ` ericonr
  2020-12-21 14:33 ` ericonr
                   ` (60 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: ericonr @ 2020-12-21 14:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r546737699

Comment:
Nor here. Did you get it to cross compile with guile support? I had a lot of trouble making this work iirc.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (15 preceding siblings ...)
  2020-12-21 14:33 ` ericonr
@ 2020-12-21 14:33 ` ericonr
  2020-12-22  3:14 ` [PR PATCH] [Updated] " unspecd
                   ` (58 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: ericonr @ 2020-12-21 14:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r546738377

Comment:
Requiring this smells fishy, but oh well.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (14 preceding siblings ...)
  2020-12-21 14:33 ` ericonr
@ 2020-12-21 14:33 ` ericonr
  2020-12-21 14:33 ` ericonr
                   ` (59 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: ericonr @ 2020-12-21 14:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r546738022

Comment:
This should go in `makedepends`, just put the comment there as well.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (16 preceding siblings ...)
  2020-12-21 14:33 ` ericonr
@ 2020-12-22  3:14 ` unspecd
  2020-12-22  3:21 ` [PR REVIEW] " unspecd
                   ` (57 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22  3:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9963 bytes --]

From 78a82f71999f317b5d5911514b504b3cd30a40c6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 46 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..15db884ed30
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,46 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+do_check() {
+	# TODO: fix failing tests
+	return 0
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}

From 0838f2c953d582dce570afa6a934995958f5df0f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From ca3c4f2ec6e450680b2a923be411679f66d5295b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
 srcpkgs/gnutls/template                 | 11 +++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From b69e0fa8e403d6e0110b2c5f40b743ae8b183994 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..c34eab6470a 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,22 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+# XXX: work around autoreconf error: "possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS".
+makedepends+=" gettext-devel"
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	autoreconf -fi
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (17 preceding siblings ...)
  2020-12-22  3:14 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-22  3:21 ` unspecd
  2020-12-22  3:38 ` [PR PATCH] [Updated] " unspecd
                   ` (56 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22  3:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r547045374

Comment:
Ok, turned it off.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (18 preceding siblings ...)
  2020-12-22  3:21 ` [PR REVIEW] " unspecd
@ 2020-12-22  3:38 ` unspecd
  2020-12-22  5:14 ` unspecd
                   ` (55 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22  3:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9789 bytes --]

From 78a82f71999f317b5d5911514b504b3cd30a40c6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 46 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..15db884ed30
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,46 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+do_check() {
+	# TODO: fix failing tests
+	return 0
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}

From 0838f2c953d582dce570afa6a934995958f5df0f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From ca3c4f2ec6e450680b2a923be411679f66d5295b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
 srcpkgs/gnutls/template                 | 11 +++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 4d99c1524e7ab8856be5fbfa59f9896ea05b33c7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch |  4 ++--
 srcpkgs/xbindkeys/template            | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
index fee7b8e0b53..da51c95652b 100644
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ b/srcpkgs/xbindkeys/patches/cross.patch
@@ -8,8 +8,8 @@ index 7bb5cba..e557452 100644
  @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
 -@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
 -@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
++@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-3.0 -lgc
++@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-3.0 -lgc
  xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
  		keys.h keys.c \
  		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..c34eab6470a 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,22 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+# XXX: work around autoreconf error: "possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS".
+makedepends+=" gettext-devel"
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	autoreconf -fi
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (19 preceding siblings ...)
  2020-12-22  3:38 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-22  5:14 ` unspecd
  2020-12-22  6:04 ` unspecd
                   ` (54 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22  5:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9941 bytes --]

From 39e5a4f9659b34ee80e77fb6266bc14509008021 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 49 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..27013610f17
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,49 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+do_check() {
+	# TODO: fix failing tests
+	return 0
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}

From b900dd9dd87fdc4c136de7d9f3c48beea714671a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 537dc516ccea696d23115d79739b4c005a1bce23 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
 srcpkgs/gnutls/template                 | 11 +++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 1fd49d2aeff194a799cbfa3a573541215c3aac2a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 13 +++++++++----
 2 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..ddfa91d8be0 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,19 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (20 preceding siblings ...)
  2020-12-22  5:14 ` unspecd
@ 2020-12-22  6:04 ` unspecd
  2020-12-22  8:13 ` [PR PATCH] [Updated] " unspecd
                   ` (53 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22  6:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749359138

Comment:
Okay, it's a little better now, but not perfect: gnutls doesn't cross-compile. I'm working on it.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (21 preceding siblings ...)
  2020-12-22  6:04 ` unspecd
@ 2020-12-22  8:13 ` unspecd
  2020-12-22  9:28 ` unspecd
                   ` (52 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22  8:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 12350 bytes --]

From 39e5a4f9659b34ee80e77fb6266bc14509008021 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 49 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..27013610f17
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,49 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+	export GUILE_FOR_BUILD=guile3
+fi
+
+do_check() {
+	# TODO: fix failing tests
+	return 0
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}

From b900dd9dd87fdc4c136de7d9f3c48beea714671a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 7595db3f02a1ce7f4d33405bbeda27d07669fc57 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/patches/use-guile3.patch       | 11 +++++
 srcpkgs/gnutls/template                       | 12 +++--
 3 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..eb95346e401 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +42,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 66ffce569875dcd068195804051470e8c80151d1 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 13 +++++++++----
 2 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..ddfa91d8be0 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,19 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
+depends="guile3"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (22 preceding siblings ...)
  2020-12-22  8:13 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-22  9:28 ` unspecd
  2020-12-22  9:38 ` [PR REVIEW] " unspecd
                   ` (51 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22  9:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749443944

Comment:
@ericonr 
```sh
[pi@rpi ~]$ xuname 
Void 5.4.68_1 aarch64-musl Unknown uptodate rDDF
[pi@rpi ~]$ xbps-query --property pkgver guile3 
guile3-3.0.4_1
[pi@rpi ~]$ xbps-query --property pkgver gnutls 
gnutls-3.6.15_2
[pi@rpi ~]$ guile3 -c '(begin (use-modules (gnutls)) (display (gnutls-version))) (newline)'
3.6.15
[pi@rpi ~]$
```
What would you say about this? :)

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (23 preceding siblings ...)
  2020-12-22  9:28 ` unspecd
@ 2020-12-22  9:38 ` unspecd
  2020-12-22  9:38 ` sirikid
                   ` (50 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22  9:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r547171340

Comment:
I will revert it back later.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (24 preceding siblings ...)
  2020-12-22  9:38 ` [PR REVIEW] " unspecd
@ 2020-12-22  9:38 ` sirikid
  2020-12-22  9:43 ` [PR REVIEW] " sirikid
                   ` (49 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: sirikid @ 2020-12-22  9:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749448563

Comment:
> do we actually need this for anything

GNU Guix

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (25 preceding siblings ...)
  2020-12-22  9:38 ` sirikid
@ 2020-12-22  9:43 ` sirikid
  2020-12-22  9:45 ` unspecd
                   ` (48 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: sirikid @ 2020-12-22  9:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 300 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r547173800

Comment:
I suggest this instead https://github.com/sirikid/void-packages/pull/5/files#diff-f84bf169ceb673e68584d5c25df39e898cf9f7cfe830f79c18ebe4f58f62f08eR26-R30

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (26 preceding siblings ...)
  2020-12-22  9:43 ` [PR REVIEW] " sirikid
@ 2020-12-22  9:45 ` unspecd
  2020-12-22  9:48 ` [PR REVIEW] " sirikid
                   ` (47 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22  9:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749451710

Comment:
> GNU Guix

https://github.com/void-linux/void-packages/pull/22359#issuecomment-708185992

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (27 preceding siblings ...)
  2020-12-22  9:45 ` unspecd
@ 2020-12-22  9:48 ` sirikid
  2020-12-22  9:50 ` sirikid
                   ` (46 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: sirikid @ 2020-12-22  9:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r547176595

Comment:
You can also pass `GUILE_FOR_BUILD` in `configure_args`

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (28 preceding siblings ...)
  2020-12-22  9:48 ` [PR REVIEW] " sirikid
@ 2020-12-22  9:50 ` sirikid
  2020-12-22  9:54 ` sirikid
                   ` (45 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: sirikid @ 2020-12-22  9:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r547177405

Comment:
Shouldn't that be autodetected?

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (29 preceding siblings ...)
  2020-12-22  9:50 ` sirikid
@ 2020-12-22  9:54 ` sirikid
  2020-12-22  9:55 ` fosslinux
                   ` (44 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: sirikid @ 2020-12-22  9:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

New comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749455038

Comment:
> > GNU Guix
> 
> [#22359 (comment)](https://github.com/void-linux/void-packages/pull/22359#issuecomment-708185992)

Long way to go, but we need Guile before Guix. Also, having Guix helps a lot in development.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (30 preceding siblings ...)
  2020-12-22  9:54 ` sirikid
@ 2020-12-22  9:55 ` fosslinux
  2020-12-22  9:57 ` fosslinux
                   ` (43 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: fosslinux @ 2020-12-22  9:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749455769

Comment:
Guix isn't in the repositories, I believe @q66 was talking about anything in the repositories that this is blocked on before an update or smth

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (31 preceding siblings ...)
  2020-12-22  9:55 ` fosslinux
@ 2020-12-22  9:57 ` fosslinux
  2020-12-22 10:13 ` [PR REVIEW] " unspecd
                   ` (42 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: fosslinux @ 2020-12-22  9:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749455769

Comment:
Guix isn't in the repositories, I believe @q66 was talking about anything in the repositories that this is blocked on before an update or smth

w/r/t musl and guix, you'd need to source build packages as needed as was done in the link provided, as Guix has no musl support and hence no binaries.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (32 preceding siblings ...)
  2020-12-22  9:57 ` fosslinux
@ 2020-12-22 10:13 ` unspecd
  2020-12-22 10:21 ` unspecd
                   ` (41 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 10:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r547189161

Comment:
Yes, you are right. Thanks for the correction.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (33 preceding siblings ...)
  2020-12-22 10:13 ` [PR REVIEW] " unspecd
@ 2020-12-22 10:21 ` unspecd
  2020-12-22 10:33 ` [PR REVIEW] " unspecd
                   ` (40 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 10:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 5789 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749467272

Comment:
gdb works fine.
```sh
$ gdb -ex='handle SIGSEGV noprint nostop' -ex='b scm_display' -ex=r -ex=bt --args guile3 -c '(display "hello\n")'
```

Without guile:
```
#0  scm_display (obj=0x7ffff77a1920, port=0x904) at print.c:1110
#1  0x00007ffff7ebb4b9 in vm_regular_engine (thread=0x7ffff7910d80) at vm-engine.c:972
#2  0x00007ffff7ebdd39 in scm_call_n (proc=<optimized out>, argv=argv@entry=0x7fffffffd668, nargs=nargs@entry=1) at vm.c:1608
#3  0x00007ffff7e37027 in scm_primitive_eval (exp=<optimized out>, exp@entry=0x7ffff73e9560) at eval.c:671
#4  0x00007ffff7e37086 in scm_eval (exp=0x7ffff73e9560, module_or_state=0x7ffff73e6f00) at eval.c:705
#5  0x00007ffff7ebb4b9 in vm_regular_engine (thread=0x7ffff7910d80) at vm-engine.c:972
#6  0x00007ffff7ebdd39 in scm_call_n (proc=<optimized out>, argv=argv@entry=0x7fffffffd848, nargs=nargs@entry=1) at vm.c:1608
#7  0x00007ffff7e37027 in scm_primitive_eval (exp=<optimized out>, exp@entry=0x7ffff73dd100) at eval.c:671
#8  0x00007ffff7e37086 in scm_eval (exp=0x7ffff73dd100, module_or_state=module_or_state@entry=0x7ffff73e6f00) at eval.c:705
#9  0x00007ffff7e920f6 in scm_shell (argc=3, argv=0x7fffffffde58) at script.c:357
#10 0x00007ffff7e4f55d in invoke_main_func (body_data=0x7fffffffdd90) at init.c:308
#11 0x00007ffff7e308ba in c_body (d=0x7fffffffdcd0) at continuations.c:430
#12 0x00007ffff7ebb4b9 in vm_regular_engine (thread=0x7ffff7910d80) at vm-engine.c:972
#13 0x00007ffff7ebdd39 in scm_call_n (proc=<optimized out>, argv=argv@entry=0x7fffffffda70, nargs=nargs@entry=2) at vm.c:1608
#14 0x00007ffff7e35cfa in scm_call_2 (proc=<optimized out>, arg1=<optimized out>, arg2=<optimized out>) at eval.c:503
#15 0x00007ffff7e376bc in scm_c_with_exception_handler (type=type@entry=0x404, handler=handler@entry=0x7ffff7eb2bc0 <catch_post_unwind_handler>, handler_data=handler_data@entry=0x7fffffffdbf0, 
    thunk=thunk@entry=0x7ffff7eb2d00 <catch_body>, thunk_data=thunk_data@entry=0x7fffffffdbf0) at exceptions.c:170
#16 0x00007ffff7eb2f0d in scm_c_catch (tag=tag@entry=0x404, body=body@entry=0x7ffff7e308b0 <c_body>, body_data=body_data@entry=0x7fffffffdcd0, handler=handler@entry=0x7ffff7e30b60 <c_handler>, 
    handler_data=handler_data@entry=0x7fffffffdcd0, pre_unwind_handler=pre_unwind_handler@entry=0x7ffff7e309b0 <pre_unwind_handler>, pre_unwind_handler_data=0x7ffff77be540) at throw.c:168
#17 0x00007ffff7e30e78 in scm_i_with_continuation_barrier (body=body@entry=0x7ffff7e308b0 <c_body>, body_data=body_data@entry=0x7fffffffdcd0, handler=handler@entry=0x7ffff7e30b60 <c_handler>, 
    handler_data=handler_data@entry=0x7fffffffdcd0, pre_unwind_handler=pre_unwind_handler@entry=0x7ffff7e309b0 <pre_unwind_handler>, pre_unwind_handler_data=0x7ffff77be540)
    at continuations.c:368
```

With guile:
```
#0  scm_display (obj="hello\n", port=#<undefined 904>) at print.c:1110
#1  0x00007ffff7ebb4b9 in vm_regular_engine (thread=0x7ffff7910d80) at vm-engine.c:972
#2  0x00007ffff7ebdd39 in scm_call_n (proc=<optimized out>, argv=argv@entry=0x7fffffffd668, nargs=nargs@entry=1) at vm.c:1608
#3  0x00007ffff7e37027 in scm_primitive_eval (exp=<optimized out>, exp@entry=(display "hello\n")) at eval.c:671
#4  0x00007ffff7e37086 in scm_eval (exp=(display "hello\n"), module_or_state="#<struct module>" = {...}) at eval.c:705
#5  0x00007ffff7ebb4b9 in vm_regular_engine (thread=0x7ffff7910d80) at vm-engine.c:972
#6  0x00007ffff7ebdd39 in scm_call_n (proc=<optimized out>, argv=argv@entry=0x7fffffffd848, nargs=nargs@entry=1) at vm.c:1608
#7  0x00007ffff7e37027 in scm_primitive_eval (exp=<optimized out>, exp@entry=((@ (ice-9 control) %) (begin ((@@ (ice-9 command-line) eval-string/lang) "(display \"hello\\n\")") (quit))))
    at eval.c:671
#8  0x00007ffff7e37086 in scm_eval (exp=((@ (ice-9 control) %) (begin ((@@ (ice-9 command-line) eval-string/lang) "(display \"hello\\n\")") (quit))), 
    module_or_state=module_or_state@entry="#<struct module>" = {...}) at eval.c:705
#9  0x00007ffff7e920f6 in scm_shell (argc=3, argv=0x7fffffffde58) at script.c:357
#10 0x00007ffff7e4f55d in invoke_main_func (body_data=0x7fffffffdd90) at init.c:308
#11 0x00007ffff7e308ba in c_body (d=0x7fffffffdcd0) at continuations.c:430
#12 0x00007ffff7ebb4b9 in vm_regular_engine (thread=0x7ffff7910d80) at vm-engine.c:972
#13 0x00007ffff7ebdd39 in scm_call_n (proc=<optimized out>, argv=argv@entry=0x7fffffffda70, nargs=nargs@entry=2) at vm.c:1608
#14 0x00007ffff7e35cfa in scm_call_2 (proc=<optimized out>, arg1=<optimized out>, arg2=<optimized out>) at eval.c:503
#15 0x00007ffff7e376bc in scm_c_with_exception_handler (type=type@entry=#t, handler=handler@entry=0x7ffff7eb2bc0 <catch_post_unwind_handler>, handler_data=handler_data@entry=0x7fffffffdbf0, 
    thunk=thunk@entry=0x7ffff7eb2d00 <catch_body>, thunk_data=thunk_data@entry=0x7fffffffdbf0) at exceptions.c:170
#16 0x00007ffff7eb2f0d in scm_c_catch (tag=tag@entry=#t, body=body@entry=0x7ffff7e308b0 <c_body>, body_data=body_data@entry=0x7fffffffdcd0, handler=handler@entry=0x7ffff7e30b60 <c_handler>, 
    handler_data=handler_data@entry=0x7fffffffdcd0, pre_unwind_handler=pre_unwind_handler@entry=0x7ffff7e309b0 <pre_unwind_handler>, pre_unwind_handler_data=0x7ffff77be540) at throw.c:168
#17 0x00007ffff7e30e78 in scm_i_with_continuation_barrier (body=body@entry=0x7ffff7e308b0 <c_body>, body_data=body_data@entry=0x7fffffffdcd0, handler=handler@entry=0x7ffff7e30b60 <c_handler>, 
    handler_data=handler_data@entry=0x7fffffffdcd0, pre_unwind_handler=pre_unwind_handler@entry=0x7ffff7e309b0 <pre_unwind_handler>, pre_unwind_handler_data=0x7ffff77be540)
    at continuations.c:368
```


^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (34 preceding siblings ...)
  2020-12-22 10:21 ` unspecd
@ 2020-12-22 10:33 ` unspecd
  2020-12-22 10:48 ` [PR PATCH] [Updated] " unspecd
                   ` (39 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 10:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r547198995

Comment:
Thanks for bisecting this, it saved a lot of time!

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (35 preceding siblings ...)
  2020-12-22 10:33 ` [PR REVIEW] " unspecd
@ 2020-12-22 10:48 ` unspecd
  2020-12-22 10:48 ` q66
                   ` (38 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 10:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 12444 bytes --]

From dcbe6fbaebf4d17b4d8c6ac9ce20a604dcd9c43c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 50 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..e13f4e5994c
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,50 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}

From d701f8c7118fb0b3506b6eb821178820992e15c7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 2858969574d44021a4164bd5886faf0ff712b5b6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/patches/use-guile3.patch       | 11 +++++
 srcpkgs/gnutls/template                       | 11 +++--
 3 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 7d6ebd88a29a18cf7a30914cd1951021888e2103 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (36 preceding siblings ...)
  2020-12-22 10:48 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-22 10:48 ` q66
  2020-12-22 10:50 ` unspecd
                   ` (37 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: q66 @ 2020-12-22 10:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749478535

Comment:
i don't really care it "works fine", I just don't want a guile dependency anywhere near base-* packages

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (37 preceding siblings ...)
  2020-12-22 10:48 ` q66
@ 2020-12-22 10:50 ` unspecd
  2020-12-22 10:57 ` q66
                   ` (36 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 10:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749479149

Comment:
> I just don't want a guile dependency

Ok, what about python?

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (38 preceding siblings ...)
  2020-12-22 10:50 ` unspecd
@ 2020-12-22 10:57 ` q66
  2020-12-22 11:00 ` q66
                   ` (35 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: q66 @ 2020-12-22 10:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749481954

Comment:
python builds and works just fine on every known (and most unknown) target, guile is fragile, takes ages to bootstrap itself, and every version so far had an assortment of often arcane issues attached

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (39 preceding siblings ...)
  2020-12-22 10:57 ` q66
@ 2020-12-22 11:00 ` q66
  2020-12-22 12:04 ` [PR PATCH] [Updated] " unspecd
                   ` (34 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: q66 @ 2020-12-22 11:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749483010

Comment:
feel free to leave it as an option for those 2 people who are ever going to use it, but I don't want it burdening any of the base- packages, so no guile default options for things like gdb and make

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (40 preceding siblings ...)
  2020-12-22 11:00 ` q66
@ 2020-12-22 12:04 ` unspecd
  2020-12-22 12:56 ` unspecd
                   ` (33 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 12:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 13769 bytes --]

From dcbe6fbaebf4d17b4d8c6ac9ce20a604dcd9c43c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/5] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 50 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d05..cb5fbab4a475 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 000000000000..1cd5714f5e94
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 000000000000..e13f4e5994ce
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,50 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}

From d701f8c7118fb0b3506b6eb821178820992e15c7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/5] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d1030..981f46f3f3cf 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 2858969574d44021a4164bd5886faf0ff712b5b6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/5] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/patches/use-guile3.patch       | 11 +++++
 srcpkgs/gnutls/template                       | 11 +++--
 3 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 000000000000..05aa26048b6f
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 000000000000..ac7d10c3d8c3
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8cf..ef478dd1b7d5 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 7d6ebd88a29a18cf7a30914cd1951021888e2103 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/5] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b530..000000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942a..3d2c2a28f946 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

From d1db1b1b5f473bcadbcca61c816405020fa69519 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 5/5] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee1..a4852fd4b76a 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (41 preceding siblings ...)
  2020-12-22 12:04 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-22 12:56 ` unspecd
  2020-12-22 13:12 ` unspecd
                   ` (32 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 12:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 16513 bytes --]

From dcbe6fbaebf4d17b4d8c6ac9ce20a604dcd9c43c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/7] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 50 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..e13f4e5994c
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,50 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}

From d701f8c7118fb0b3506b6eb821178820992e15c7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/7] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 2858969574d44021a4164bd5886faf0ff712b5b6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/7] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/patches/use-guile3.patch       | 11 +++++
 srcpkgs/gnutls/template                       | 11 +++--
 3 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 7d6ebd88a29a18cf7a30914cd1951021888e2103 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/7] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

From d1db1b1b5f473bcadbcca61c816405020fa69519 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 5/7] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From e1321fcb09481c9b75d7b671d135cfe536572ad0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:38:32 +1100
Subject: [PATCH 6/7] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2ff08129d89 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i wisp.in -e "s/guile/guile3/"
+	autoreconf -fi
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From 94635a3bb546acdbb033a0beb36f963b6a26aa81 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 7/7] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (42 preceding siblings ...)
  2020-12-22 12:56 ` unspecd
@ 2020-12-22 13:12 ` unspecd
  2020-12-22 14:35 ` unspecd
                   ` (31 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 13:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 14623 bytes --]

From dcbe6fbaebf4d17b4d8c6ac9ce20a604dcd9c43c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/6] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 50 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..e13f4e5994c
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,50 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}

From d701f8c7118fb0b3506b6eb821178820992e15c7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/6] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 2858969574d44021a4164bd5886faf0ff712b5b6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/6] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/patches/use-guile3.patch       | 11 +++++
 srcpkgs/gnutls/template                       | 11 +++--
 3 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 7d6ebd88a29a18cf7a30914cd1951021888e2103 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/6] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

From d1db1b1b5f473bcadbcca61c816405020fa69519 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 5/6] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 20d064366d08f12927576433cf3e1873db5bd2e5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/6] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (43 preceding siblings ...)
  2020-12-22 13:12 ` unspecd
@ 2020-12-22 14:35 ` unspecd
  2020-12-22 14:36 ` unspecd
                   ` (30 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 14:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 17006 bytes --]

From 906705ff2fadc2e2bc75af7bd5560e7439079c1c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/7] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 50 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 54 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..e13f4e5994c
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,50 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From f8368f37172b8a6eab0c8b2e396d8ab758e57b4b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/7] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 65dff1aeb80e6d25d6b170eeca10e5404b9bbfc9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/7] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/patches/use-guile3.patch       | 11 +++++
 srcpkgs/gnutls/template                       | 11 +++--
 3 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 647185da0adc3376d305b467750178ea2492ccc4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/7] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

From c40b89e145a73a63811ecd5e157ae5b8e4f6c563 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 5/7] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 909c55ffc7c3920ef0e2661664eadb03385c7f83 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/7] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From beb194c5232530fa56faa0d0117781bce2f4670c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 7/7] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 23 ++++++++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..4c3b6df49bb 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,25 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	# XXX: hardcode the guile program name for now
+        for file in wisp.in tests/runtests*.sh; do
+		vsed -i $file -e "s/guile/guile3/"
+	done
+
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (44 preceding siblings ...)
  2020-12-22 14:35 ` unspecd
@ 2020-12-22 14:36 ` unspecd
  2020-12-22 18:25 ` [PR REVIEW] " unspecd
                   ` (29 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 14:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 16999 bytes --]

From 906705ff2fadc2e2bc75af7bd5560e7439079c1c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/7] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 50 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 54 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..e13f4e5994c
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,50 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From f8368f37172b8a6eab0c8b2e396d8ab758e57b4b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/7] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 65dff1aeb80e6d25d6b170eeca10e5404b9bbfc9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/7] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/patches/use-guile3.patch       | 11 +++++
 srcpkgs/gnutls/template                       | 11 +++--
 3 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
 create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+ 
+-   AC_PATH_PROG([guile_snarf], [guile-snarf])
++   AC_PATH_PROG([guile_snarf], [guile-snarf3])
+    if test "x$guile_snarf" = "x"; then
+       AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+       opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 647185da0adc3376d305b467750178ea2492ccc4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/7] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

From c40b89e145a73a63811ecd5e157ae5b8e4f6c563 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 5/7] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 909c55ffc7c3920ef0e2661664eadb03385c7f83 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/7] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 1f6531cccdcbdaf930da8adbcb77a0022bbaf0cb Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 7/7] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 23 ++++++++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..ece8919023b 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,25 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	# XXX: hardcode the guile program name for now
+	for file in wisp.in tests/runtests*.sh; do
+		vsed -i $file -e "s/guile/guile3/"
+	done
+
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (45 preceding siblings ...)
  2020-12-22 14:36 ` unspecd
@ 2020-12-22 18:25 ` unspecd
  2020-12-22 20:52 ` sirikid
                   ` (28 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 18:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r547434859

Comment:
This seems to be necessary.
in `11-pkglint-elf-in-usrshare.sh`:
```sh
        case "${mime}" in
            application/x-sharedlib*|\
             application/x-pie-executable*|\
             application/x-executable*)
                if [[ ${ignore_elf_files} != *"${file}"* ]]; then
                    matches+=" ${file}"
                fi
                ;;
```
Sample *.go file:
```sh
$ readelf -h texinfo.go | grep Type
  Type:                              DYN (Shared object file)
$ file --mime-type texinfo.go 
texinfo.go: application/x-sharedlib
```

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (46 preceding siblings ...)
  2020-12-22 18:25 ` [PR REVIEW] " unspecd
@ 2020-12-22 20:52 ` sirikid
  2020-12-22 21:43 ` [PR PATCH] [Updated] " unspecd
                   ` (27 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: sirikid @ 2020-12-22 20:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r547502235

Comment:
You are right. It makes sense to make the same changes in 11 too. Probably will do it later.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (47 preceding siblings ...)
  2020-12-22 20:52 ` sirikid
@ 2020-12-22 21:43 ` unspecd
  2020-12-22 21:47 ` unspecd
                   ` (26 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 21:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 19060 bytes --]

From 74250a5818204ba5193d831daec01ebda4fbca15 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/8] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 60 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..f65b2c97a4f
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,60 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From b954586e234ab52cd4dc7a5ae8d720e74a542f56 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 04:53:13 +1100
Subject: [PATCH 2/8] guile: add alternatives

---
 srcpkgs/guile/template | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 9e735585468..4ad6b07cbe6 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,20 +1,28 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1"
+
 if [ "$CROSS_BUILD" ]; then
 	# Need host guile to cross compile
 	hostmakedepends+=" guile"
@@ -25,6 +33,14 @@ pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		ppc*) export CFLAGS+=" -Os";;
 	esac
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
 }
 
 libguile_package() {
@@ -40,10 +56,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }

From 1968b75b4170ce90400fa4f97fdf7d9938dc051c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 3/8] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From a15f44a9b48d12bf3edf63f4b93853a97ceaf62f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 4/8] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 96efa58fb8dbcc43981f73c1a31b53d6f138d535 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 5/8] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From d48e21e5bfae74c1eac74337415ece17355af908 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/8] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 5daede7f18f6d04c1c6404f604904be5f867e5b8 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 7/8] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 4970e88e7df2f2d1587ce52d3f9642a977d845e7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 8/8] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (48 preceding siblings ...)
  2020-12-22 21:43 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-22 21:47 ` unspecd
  2020-12-22 21:49 ` unspecd
                   ` (25 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 21:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 19060 bytes --]

From 74250a5818204ba5193d831daec01ebda4fbca15 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/8] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 60 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..f65b2c97a4f
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,60 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From b954586e234ab52cd4dc7a5ae8d720e74a542f56 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 04:53:13 +1100
Subject: [PATCH 2/8] guile: add alternatives

---
 srcpkgs/guile/template | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 9e735585468..4ad6b07cbe6 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,20 +1,28 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1"
+
 if [ "$CROSS_BUILD" ]; then
 	# Need host guile to cross compile
 	hostmakedepends+=" guile"
@@ -25,6 +33,14 @@ pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		ppc*) export CFLAGS+=" -Os";;
 	esac
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
 }
 
 libguile_package() {
@@ -40,10 +56,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }

From 1968b75b4170ce90400fa4f97fdf7d9938dc051c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 3/8] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From a15f44a9b48d12bf3edf63f4b93853a97ceaf62f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 4/8] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 96efa58fb8dbcc43981f73c1a31b53d6f138d535 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 5/8] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From d48e21e5bfae74c1eac74337415ece17355af908 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/8] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 5daede7f18f6d04c1c6404f604904be5f867e5b8 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 7/8] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 4970e88e7df2f2d1587ce52d3f9642a977d845e7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 8/8] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (49 preceding siblings ...)
  2020-12-22 21:47 ` unspecd
@ 2020-12-22 21:49 ` unspecd
  2020-12-22 21:52 ` unspecd
                   ` (24 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 21:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 19248 bytes --]

From 74250a5818204ba5193d831daec01ebda4fbca15 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/8] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 60 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..f65b2c97a4f
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,60 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From e4d6ecf682cc46a360aa4fcc61e2ed6e20943e5c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 04:53:13 +1100
Subject: [PATCH 2/8] guile: add alternatives

---
 srcpkgs/guile/template | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 9e735585468..20d89c953d5 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,20 +1,32 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1"
+
+if [ "$XBPS_ENDIAN" != "$XBPS_TARGET_ENDIAN" ]; then
+	broken="opposite-endian host generates broken files"
+fi
+
 if [ "$CROSS_BUILD" ]; then
 	# Need host guile to cross compile
 	hostmakedepends+=" guile"
@@ -25,6 +37,16 @@ pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		ppc*) export CFLAGS+=" -Os";;
 	esac
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
+	# broken files causing crash
+	rm -rf prebuilt/32-bit-big-endian
 }
 
 libguile_package() {
@@ -40,10 +62,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }

From b01447fc06b2dbdbeafb33c3d433a68d2ef5b2b9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 3/8] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 5e19cce1afe83cdc15b2c837ea104bbcf586d767 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 4/8] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From cd9b3a9242f7e19910ee481b20d3591b9bbf12ab Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 5/8] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From 63132ec770f57cc400e6cadaf1a182c6456ddc25 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/8] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 3cfefa0b5c251436f7a49a9a95aab9918ac8bfd3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 7/8] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 6656057e774aecb0c3ed8dd82b32ab27874b2b86 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 8/8] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (50 preceding siblings ...)
  2020-12-22 21:49 ` unspecd
@ 2020-12-22 21:52 ` unspecd
  2020-12-22 21:54 ` unspecd
                   ` (23 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 21:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 19060 bytes --]

From 74250a5818204ba5193d831daec01ebda4fbca15 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/8] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 60 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..f65b2c97a4f
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,60 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From e1a8aef05d95307e28251450699d539ee0120592 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 04:53:13 +1100
Subject: [PATCH 2/8] guile: add alternatives

---
 srcpkgs/guile/template | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 9e735585468..4ad6b07cbe6 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,20 +1,28 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1"
+
 if [ "$CROSS_BUILD" ]; then
 	# Need host guile to cross compile
 	hostmakedepends+=" guile"
@@ -25,6 +33,14 @@ pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		ppc*) export CFLAGS+=" -Os";;
 	esac
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
 }
 
 libguile_package() {
@@ -40,10 +56,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }

From c1c51d6a826e9f9e0b32fe75e4789f3cd2cea6f2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 3/8] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 10dcfed60b04bb604763cfe5a4ad40bbdd57eb65 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 4/8] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 3a58003574d0a2259e5eb0f61ef698f366386ec5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 5/8] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From b9154b76208260ff49e4e8929733532c095d5a2b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/8] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From ee486bf5966d40834c9a1c77acbc050d56f1e4ae Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 7/8] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From a6b30a916c05b8df088b5ea83e1a0e5b8b0eb1d2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 8/8] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (51 preceding siblings ...)
  2020-12-22 21:52 ` unspecd
@ 2020-12-22 21:54 ` unspecd
  2020-12-22 22:05 ` unspecd
                   ` (22 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 21:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 147 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749794367

Comment:
Oh no.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (52 preceding siblings ...)
  2020-12-22 21:54 ` unspecd
@ 2020-12-22 22:05 ` unspecd
  2020-12-22 23:02 ` [PR PATCH] [Updated] " unspecd
                   ` (21 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 22:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 147 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749794367

Comment:
Oh no.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (53 preceding siblings ...)
  2020-12-22 22:05 ` unspecd
@ 2020-12-22 23:02 ` unspecd
  2020-12-22 23:18 ` unspecd
                   ` (20 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 23:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 16484 bytes --]

From 74250a5818204ba5193d831daec01ebda4fbca15 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/7] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 60 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..cb5fbab4a47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..f65b2c97a4f
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,60 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From d3e5fe8f37a228cfb4d67d2b7ed6b96d218d0e6d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/7] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From d85091433abf9740675882bec69ffcac0caece80 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/7] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 9fa7449f0357ed7f15d5f0ed478fc3379f8878c2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 4/7] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From b6f401001a0b129a9a76847c0690c4c893871e80 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 5/7] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 2a8c3e4b9f64194cd63f755810d624e134560ff4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 6/7] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 6c771e0ed1f84fa5a2884452f8c7a97831f7a6a4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 7/7] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (54 preceding siblings ...)
  2020-12-22 23:02 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-22 23:18 ` unspecd
  2020-12-24  7:22 ` unspecd
                   ` (19 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-22 23:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2411 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749830816

Comment:
How can I merge this with 720f2c1c52da5b672944381616cc76b23c9ed9fa?
`srcpkgs/guile/template`
```diff
@@ -1,20 +1,28 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1"
+
 if [ "$CROSS_BUILD" ]; then
 	# Need host guile to cross compile
 	hostmakedepends+=" guile"
@@ -25,6 +33,14 @@ pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		ppc*) export CFLAGS+=" -Os";;
 	esac
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
 }
 
 libguile_package() {
@@ -40,10 +56,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }
```


^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (55 preceding siblings ...)
  2020-12-22 23:18 ` unspecd
@ 2020-12-24  7:22 ` unspecd
  2020-12-24 10:03 ` unspecd
                   ` (18 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-24  7:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 979 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-750785271

Comment:
Trying to cross-compile gnucash, I got issue:
```
[ 96%] Linking CXX executable ../bin/gnucash
/usr/lib/gcc/aarch64-linux-musl/9.3.0/../../../../aarch64-linux-musl/bin/ld: ../lib/gnucash/libgnc-csv-import.so: undefined reference to `boost::icu_regex_traits::isctype(int, unsigned long) const'
/usr/lib/gcc/aarch64-linux-musl/9.3.0/../../../../aarch64-linux-musl/bin/ld: ../lib/gnucash/libgnc-csv-import.so: undefined reference to `boost::re_detail_107200::icu_regex_traits_implementation::do_transform(int const*, int const*, icu_67::Collator const*) const'
/usr/lib/gcc/aarch64-linux-musl/9.3.0/../../../../aarch64-linux-musl/bin/ld: ../lib/gnucash/libgnc-csv-import.so: undefined reference to `boost::basic_regex<int, boost::icu_regex_traits>::do_assign(int const*, int const*, unsigned int)'
```
Need help to solve this problem.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (56 preceding siblings ...)
  2020-12-24  7:22 ` unspecd
@ 2020-12-24 10:03 ` unspecd
  2020-12-24 10:04 ` unspecd
                   ` (17 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-24 10:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1024 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-750832289

Comment:
Well, this is a boost issue.
```sh
$ xuname
Void 5.10.2_1 x86_64-musl GenuineIntel uptodate rrrnFFFFFFFFF
$ objdump -T /usr/lib/libboost_*.so | grep isctype
000000000001ded0 g    DF .text	00000000000001c6  Base        _ZN5boost14c_regex_traitsIcE7isctypeEcj
0000000000095830 g    DF .text	0000000000000209  Base        _ZN5boost14c_regex_traitsIwE7isctypeEwj
000000000004b920 g    DF .text	000000000000017f  Base        _ZNK5boost16icu_regex_traits7isctypeEim
$ objdump -T $(xdistdir)/masterdir/usr/aarch64-linux-musl/lib/libboost_regex.so| grep isctype
00000000000191c8 g    DF .text	000000000000017c  Base        _ZN5boost14c_regex_traitsIcE7isctypeEcj
000000000006b510 g    DF .text	00000000000001e8  Base        _ZN5boost14c_regex_traitsIwE7isctypeEwj
$ 
```

`_ZNK5boost16icu_regex_traits7isctypeEim` == `boost::icu_regex_traits::isctype(int, unsigned long) const`

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (57 preceding siblings ...)
  2020-12-24 10:03 ` unspecd
@ 2020-12-24 10:04 ` unspecd
  2020-12-24 10:05 ` unspecd
                   ` (16 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-24 10:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1021 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-750832289

Comment:
Well, this is a boost issue.
```sh
$ xuname
Void 5.10.2_1 x86_64-musl GenuineIntel uptodate rrrnFFFFFFFFF
$ objdump -T /usr/lib/libboost_*.so | grep isctype
000000000001ded0 g    DF .text	00000000000001c6  Base        _ZN5boost14c_regex_traitsIcE7isctypeEcj
0000000000095830 g    DF .text	0000000000000209  Base        _ZN5boost14c_regex_traitsIwE7isctypeEwj
000000000004b920 g    DF .text	000000000000017f  Base        _ZNK5boost16icu_regex_traits7isctypeEim
$ objdump -T $(xdistdir)/masterdir/usr/aarch64-linux-musl/lib/libboost_*.so | grep isctype
00000000000191c8 g    DF .text	000000000000017c  Base        _ZN5boost14c_regex_traitsIcE7isctypeEcj
000000000006b510 g    DF .text	00000000000001e8  Base        _ZN5boost14c_regex_traitsIwE7isctypeEwj
$ 
```

`_ZNK5boost16icu_regex_traits7isctypeEim` == `boost::icu_regex_traits::isctype(int, unsigned long) const`

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (58 preceding siblings ...)
  2020-12-24 10:04 ` unspecd
@ 2020-12-24 10:05 ` unspecd
  2020-12-26  0:51 ` [PR PATCH] [Updated] " unspecd
                   ` (15 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-24 10:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1015 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-750832289

Comment:
Well, this is a boost issue.
```sh
$ xuname
Void 5.10.2_1 x86_64-musl GenuineIntel uptodate rrrnFFFFFFFFF
$ objdump -T /usr/lib/libboost_*.so | grep isctype
000000000001ded0 g    DF .text	00000000000001c6  Base        _ZN5boost14c_regex_traitsIcE7isctypeEcj
0000000000095830 g    DF .text	0000000000000209  Base        _ZN5boost14c_regex_traitsIwE7isctypeEwj
000000000004b920 g    DF .text	000000000000017f  Base        _ZNK5boost16icu_regex_traits7isctypeEim
$ objdump -T $(xdistdir)/masterdir/usr/aarch64-linux-musl/lib/libboost_*.so | grep isctype
00000000000191c8 g    DF .text	000000000000017c  Base        _ZN5boost14c_regex_traitsIcE7isctypeEcj
000000000006b510 g    DF .text	00000000000001e8  Base        _ZN5boost14c_regex_traitsIwE7isctypeEwj
```
`_ZNK5boost16icu_regex_traits7isctypeEim` == `boost::icu_regex_traits::isctype(int, unsigned long) const`

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (59 preceding siblings ...)
  2020-12-24 10:05 ` unspecd
@ 2020-12-26  0:51 ` unspecd
  2020-12-26  0:54 ` unspecd
                   ` (14 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-26  0:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 16489 bytes --]

From 8e07e4224accd8f3f3f139be4c3abf3ec419a9fa Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/7] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 60 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index 24e2df09f9d..1ae9318568c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4040,3 +4040,4 @@ libndr-samba4.so samba-libs-4.13.2_1
 libsmb-transport-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..f65b2c97a4f
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,60 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From 108239d34102db601f28b10f127349248ca59625 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/7] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From c3f894c9c33fa9936ae6c9d3d5db781bf35dbde3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/7] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 82a0d0a4dc8ddb1c86cf458526ce978f652dcb72 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 4/7] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From 685777310fe34912110b749e8ffc299837c62675 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 5/7] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From efbd186f168d94eddb9562bcf427efcb4adadc5d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 6/7] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 3bcd8e1ff9aee0c6b4b1209a12e9b7c25a245c16 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 7/7] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (60 preceding siblings ...)
  2020-12-26  0:51 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-26  0:54 ` unspecd
  2020-12-26  4:55 ` [PR PATCH] [Updated] " unspecd
                   ` (13 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-26  0:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2411 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-749830816

Comment:
How can I merge this with 720f2c1c52da5b672944381616cc76b23c9ed9fa?
`srcpkgs/guile/template`
```diff
@@ -1,20 +1,28 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1"
+
 if [ "$CROSS_BUILD" ]; then
 	# Need host guile to cross compile
 	hostmakedepends+=" guile"
@@ -25,6 +33,14 @@ pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		ppc*) export CFLAGS+=" -Os";;
 	esac
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
 }
 
 libguile_package() {
@@ -40,10 +56,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }
```


^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (61 preceding siblings ...)
  2020-12-26  0:54 ` unspecd
@ 2020-12-26  4:55 ` unspecd
  2020-12-26  6:14 ` unspecd
                   ` (12 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-26  4:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 19286 bytes --]

From d880c389674fc1fc88d675971a0d444ea127fb3f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/8] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 62 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 66 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index 24e2df09f9d..1ae9318568c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4040,3 +4040,4 @@ libndr-samba4.so samba-libs-4.13.2_1
 libsmb-transport-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..ce75bbbcdff
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,62 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1
+ scheme:scheme:/usr/bin/guile3
+ scheme:scheme.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From 95f4f4bca68fcb7c8bfc592bc385b0e9347da6c3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 26 Dec 2020 13:08:43 +1100
Subject: [PATCH 2/8] guile: add alternatives

---
 srcpkgs/guile/template | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 60a5be98584..9334daa1f78 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,20 +1,30 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1
+ scheme:scheme:/usr/bin/guile2
+ scheme:scheme.1:/usr/share/man/man1/guile2.1"
+
 if [ "$XBPS_ENDIAN" != "$XBPS_TARGET_ENDIAN" ]; then
 	broken="opposite-endian host generates broken files"
 fi
@@ -29,6 +39,17 @@ post_extract() {
 	rm -rf prebuilt/32-bit-big-endian
 }
 
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
 libguile_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
@@ -42,10 +63,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }

From 5297472d3550d8730783c2034aae8ac366eee2f5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 3/8] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From 11645af8f483a7c40eaa01a7f1fd6f6cb6c3a2e6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 4/8] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 0039664a0614051a6897dda42958a1882694467a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 5/8] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 609d4d8bb7b592aa8bf5265f1374686da19f3564 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/8] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 79801121d9fc568a03e40b9e7fe5b2e7ca6b47e7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 7/8] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 60f637df6bbed8178c3b81d604aab08b5d24f0c1 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 8/8] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (62 preceding siblings ...)
  2020-12-26  4:55 ` [PR PATCH] [Updated] " unspecd
@ 2020-12-26  6:14 ` unspecd
  2020-12-26  6:26 ` [PR REVIEW] " ericonr
                   ` (11 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-26  6:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-751323377

Comment:
Looks like this PR is ready to be merged.

Next steps:
 * `gnucash` - fix cross build. This depends on issue #27398.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (63 preceding siblings ...)
  2020-12-26  6:14 ` unspecd
@ 2020-12-26  6:26 ` ericonr
  2020-12-26  6:26 ` ericonr
                   ` (10 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: ericonr @ 2020-12-26  6:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r548949611

Comment:
Is it correct to remove guile from depends?

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (65 preceding siblings ...)
  2020-12-26  6:26 ` ericonr
@ 2020-12-26  6:26 ` ericonr
  2020-12-26  6:51 ` unspecd
                   ` (8 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: ericonr @ 2020-12-26  6:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r548949804

Comment:
Why remove depends completely?

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (64 preceding siblings ...)
  2020-12-26  6:26 ` [PR REVIEW] " ericonr
@ 2020-12-26  6:26 ` ericonr
  2020-12-26  6:26 ` ericonr
                   ` (9 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: ericonr @ 2020-12-26  6:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r548949766

Comment:
Where is this patch from? What does it do? Is it going to be upstreamed?

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (66 preceding siblings ...)
  2020-12-26  6:26 ` ericonr
@ 2020-12-26  6:51 ` unspecd
  2020-12-26  7:58 ` unspecd
                   ` (7 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-26  6:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 688 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r548951709

Comment:
> Why isn't libguile3 a separate package?

Do you mean like in guile2.2?
```sh
$ xbps-query -Rf libguile
/usr/lib/libguile-2.2.so.1.4.2
/usr/share/gdb/auto-load/usr/lib/libguile-2.2.so.1.4.2-gdb.scm
/usr/lib/libguile-2.2.so.1 -> /usr/lib/libguile-2.2.so.1.4.2
```
`libguile` does not make sense without `*.go` and `*.scm` files, which are in the `guile` package:
```
$ xbps-query -Rf guile | grep '\.go'
$ xbps-query -Rf guile | grep '\.scm'
```
`libguile-2.2.so` is just a runtime library, like `libpython3.9.so` in `python3`.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (67 preceding siblings ...)
  2020-12-26  6:51 ` unspecd
@ 2020-12-26  7:58 ` unspecd
  2020-12-26  8:08 ` unspecd
                   ` (6 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-26  7:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 928 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r548956804

Comment:
> Where is this patch from? What does it do?

This patch (written by me) is to prevent errors when cross compiling. I make it like [that](https://gitlab.com/gnutls/gnutls/-/commit/676ae412aeea58fa2c6aa7960ec16223101556eb#c320a9515fbbbdc26cb6510f8ab9a0b169ac88b9):
```diff
@@ -521,8 +521,9 @@
     (or (getenv "GNUTLS_GUILE_EXTENSION_DIR")
         "@guileextensiondir@"))
 
-  (load-extension (string-append %libdir "/guile-gnutls-v-2")
-                  "scm_init_gnutls"))
+  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
+    (load-extension (string-append %libdir "/guile-gnutls-v-2")
+                    "scm_init_gnutls")))
```

> Is it going to be upstreamed?

Hmm, I didn't think about it, really. I'll try to send the patch to the upstream developers.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (68 preceding siblings ...)
  2020-12-26  7:58 ` unspecd
@ 2020-12-26  8:08 ` unspecd
  2020-12-26  8:53 ` unspecd
                   ` (5 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-26  8:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 928 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r548956804

Comment:
> Where is this patch from? What does it do?

This patch (written by me) is to prevent errors when cross compiling. I made it like [that](https://gitlab.com/gnutls/gnutls/-/commit/676ae412aeea58fa2c6aa7960ec16223101556eb#c320a9515fbbbdc26cb6510f8ab9a0b169ac88b9):
```diff
@@ -521,8 +521,9 @@
     (or (getenv "GNUTLS_GUILE_EXTENSION_DIR")
         "@guileextensiondir@"))
 
-  (load-extension (string-append %libdir "/guile-gnutls-v-2")
-                  "scm_init_gnutls"))
+  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
+    (load-extension (string-append %libdir "/guile-gnutls-v-2")
+                    "scm_init_gnutls")))
```

> Is it going to be upstreamed?

Hmm, I didn't think about it, really. I'll try to send the patch to the upstream developers.

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR REVIEW] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (69 preceding siblings ...)
  2020-12-26  8:08 ` unspecd
@ 2020-12-26  8:53 ` unspecd
  2021-01-08  6:20 ` [PR PATCH] [Updated] " unspecd
                   ` (4 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2020-12-26  8:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#discussion_r548961097

Comment:
I guess you've already [guessed why](https://github.com/void-linux/void-packages/pull/27320#pullrequestreview-558849450) :)

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (70 preceding siblings ...)
  2020-12-26  8:53 ` unspecd
@ 2021-01-08  6:20 ` unspecd
  2021-01-08  6:20 ` unspecd
                   ` (3 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2021-01-08  6:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 19291 bytes --]

From 6329e860843d0403a92e4bae3d3e1399313a5f60 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/8] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 62 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 66 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index bfffb675aea..6ae3d4d9ebe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4046,3 +4046,4 @@ libsmb-transport-samba4.so samba-libs-4.13.2_1
 libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..ce75bbbcdff
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,62 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1
+ scheme:scheme:/usr/bin/guile3
+ scheme:scheme.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From ed7eab4b67dc8ad7e07d683eca9a48031c32ab24 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 26 Dec 2020 13:08:43 +1100
Subject: [PATCH 2/8] guile: add alternatives

---
 srcpkgs/guile/template | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 60a5be98584..9334daa1f78 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,20 +1,30 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1
+ scheme:scheme:/usr/bin/guile2
+ scheme:scheme.1:/usr/share/man/man1/guile2.1"
+
 if [ "$XBPS_ENDIAN" != "$XBPS_TARGET_ENDIAN" ]; then
 	broken="opposite-endian host generates broken files"
 fi
@@ -29,6 +39,17 @@ post_extract() {
 	rm -rf prebuilt/32-bit-big-endian
 }
 
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
 libguile_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
@@ -42,10 +63,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }

From 40e9d5d8868a4c4d6396d79f7869cb32caf3a47c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 3/8] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From 10499e0cb70b8b22242e2980705ca1cf43d2cb47 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 4/8] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From 990fc077c9337dfa0e6b0a515067f9d8e3f88489 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 5/8] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 83cade369af729e1f2d394fa5b242bf0e0231719 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/8] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 623cfd768b97239d177511ba84b504e2fbd4cb4c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 7/8] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 0a9b1d1b151ef477e79be293cd5586bc03a3067b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 8/8] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (71 preceding siblings ...)
  2021-01-08  6:20 ` [PR PATCH] [Updated] " unspecd
@ 2021-01-08  6:20 ` unspecd
  2021-01-08  6:22 ` unspecd
                   ` (2 subsequent siblings)
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2021-01-08  6:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 19291 bytes --]

From de35eacb555d76de6830e79f54cfc05fc66d4815 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/8] New package: guile3-3.0.4

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 62 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 66 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index bfffb675aea..513e2913bb0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4046,3 +4046,4 @@ libsmb-transport-samba4.so samba-libs-4.13.2_1
 libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.5_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..dad056eeacb
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,62 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.5
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=222046009a20b432ffa7c11b8d5a1d9ad0d8627be05cc1e8af612bc54ba2ea85
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1
+ scheme:scheme:/usr/bin/guile3
+ scheme:scheme.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From 91d59d8f1f49906b4a54bcd07aba195b0be7a557 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 26 Dec 2020 13:08:43 +1100
Subject: [PATCH 2/8] guile: add alternatives

---
 srcpkgs/guile/template | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 60a5be98584..9334daa1f78 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,20 +1,30 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1
+ scheme:scheme:/usr/bin/guile2
+ scheme:scheme.1:/usr/share/man/man1/guile2.1"
+
 if [ "$XBPS_ENDIAN" != "$XBPS_TARGET_ENDIAN" ]; then
 	broken="opposite-endian host generates broken files"
 fi
@@ -29,6 +39,17 @@ post_extract() {
 	rm -rf prebuilt/32-bit-big-endian
 }
 
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
 libguile_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
@@ -42,10 +63,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }

From dad968d5f9d0bb3f0dd7fa055f7db178687a83d9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 3/8] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From 8774f98fcd3b9b1b2b3105abdb2c7ed5c708ff57 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 4/8] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From a0acbba43e36f684e5e4d0e48f71810f59f38716 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 5/8] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From f45eb2a47d458be69ee12e1286bbfff334415468 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/8] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 33e9e49ca36557cc5d85b3557f63463655ab17f9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 7/8] aisleriot: rebuild for guile-3.0.4

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 4f918280ac07f1bdd34c2c7970630cd3540e7a14 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 8/8] xbindkeys: rebuild for guile-3.0.4

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (72 preceding siblings ...)
  2021-01-08  6:20 ` unspecd
@ 2021-01-08  6:22 ` unspecd
  2021-01-08  6:23 ` unspecd
  2021-01-13  5:50 ` [PR PATCH] [Updated] " unspecd
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2021-01-08  6:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 19291 bytes --]

From 305987288e9d3846348db9180183178c1787d465 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/8] New package: guile3-3.0.5

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 62 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 66 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index bfffb675aea..513e2913bb0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4046,3 +4046,4 @@ libsmb-transport-samba4.so samba-libs-4.13.2_1
 libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 guile3-3.0.5_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..dad056eeacb
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,62 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.5
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=222046009a20b432ffa7c11b8d5a1d9ad0d8627be05cc1e8af612bc54ba2ea85
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1
+ scheme:scheme:/usr/bin/guile3
+ scheme:scheme.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From dc6ca94e1b34a0562db1df28b30a9631faadfa78 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 26 Dec 2020 13:08:43 +1100
Subject: [PATCH 2/8] guile: add alternatives

---
 srcpkgs/guile/template | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 60a5be98584..9334daa1f78 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,20 +1,30 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1
+ scheme:scheme:/usr/bin/guile2
+ scheme:scheme.1:/usr/share/man/man1/guile2.1"
+
 if [ "$XBPS_ENDIAN" != "$XBPS_TARGET_ENDIAN" ]; then
 	broken="opposite-endian host generates broken files"
 fi
@@ -29,6 +39,17 @@ post_extract() {
 	rm -rf prebuilt/32-bit-big-endian
 }
 
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
 libguile_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
@@ -42,10 +63,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }

From 38d9032a43fa24783a589992fe4b7b2a43ffec79 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 3/8] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From a5ab004b602c2385dd36ae6842b32419e7fb7dc7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 4/8] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From f0fec5a99a1ce5cbd4bde3ce4d9bddd0f15b7123 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 5/8] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 62079f9a8aa131058b9af583ef4f1339a52651c6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/8] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 6969aa37b1dcad0480077a53edceb585945c3ffa Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 7/8] aisleriot: rebuild for guile-3.0.5

---
 srcpkgs/aisleriot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a4852fd4b76 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,15 +1,15 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
 version=3.22.13
-revision=2
+revision=3
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From b80f7a40da429a1342d5728b2524839853429fce Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 8/8] xbindkeys: rebuild for guile-3.0.5

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (73 preceding siblings ...)
  2021-01-08  6:22 ` unspecd
@ 2021-01-08  6:23 ` unspecd
  2021-01-13  5:50 ` [PR PATCH] [Updated] " unspecd
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2021-01-08  6:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/27320#issuecomment-756574131

Comment:
guile3: update to 3.0.5

^ permalink raw reply	[flat|nested] 77+ messages in thread

* Re: [PR PATCH] [Updated] Guile 3.0, again
  2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
                   ` (74 preceding siblings ...)
  2021-01-08  6:23 ` unspecd
@ 2021-01-13  5:50 ` unspecd
  75 siblings, 0 replies; 77+ messages in thread
From: unspecd @ 2021-01-13  5:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320

Guile 3.0, again


A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 19159 bytes --]

From a4e7cf87ec8c5ea4e5ace99efdfa0670dbab02b1 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/8] New package: guile3-3.0.5

---
 common/shlibs           |  1 +
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 62 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/guile3/update   |  2 ++
 4 files changed, 66 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 100644 srcpkgs/guile3/update

diff --git a/common/shlibs b/common/shlibs
index 5e6a8d0c6ec..ca1ba35933e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4044,3 +4044,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
+libguile-3.0.so.1 guile3-3.0.5_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..dad056eeacb
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,62 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.5
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel readline-devel libatomic_ops-devel
+ libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=222046009a20b432ffa7c11b8d5a1d9ad0d8627be05cc1e8af612bc54ba2ea85
+
+alternatives="
+ guile:guile:/usr/bin/guile3
+ guile:guild:/usr/bin/guild3
+ guile:guile-config:/usr/bin/guile-config3
+ guile:guile-snarf:/usr/bin/guile-snarf3
+ guile:guile-tools:/usr/bin/guile-tools3
+ guile:guile.1:/usr/share/man/man1/guile3.1
+ scheme:scheme:/usr/bin/guile3
+ scheme:scheme.1:/usr/share/man/man1/guile3.1"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	configure_args+=" GUILE_FOR_BUILD=guile3"
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	vmkdir usr/share/gdb/auto-load/usr/lib
+	mv ${DESTDIR}/usr/lib/*.scm ${DESTDIR}/usr/share/gdb/auto-load/usr/lib
+	# conflicts with guile-1.8, guile-2.2
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gc-devel gmp-devel guile3>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		depends+=" libatomic_ops-devel"
+	fi
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-3.0.m4}
+	}
+}
diff --git a/srcpkgs/guile3/update b/srcpkgs/guile3/update
new file mode 100644
index 00000000000..31edd11d4fc
--- /dev/null
+++ b/srcpkgs/guile3/update
@@ -0,0 +1,2 @@
+site="${homepage}/download"
+pattern='/guile-\K[\d\.]+(?=\.tar\.gz)'

From 2d8996480ef04f33df8ba67dcb00b577fdeb15cd Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 26 Dec 2020 13:08:43 +1100
Subject: [PATCH 2/8] guile: add alternatives

---
 srcpkgs/guile/template | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 60a5be98584..9334daa1f78 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,20 +1,30 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
 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"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
 subpackages="libguile guile-devel"
 
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1
+ scheme:scheme:/usr/bin/guile2
+ scheme:scheme.1:/usr/share/man/man1/guile2.1"
+
 if [ "$XBPS_ENDIAN" != "$XBPS_TARGET_ENDIAN" ]; then
 	broken="opposite-endian host generates broken files"
 fi
@@ -29,6 +39,17 @@ post_extract() {
 	rm -rf prebuilt/32-bit-big-endian
 }
 
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+	fi
+}
+
+post_install() {
+	# conflicts with guile-1.8, guile-3.0
+	rm -rf ${DESTDIR}/usr/share/info
+}
+
 libguile_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
@@ -42,10 +63,11 @@ guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel gc-devel guile>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/guile-config
+		vmove usr/bin/guile-config2
 		vmove usr/include
-		vmove usr/share/aclocal
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/aclocal
+		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
 	}
 }

From f42379f9e9a64fcfd3ca5973001c39f806830e7c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Dec 2020 00:40:17 +1100
Subject: [PATCH 3/8] guile-wisp: update to 1.0.3; switch to guile-3.0

---
 srcpkgs/guile-wisp/template | 18 +++++++++++-------
 srcpkgs/guile-wisp/update   |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guile-wisp/template b/srcpkgs/guile-wisp/template
index 73915ce9419..2cde69db6f0 100644
--- a/srcpkgs/guile-wisp/template
+++ b/srcpkgs/guile-wisp/template
@@ -1,16 +1,20 @@
 # Template file for 'guile-wisp'
 pkgname=guile-wisp
-version=1.0.2
+version=1.0.3
 revision=1
-wrksrc="wisp-${version}"
+wrksrc="wisp-v${version}"
 build_style=gnu-configure
 configure_args="--datarootdir=/usr/share"
-hostmakedepends="guile pkg-config python3"
-makedepends="guile-devel"
-depends="guile>=2.0"
+hostmakedepends="automake pkg-config guile3 python3"
+makedepends="guile3-devel"
 short_desc="SRFI-119 (WISP, Whitespace Lisp) implementation for guile"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.draketo.de/english/wisp"
-distfiles="https://bitbucket.org/ArneBab/wisp/downloads/wisp-${version}.tar.gz"
-checksum=c66d2bdf0ceffce7322783288ab40bb2a1aef0d1e55207ada7547999e43dff0e
+distfiles="https://hg.sr.ht/~arnebab/wisp/archive/v${version}.tar.gz"
+checksum=82005c2a68950019c27a6b435a019736465fb0d1624dfb9898f9ccaa50ad866d
+
+pre_configure() {
+	vsed -i configure.ac -e "s/AC_CHECK_TARGET_TOOL/AC_CHECK_TOOL/"
+	autoreconf -i
+}
diff --git a/srcpkgs/guile-wisp/update b/srcpkgs/guile-wisp/update
index b1bfd211bb6..b0161414179 100644
--- a/srcpkgs/guile-wisp/update
+++ b/srcpkgs/guile-wisp/update
@@ -1,2 +1,2 @@
-site="https://bitbucket.org/ArneBab/wisp/downloads/"
-pattern="wisp-\K[\d.]+"
+site="https://hg.sr.ht/~arnebab/wisp/tags"
+pattern='/archive/v\K[\d\.]+(?=\.tar\.gz)'

From 08b48e9d0c5e30ce96990a40f1b0debe49bc3ab9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 4/8] gdb: enable guile

---
 srcpkgs/gdb/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..981f46f3f3c 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
  $(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
@@ -30,7 +38,7 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.

From a4699eb053d1deb51494b05ca659504c5331c129 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 5/8] gnutls: enable guile

---
 .../patches/modules-gnutls-fwd-decls.patch    | 48 +++++++++++++++++++
 srcpkgs/gnutls/template                       | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch

diff --git a/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
new file mode 100644
index 00000000000..05aa26048b6
--- /dev/null
+++ b/srcpkgs/gnutls/patches/modules-gnutls-fwd-decls.patch
@@ -0,0 +1,48 @@
+--- guile/modules/gnutls.in.orig
++++ guile/modules/gnutls.in
+@@ -566,20 +566,33 @@
+ 
+ 
+ ;; Renaming.
+-(define protocol/ssl-3 protocol/ssl3)
+-(define protocol/tls-1.0 protocol/tls1-0)
+-(define protocol/tls-1.1 protocol/tls1-1)
++(define protocol/ssl-3 #f)
++(define protocol/tls-1.0 #f)
++(define protocol/tls-1.1 #f)
+ 
+ ;; Aliases.
+-(define credentials/anonymous   credentials/anon)
+-(define cipher/rijndael-256-cbc cipher/aes-256-cbc)
+-(define cipher/rijndael-128-cbc cipher/aes-128-cbc)
+-(define cipher/rijndael-cbc     cipher/aes-128-cbc)
+-(define cipher/arcfour-128      cipher/arcfour)
+-(define certificate-verify/allow-any-x509-v1-ca-certificate
+-  certificate-verify/allow-any-x509-v1-ca-crt)
+-(define certificate-verify/allow-x509-v1-ca-certificate
+-  certificate-verify/allow-x509-v1-ca-crt)
++(define credentials/anonymous   #f)
++(define cipher/rijndael-256-cbc #f)
++(define cipher/rijndael-128-cbc #f)
++(define cipher/rijndael-cbc     #f)
++(define cipher/arcfour-128      #f)
++(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
++(define certificate-verify/allow-x509-v1-ca-certificate     #f)
++
++(eval-when (load eval)
++  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
++    (set! protocol/ssl-3          protocol/ssl3)
++    (set! protocol/tls-1.0        protocol/tls1-0)
++    (set! protocol/tls-1.1        protocol/tls1-1)
++    (set! credentials/anonymous   credentials/anon)
++    (set! cipher/rijndael-256-cbc cipher/aes-256-cbc)
++    (set! cipher/rijndael-128-cbc cipher/aes-128-cbc)
++    (set! cipher/rijndael-cbc     cipher/aes-128-cbc)
++    (set! cipher/arcfour-128      cipher/arcfour)
++    (set! certificate-verify/allow-any-x509-v1-ca-certificate
++      certificate-verify/allow-any-x509-v1-ca-crt)
++    (set! certificate-verify/allow-x509-v1-ca-certificate
++      certificate-verify/allow-x509-v1-ca-crt)))
+ 
+ ;; Deprecated OpenPGP bindings.
+ (define-deprecated certificate-type/openpgp)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..ef478dd1b7d 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,8 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
+build_options="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -39,6 +41,7 @@ gnutls-devel_package() {
 		vmove usr/share/info
 	}
 }
+
 gnutls-tools_package() {
 	short_desc+=" - bundled tools"
 	pkg_install() {

From 867527525874307327c8b898e1431ddb41580124 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:21:25 +1100
Subject: [PATCH 6/8] make: switch to guile-3.0

---
 srcpkgs/make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 0aebcbc70be..88db1a74533 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,12 +1,12 @@
 # Template file for 'make'
 pkgname=make
 version=4.3
-revision=3
+revision=4
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_with guile)"
 hostmakedepends="$(vopt_if guile pkg-config)"
-makedepends="$(vopt_if guile 'gc-devel guile-devel')"
+makedepends="$(vopt_if guile guile3-devel)"
 checkdepends="perl"
 short_desc="GNU Make build tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 8ec7b8806b2cd33addd1425bb7654e0af4960911 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Dec 2020 23:03:50 +1100
Subject: [PATCH 7/8] aisleriot: rebuild for guile-3.0.5

---
 srcpkgs/aisleriot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index a26d8c2f0cf..29c4990347b 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -6,10 +6,10 @@ build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
-depends="guile yelp"
+makedepends="guile3-devel libcanberra-devel librsvg-devel"
+depends="yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"

From 91e78acef58b2495f490a869a1642b8e93e9523e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 8/8] xbindkeys: rebuild for guile-3.0.5

---
 srcpkgs/xbindkeys/patches/cross.patch | 15 ---------------
 srcpkgs/xbindkeys/template            | 12 ++++++++----
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
deleted file mode 100644
index fee7b8e0b53..00000000000
--- a/srcpkgs/xbindkeys/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git Makefile.in Makefile.in
-index 7bb5cba..e557452 100644
---- Makefile.in
-+++ Makefile.in
-@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
- @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
--@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
--@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
-+@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
-+@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.2 -lgc
- xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
- 		keys.h keys.c \
- 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3d2c2a28f94 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,18 @@
 # Template file for 'xbindkeys'
 pkgname=xbindkeys
 version=1.8.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel"
 short_desc="Launch shell commands with your keyboard or your mouse under X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+pre_configure() {
+	# this makes sure to use guile-3.0
+	vsed -i configure -e 's/2.2 2.0 1.8/3.0 2.2 2.0 1.8/'
+}

^ permalink raw reply	[flat|nested] 77+ messages in thread

end of thread, other threads:[~2021-01-13  5:50 UTC | newest]

Thread overview: 77+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-21 10:09 [PR PATCH] Guile 3.0, again unspecd
2020-12-21 10:11 ` [PR PATCH] [Updated] " unspecd
2020-12-21 10:19 ` [PR REVIEW] " sirikid
2020-12-21 10:51 ` [PR PATCH] [Updated] " unspecd
2020-12-21 12:25 ` unspecd
2020-12-21 12:27 ` unspecd
2020-12-21 12:38 ` unspecd
2020-12-21 12:45 ` unspecd
2020-12-21 12:47 ` [PR PATCH] [Updated] " unspecd
2020-12-21 12:48 ` unspecd
2020-12-21 13:08 ` unspecd
2020-12-21 13:29 ` q66
2020-12-21 13:30 ` q66
2020-12-21 13:31 ` q66
2020-12-21 14:33 ` [PR REVIEW] " ericonr
2020-12-21 14:33 ` ericonr
2020-12-21 14:33 ` ericonr
2020-12-21 14:33 ` ericonr
2020-12-22  3:14 ` [PR PATCH] [Updated] " unspecd
2020-12-22  3:21 ` [PR REVIEW] " unspecd
2020-12-22  3:38 ` [PR PATCH] [Updated] " unspecd
2020-12-22  5:14 ` unspecd
2020-12-22  6:04 ` unspecd
2020-12-22  8:13 ` [PR PATCH] [Updated] " unspecd
2020-12-22  9:28 ` unspecd
2020-12-22  9:38 ` [PR REVIEW] " unspecd
2020-12-22  9:38 ` sirikid
2020-12-22  9:43 ` [PR REVIEW] " sirikid
2020-12-22  9:45 ` unspecd
2020-12-22  9:48 ` [PR REVIEW] " sirikid
2020-12-22  9:50 ` sirikid
2020-12-22  9:54 ` sirikid
2020-12-22  9:55 ` fosslinux
2020-12-22  9:57 ` fosslinux
2020-12-22 10:13 ` [PR REVIEW] " unspecd
2020-12-22 10:21 ` unspecd
2020-12-22 10:33 ` [PR REVIEW] " unspecd
2020-12-22 10:48 ` [PR PATCH] [Updated] " unspecd
2020-12-22 10:48 ` q66
2020-12-22 10:50 ` unspecd
2020-12-22 10:57 ` q66
2020-12-22 11:00 ` q66
2020-12-22 12:04 ` [PR PATCH] [Updated] " unspecd
2020-12-22 12:56 ` unspecd
2020-12-22 13:12 ` unspecd
2020-12-22 14:35 ` unspecd
2020-12-22 14:36 ` unspecd
2020-12-22 18:25 ` [PR REVIEW] " unspecd
2020-12-22 20:52 ` sirikid
2020-12-22 21:43 ` [PR PATCH] [Updated] " unspecd
2020-12-22 21:47 ` unspecd
2020-12-22 21:49 ` unspecd
2020-12-22 21:52 ` unspecd
2020-12-22 21:54 ` unspecd
2020-12-22 22:05 ` unspecd
2020-12-22 23:02 ` [PR PATCH] [Updated] " unspecd
2020-12-22 23:18 ` unspecd
2020-12-24  7:22 ` unspecd
2020-12-24 10:03 ` unspecd
2020-12-24 10:04 ` unspecd
2020-12-24 10:05 ` unspecd
2020-12-26  0:51 ` [PR PATCH] [Updated] " unspecd
2020-12-26  0:54 ` unspecd
2020-12-26  4:55 ` [PR PATCH] [Updated] " unspecd
2020-12-26  6:14 ` unspecd
2020-12-26  6:26 ` [PR REVIEW] " ericonr
2020-12-26  6:26 ` ericonr
2020-12-26  6:26 ` ericonr
2020-12-26  6:51 ` unspecd
2020-12-26  7:58 ` unspecd
2020-12-26  8:08 ` unspecd
2020-12-26  8:53 ` unspecd
2021-01-08  6:20 ` [PR PATCH] [Updated] " unspecd
2021-01-08  6:20 ` unspecd
2021-01-08  6:22 ` unspecd
2021-01-08  6:23 ` unspecd
2021-01-13  5:50 ` [PR PATCH] [Updated] " unspecd

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git