From 670e61df33551d945334bc156e11b895775b785c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 12 Oct 2022 23:59:37 -0300 Subject: [PATCH] gap: update to 4.12.1. --- common/shlibs | 2 +- ...atlasrep-dont_use_network_by_default.patch | 11 +++++ srcpkgs/gap/template | 42 +++++++++++++------ 3 files changed, 41 insertions(+), 14 deletions(-) create mode 100644 srcpkgs/gap/patches/atlasrep-dont_use_network_by_default.patch diff --git a/common/shlibs b/common/shlibs index 54157f1bc74..671d9b21117 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4014,7 +4014,7 @@ liblinbox.so.0 linbox-1.6.3_1 libpari-gmp-tls.so.8 pari-2.15.0_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 +libgap.so.8 gap-4.12.0_1 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1 libxcvt.so.0 libxcvt-0.1.1_1 libgf2x.so.3 gf2x-1.3.0_1 diff --git a/srcpkgs/gap/patches/atlasrep-dont_use_network_by_default.patch b/srcpkgs/gap/patches/atlasrep-dont_use_network_by_default.patch new file mode 100644 index 00000000000..1a6be215091 --- /dev/null +++ b/srcpkgs/gap/patches/atlasrep-dont_use_network_by_default.patch @@ -0,0 +1,11 @@ +--- a/pkg/atlasrep/gap/userpref.g 2022-09-06 17:41:17.000000000 -0300 ++++ b/pkg/atlasrep/gap/userpref.g 2022-10-29 07:46:48.580833277 -0300 +@@ -46,7 +46,7 @@ + this information depends on the value of the preference at the time \ + when the AtlasRep package and its data extensions get loaded." + ], +- default:= true, ++ default:= false, + values:= [ true, false ], + multi:= false, + package:= "AtlasRep", diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template index 7bc7d13ace2..277537fe0fa 100644 --- a/srcpkgs/gap/template +++ b/srcpkgs/gap/template @@ -1,17 +1,17 @@ # Template file for 'gap' pkgname=gap -version=4.11.1 +version=4.12.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" short_desc="Groups, Algorithms, Programming - computational discrete algebra" maintainer="Gonzalo TornarĂ­a " license="GPL-2.0-or-later" -homepage="http://www.gap-system.org/" +homepage="https://www.gap-system.org/" +changelog="https://raw.githubusercontent.com/gap-system/gap/master/CHANGES.md" distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz" -checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304 +checksum=f9ebef11ee31b210ce36e3c70960742b4e253282bbd5270adc9324273c92b016 if [ "$XBPS_CHECK_PKGS" = full ]; then # not sure about this -- takes about 25 minutes @@ -21,20 +21,36 @@ fi _GAPROOT=/usr/share/gap/ # minimal required packages -_GAPPKGS="GAPDoc primgrp SmallGrp transgrp" +_GAPPKGS="autodoc gapdoc primgrp smallgrp transgrp" # other expected packages -_GAPPKGS+=" atlasrep autpgrp alnuth crisp ctbllib FactInt fga irredsol laguna - polenta polycyclic resclasses sophus tomlib" +_GAPPKGS+=" atlasrep autpgrp alnuth crisp ctbllib factint fga irredsol laguna + polenta polycyclic radiroot resclasses sophus tomlib utils" + +post_extract() { + # keep around only the packages that we want to install + mkdir pkg.install + for p in ${_GAPPKGS}; do + mv "pkg/$p" pkg.install + done + mv pkg pkg.orig + mv pkg.install pkg +} post_install() { - vmkdir ${_GAPROOT}/pkg + vmkdir ${_GAPROOT} + vcopy pkg ${_GAPROOT} +} + +pre_check() { + msg_normal "Check that loading packages works\n" 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 + cat <<-EOF + if LoadPackage("$p") <> true then + Error("loading package '$p'"); + fi; + EOF + done | ./gap --quitonbreak -b -q -r } gap-devel_package() {