From e7e90c08e15e14ba701aae3b7a5415467433bcc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 11 Jan 2022 12:39:21 -0300 Subject: [PATCH 1/4] Fix CI since github no longer accepts git:// protocol As of today, everything fails on CI with: ``` Run common/travis/fetch_upstream.sh Fetching upstream... fatal: remote error: The unauthenticated git protocol on port 9418 is no longer supported. Please see https://github.blog/2021-09-01-improving-git-protocol-security-github/ for more information. Error: Process completed with exit code 128. ``` Switching `git://` to `https://` should fix this. --- common/travis/fetch_upstream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh index b1b06d9d54f9..45315563e0b1 100755 --- a/common/travis/fetch_upstream.sh +++ b/common/travis/fetch_upstream.sh @@ -9,4 +9,4 @@ elif command -v git >/dev/null 2>&1; then fi /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m' -$GIT_CMD fetch --depth 200 git://github.com/void-linux/void-packages.git master +$GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master From 17cf9ba48c4fd2986fe833fd8171e906baaed054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 10 Jan 2022 16:18:04 -0300 Subject: [PATCH 2/4] New package: gap-4.11.1 --- common/shlibs | 1 + srcpkgs/gap-devel | 1 + srcpkgs/gap/template | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 120000 srcpkgs/gap-devel create mode 100644 srcpkgs/gap/template diff --git a/common/shlibs b/common/shlibs index 999d3ad714b8..1e537682c3a1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4021,6 +4021,7 @@ libpari-gmp.so.7 pari-2.13.0_1 libpari-gmp-tls.so.7 pari-2.13.2_1 libtree-sitter.so.0 tree-sitter-0.19.0_1 libplanarity.so.0 planarity-3.0.1.1_1 +libgap.so.0 gap-4.11.1_1 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1 libgf2x.so.3 gf2x-1.3.0_1 libntl.so.44 ntl-11.5.1_1 diff --git a/srcpkgs/gap-devel b/srcpkgs/gap-devel new file mode 120000 index 000000000000..e195f60d0b1a --- /dev/null +++ b/srcpkgs/gap-devel @@ -0,0 +1 @@ +gap \ No newline at end of file diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template new file mode 100644 index 000000000000..683d4e4edb63 --- /dev/null +++ b/srcpkgs/gap/template @@ -0,0 +1,41 @@ +# Template file for 'gap' +pkgname=gap +version=4.11.1 +revision=1 +build_style=gnu-configure +makedepends="gmp-devel zlib-devel readline-devel" +make_install_target="install-bin install-gaproot install-headers install-libgap" +short_desc="Groups, Algorithms, Programming - computational discrete algebra" +maintainer="Gonzalo Tornaría " +license="GPL-2.0-or-later" +homepage="http://www.gap-system.org/" +distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz" +checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304 + +_GAPROOT=/usr/share/gap/ + +# minimal required packages +_GAPPKGS="GAPDoc primgrp SmallGrp transgrp" + +# other expected packages +_GAPPKGS+=" atlasrep autpgrp alnuth crisp ctbllib FactInt fga irredsol laguna + polenta polycyclic resclasses sophus tomlib" + +post_install() { + vmkdir ${_GAPROOT}/pkg + for p in ${_GAPPKGS}; do + [ -d pkg/$p ] || p="$p-*" + vcopy "pkg/$p" ${_GAPROOT}/pkg + done + # not handled by make install-headers + vcopy gen/config.h /usr/include/gap +} + +gap-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From a03f91291a18a46ad1a1aedb7f4d07db59b83df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 11 Jan 2022 00:09:49 -0300 Subject: [PATCH 3/4] gap: run more tests on full check --- srcpkgs/gap/template | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template index 683d4e4edb63..74be8c03ea42 100644 --- a/srcpkgs/gap/template +++ b/srcpkgs/gap/template @@ -4,6 +4,7 @@ version=4.11.1 revision=1 build_style=gnu-configure makedepends="gmp-devel zlib-devel readline-devel" +checkdepends="perl" make_install_target="install-bin install-gaproot install-headers install-libgap" short_desc="Groups, Algorithms, Programming - computational discrete algebra" maintainer="Gonzalo Tornaría " @@ -12,6 +13,11 @@ homepage="http://www.gap-system.org/" distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz" checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304 +if [ "$XBPS_CHECK_PKGS" = full ]; then + # not sure about this -- takes about 25 minutes + make_check_target=teststandard +fi + _GAPROOT=/usr/share/gap/ # minimal required packages From 84e258bbdd9254bad242805ad1fd6f6da1583126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 11 Jan 2022 12:30:31 -0300 Subject: [PATCH 4/4] fix lint --- srcpkgs/gap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template index 74be8c03ea42..7bc7d13ace20 100644 --- a/srcpkgs/gap/template +++ b/srcpkgs/gap/template @@ -3,9 +3,9 @@ pkgname=gap version=4.11.1 revision=1 build_style=gnu-configure +make_install_target="install-bin install-gaproot install-headers install-libgap" makedepends="gmp-devel zlib-devel readline-devel" checkdepends="perl" -make_install_target="install-bin install-gaproot install-headers install-libgap" short_desc="Groups, Algorithms, Programming - computational discrete algebra" maintainer="Gonzalo Tornaría " license="GPL-2.0-or-later"