Date: Wednesday, November 7, 2018 @ 17:46:30 Author: arojas Revision: 403012
Update to 4.10.0 Modified: gap/trunk/PKGBUILD Deleted: gap/trunk/gap-polymake-3.1.patch ------------------------+ PKGBUILD | 38 +++---- gap-polymake-3.1.patch | 247 ----------------------------------------------- 2 files changed, 18 insertions(+), 267 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-11-07 17:46:05 UTC (rev 403011) +++ PKGBUILD 2018-11-07 17:46:30 UTC (rev 403012) @@ -4,18 +4,16 @@ pkgbase=gap pkgname=(gap gap-doc gap-packages) -pkgver=4.9.3 +pkgver=4.10.0 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-no-packages-by-default.patch - gap-polymake-3.1.patch) -sha256sums=('e502941e52352285e87faaf11e7f0e810eab8e38849d869fc6b9714d6cf7fe7c' - 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2' - '6d8d57a9947575a3f95e682172040618be3d6a144424496229ae4ec50c0ab4e9') -makedepends=(libxaw givaro mpfi normaliz boost c-xsc zeromq fplll polymake wget) +source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz"; gap-no-packages-by-default.patch) +sha256sums=('314b8d949c0bb01ef8bee199b29571d42714df660aba0d76ded254f58295904f' + 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2') +makedepends=(libxaw givaro mpfi normaliz boost c-xsc zeromq fplll polymake wget chrpath) prepare() { cd gap-$pkgver @@ -22,15 +20,8 @@ # Use system normaliz sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh -# Fix build of guava package - sed -e '/cd leon make/d' -i pkg/guava-*/src/Makefile - sed -e '/AM_INIT_AUTOMAKE/d' -i pkg/guava-*/src/leon/configure.ac # Don't load any packages by default patch -p1 -i ../gap-no-packages-by-default.patch -# Fix build of PolymakeInterface with polymake 3.1 - patch -p1 -i ../gap-polymake-3.1.patch -# Fix https://bugs.archlinux.org/task/55174 - sed -e '/xgap/d' -i pkg/sonata/PackageInfo.g # Disable anupq package, it's i686 only rm -r pkg/anupq-* } @@ -41,11 +32,8 @@ make cd pkg - export MAKEFLAGS='-j1' # Fix build of guava package + export MAKEFLAGS='-j1' # Fix build of carat package ../bin/BuildPackages.sh -# These packages fail to build: -# linboxing (doesn't support givaro 4) -# PolymakeInterface (T_POLYMAKE removed from GAP) } package_gap() { @@ -54,7 +42,9 @@ replaces=(gap-data) cd gap-$pkgver - mkdir -p "$pkgdir"/usr/{bin,lib/gap/pkg} + make DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir"/usr/lib/gap/pkg cp -r grp lib "$pkgdir"/usr/lib/gap cp -r pkg/{GAPDoc-*,primgrp-*,SmallGrp-*,transgrp} "$pkgdir"/usr/lib/gap/pkg install -m755 gap -t "$pkgdir"/usr/lib/gap @@ -74,7 +64,8 @@ package_gap-packages() { depends=(gap) 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' + 'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ interface package' + 'polymake: Polymake interface package' 'curl: curl interface package') pkgdesc="Extra packages for GAP" cd gap-$pkgver @@ -83,4 +74,11 @@ # provided by main gap package rm -r "$pkgdir"/usr/lib/gap/pkg/{GAPDoc-*,primgrp-*,SmallGrp-*,transgrp} + +# fix RPATH + chrpath -r \$ORIGIN/../lib/ "$pkgdir"/usr/lib/gap/pkg/semigroups-*/bin/x86_64-pc-linux-gnu-default64/semigroups.so + chrpath -d "$pkgdir"/usr/lib/gap/pkg/NormalizInterface-*/bin/x86_64-pc-linux-gnu-default64/NormalizInterface.so + +# remove leftover binaries + find "$pkgdir"/usr/lib/gap/pkg -name .libs | xargs rm -r } Deleted: gap-polymake-3.1.patch =================================================================== --- gap-polymake-3.1.patch 2018-11-07 17:46:05 UTC (rev 403011) +++ gap-polymake-3.1.patch 2018-11-07 17:46:30 UTC (rev 403012) @@ -1,247 +0,0 @@ -diff -ru gap4r8.old/pkg/PolymakeInterface/src/polymake_cone.cpp gap4r8/pkg/PolymakeInterface/src/polymake_cone.cpp ---- gap4r8.old/pkg/PolymakeInterface/src/polymake_cone.cpp 2016-11-12 15:25:17.000000000 +0100 -+++ gap4r8/pkg/PolymakeInterface/src/polymake_cone.cpp 2017-03-29 13:37:29.000000000 +0200 -@@ -321,7 +321,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 0;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (matr(i,j)).to_int() )); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (matr(i,j)) )); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - CHANGED_BAG(RETLI); -@@ -333,7 +333,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr2.cols()); - SET_LEN_PLIST( LIZeil ,matr2_cols ); - for(int j = 0;j<matr2.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (matr2(i,j)).to_int() )); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (matr2(i,j)) )); - } - SET_ELM_PLIST(RETLI,matr.rows() + i +1,LIZeil); - CHANGED_BAG(RETLI); -@@ -343,7 +343,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr2.cols()); - SET_LEN_PLIST( LIZeil ,matr2_cols); - for(int j = 0;j<matr2.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (-matr2(i,j)).to_int() )); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (-matr2(i,j)) )); - } - SET_ELM_PLIST(RETLI,matr.rows() + matr2.rows() + i +1,LIZeil); - CHANGED_BAG(RETLI); -@@ -384,7 +384,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 0;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (matr(i,j)).to_int() )); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (matr(i,j)) )); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - CHANGED_BAG(RETLI); -@@ -422,7 +422,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()); - SET_LEN_PLIST( LIZeil ,matr_cols); - for(int j = 0;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT((matr(i,j)).to_int())); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT((matr(i,j)))); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - } -@@ -500,7 +500,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 0;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil, j+1, INTOBJ_INT( matr(i,j).to_int() ) ); -+ SET_ELM_PLIST(LIZeil, j+1, INTOBJ_INT( matr(i,j) ) ); - CHANGED_BAG( LIZeil ); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); -@@ -517,9 +517,9 @@ - SET_LEN_PLIST( LIZeil , matr2_cols ); - SET_LEN_PLIST( LIZeil2, matr2_cols ); - for(int j = 0;j<matr2.cols();j++){ -- SET_ELM_PLIST( LIZeil, j+1, INTOBJ_INT( matr2(i,j).to_int() )); -+ SET_ELM_PLIST( LIZeil, j+1, INTOBJ_INT( matr2(i,j) )); - CHANGED_BAG( LIZeil ); -- SET_ELM_PLIST( LIZeil2, j+1, INTOBJ_INT( -matr2(i,j).to_int() ) ); -+ SET_ELM_PLIST( LIZeil2, j+1, INTOBJ_INT( -matr2(i,j) ) ); - CHANGED_BAG( LIZeil2 ); - - } -@@ -581,7 +581,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 0;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (matr(i,j)).to_int() )); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (matr(i,j)) )); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - CHANGED_BAG(RETLI); -diff -ru gap4r8.old/pkg/PolymakeInterface/src/polymake_fan.cpp gap4r8/pkg/PolymakeInterface/src/polymake_fan.cpp ---- gap4r8.old/pkg/PolymakeInterface/src/polymake_fan.cpp 2016-11-12 15:25:17.000000000 +0100 -+++ gap4r8/pkg/PolymakeInterface/src/polymake_fan.cpp 2017-03-29 13:37:58.000000000 +0200 -@@ -407,7 +407,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 0;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (matr(i,j)).to_int() )); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT( (matr(i,j)) )); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - CHANGED_BAG(RETLI); -@@ -439,8 +439,8 @@ - Obj RETLI = NEW_PLIST( T_PLIST , matr.size() ); - SET_LEN_PLIST( RETLI , matr_rows ); - for(int i = 0;i<matr.size(); i++){ -- SET_ELM_PLIST(RETLI,i+1,INTOBJ_INT( (matr[i]).to_int() )); -+ SET_ELM_PLIST(RETLI,i+1,INTOBJ_INT( (matr[i]) )); - CHANGED_BAG(RETLI); - } - return RETLI; --} -\ No hay ningún carácter de nueva línea al final del fichero -+} -diff -ru gap4r8.old/pkg/PolymakeInterface/src/polymake_fktn.cpp gap4r8/pkg/PolymakeInterface/src/polymake_fktn.cpp ---- gap4r8.old/pkg/PolymakeInterface/src/polymake_fktn.cpp 2016-11-12 15:25:17.000000000 +0100 -+++ gap4r8/pkg/PolymakeInterface/src/polymake_fktn.cpp 2017-03-29 13:15:26.000000000 +0200 -@@ -120,7 +120,7 @@ - } - - --Obj REAL_OBJECT_HAS_PROPERTY( Polymake_Data* data, Obj cone, const char* prop ){ -+Obj REAL_OBJECT_HAS_PROPERTY( Polymake_Data* data, Obj cone, polymake::AnyString& prop ){ - - #ifdef MORE_TESTS - if(! IS_POLYMAKE_OBJECT(cone) ){ -@@ -143,7 +143,7 @@ - - } - --Obj REAL_OBJECT_HAS_INT_PROPERTY( Polymake_Data* data, Obj cone, const char* prop ){ -+Obj REAL_OBJECT_HAS_INT_PROPERTY( Polymake_Data* data, Obj cone, polymake::AnyString& prop ){ - - #ifdef MORE_TESTS - if(! IS_POLYMAKE_OBJECT(cone) ){ -@@ -188,7 +188,7 @@ - } - - --void REAL_SET_PROPERTY_TRUE( Polymake_Data* data, Obj conv, const char* prop){ -+void REAL_SET_PROPERTY_TRUE( Polymake_Data* data, Obj conv, polymake::AnyString& prop){ - - #ifdef MORE_TESTS - if(! IS_POLYMAKE_OBJECT(conv) ){ -@@ -252,8 +252,10 @@ - return NULL; - } - Obj content = ELM_PLIST( current_option, 2 ); -+ std::string d(CSTR_STRING(description)); - if( IS_STRING( content ) ){ -- visual_options[ CSTR_STRING( description ) ] << CSTR_STRING( content ); -+ -+ visual_options[ d ] << CSTR_STRING( content ); - }else{ - if( IS_PLIST( content ) ){ - pm::Integer* cont = new pm::Integer[ LEN_PLIST( content ) ]; -@@ -265,7 +267,7 @@ - } - cont[ j - 1 ] = INT_INTOBJ( elem ); - } -- visual_options[ CSTR_STRING( description ) ] << cont; -+ visual_options[ d ] << cont; - } - } - } -diff -ru gap4r8.old/pkg/PolymakeInterface/src/polymake_polytopes.cpp gap4r8/pkg/PolymakeInterface/src/polymake_polytopes.cpp ---- gap4r8.old/pkg/PolymakeInterface/src/polymake_polytopes.cpp 2016-11-12 15:25:17.000000000 +0100 -+++ gap4r8/pkg/PolymakeInterface/src/polymake_polytopes.cpp 2017-03-29 13:37:00.000000000 +0200 -@@ -105,7 +105,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()-1); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 1;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j,INTOBJ_INT((matr(i,j)).to_int())); -+ SET_ELM_PLIST(LIZeil,j,INTOBJ_INT((matr(i,j)))); - } - SET_ELM_PLIST(RETLI,k,LIZeil); - CHANGED_BAG(RETLI); -@@ -147,7 +147,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()-1); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 1;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j,INTOBJ_INT((matr(i,j)).to_int())); -+ SET_ELM_PLIST(LIZeil,j,INTOBJ_INT((matr(i,j)))); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - CHANGED_BAG(RETLI); -@@ -252,7 +252,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols() ); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 0;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT((matr(i,j)).to_int())); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT((matr(i,j)))); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - CHANGED_BAG(RETLI); -@@ -290,7 +290,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols() ); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 0;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT((matr(i,j)).to_int())); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT((matr(i,j)))); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - CHANGED_BAG(RETLI); -@@ -328,7 +328,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()-1); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 1;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j,INTOBJ_INT((matr(i,j)).to_int())); -+ SET_ELM_PLIST(LIZeil,j,INTOBJ_INT((matr(i,j)))); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - CHANGED_BAG(RETLI); -@@ -434,7 +434,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 0;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT((matr(i,j)).to_int())); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT((matr(i,j)))); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - CHANGED_BAG(RETLI); -@@ -479,7 +479,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()-1); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 1;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j, INTOBJ_INT( (matr(i,j)).to_int() ) ); -+ SET_ELM_PLIST(LIZeil,j, INTOBJ_INT( (matr(i,j)) ) ); - } - SET_ELM_PLIST(RETLI,k,LIZeil); - CHANGED_BAG(RETLI); -@@ -591,7 +591,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()-1); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 1;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j,INTOBJ_INT((matr(i,j)).to_int())); -+ SET_ELM_PLIST(LIZeil,j,INTOBJ_INT((matr(i,j)))); - } - SET_ELM_PLIST(RETLI,i+1,LIZeil); - CHANGED_BAG(RETLI); -@@ -630,4 +630,4 @@ - - return elem; - --} -\ No hay ningún carácter de nueva línea al final del fichero -+} -diff -ru gap4r8.old/pkg/PolymakeInterface/src/polymake_tropical.cpp gap4r8/pkg/PolymakeInterface/src/polymake_tropical.cpp ---- gap4r8.old/pkg/PolymakeInterface/src/polymake_tropical.cpp 2016-11-12 15:25:17.000000000 +0100 -+++ gap4r8/pkg/PolymakeInterface/src/polymake_tropical.cpp 2017-03-29 13:38:24.000000000 +0200 -@@ -134,7 +134,7 @@ - LIZeil = NEW_PLIST( T_PLIST, matr.cols()); - SET_LEN_PLIST( LIZeil , matr_cols ); - for(int j = 0;j<matr.cols();j++){ -- SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT((matr(i,j)).to_int())); -+ SET_ELM_PLIST(LIZeil,j+1,INTOBJ_INT((matr(i,j)))); - } - SET_ELM_PLIST(RETLI,k,LIZeil); - CHANGED_BAG(RETLI);
