From 7ca4ee21837e443d3b1b88fdc5513e82c61e222d Mon Sep 17 00:00:00 2001 From: Anjandev Momi Date: Tue, 26 May 2020 20:01:03 -0700 Subject: [PATCH 01/10] New package: guile3-3.0.2 --- common/shlibs | 2 ++ srcpkgs/guile3-devel | 1 + srcpkgs/guile3/template | 51 +++++++++++++++++++++++++++++++++++++++++ srcpkgs/libguile3 | 1 + 4 files changed, 55 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 54a00e3150d..2d19f51176e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3958,3 +3958,5 @@ libvips.so.42 libvips-8.9.2_1 libvips-cpp.so.42 libvips-8.9.2_1 libselinux.so.1 libselinux-3.0_1 libsepol.so.1 libsepol-3.0_1 +libguile-3.0.so.1 libguile3-3.0.2_1 +guile-readline.so.0 libguile3-3.0.2_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..fe78c593f47 --- /dev/null +++ b/srcpkgs/guile3/template @@ -0,0 +1,51 @@ +# Template file for 'guile3' +pkgname=guile3 +version=3.0.2 +revision=1 +wrksrc=guile-${version} +build_style=gnu-configure +configure_args="--disable-static --disable-error-on-warning --program-suffix=3" +hostmakedepends="pkg-config texinfo" +makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel + libunistring-devel readline-devel" +short_desc="Portable, embeddable Scheme implementation written in C" +maintainer="Anjandev Momi " +license="GPL-3.0-or-later, LGPL-3.0-or-later" +homepage="http://www.gnu.org/software/guile" +distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz" +checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57 +subpackages="libguile3 guile3-devel" + +if [ "$CROSS_BUILD" ]; then + # Need host guile to cross compile + hostmakedepends+=" guile3" +fi + +pre_configure() { + # magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218 + case "$XBPS_TARGET_MACHINE" in + ppc*) export CFLAGS+=" -Os";; + esac +} + +libguile3_package() { + short_desc+=" - runtime library" + pkg_install() { + vmove "usr/lib/*.so.*" + vmove "usr/lib/guile/*/extensions/guile-readline.so.*" + vmkdir usr/share/gdb/auto-load/usr/lib + mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib + } +} + +guile3-devel_package() { + short_desc+=" - development files" + depends="gmp-devel gc-devel guile3>=${version}_${revision}" + pkg_install() { + vmove usr/bin/guile-config3 + vmove usr/include + vmove usr/share/aclocal + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} 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 1953dead73d40d4867822122c9d3f8510cec4bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 27 May 2020 14:12:02 -0300 Subject: [PATCH 02/10] gnutls: generate Guile 3.0 bindings --- srcpkgs/gnutls/patches/gnutls-guile3.patch | 19 +++++++++++++++++++ srcpkgs/gnutls/template | 12 ++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/gnutls/patches/gnutls-guile3.patch diff --git a/srcpkgs/gnutls/patches/gnutls-guile3.patch b/srcpkgs/gnutls/patches/gnutls-guile3.patch new file mode 100644 index 00000000000..745dc2cdc1d --- /dev/null +++ b/srcpkgs/gnutls/patches/gnutls-guile3.patch @@ -0,0 +1,19 @@ +*** configure.ac 2020-05-27 04:58:09.858735786 -0300 +--- configure.ac 2020-05-27 04:53:37.731383580 -0300 +*************** +*** 964,970 **** + *** Detecting GNU Guile... + ]) + +! AC_PATH_PROG([guile_snarf], [guile-snarf]) + if test "x$guile_snarf" = "x"; then + AC_MSG_WARN([`guile-snarf' from Guile not found. Guile bindings not built.]) + opt_guile_bindings=no +--- 964,970 ---- + *** Detecting GNU Guile... + ]) + +! 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 95bfab6a3f2..67e79f19eba 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,16 +1,17 @@ # Template file for 'gnutls' pkgname=gnutls version=3.6.13 -revision=2 +revision=3 build_style=gnu-configure -configure_args="--with-zlib --disable-guile --disable-static +configure_args="--with-zlib --disable-static $(vopt_if guile --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 +20,9 @@ homepage="https://gnutls.org" distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz" checksum=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38 +build_options="guile" +build_options_default="guile" + pre_configure() { autoreconf -vfi } From a1fe2d94adda043d083cb2e3b5b87b40803c97d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 27 May 2020 14:12:30 -0300 Subject: [PATCH 03/10] aisleriot: update to 3.22.11 - Change build_style to meson - Change distfile location - Use pysol package instead of distfile - Add yelp dep for viewing help info --- srcpkgs/aisleriot/template | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template index 40d46895aa4..c6294d9bc55 100644 --- a/srcpkgs/aisleriot/template +++ b/srcpkgs/aisleriot/template @@ -1,29 +1,19 @@ # Template file for 'aisleriot' pkgname=aisleriot -version=3.22.9 +version=3.22.11 revision=1 -_pysol_cardsets=PySolFC-Cardsets -_pysol_ver=2.0 -build_style=gnu-configure -configure_args="--with-platform=gtk-only - --with-pysol-card-theme-path=${XBPS_BUILDDIR}/${_pysol_cardsets}-${_pysol_ver}" -hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config" -makedepends="gc-devel guile-devel libcanberra-devel librsvg-devel - libatomic_ops-devel" -depends="aisleriot-data guile" +wrksrc="${pkgname}-${version}-08104246822df8286d3f0d7b30b697d644ddc656" +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 guile3 intltool itstool pkg-config + pysolfc-cardsets" +makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel" +depends="guile3 yelp" short_desc="GNOME solitaire card game" maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Aisleriot" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz - http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2" -checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b - c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7" - -aisleriot-data_package() { - short_desc+=" - data" - archs=noarch - pkg_install() { - vmove usr/share - } -} +distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pgkname}-${version}.tar.gz" +checksum=eed8edb267a9fa61651b1d3a22a83f51415a4e55d76d5ae737e18a9e9477016b From 3d16fa9916c638db5cb6bef4e489d9960fe8f8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 27 May 2020 14:13:54 -0300 Subject: [PATCH 04/10] New package: scheme-bytestructures-1.0.7 Dependency for guile3-git --- srcpkgs/scheme-bytestructures/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/scheme-bytestructures/template diff --git a/srcpkgs/scheme-bytestructures/template b/srcpkgs/scheme-bytestructures/template new file mode 100644 index 00000000000..55da4ba01df --- /dev/null +++ b/srcpkgs/scheme-bytestructures/template @@ -0,0 +1,23 @@ +# Template file for 'scheme-bytestructures' +pkgname=scheme-bytestructures +version=1.0.7 +revision=1 +build_style=gnu-configure +#configure_args="" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +hostmakedepends="automake pkg-config guile3" +makedepends="guile3-devel" +depends="" +short_desc="Structured access to bytevector contents" +maintainer="Érico Nogueira " +license="GPL-3.0-or-later" +homepage="https://github.com/TaylanUB/scheme-bytestructures" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=cb5202289b0aa4fe470bf16a44b810631863afd48bf2677fd4bf53af017b52c8 + +pre_configure() { + autoreconf -vfi +} From dee118aa8ed21188c0af1f08347f3bbc43a1c57d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 27 May 2020 14:16:36 -0300 Subject: [PATCH 05/10] New package: guile-git-0.3.0 Dependency for guix. --- srcpkgs/guile-git/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/guile-git/template diff --git a/srcpkgs/guile-git/template b/srcpkgs/guile-git/template new file mode 100644 index 00000000000..81282341ef2 --- /dev/null +++ b/srcpkgs/guile-git/template @@ -0,0 +1,19 @@ +# Template file for 'guile-git' +pkgname=guile-git +version=0.3.0 +revision=1 +wrksrc="${pkgname}-v${version}" +build_style=gnu-configure +hostmakedepends="automake pkg-config guile3 texinfo" +makedepends="libgit2-devel guile3-devel scheme-bytestructures" +depends="scheme-bytestructures libgit2-devel" +short_desc="Guile 3 bindings of libgit2" +maintainer="Érico Nogueira " +license="GPL-3.0-or-later" +homepage="https://gitlab.com/guile-git/guile-git" +distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz" +checksum=e12fc747cc817e60be07fea44126b077b292dbd1e96a5bee766754d5cc7e4a05 + +pre_configure() { + autoreconf -vfi +} From 24e4c94683ac35604ea316ef67ef58edf5f24fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 27 May 2020 14:18:18 -0300 Subject: [PATCH 06/10] New package: guile-ssh-0.12.0 Dependency for guix. --- .../allow-build-with-guile-3.0-guild.patch | 19 +++++++++++++++++++ .../allow-build-with-guile-3.0-snarf.patch | 17 +++++++++++++++++ srcpkgs/guile-ssh/template | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch create mode 100644 srcpkgs/guile-ssh/template diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch new file mode 100644 index 00000000000..e47cee302fb --- /dev/null +++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch @@ -0,0 +1,19 @@ +*** configure.ac 2020-05-27 12:02:15.450830987 -0300 +--- configure.ac 2020-05-27 12:02:03.329824812 -0300 +*************** +*** 92,98 **** + GUILE_SITE_DIR + + if test "x$GUILD" = "x"; then +! GUILD=`which guild` + AC_SUBST(GUILD) + fi + +--- 92,98 ---- + GUILE_SITE_DIR + + if test "x$GUILD" = "x"; then +! GUILD=`which guild3` + AC_SUBST(GUILD) + fi + diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch new file mode 100644 index 00000000000..b90ef05bdb0 --- /dev/null +++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch @@ -0,0 +1,17 @@ +*** am/snarf 2020-01-05 13:19:18.000000000 -0300 +--- am/snarf 2020-05-27 12:02:42.774844905 -0300 +*************** +*** 1,6 **** + # -*- makefile -*- + +! GUILE_SNARF = `which guile-snarf` + + AM_V_SNARF = $(AM_V_SNARF_$(V)) + AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY)) +--- 1,6 ---- + # -*- makefile -*- + +! GUILE_SNARF = `which guile-snarf3` + + AM_V_SNARF = $(AM_V_SNARF_$(V)) + AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY)) diff --git a/srcpkgs/guile-ssh/template b/srcpkgs/guile-ssh/template new file mode 100644 index 00000000000..9cf4a2ee39e --- /dev/null +++ b/srcpkgs/guile-ssh/template @@ -0,0 +1,18 @@ +# Template file for 'guile-ssh' +pkgname=guile-ssh +version=0.12.0 +revision=1 +build_style=gnu-configure +hostmakedepends="automake pkg-config guile3 libtool which texinfo" +makedepends="guile3-devel libssh-devel" +depends="libssh-devel" +short_desc="SSH module for Guile based on libssh" +maintainer="Érico Nogueira " +license="GPL-3.0-or-later" +homepage="https://github.com/artyom-poptsov/guile-ssh" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=d5b610fa0259187a824dfd26b11a415c1ca7b107912feea8b1a9e7c0fcfbe59c + +pre_configure() { + autoreconf -vfi +} From 5d2c2cf6117a6caf2c97be9e4b02a1437dbfbdb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 27 May 2020 14:21:14 -0300 Subject: [PATCH 07/10] New package: guile-gcrypt-0.3.0 Dependency for guix. --- srcpkgs/guile-gcrypt/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/guile-gcrypt/template diff --git a/srcpkgs/guile-gcrypt/template b/srcpkgs/guile-gcrypt/template new file mode 100644 index 00000000000..7210f5f50d4 --- /dev/null +++ b/srcpkgs/guile-gcrypt/template @@ -0,0 +1,19 @@ +# Template file for 'guile-gcrypt' +pkgname=guile-gcrypt +version=0.3.0 +revision=1 +wrksrc="${pkgname}" +build_style=gnu-configure +hostmakedepends="automake guile3 pkg-config texinfo" +makedepends="libgcrypt-devel guile3-devel" +depends="libgcrypt-devel" +short_desc="Guile 3 bindings for libgcrypt" +maintainer="Érico Nogueira " +license="GPL-3.0-or-later" +homepage="https://notabug.org/cwebber/guile-gcrypt" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=07394c3de4f31a36ca2b670e1998c526de891d9436f12e94d8862ab081274d6a + +pre_configure() { + autoreconf -vfi +} From 33c6c2727b57015b382b91b0388a652979dea85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 27 May 2020 14:22:17 -0300 Subject: [PATCH 08/10] New package: guile-json Dependency for guix. --- srcpkgs/guile-json/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/guile-json/template diff --git a/srcpkgs/guile-json/template b/srcpkgs/guile-json/template new file mode 100644 index 00000000000..3ec0e20650e --- /dev/null +++ b/srcpkgs/guile-json/template @@ -0,0 +1,13 @@ +# Template file for 'guile-json' +pkgname=guile-json +version=3.3.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config guile3" +makedepends="guile3-devel" +short_desc="JSON module for Guile" +maintainer="Érico Nogueira " +license="GPL-3.0-or-later" +homepage="https://savannah.nongnu.org/projects/guile-json/" +distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=ceb7357308d75a9c49dabbddaecf60c9731eda3512b9275a79bb508f628c783d From fbc205d58c5294b980737e818528aaaa1d4fcb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 27 May 2020 14:23:06 -0300 Subject: [PATCH 09/10] New package: guile-sqlite3 Dependency for guix. --- .../patches/allow-build-with-guile-3.0.patch | 19 +++++++++++++++++++ srcpkgs/guile-sqlite3/template | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch create mode 100644 srcpkgs/guile-sqlite3/template diff --git a/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch new file mode 100644 index 00000000000..3196e9df051 --- /dev/null +++ b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch @@ -0,0 +1,19 @@ +*** configure.old 2020-05-27 06:34:42.422898841 -0300 +--- configure.ac 2020-05-27 06:34:25.983868381 -0300 +*************** +*** 14,20 **** + m4_pattern_forbid([PKG_CHECK_MODULES]) + m4_pattern_forbid([GUILE_PKG]) + +! GUILE_PKG([2.2 2.0]) + GUILE_PROGS + + PKG_CHECK_MODULES([SQLITE], [sqlite3]) +--- 14,20 ---- + m4_pattern_forbid([PKG_CHECK_MODULES]) + m4_pattern_forbid([GUILE_PKG]) + +! GUILE_PKG([3.0 2.2 2.0]) + GUILE_PROGS + + PKG_CHECK_MODULES([SQLITE], [sqlite3]) diff --git a/srcpkgs/guile-sqlite3/template b/srcpkgs/guile-sqlite3/template new file mode 100644 index 00000000000..abaa0c247b3 --- /dev/null +++ b/srcpkgs/guile-sqlite3/template @@ -0,0 +1,19 @@ +# Template file for 'guile-sqlite3' +pkgname=guile-sqlite3 +version=0.1.0 +revision=1 +wrksrc="${pkgname}" +build_style=gnu-configure +hostmakedepends="automake pkg-config guile3" +makedepends="sqlite-devel guile3-devel" +depends="sqlite-devel" +short_desc="Guile bindings to SQLite" +maintainer="Érico Nogueira " +license="LGPL-3.0-or-later" +homepage="https://notabug.org/guile-sqlite3/guile-sqlite3" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=7501cd60bc693e581dc3e153f418279e1e1637c0760bc4524af6eb2d8eac2fe9 + +pre_configure() { + autoreconf -vfi +} From 8745bc12fc5744e621f4c45694717705ba0c1a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 27 May 2020 14:25:50 -0300 Subject: [PATCH 10/10] New package: guix-1.1.0 --- srcpkgs/guix/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/guix/template diff --git a/srcpkgs/guix/template b/srcpkgs/guix/template new file mode 100644 index 00000000000..09d833d6584 --- /dev/null +++ b/srcpkgs/guix/template @@ -0,0 +1,18 @@ +# Template file for 'guix' +pkgname=guix +version=1.1.0 +revision=1 +build_style=gnu-configure +configure_args="--with-bash-completion-dir=${DESTDIR}/usr/share/bash-completion/completions + --with-fish-completion-dir=${DESTDIR}/usr/share/fish/vendor_completions.d + --with-zsh-completion-dir=${DESTDIR}/usr/share/zsh/site_functions" +hostmakedepends="guile3 pkg-config" +_guile_libs="guile-git guile-json guile-sqlite3 guile-gcrypt guile-ssh" +makedepends="gnutls gnutls-devel guile3-devel ${_guile_libs} zlib-devel" +depends="guile3 ${_guile_libs}" +short_desc="Package management tool for the GNU system" +maintainer="Érico Nogueira " +license="GPL-3.0-or-later" +homepage="https://guix.gnu.org/" +distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=5c59106ff4ac497c6097686834b0c914109cf5e44eb6b94ebce818923043640f