Date: Wednesday, February 13, 2019 @ 20:04:59 Author: arojas Revision: 432114
archrelease: copy trunk to community-x86_64 Added: singular/repos/community-x86_64/PKGBUILD (from rev 432113, singular/trunk/PKGBUILD) singular/repos/community-x86_64/singular-polymake-3.3.patch (from rev 432113, singular/trunk/singular-polymake-3.3.patch) Deleted: singular/repos/community-x86_64/PKGBUILD -----------------------------+ PKGBUILD | 81 +++++++++++++++-------------- singular-polymake-3.3.patch | 116 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 37 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-02-13 20:04:19 UTC (rev 432113) +++ PKGBUILD 2019-02-13 20:04:59 UTC (rev 432114) @@ -1,37 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Rémy Oudompheng <oudom...@clipper.ens.fr> - -pkgname=singular -_majver=4-1-1 -_patchver=4 -pkgver=${_majver//-/.}.p${_patchver} -#pkgver=${_majver//-/.} -pkgrel=3 -pkgdesc="Computer Algebra System for polynomial computations" -arch=(x86_64) -url="http://www.singular.uni-kl.de/" -license=(GPL) -depends=(flint cddlib) # polymake -makedepends=(doxygen python2) -optdepends=('python2: Python interface') -source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}p${_patchver}.tar.gz") -#source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz") -sha256sums=('79d6ed8489ef08eed4d4f4b8f8be4ab4da70f611e0b8889fdc6f825f25981a84') -options=(!zipman) - -build() { - cd singular-${_majver//-/.} - ./configure --prefix=/usr --libexecdir=/usr/lib - make -} - -package() { - cd singular-${_majver//-/.} - make DESTDIR="$pkgdir" install - - # Fix ownership - chown -R root:root "$pkgdir"/usr/share/singular/html "$pkgdir"/usr/share/info "$pkgdir"/usr/share/doc/singular.idx - # Fix singular.idx location https://www.singular.uni-kl.de:8002/trac/ticket/842 - mv "$pkgdir"/usr/share/doc/singular.idx "$pkgdir"/usr/share/singular - rm -r "$pkgdir"/usr/share/doc -} Copied: singular/repos/community-x86_64/PKGBUILD (from rev 432113, singular/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-02-13 20:04:59 UTC (rev 432114) @@ -0,0 +1,44 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Rémy Oudompheng <oudom...@clipper.ens.fr> + +pkgname=singular +_majver=4-1-1 +_patchver=4 +pkgver=${_majver//-/.}.p${_patchver} +#pkgver=${_majver//-/.} +pkgrel=4 +pkgdesc="Computer Algebra System for polynomial computations" +arch=(x86_64) +url="https://www.singular.uni-kl.de/" +license=(GPL) +depends=(flint cddlib) # polymake +makedepends=(doxygen python2 polymake) +optdepends=('python2: Python interface' 'polymake: Polymake module') +source=("https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}p${_patchver}.tar.gz" + singular-polymake-3.3.patch) +#source=("https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz") +sha256sums=('79d6ed8489ef08eed4d4f4b8f8be4ab4da70f611e0b8889fdc6f825f25981a84' + '683fd857562928833209f70765a6348a547d41bda6293b59a6e8ced54d062efc') +options=(!zipman) + +prepare() { + cd singular-${_majver//-/.} + patch -p1 -i ../singular-polymake-3.3.patch # Fix build with polymake 3.3 +} + +build() { + cd singular-${_majver//-/.} + ./configure --prefix=/usr --libexecdir=/usr/lib + make +} + +package() { + cd singular-${_majver//-/.} + make DESTDIR="$pkgdir" install + + # Fix ownership + chown -R root:root "$pkgdir"/usr/share/singular/html "$pkgdir"/usr/share/info "$pkgdir"/usr/share/doc/singular.idx + # Fix singular.idx location https://www.singular.uni-kl.de:8002/trac/ticket/842 + mv "$pkgdir"/usr/share/doc/singular.idx "$pkgdir"/usr/share/singular + rm -r "$pkgdir"/usr/share/doc +} Copied: singular/repos/community-x86_64/singular-polymake-3.3.patch (from rev 432113, singular/trunk/singular-polymake-3.3.patch) =================================================================== --- singular-polymake-3.3.patch (rev 0) +++ singular-polymake-3.3.patch 2019-02-13 20:04:59 UTC (rev 432114) @@ -0,0 +1,116 @@ +diff --git a/Singular/dyn_modules/polymake/polymake_conversion.cc b/Singular/dyn_modules/polymake/polymake_conversion.cc +index 7d6411997..896db9ca9 100644 +--- a/Singular/dyn_modules/polymake/polymake_conversion.cc ++++ b/Singular/dyn_modules/polymake/polymake_conversion.cc +@@ -403,7 +403,7 @@ gfan::ZFan* PmFan2ZFan (polymake::perl::Object* pf) + int n = pf->give("N_MAXIMAL_CONES"); + for (int i=0; i<n; i++) + { +- polymake::perl::Object pmcone=pf->CallPolymakeMethod("cone",i); ++ polymake::perl::Object pmcone=pf->call_method("cone",i); + gfan::ZCone* zc=PmCone2ZCone(&pmcone); + zf->insert(*zc); + } +diff --git a/Singular/dyn_modules/polymake/polymake_wrapper.cc b/Singular/dyn_modules/polymake/polymake_wrapper.cc +index a43eb66cd..3f73bd4f8 100644 +--- a/Singular/dyn_modules/polymake/polymake_wrapper.cc ++++ b/Singular/dyn_modules/polymake/polymake_wrapper.cc +@@ -34,7 +34,7 @@ static BOOLEAN bbpolytope_Op2(int op, leftv res, leftv i1, leftv i2) + polymake::perl::Object* pp = ZPolytope2PmPolytope(zp); + polymake::perl::Object* pq = ZPolytope2PmPolytope(zq); + polymake::perl::Object pms; +- CallPolymakeFunction("minkowski_sum", *pp, *pq) >> pms; ++ polymake::call_function("minkowski_sum", *pp, *pq) >> pms; + ms = PmPolytope2ZPolytope(&pms); + delete pp; + delete pq; +@@ -1063,7 +1063,7 @@ BOOLEAN PMlatticePoints(leftv res, leftv args) + { + polymake::perl::Object* p = ZPolytope2PmPolytope(zp); + #if (POLYMAKEVERSION >=214) +- polymake::Matrix<polymake::Integer> lp = p->CallPolymakeMethod("LATTICE_POINTS"); ++ polymake::Matrix<polymake::Integer> lp = p->call_method("LATTICE_POINTS"); + #elif (POLYMAKEVERSION >=212) + polymake::Matrix<polymake::Integer> lp = p->give("LATTICE_POINTS"); + #else +@@ -1291,7 +1291,7 @@ BOOLEAN PMhilbertBasis(leftv res, leftv args) + { + polymake::perl::Object* p = ZPolytope2PmPolytope(zp); + #if (POLYMAKEVERSION >=214) +- polymake::Matrix<polymake::Integer> lp = p->CallPolymakeMethod("HILBERT_BASIS"); ++ polymake::Matrix<polymake::Integer> lp = p->call_method("HILBERT_BASIS"); + #elif (POLYMAKEVERSION >=212) + polymake::Matrix<polymake::Integer> lp = p->give("HILBERT_BASIS"); + #else +@@ -1375,7 +1375,7 @@ BOOLEAN PMminkowskiSum(leftv res, leftv args) + polymake::perl::Object* pp = ZPolytope2PmPolytope(zp); + polymake::perl::Object* pq = ZPolytope2PmPolytope(zq); + polymake::perl::Object pms; +- CallPolymakeFunction("minkowski_sum", *pp, *pq) >> pms; ++ polymake::call_function("minkowski_sum", *pp, *pq) >> pms; + delete pp; + delete pq; + ms = PmPolytope2ZPolytope(&pms); +@@ -1403,7 +1403,7 @@ BOOLEAN PMminkowskiSum(leftv res, leftv args) + polymake::perl::Object* pp = ZPolytope2PmPolytope(zp); + polymake::perl::Object* pq = ZPolytope2PmPolytope(zq); + polymake::perl::Object pms; +- CallPolymakeFunction("minkowski_sum", *pp, *pq) >> pms; ++ polymake::call_function("minkowski_sum", *pp, *pq) >> pms; + delete pp; + delete pq; + ms = PmPolytope2ZPolytope(&pms); +@@ -1437,7 +1437,7 @@ BOOLEAN PMminkowskiSum(leftv res, leftv args) + polymake::perl::Object* pp = ZPolytope2PmPolytope(zp); + polymake::perl::Object* pq = ZPolytope2PmPolytope(zq); + polymake::perl::Object pms; +- CallPolymakeFunction("minkowski_sum", *pp, *pq) >> pms; ++ polymake::call_function("minkowski_sum", *pp, *pq) >> pms; + delete pp; + delete pq; + ms = PmPolytope2ZPolytope(&pms); +@@ -1466,7 +1466,7 @@ BOOLEAN PMminkowskiSum(leftv res, leftv args) + polymake::perl::Object* pp = ZPolytope2PmPolytope(zp); + polymake::perl::Object* pq = ZPolytope2PmPolytope(zq); + polymake::perl::Object pms; +- CallPolymakeFunction("minkowski_sum", *pp, *pq) >> pms; ++ polymake::call_function("minkowski_sum", *pp, *pq) >> pms; + delete pp; + delete pq; + ms = PmPolytope2ZPolytope(&pms); +@@ -1494,7 +1494,7 @@ polymake::Matrix<polymake::Integer> verticesOf(const polymake::perl::Object* p, + polymake::Matrix<polymake::Integer> allrays = p->give("VERTICES"); + polymake::Matrix<polymake::Integer> wantedrays; + bool ok = true; +- for(polymake::Entire<polymake::Set<polymake::Integer> >::const_iterator i=polymake::entire(*s); !i.at_end(); i++) ++ for(auto i=polymake::entire(*s); !i.at_end(); i++) + { + wantedrays = wantedrays / allrays.row(PmInteger2Int(*i,ok)); + } +@@ -1709,7 +1709,7 @@ BOOLEAN visual(leftv res, leftv args) + try + { + polymake::perl::Object* pp = ZPolytope2PmPolytope(zp); +- VoidCallPolymakeFunction("jreality",pp->CallPolymakeMethod("VISUAL")); ++ polymake::call_function("jreality",pp->call_method("VISUAL")); + delete pp; + } + catch (const std::exception& ex) +@@ -1730,7 +1730,7 @@ BOOLEAN visual(leftv res, leftv args) + try + { + polymake::perl::Object* pf=ZFan2PmFan(zf); +- VoidCallPolymakeFunction("jreality",pf->CallPolymakeMethod("VISUAL")); ++ polymake::call_function("jreality",pf->call_method("VISUAL")); + } + catch (const std::exception& ex) + { +@@ -1759,7 +1759,7 @@ BOOLEAN normalFan(leftv res, leftv args) + { + polymake::perl::Object* p=ZPolytope2PmPolytope(zp); + polymake::perl::Object pf; +- CallPolymakeFunction("normal_fan", *p) >> pf; ++ polymake::call_function("normal_fan", *p) >> pf; + delete p; + zf = PmFan2ZFan(&pf); + }