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

[Antonio Rojas]

    Date: Friday, September 18, 2020 @ 19:58:07
  Author: arojas
Revision: 710735

polymake 4.2 rebuild, fix build with latest normaliz, libsemigroups and cddlib

Added:
  gap/trunk/gap-cddlib-0.94k.patch
  gap/trunk/gap-libsemigroups-1.3.patch
  gap/trunk/gap-normaliz-3.8.8.patch
Modified:
  gap/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   25 +++++++++++++++++++++----
 gap-cddlib-0.94k.patch      |   15 +++++++++++++++
 gap-libsemigroups-1.3.patch |   12 ++++++++++++
 gap-normaliz-3.8.8.patch    |   13 +++++++++++++
 4 files changed, 61 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-18 19:54:40 UTC (rev 710734)
+++ PKGBUILD	2020-09-18 19:58:07 UTC (rev 710735)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.11.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/"
@@ -12,11 +12,19 @@
 license=(GPL)
 source=("https://files.gap-system.org/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz" gap.sh
          git+https://github.com/gap-packages/NormalizInterface#commit=cd69a42
-         gap-polymake-4.0.patch)
+         git+https://github.com/gap-packages/Semigroups#commit=ff2fb291
+         gap-polymake-4.0.patch
+         gap-cddlib-0.94k.patch
+         gap-normaliz-3.8.8.patch
+         gap-libsemigroups-1.3.patch)
 sha256sums=('6fda7af23394708aeb3b4bca8885f5fdcb7c3ae4419639dfb2d9f67d3f590abb'
             '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
             'SKIP'
-            'e3f6d671c8df9acb6143a7c279391957967cd44f0a00b949323401d5b54ed685')
+            'SKIP'
+            'e3f6d671c8df9acb6143a7c279391957967cd44f0a00b949323401d5b54ed685'
+            '151ddbd7cf234158c8bd79153ac0ded3076f103859a65b238dd5c86084be3d98'
+            '4023aaf1617d653f84d711d5642485984395a01464d64ded0a7e884c48b2a332'
+            'c69c35293c194528a0beeeea533d3bae93208cc6a6bed9ffab2c2ebdb1c6d444')
 makedepends=(libxaw givaro mpfi normaliz polymake boost libsemigroups c-xsc zeromq fplll wget chrpath fmt git)
 
 prepare() {
@@ -34,8 +42,17 @@
   rm -r pkg/NormalizInterface-1.1.0
   cp -r ../NormalizInterface pkg
 
-  cd pkg/PolymakeInterface-*
+  cd pkg/semigroups-* 
+  patch -p1 -i "$srcdir"/gap-libsemigroups-1.3.patch # Fix build with libsemigroups 1.3
+
+  cd ../PolymakeInterface-*
   patch -p2 -i "$srcdir"/gap-polymake-4.0.patch # Fix build with polymake 4.0
+
+  cd ../CddInterface-*
+  patch -p1 -i "$srcdir"/gap-cddlib-0.94k.patch # Fix build with cddlib 0.94k
+
+  cd ../NormalizInterface
+  patch -p1 -i "$srcdir"/gap-normaliz-3.8.8.patch # Fix build with normaliz 3.8.8
 }
 
 build() {

Added: gap-cddlib-0.94k.patch
===================================================================
--- gap-cddlib-0.94k.patch	                        (rev 0)
+++ gap-cddlib-0.94k.patch	2020-09-18 19:58:07 UTC (rev 710735)
@@ -0,0 +1,15 @@
+diff --git a/src/CddInterface.c b/src/CddInterface.c
+index da948e0..e025492 100644
+--- a/src/CddInterface.c
++++ b/src/CddInterface.c
+@@ -4,8 +4,8 @@
+ 
+ #include "src/compiled.h" /* GAP headers */
+ 
+-#include "setoper.h"
+-#include "cdd.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
+ 
+ #include "gmp.h"
+ 

Added: gap-libsemigroups-1.3.patch
===================================================================
--- gap-libsemigroups-1.3.patch	                        (rev 0)
+++ gap-libsemigroups-1.3.patch	2020-09-18 19:58:07 UTC (rev 710735)
@@ -0,0 +1,12 @@
+diff --git a/src/semigrp.h b/src/semigrp.h
+index f2d5463a..327a7f14 100644
+--- a/src/semigrp.h
++++ b/src/semigrp.h
+@@ -23,6 +23,7 @@
+ 
+ #include "compiled.h"  // GAP headers
+ 
++#include "libsemigroups/element-adapters.hpp"
+ #include "libsemigroups/froidure-pin.hpp"
+ 
+ #include "converter.h"

Added: gap-normaliz-3.8.8.patch
===================================================================
--- gap-normaliz-3.8.8.patch	                        (rev 0)
+++ gap-normaliz-3.8.8.patch	2020-09-18 19:58:07 UTC (rev 710735)
@@ -0,0 +1,13 @@
+diff --git a/src/normaliz.cc b/src/normaliz.cc
+index 979152d..f4a5748 100644
+--- a/src/normaliz.cc
++++ b/src/normaliz.cc
+@@ -26,7 +26,7 @@
+ #include "compiled.h" // GAP headers
+ 
+ #include "libnormaliz/cone.h"
+-#include "libnormaliz/map_operations.h"
++#include "libnormaliz/list_and_map_operations.h"
+ 
+ #include <vector>
+