From c36c7bb6e5b7d93a48f94dd60aa0458ddba5621f Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 18 Mar 2024 00:09:48 +0000 Subject: [PATCH] extra/gap to 4.13.0-1 --- extra/gap/.SRCINFO | 52 ++++++++++++------------- extra/gap/.nvchecker.toml | 5 +++ extra/gap/PKGBUILD | 82 ++++++++++++++++++++++++--------------- 3 files changed, 82 insertions(+), 57 deletions(-) create mode 100644 extra/gap/.nvchecker.toml diff --git a/extra/gap/.SRCINFO b/extra/gap/.SRCINFO index aa88caae4..69f1dcb5b 100644 --- a/extra/gap/.SRCINFO +++ b/extra/gap/.SRCINFO @@ -1,29 +1,29 @@ pkgbase = gap pkgdesc = Groups, Algorithms, Programming: a system for computational discrete algebra - pkgver = 4.12.2 - pkgrel = 4 + pkgver = 4.13.0 + pkgrel = 1 url = https://www.gap-system.org/ arch = x86_64 - license = GPL - makedepends = libxaw - makedepends = givaro - makedepends = mpfi - makedepends = cddlib + license = GPL-2.0-or-later makedepends = boost - makedepends = libsemigroups makedepends = c-xsc - makedepends = zeromq - makedepends = fplll - makedepends = wget + makedepends = cddlib makedepends = chrpath - makedepends = fmt makedepends = eigen - makedepends = normaliz + makedepends = fmt + makedepends = fplll + makedepends = givaro makedepends = jq - source = https://github.com/gap-system/gap/releases/download/v4.12.2/gap-4.12.2.tar.gz - source = package-infos-4.12.2.json.gz::https://github.com/gap-system/gap/releases/download/v4.12.2/package-infos.json.gz - sha256sums = 672308745eb78a222494ee8dd6786edd5bc331456fcc6456ac064bdb28d587a8 - sha256sums = 33f8e2233e9aa74217741467f0138a932a2dfee212c774eaad0e0ef6876868c2 + makedepends = libsemigroups + makedepends = libxaw + makedepends = mpfi + makedepends = normaliz + makedepends = wget + makedepends = zeromq + source = https://github.com/gap-system/gap/releases/download/v4.13.0/gap-4.13.0.tar.gz + source = package-infos-4.13.0.json.gz::https://github.com/gap-system/gap/releases/download/v4.13.0/package-infos.json.gz + sha256sums = cc76ecbe33d6719450a593e613fb87e9e4247faa876f632dd0f97c398f92265d + sha256sums = b3f606cc5e6f388aa311c3824042d301d75ace780f19023561ef9d78982dcb7a pkgname = gap depends = gmp @@ -36,19 +36,19 @@ pkgname = gap pkgname = gap-packages pkgdesc = Extra packages for GAP depends = gap - optdepends = libxaw: xgap package optdepends = c-xsc: float package + optdepends = cddlib: CddLib interface package + optdepends = curl: curl interface package + optdepends = fplll: float package + optdepends = libmpc: float package + optdepends = libsemigroups: semigroups package + optdepends = libxaw: xgap package optdepends = mpfi: float package optdepends = nauty: grape package - optdepends = libmpc: float package - optdepends = fplll: float package - optdepends = zeromq: ZeroMQ interface package - optdepends = planarity: digraph package - optdepends = curl: curl interface package - optdepends = libsemigroups: semigroups package - optdepends = cddlib: CddLib interface package optdepends = normaliz: NormalizInterface package optdepends = pari: alnuth package - optdepends = singular: singular package + optdepends = planarity: digraph package optdepends = polymake: polymaking package + optdepends = singular: singular package + optdepends = zeromq: ZeroMQ interface package provides = diff --git a/extra/gap/.nvchecker.toml b/extra/gap/.nvchecker.toml new file mode 100644 index 000000000..be81cbfe6 --- /dev/null +++ b/extra/gap/.nvchecker.toml @@ -0,0 +1,5 @@ +[gap] +source = 'github' +github = 'gap-system/gap' +use_latest_release = true +prefix = 'v' diff --git a/extra/gap/PKGBUILD b/extra/gap/PKGBUILD index e2e506c1b..abde4f7b8 100644 --- a/extra/gap/PKGBUILD +++ b/extra/gap/PKGBUILD @@ -7,22 +7,39 @@ # - strip -m32 flags pkgbase=gap -pkgname=(gap gap-packages) -pkgver=4.12.2 -pkgrel=4 +pkgname=(gap + gap-packages) +_pkgver=4.13.0 +pkgver=${_pkgver/-/.} +pkgrel=1 pkgdesc='Groups, Algorithms, Programming: a system for computational discrete algebra' arch=(x86_64) url='https://www.gap-system.org/' -license=(GPL) -source=(https://github.com/gap-system/gap/releases/download/v$pkgver/$pkgbase-$pkgver.tar.gz - package-infos-$pkgver.json.gz::https://github.com/gap-system/gap/releases/download/v$pkgver/package-infos.json.gz) -sha256sums=('672308745eb78a222494ee8dd6786edd5bc331456fcc6456ac064bdb28d587a8' - '33f8e2233e9aa74217741467f0138a932a2dfee212c774eaad0e0ef6876868c2') -makedepends=(libxaw givaro mpfi cddlib boost libsemigroups c-xsc zeromq fplll wget chrpath fmt eigen normaliz jq) +license=(GPL-2.0-or-later) +source=(https://github.com/gap-system/gap/releases/download/v$_pkgver/$pkgbase-$_pkgver.tar.gz + package-infos-$pkgver.json.gz::https://github.com/gap-system/gap/releases/download/v$_pkgver/package-infos.json.gz) +sha256sums=('cc76ecbe33d6719450a593e613fb87e9e4247faa876f632dd0f97c398f92265d' + 'b3f606cc5e6f388aa311c3824042d301d75ace780f19023561ef9d78982dcb7a') +makedepends=(boost + c-xsc + cddlib + chrpath + eigen + fmt + fplll + givaro + jq + libsemigroups + libxaw + mpfi + normaliz + wget + zeromq) prepare() { - cd gap-$pkgver + cd gap-$_pkgver + rm -fr pkg/xgap # Use system normaliz rm pkg/normalizinterface/prerequisites.sh # Use system nauty @@ -35,21 +52,21 @@ prepare() { } build() { - cd gap-$pkgver + cd gap-$_pkgver ./configure --prefix=/usr --with-gmp=system # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool +# sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make # Install libgap so we can link packages against it mkdir -p tmp-install - make DESTDIR="$srcdir"/gap-$pkgver/tmp-install install-libgap + make DESTDIR="$srcdir"/gap-$_pkgver/tmp-install install-libgap cd pkg export CXXFLAGS+=" -std=gnu++14" # Fix build of normalizinterface - export LDFLAGS+=" -L$srcdir/gap-$pkgver/tmp-install/usr/lib -lgap" # See https://trac.sagemath.org/ticket/27372 + export LDFLAGS+=" -L$srcdir/gap-$_pkgver/tmp-install/usr/lib -lgap" # See https://trac.sagemath.org/ticket/27372 export LD_LIBRARY_PATH="$srcdir"/gap-$pkgver/tmp-install/usr/lib ../bin/BuildPackages.sh --strict \ --add-package-config-Semigroups --with-external-libsemigroups @@ -59,12 +76,13 @@ _standardpkgs=(gapdoc primgrp smallgrp transgrp atlasrep autpgrp alnuth crisp ct polenta polycyclic radiroot resclasses sophus tomlib utils autodoc) package_gap() { - depends=(gmp zlib) + depends=(gmp + zlib) optdepends=('gap-packages: extra packages') conflicts=(gap-doc) provides=(gap-doc) replaces=(gap-doc) - cd gap-$pkgver + cd gap-$_pkgver make DESTDIR="$pkgdir" install @@ -82,23 +100,28 @@ package_gap() { package_gap-packages() { depends=(gap) - optdepends=('libxaw: xgap package' 'c-xsc: float package' 'mpfi: float package' 'nauty: grape package' - 'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ interface package' 'planarity: digraph package' - 'curl: curl interface package' 'libsemigroups: semigroups package' 'cddlib: CddLib interface package' - 'normaliz: NormalizInterface package' 'pari: alnuth package' 'singular: singular package' 'polymake: polymaking package') - pkgdesc="Extra packages for GAP" - cd gap-$pkgver + optdepends=('c-xsc: float package' + 'cddlib: CddLib interface package' + 'curl: curl interface package' + 'fplll: float package' + 'libmpc: float package' + 'libsemigroups: semigroups package' + 'libxaw: xgap package' + 'mpfi: float package' + 'nauty: grape package' + 'normaliz: NormalizInterface package' + 'pari: alnuth package' + 'planarity: digraph package' + 'polymake: polymaking package' + 'singular: singular package' + 'zeromq: ZeroMQ interface package') + pkgdesc='Extra packages for GAP' + cd gap-$_pkgver mkdir -p "$pkgdir"/usr/{bin,lib/gap} cp -r pkg "$pkgdir"/usr/lib/gap chmod 755 "$pkgdir"/usr/lib/gap/pkg -# fix xgap launch script - sed -e "s|/build/gap/src/gap-$pkgver|/usr/lib/gap|g" -e 's|^GAP=.*|GAP=/usr/lib/gap/gap|g' \ - "$pkgdir"/usr/lib/gap/pkg/xgap/xgap.sh > "$pkgdir"/usr/bin/xgap - chmod 755 "$pkgdir"/usr/bin/xgap - rm "$pkgdir"/usr/lib/gap/pkg/xgap/xgap.sh - # provided by main gap package for _pkg in ${_standardpkgs[@]}; do rm -r "$pkgdir"/usr/lib/gap/pkg/$_pkg @@ -107,9 +130,6 @@ package_gap-packages() { # fix RPATH find "$pkgdir"/usr/lib/gap/pkg/ -name '*.so' | xargs chrpath -d -# remove bundled planarity - rm -fr "$pkgdir"/usr/lib/gap/pkg/digraphs/bin/lib/ - # use system nauty in grape package install -d "$pkgdir"/usr/lib/gap/pkg/grape/bin/x86_64-pc-linux-gnu-default64-kv8 ln -s /usr/bin/dreadnaut "$pkgdir"/usr/lib/gap/pkg/grape/bin/x86_64-pc-linux-gnu-default64-kv8