[arch-commits] Commit in gap/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Thursday, June 2, 2022 @ 15:23:25
  Author: arojas
Revision: 1218682

Update semigroups and NormalizInterface packages to fix build with recent libraries (FS#74938)

Modified:
  gap/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-02 15:16:53 UTC (rev 1218681)
+++ PKGBUILD	2022-06-02 15:23:25 UTC (rev 1218682)
@@ -5,19 +5,22 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.11.1
-pkgrel=9
+pkgrel=10
 pkgdesc='Groups, Algorithms, Programming: a system for computational discrete algebra'
 arch=(x86_64)
 url='https://www.gap-system.org/'
 license=(GPL)
+_semigroupsver=4.0.1
+_normalizinterfacever=1.3.2
 source=(https://github.com/gap-system/gap/releases/download/v$pkgver/$pkgbase-$pkgver.tar.gz
         gap.sh
-        git+https://github.com/semigroups/Semigroups#commit=c5e2c895b15762896520a5b3636aa0e3bb2f881f)
+        https://github.com/semigroups/Semigroups/archive/v$_semigroupsver/Semigroups-$_semigroupsver.tar.gz
+        https://github.com/gap-packages/NormalizInterface/releases/download/v$_normalizinterfacever/NormalizInterface-$_normalizinterfacever.tar.gz)
 sha256sums=('6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304'
             '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
-            'SKIP')
-makedepends=(libxaw givaro mpfi cddlib boost libsemigroups c-xsc zeromq fplll wget chrpath fmt eigen git)
-# TODO: unbundle normaliz
+            '09f3f59506e6b273d44954eff91b9af7ffb91263d70e43faf676bcdb51878974'
+            '05f8ec10bd9975cc3f84249057b96e4865c284d9aaf5d94ac0c3e96377c3645e')
+makedepends=(libxaw givaro mpfi cddlib boost libsemigroups c-xsc zeromq fplll wget chrpath fmt eigen normaliz)
 
 prepare() {
   cd gap-$pkgver
@@ -24,6 +27,8 @@
 
 # Use system libsemigroups
   sed -e 's|test "$with_external_libsemigroups" = yes|true|' -i pkg/semigroups-*/configure
+# Use system normaliz
+  sed -e 's|.\/build-normaliz.sh|true|' -i bin/BuildPackages.sh
 # Fix https://bugs.archlinux.org/task/55174
   sed -e '/xgap/d' -i pkg/sonata-*/PackageInfo.g
   sed -e '/XGAP/d' -i pkg/cryst/PackageInfo.g
@@ -30,14 +35,20 @@
 
 # Update semigroups to support libsemigroups 2
   rm -r pkg/semigroups-* 
-  mv ../Semigroups pkg/semigroups
-  cd pkg/semigroups
+  mv ../Semigroups-$_semigroupsver pkg/semigroups-$_semigroupsver
+  cd pkg/semigroups-$_semigroupsver
   rm prerequisites.sh
   mkdir libsemigroups
   ./autogen.sh
   sed -e 's|test "$with_external_libsemigroups" = yes|true|' -i configure
 
-  cd ../CddInterface-*
+# Update normalizinterface to support normaliz 3.9
+  cd ..
+  rm -r NormalizInterface*
+  mv ../../NormalizInterface-$_normalizinterfacever .
+  sed -e 's|\$PWD/NormalizInstallDir|/usr|' -i NormalizInterface-$_normalizinterfacever/configure
+
+  cd CddInterface-*
   sed -e 's|/usr/include/cdd|/usr/include/cddlib|' -i configure.ac # Fix build with cddlib 0.94k
   rm configure
 }
@@ -123,7 +134,8 @@
   replaces=(gap-4.8-packages)
   optdepends=('libxaw: xgap package' 'c-xsc: float package' 'mpfi: float 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')
+              'curl: curl interface package' 'libsemigroups: semigroups package' 'cddlib: CddLib interface package'
+              'normaliz: NormalizInterface package')
   pkgdesc="Extra packages for GAP"
   cd gap-$pkgver