[arch-commits] Commit in gap-4.8/repos/community-x86_64 (6 files)
Antonio Rojas
arojas at archlinux.org
Sun Aug 19 00:08:09 UTC 2018
Date: Sunday, August 19, 2018 @ 00:08:08
Author: arojas
Revision: 372728
archrelease: copy trunk to community-x86_64
Added:
gap-4.8/repos/community-x86_64/PKGBUILD
(from rev 372727, gap-4.8/trunk/PKGBUILD)
gap-4.8/repos/community-x86_64/gap-no-packages-by-default.patch
(from rev 372727, gap-4.8/trunk/gap-no-packages-by-default.patch)
gap-4.8/repos/community-x86_64/gap-polymake-3.1.patch
(from rev 372727, gap-4.8/trunk/gap-polymake-3.1.patch)
Deleted:
gap-4.8/repos/community-x86_64/PKGBUILD
gap-4.8/repos/community-x86_64/gap-no-packages-by-default.patch
gap-4.8/repos/community-x86_64/gap-polymake-3.1.patch
----------------------------------+
PKGBUILD | 233 ++++++++---------
gap-no-packages-by-default.patch | 26 -
gap-polymake-3.1.patch | 494 ++++++++++++++++++-------------------
3 files changed, 376 insertions(+), 377 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-19 00:07:22 UTC (rev 372727)
+++ PKGBUILD 2018-08-19 00:08:08 UTC (rev 372728)
@@ -1,117 +0,0 @@
-# $Id: PKGBUILD 279654 2018-01-06 19:42:39Z bpiotrowski $
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: TDY <tdy at archlinux.info>
-# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
-
-pkgbase=gap-4.8
-pkgname=(gap-4.8 gap-4.8-data gap-4.8-doc gap-4.8-packages)
-pkgver=4.8.10
-_gapver=4r8p10_2018_01_15-13_02
-pkgrel=2
-pkgdesc="Groups, Algorithms, Programming: a system for computational discrete algebra (version 4.8)"
-arch=(x86_64)
-url="https://www.gap-system.org/"
-license=(GPL)
-source=("https://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz" gap-no-packages-by-default.patch
- gap-polymake-3.1.patch)
-sha256sums=('fc0dac32d196a825be5b4cab6a970aad58f1d16ca2870bd0381c94c85e7a9e5b'
- 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2'
- '6d8d57a9947575a3f95e682172040618be3d6a144424496229ae4ec50c0ab4e9')
-makedepends=(libxaw openmpi givaro mpfi normaliz polymake boost c-xsc) # fplll
-
-prepare() {
- cd gap4r8
-
-# Use system normaliz
- sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
-# Fix build of guava package
- sed -e "s|MAKE=make|MAKE='make -j1'|" -i bin/BuildPackages.sh
- 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 fplll in float package, doesn't support 5.2
- pushd pkg/float-*
- sed -e '/FPLLL/d' -i configure.ac
- sed -e '39,44d' -i src/Makefile.am
- ./autogen.sh
- popd
-# Disable anupq package, it's i686 only
- rm -r pkg/anupq-*
-}
-
-build() {
- cd gap4r8
- CC=mpicc ./configure --prefix=/usr --with-gmp=system
- make
-
- cd pkg
- export CXXFLAGS+=' -I/usr/include/cxsc' # Fix build of float package
- sh ../bin/BuildPackages.sh
-# These packages fail to build:
-# linboxing (doesn't support givaro 4)
-# semigroups
-
- cd ../etc
- sh install-tools.sh
-}
-
-package_gap-4.8() {
- depends=(gmp openmpi)
- optdepends=('gap-4.8-packages: extra packages' 'gap-4.8-data: additional databases' 'gap-4.8-doc: documentation')
- cd gap4r8
-
- mkdir -p "$pkgdir"/usr/lib/gap-4.8
- cp -r bin etc grp lib CITATION "$pkgdir"/usr/lib/gap-4.8
-
- mkdir -p "$pkgdir"/usr/lib/gap-4.8/pkg
- cp -r pkg/GAPDoc-* "$pkgdir"/usr/lib/gap-4.8/pkg
-
- mkdir -p "$pkgdir"/usr/bin
- install -m755 "$pkgdir"/usr/lib/gap-4.8/bin/gap.sh "$pkgdir"/usr/bin/gap-4.8
-
-# fix location
- sed -e 's|/build/gap-4.8/src/gap4r8|/usr/lib/gap-4.8|' -i "$pkgdir"/usr/bin/gap-4.8 -i "$pkgdir"/usr/lib/gap-4.8/bin/*/sysinfo.gap
-
-# remove unneeded stuff
- rm "$pkgdir"/usr/lib/gap-4.8/bin/*/*.o
- rm "$pkgdir"/usr/lib/gap-4.8/bin/gap.sh
- find "$pkgdir"/usr/lib/gap-4.8/bin/ -maxdepth 1 -type f -exec rm {} \;
- rm -r "$pkgdir"/usr/lib/gap-4.8/bin/*/{config*,extern,gac,Makefile}
-}
-
-package_gap-4.8-data() {
- depends=(gap-4.8)
- pkgdesc="Additional databases for GAP 4.8"
- cd gap4r8
-
- mkdir -p "$pkgdir"/usr/lib/gap-4.8
- cp -r prim small trans "$pkgdir"/usr/lib/gap-4.8
-}
-
-package_gap-4.8-doc() {
- depends=(gap-4.8)
- pkgdesc="Documentation for GAP 4.8"
- cd gap4r8
-
- mkdir -p "$pkgdir"/usr/lib/gap-4.8
- cp -r doc "$pkgdir"/usr/lib/gap-4.8
-}
-
-package_gap-4.8-packages() {
- depends=(gap-4.8)
- optdepends=('normaliz: Normaliz interface package' 'polymake: Polymake interface package' 'libxaw: xgap package'
- 'c-xsc: float package' 'mpfi: float package' 'libmpc: float package') # 'fplll: float package'
- pkgdesc="Extra packages for GAP 4.8"
- cd gap4r8
-
- mkdir -p "$pkgdir"/usr/lib/gap-4.8
- cp -r pkg "$pkgdir"/usr/lib/gap-4.8
-
-# GAPDoc is in main package
- rm -r "$pkgdir"/usr/lib/gap-4.8/pkg/GAPDoc-*
-}
Copied: gap-4.8/repos/community-x86_64/PKGBUILD (from rev 372727, gap-4.8/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-19 00:08:08 UTC (rev 372728)
@@ -0,0 +1,116 @@
+# $Id: PKGBUILD 279654 2018-01-06 19:42:39Z bpiotrowski $
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: TDY <tdy at archlinux.info>
+# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
+
+pkgbase=gap-4.8
+pkgname=(gap-4.8 gap-4.8-data gap-4.8-doc gap-4.8-packages)
+pkgver=4.8.10
+_gapver=4r8p10_2018_01_15-13_02
+pkgrel=3
+pkgdesc="Groups, Algorithms, Programming: a system for computational discrete algebra (version 4.8)"
+arch=(x86_64)
+url="https://www.gap-system.org/"
+license=(GPL)
+source=("https://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz" gap-no-packages-by-default.patch
+ gap-polymake-3.1.patch)
+sha256sums=('fc0dac32d196a825be5b4cab6a970aad58f1d16ca2870bd0381c94c85e7a9e5b'
+ 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2'
+ '6d8d57a9947575a3f95e682172040618be3d6a144424496229ae4ec50c0ab4e9')
+makedepends=(libxaw openmpi givaro mpfi normaliz polymake boost c-xsc) # fplll
+
+prepare() {
+ cd gap4r8
+
+# Use system normaliz
+ sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
+# Fix build of guava package
+ sed -e "s|MAKE=make|MAKE='make -j1'|" -i bin/BuildPackages.sh
+ 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 fplll in float package, doesn't support 5.2
+ pushd pkg/float-*
+ sed -e '/FPLLL/d' -i configure.ac
+ sed -e '39,44d' -i src/Makefile.am
+ ./autogen.sh
+ popd
+# Disable anupq package, it's i686 only
+ rm -r pkg/anupq-*
+}
+
+build() {
+ cd gap4r8
+ CC=mpicc ./configure --prefix=/usr --with-gmp=system
+ make
+
+ cd pkg
+ export CXXFLAGS+=' -I/usr/include/cxsc' # Fix build of float package
+ sh ../bin/BuildPackages.sh
+# These packages fail to build:
+# linboxing (doesn't support givaro 4)
+# semigroups
+
+ cd ../etc
+ sh install-tools.sh
+}
+
+package_gap-4.8() {
+ depends=(gmp openmpi)
+ optdepends=('gap-4.8-packages: extra packages' 'gap-4.8-data: additional databases' 'gap-4.8-doc: documentation')
+ cd gap4r8
+
+ mkdir -p "$pkgdir"/usr/lib/gap-4.8
+ cp -r bin etc grp lib CITATION "$pkgdir"/usr/lib/gap-4.8
+
+ mkdir -p "$pkgdir"/usr/lib/gap-4.8/pkg
+ cp -r pkg/GAPDoc-* "$pkgdir"/usr/lib/gap-4.8/pkg
+
+ mkdir -p "$pkgdir"/usr/bin
+ ln -s /usr/lib/gap-4.8/bin/gap.sh "$pkgdir"/usr/bin/gap-4.8
+
+# fix location
+ sed -e 's|/build/gap-4.8/src/gap4r8|/usr/lib/gap-4.8|' \
+ -i "$pkgdir"/usr/lib/gap-4.8/bin/gap.sh -i "$pkgdir"/usr/lib/gap-4.8/bin/*/sysinfo.gap
+
+# remove unneeded stuff
+ rm "$pkgdir"/usr/lib/gap-4.8/bin/*/*.o
+ rm -r "$pkgdir"/usr/lib/gap-4.8/bin/*/{config*,extern,gac,Makefile}
+}
+
+package_gap-4.8-data() {
+ depends=(gap-4.8)
+ pkgdesc="Additional databases for GAP 4.8"
+ cd gap4r8
+
+ mkdir -p "$pkgdir"/usr/lib/gap-4.8
+ cp -r prim small trans "$pkgdir"/usr/lib/gap-4.8
+}
+
+package_gap-4.8-doc() {
+ depends=(gap-4.8)
+ pkgdesc="Documentation for GAP 4.8"
+ cd gap4r8
+
+ mkdir -p "$pkgdir"/usr/lib/gap-4.8
+ cp -r doc "$pkgdir"/usr/lib/gap-4.8
+}
+
+package_gap-4.8-packages() {
+ depends=(gap-4.8)
+ optdepends=('normaliz: Normaliz interface package' 'polymake: Polymake interface package' 'libxaw: xgap package'
+ 'c-xsc: float package' 'mpfi: float package' 'libmpc: float package') # 'fplll: float package'
+ pkgdesc="Extra packages for GAP 4.8"
+ cd gap4r8
+
+ mkdir -p "$pkgdir"/usr/lib/gap-4.8
+ cp -r pkg "$pkgdir"/usr/lib/gap-4.8
+
+# GAPDoc is in main package
+ rm -r "$pkgdir"/usr/lib/gap-4.8/pkg/GAPDoc-*
+}
Deleted: gap-no-packages-by-default.patch
===================================================================
--- gap-no-packages-by-default.patch 2018-08-19 00:07:22 UTC (rev 372727)
+++ gap-no-packages-by-default.patch 2018-08-19 00:08:08 UTC (rev 372728)
@@ -1,13 +0,0 @@
---- gap4r8/lib/package.gi.orig 2016-11-25 18:59:02.234113245 +0000
-+++ gap4r8/lib/package.gi 2016-11-25 18:59:53.093996139 +0000
-@@ -1743,9 +1743,7 @@
- For backwards compatibility, the default lists most of packages \
- that were autoloaded in GAP 4.4 (add or remove packages as you like)."
- ],
-- default:= [ "autpgrp", "alnuth", "crisp", "ctbllib", "factint", "fga",
-- "irredsol", "laguna", "polenta", "polycyclic", "resclasses",
-- "sophus", "tomlib" ],
-+ default:= [ ],
- values:= function() return RecNames( GAPInfo.PackagesInfo ); end,
- multi:= true,
- ) );
Copied: gap-4.8/repos/community-x86_64/gap-no-packages-by-default.patch (from rev 372727, gap-4.8/trunk/gap-no-packages-by-default.patch)
===================================================================
--- gap-no-packages-by-default.patch (rev 0)
+++ gap-no-packages-by-default.patch 2018-08-19 00:08:08 UTC (rev 372728)
@@ -0,0 +1,13 @@
+--- gap4r8/lib/package.gi.orig 2016-11-25 18:59:02.234113245 +0000
++++ gap4r8/lib/package.gi 2016-11-25 18:59:53.093996139 +0000
+@@ -1743,9 +1743,7 @@
+ For backwards compatibility, the default lists most of packages \
+ that were autoloaded in GAP 4.4 (add or remove packages as you like)."
+ ],
+- default:= [ "autpgrp", "alnuth", "crisp", "ctbllib", "factint", "fga",
+- "irredsol", "laguna", "polenta", "polycyclic", "resclasses",
+- "sophus", "tomlib" ],
++ default:= [ ],
+ values:= function() return RecNames( GAPInfo.PackagesInfo ); end,
+ multi:= true,
+ ) );
Deleted: gap-polymake-3.1.patch
===================================================================
--- gap-polymake-3.1.patch 2018-08-19 00:07:22 UTC (rev 372727)
+++ gap-polymake-3.1.patch 2018-08-19 00:08:08 UTC (rev 372728)
@@ -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);
Copied: gap-4.8/repos/community-x86_64/gap-polymake-3.1.patch (from rev 372727, gap-4.8/trunk/gap-polymake-3.1.patch)
===================================================================
--- gap-polymake-3.1.patch (rev 0)
+++ gap-polymake-3.1.patch 2018-08-19 00:08:08 UTC (rev 372728)
@@ -0,0 +1,247 @@
+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);
More information about the arch-commits
mailing list