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

[Antonio Rojas]

    Date: Saturday, June 22, 2019 @ 14:08:51
  Author: arojas
Revision: 482770

Update to 4.10.2

Modified:
  gap/trunk/PKGBUILD

----------+
 PKGBUILD |   31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-22 13:25:03 UTC (rev 482769)
+++ PKGBUILD	2019-06-22 14:08:51 UTC (rev 482770)
@@ -4,18 +4,16 @@
 
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
-pkgver=4.10.1
-pkgrel=4
+pkgver=4.10.2
+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://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz" gap.sh
-        gap-polymake-3.3.patch)
-sha256sums=('b2d8800e338a6a9afdf92b06368c2e1a16b8adebffcd4c10319c1b3a4e827e45'
-            '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
-            'c92849b2643e0e21ffdcfa230fb23fe4a276ec15402f178d5d69ddb0e537fbbe')
-makedepends=(libxaw givaro mpfi normaliz boost c-xsc zeromq fplll polymake wget chrpath)
+source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz" gap.sh)
+sha256sums=('11175bed0234101643d510d4ab94c44db30bd303bfe63d86b9b86ae67cff9e49'
+            '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46')
+makedepends=(libxaw givaro mpfi normaliz boost libsemigroups c-xsc zeromq fplll polymake wget chrpath)
 
 prepare() {
   cd gap-$pkgver
@@ -22,14 +20,13 @@
 
 # Use system normaliz
   sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
+# Use system libsemigroups
+  sed -e 's|test "$with_external_libsemigroups" = yes|true|' -i pkg/semigroups-*/configure
 # Disable anupq package, it's i686 only
   rm -r pkg/anupq-*
 # 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
-
-  cd pkg/PolymakeInterface*
-  patch -p2 -i "$srcdir"/gap-polymake-3.3.patch # Fix build of PolymakeInterface with polymake 3.3
 }
 
 build() {
@@ -47,7 +44,6 @@
   libtool --mode=install install libgap.la "$srcdir"/gap-$pkgver/tmp-install
 
   cd pkg
-  export MAKEFLAGS='-j1' # Fix build of carat package
   export CXXFLAGS+=" -I/usr/include/cxsc" # Find c-xsc headers
   export LDFLAGS+=" -L$srcdir/gap-$pkgver/tmp-install -lgap" # See https://trac.sagemath.org/ticket/27372
   export LD_LIBRARY_PATH="$srcdir"/gap-$pkgver/tmp-install
@@ -95,8 +91,8 @@
   depends=(gap)
   replaces=(gap-4.8-packages)
   optdepends=('normaliz: Normaliz interface package' 'libxaw: xgap package' 'c-xsc: float package' 'mpfi: float package'
-              'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ interface package'
-              'polymake: Polymake interface package' 'curl: curl interface package')
+              'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ interface package' 'planarity: digraph package'
+              'polymake: Polymake interface package' 'curl: curl interface package' 'libsemigroups: semigroups package')
   pkgdesc="Extra packages for GAP"
   cd gap-$pkgver
 
@@ -109,10 +105,13 @@
   done
 
 # fix RPATH
-  chrpath -r \$ORIGIN/../lib/ "$pkgdir"/usr/lib/gap/pkg/semigroups-*/bin/x86_64-*/semigroups.so
-  chrpath -d "$pkgdir"/usr/lib/gap/pkg/NormalizInterface-*/bin/x86_64-*/NormalizInterface.so
+  find "$pkgdir"/usr/lib/gap/pkg/ -name '*.so' | xargs chrpath -d
 
+# remove bundled planarity
+  rm -r "$pkgdir"/usr/lib/gap/pkg/digraphs-*/bin/lib/
+
 # remove leftover binaries and source files
   find "$pkgdir"/usr/lib/gap/pkg -name .libs -o -name '*.o' | xargs rm -fr
   find "$pkgdir"/usr/lib/gap/pkg -type d -name src | xargs rm -fr
+  rm -fr "$pkgdir"/usr/lib/gap/pkg/log
 }