From 74250a5818204ba5193d831daec01ebda4fbca15 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov 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 " +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 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 " 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 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 " 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 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 " @@ -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 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 " 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 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 " From 5daede7f18f6d04c1c6404f604904be5f867e5b8 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov 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 " license="GPL-3.0-or-later" From 4970e88e7df2f2d1587ce52d3f9642a977d845e7 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov 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 " 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/' +}