[arch-commits] Commit in singular/repos/community-x86_64 (3 files)
Antonio Rojas
arojas at archlinux.org
Mon Jan 6 00:18:09 UTC 2020
Date: Monday, January 6, 2020 @ 00:18:08
Author: arojas
Revision: 549540
archrelease: copy trunk to community-x86_64
Added:
singular/repos/community-x86_64/PKGBUILD
(from rev 549539, singular/trunk/PKGBUILD)
Deleted:
singular/repos/community-x86_64/PKGBUILD
singular/repos/community-x86_64/singular-polymake-3.3.patch
-----------------------------+
PKGBUILD | 92 +++++++++++++++++----------------
singular-polymake-3.3.patch | 116 ------------------------------------------
2 files changed, 47 insertions(+), 161 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-06 00:17:46 UTC (rev 549539)
+++ PKGBUILD 2020-01-06 00:18:08 UTC (rev 549540)
@@ -1,45 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
-
-pkgname=singular
-_majver=4-1-2
-_patchver=2
-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)
-makedepends=(doxygen polymake)
-optdepends=('polymake: Polymake module')
-source=("ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}p${_patchver}.tar.gz"
-#source=("ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz"
- singular-polymake-3.3.patch)
-sha256sums=('07b22773d982d43687f15ba73de7968d23cc15d2c8f23434742134f7bfc68ef5'
- '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
-# https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd singular-${_majver//-/.}
- make DESTDIR="$pkgdir" install
-
- # Install missing header
- install -Dm644 factory/globaldefs.h "$pkgdir"/usr/include/factory
- # Fix ownership
- chown -R root:root "$pkgdir"/usr/share/singular/html "$pkgdir"/usr/share/info "$pkgdir"/usr/share/singular/singular.idx
-}
Copied: singular/repos/community-x86_64/PKGBUILD (from rev 549539, singular/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-01-06 00:18:08 UTC (rev 549540)
@@ -0,0 +1,47 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
+
+pkgname=singular
+_majver=4-1-2
+_patchver=2
+pkgver=${_majver//-/.}.p${_patchver}
+#pkgver=${_majver//-/.}
+pkgrel=5
+pkgdesc="Computer Algebra System for polynomial computations"
+arch=(x86_64)
+url="https://www.singular.uni-kl.de/"
+license=(GPL)
+depends=(flint cddlib)
+makedepends=(doxygen polymake)
+optdepends=('polymake: Polymake module')
+source=("ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}p${_patchver}.tar.gz"
+#source=("ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz"
+ singular-polymake-3.3.patch::"https://github.com/Singular/Sources/commit/23a8f24e.patch"
+ singular-missing-header.patch::"https://github.com/Singular/Sources/commit/10ccdf4e.patch")
+sha256sums=('07b22773d982d43687f15ba73de7968d23cc15d2c8f23434742134f7bfc68ef5'
+ '5d3e18a1f519232f19d5e5150f551cc2d32e8a1022b448ee8ae9d45ef11e5977'
+ '413670eaaa393dd9594b7be4a1053483c16bf7ef578b89b3423e8f052cfd2810')
+options=(!zipman)
+
+prepare() {
+ cd singular-${_majver//-/.}
+ patch -p1 -i ../singular-polymake-3.3.patch # Fix build with polymake 3.3
+ patch -p1 -i ../singular-missing-header.patch # Install missing header
+ ./autogen.sh
+}
+
+build() {
+ cd singular-${_majver//-/.}
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+# https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ 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/singular/singular.idx
+}
Deleted: singular-polymake-3.3.patch
===================================================================
--- singular-polymake-3.3.patch 2020-01-06 00:17:46 UTC (rev 549539)
+++ singular-polymake-3.3.patch 2020-01-06 00:18:08 UTC (rev 549540)
@@ -1,116 +0,0 @@
-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);
- }
More information about the arch-commits
mailing list