From 865ca8b0e4efe99689a0f250a16e5b824c8d8307 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 2 Jun 2024 12:00:12 -0700 Subject: [PATCH 1/6] build/pkgs/pynormaliz: Update to 2.20 --- build/pkgs/pynormaliz/checksums.ini | 4 ++-- build/pkgs/pynormaliz/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/pynormaliz/checksums.ini b/build/pkgs/pynormaliz/checksums.ini index 25b41b1c0ab..154f2bfb4c0 100644 --- a/build/pkgs/pynormaliz/checksums.ini +++ b/build/pkgs/pynormaliz/checksums.ini @@ -1,4 +1,4 @@ tarball=PyNormaliz-VERSION.tar.gz -sha1=08617ca50ce0e0317a3377381bf37c1a0ab826c1 -sha256=359218cf35f400c43f338a132b7887f6a2affb05057c4e7eaa315a9f2b6a8b39 +sha1=4ce4fef4db61a0408bc84747294922fc49afc090 +sha256=95d29fff9380ea2948166fd2b4c730985e0881043fa41f3e44ff9f402b97f0b4 upstream_url=https://pypi.io/packages/source/p/pynormaliz/PyNormaliz-VERSION.tar.gz diff --git a/build/pkgs/pynormaliz/package-version.txt b/build/pkgs/pynormaliz/package-version.txt index fae0ceb2953..a4b5a6f4a49 100644 --- a/build/pkgs/pynormaliz/package-version.txt +++ b/build/pkgs/pynormaliz/package-version.txt @@ -1 +1 @@ -2.18.p0 +2.20 From 36b531e20d0803b2fdb3837148966cbbb1f4a193 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 2 Jun 2024 12:00:35 -0700 Subject: [PATCH 2/6] build/pkgs/normaliz: Update to 3.10.3 --- build/pkgs/normaliz/checksums.ini | 4 ++-- build/pkgs/normaliz/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/normaliz/checksums.ini b/build/pkgs/normaliz/checksums.ini index acb6e5cde7f..c281052483f 100644 --- a/build/pkgs/normaliz/checksums.ini +++ b/build/pkgs/normaliz/checksums.ini @@ -1,4 +1,4 @@ tarball=normaliz-VERSION.tar.gz -sha1=d3c4e554c6a5ccf4fd04147e7744a63e3def1766 -sha256=365e1d1e2a338dc4df1947a440e606bb66dd261307e617905e8eca64eaafcf6e +sha1=ca5c9debcc3b1a02165659cf619935c37fa4faa4 +sha256=0aeb58fbbca362ed759f338a85e74156ed411e2846cc395f52d23ae90022ec91 upstream_url=https://github.com/Normaliz/Normaliz/releases/download/vVERSION/normaliz-VERSION.tar.gz diff --git a/build/pkgs/normaliz/package-version.txt b/build/pkgs/normaliz/package-version.txt index 2377fe517a0..7d4ef04f654 100644 --- a/build/pkgs/normaliz/package-version.txt +++ b/build/pkgs/normaliz/package-version.txt @@ -1 +1 @@ -3.10.1.p0 +3.10.3 From f53fe4282f38a4a4545f93fa6f0f7aeb7e138975 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 2 Jun 2024 12:00:57 -0700 Subject: [PATCH 3/6] build/pkgs/e_antic: Update to 2.0.2 --- build/pkgs/e_antic/checksums.ini | 4 ++-- build/pkgs/e_antic/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/e_antic/checksums.ini b/build/pkgs/e_antic/checksums.ini index f0afbce6ac8..2df790ac90f 100644 --- a/build/pkgs/e_antic/checksums.ini +++ b/build/pkgs/e_antic/checksums.ini @@ -1,4 +1,4 @@ tarball=e-antic-VERSION.tar.gz -sha1=587052e189f9a7a145ac3144e6b7f11fca54b1ff -sha256=a38d2ab62c1b00fa2ee78f39039cc4d9d8e83de5fa5e2a18529ad34ab8976fe1 +sha1=f20808a3f4857ecec58929f811b73c2a7664e666 +sha256=8328e6490129dfec7f4aa478ebd54dc07686bd5e5e7f5f30dcf20c0f11b67f60 upstream_url=https://github.com/flatsurf/e-antic/releases/download/VERSION/e-antic-VERSION.tar.gz diff --git a/build/pkgs/e_antic/package-version.txt b/build/pkgs/e_antic/package-version.txt index 227cea21564..e9307ca5751 100644 --- a/build/pkgs/e_antic/package-version.txt +++ b/build/pkgs/e_antic/package-version.txt @@ -1 +1 @@ -2.0.0 +2.0.2 From aee3b5930a48b97f5ab22152cdbdac6362d761d6 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 2 Jun 2024 12:01:44 -0700 Subject: [PATCH 4/6] build/pkgs/polymake: Update to 4.12 --- build/pkgs/polymake/checksums.ini | 4 ++-- build/pkgs/polymake/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/polymake/checksums.ini b/build/pkgs/polymake/checksums.ini index b76cd23ad88..3173f176491 100644 --- a/build/pkgs/polymake/checksums.ini +++ b/build/pkgs/polymake/checksums.ini @@ -1,4 +1,4 @@ tarball=polymake-VERSION-minimal.tar.bz2 -sha1=0445f1a6d174906317a07c4bef299d0b4502c779 -sha256=5df6f0acd700119bd0c4b5766762852ffbd857765b5dcc88802ff5d2108add23 +sha1=aa1a153fac97a9faad61842f4a4232fbf444155f +sha256=bd5a667ffca4bf7eb8d51134030ce3df3b16dd9d0e800fafdb1ce835867640d9 upstream_url=https://polymake.org/lib/exe/fetch.php/download/polymake-VERSION-minimal.tar.bz2 diff --git a/build/pkgs/polymake/package-version.txt b/build/pkgs/polymake/package-version.txt index b849ff8ebf1..f5885845348 100644 --- a/build/pkgs/polymake/package-version.txt +++ b/build/pkgs/polymake/package-version.txt @@ -1 +1 @@ -4.11 +4.12 From 9aecc6fc4746548bbcb85d204e738cc7d2d223e3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 2 Jun 2024 12:07:42 -0700 Subject: [PATCH 5/6] build/pkgs/normaliz/patches/411.patch: Remove --- build/pkgs/normaliz/patches/411.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 build/pkgs/normaliz/patches/411.patch diff --git a/build/pkgs/normaliz/patches/411.patch b/build/pkgs/normaliz/patches/411.patch deleted file mode 100644 index d9e52bd78bf..00000000000 --- a/build/pkgs/normaliz/patches/411.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit ecdb62c90a3767b440800dcf2c49589e890a53b1 -Author: Matthias Koeppe -Date: Tue Aug 8 17:03:32 2023 -0700 - - full_cone.cpp: Remove debug output - -diff --git a/source/libnormaliz/full_cone.cpp b/source/libnormaliz/full_cone.cpp -index 0fd906b3..cb2cce2b 100644 ---- a/source/libnormaliz/full_cone.cpp -+++ b/source/libnormaliz/full_cone.cpp -@@ -3447,8 +3447,8 @@ void Full_Cone::build_cone_dynamic() { - // if they aren't in a hyperplane anyway - if(IntHullNorm.size() > 0){ - #pragma omp parallel for -- for(size_t i = 0; i< OriGens.nr_of_rows(); ++i){ -- cout << "i " << i << " -- " << OriGensFloat[i]; -+ for (size_t i = 0; i< OriGens.nr_of_rows(); ++i){ -+ // cout << "i " << i << " -- " << OriGensFloat[i]; - nmz_float norm = v_scalar_product(OriGensFloat[i], IntHullNormFloat); - v_scalar_division(OriGensFloat[i], norm); - } From 6428af31ab31fd130ea82c7b19a15ac31f11358e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 2 Jun 2024 12:08:05 -0700 Subject: [PATCH 6/6] build/pkgs/normaliz/patches/flint3_d-torrance.patch: Remove --- .../normaliz/patches/flint3_d-torrance.patch | 55 ------------------- 1 file changed, 55 deletions(-) delete mode 100644 build/pkgs/normaliz/patches/flint3_d-torrance.patch diff --git a/build/pkgs/normaliz/patches/flint3_d-torrance.patch b/build/pkgs/normaliz/patches/flint3_d-torrance.patch deleted file mode 100644 index 5a6e36c51c4..00000000000 --- a/build/pkgs/normaliz/patches/flint3_d-torrance.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/source/libnormaliz/vector_operations.h -+++ b/source/libnormaliz/vector_operations.h -@@ -547,7 +547,10 @@ - - fmpq_poly_fit_length(flp, n); - for (size_t i = 0; i < poly_vector.size(); ++i) { -- fmpq_poly_set_coeff_mpq(flp, (slong)i, poly_vector[i].get_mpq_t()); -+ fmpq_t fcurrent_coeff; -+ fmpq_init(fcurrent_coeff); -+ fmpq_set_mpq(fcurrent_coeff, poly_vector[i].get_mpq_t()); -+ fmpq_poly_set_coeff_fmpq(flp, (slong)i, fcurrent_coeff); - } - } - -@@ -560,8 +563,11 @@ - poly_vector.resize(length); - for (slong i = 0; i < length; i++) { - mpq_t current_coeff; -+ fmpq_t fcurrent_coeff; - mpq_init(current_coeff); -- fmpq_poly_get_coeff_mpq(current_coeff, flp, (slong)i); -+ fmpq_init(fcurrent_coeff); -+ fmpq_poly_get_coeff_fmpq(fcurrent_coeff, flp, (slong)i); -+ fmpq_get_mpq(current_coeff, fcurrent_coeff); - poly_vector[i] = mpq_class(current_coeff); - } - } ---- a/source/libnormaliz/HilbertSeries.cpp -+++ b/source/libnormaliz/HilbertSeries.cpp -@@ -72,7 +72,10 @@ - slong n = (slong)nmzp.size(); - fmpz_poly_fit_length(flp, n); - for (size_t i = 0; i < nmzp.size(); ++i) { -- fmpz_poly_set_coeff_mpz(flp, (slong)i, nmzp[i].get_mpz_t()); -+ fmpz_t fc; -+ fmpz_init(fc); -+ fmpz_set_mpz(fc, nmzp[i].get_mpz_t()); -+ fmpz_poly_set_coeff_fmpz(flp, (slong)i, fc); - } - } - -@@ -80,9 +83,12 @@ - size_t n = (size_t)fmpz_poly_length(flp); - nmzp.resize(n); - mpz_t c; -+ fmpz_t fc; - mpz_init(c); -+ fmpz_init(fc); - for (size_t i = 0; i < nmzp.size(); ++i) { -- fmpz_poly_get_coeff_mpz(c, flp, i); -+ fmpz_poly_get_coeff_fmpz(fc, flp, i); -+ fmpz_get_mpz(c, fc); - nmzp[i] = mpz_class(c); - } - mpz_clear(c);