gentoo auto-resync : 14:11:2023 - 04:26:45

2 files changed, 76 insertions, 0 deletions

diff --git a/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch b/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch
new file mode 100644
index 000000000000..2f58b0f76299
--- /dev/null
+++ b/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch
@@ -0,0 +1,23 @@
+commit d55dc6bd7f2da9245884f86706cb96e2d11fa83a
+Author: Benjamin Lorenz <lorenz@math.tu-berlin.de>
+Date:   Tue Nov 7 16:49:33 2023 +0100
+
+    barycentric_subdivision: dont call back on empty strings
+    
+    thanks jamesjer
+    
+    @Jenkins: merge
+
+diff --git a/apps/topaz/src/barycentric_subdivision.cc b/apps/topaz/src/barycentric_subdivision.cc
+index 753afb4040..e2d4130bc3 100644
+--- a/apps/topaz/src/barycentric_subdivision.cc
++++ b/apps/topaz/src/barycentric_subdivision.cc
+@@ -139,7 +139,7 @@ bs_data2Object(const bool realize,
+    else
+       desc << k << "th ";
+    desc << "barycentric subdivision of " << description;
+-   if (description.back() != '\n')
++   if (description.empty() || description.back() != '\n')
+       desc << endl;
+    p_out.set_description() << desc.str();
+    return p_out;
diff --git a/sci-mathematics/polymake/files/polymake-4.11-singular-sat.patch b/sci-mathematics/polymake/files/polymake-4.11-singular-sat.patch
new file mode 100644
index 000000000000..739e503ac246
--- /dev/null
+++ b/sci-mathematics/polymake/files/polymake-4.11-singular-sat.patch
@@ -0,0 +1,53 @@
+commit 4ce0549f510d246c8f69c85c509fc2d13d882442
+Author: Benjamin Lorenz <lorenz@math.tu-berlin.de>
+Date:   Thu Nov 9 11:15:06 2023 +0100
+
+    singular: support new return types for saturation command
+    
+    This was changed from (ideal, exponent) to just the ideal in singular 4-3-2p5.
+    To allow older versions we keep using sat but support both return types
+    instead of switching to the new sat_with_exp.
+
+diff --git a/bundled/singular/apps/ideal/src/singularIdeal.cc b/bundled/singular/apps/ideal/src/singularIdeal.cc
+index 4cbc00a6f4..bdade5c29d 100644
+--- a/bundled/singular/apps/ideal/src/singularIdeal.cc
++++ b/bundled/singular/apps/ideal/src/singularIdeal.cc
+@@ -236,22 +236,24 @@ public:
+       arg.next->data=(void *)idCopy(J);
+       // call primdecSY
+       BOOLEAN res=iiMake_proc(sathdl, nullptr ,&arg);
+-      if(!res && (iiRETURNEXPR.Typ() == LIST_CMD)){
+-         lists L = (lists)iiRETURNEXPR.Data();
+-         SingularIdeal_wrap* result;
+-         if(L->m[0].Typ() == IDEAL_CMD){
+-            result = new SingularIdeal_impl((::ideal) (L->m[0].Data()),singRing);
+-         } else {
+-            throw std::runtime_error("Something went wrong for the primary decomposition");
++      if(!res) {
++         ::ideal iddata = nullptr;
++         if (iiRETURNEXPR.Typ() == LIST_CMD) {
++            lists L = (lists)iiRETURNEXPR.Data();
++            if(L->m[0].Typ() == IDEAL_CMD)
++               iddata = (::ideal) L->m[0].Data();
++         } else if (iiRETURNEXPR.Typ() == IDEAL_CMD) {
++            iddata = (::ideal) iiRETURNEXPR.Data();
++         }
++         if (iddata != nullptr) {
++            SingularIdeal_wrap* result = new SingularIdeal_impl(iddata, singRing);
++            iiRETURNEXPR.CleanUp();
++            iiRETURNEXPR.Init();
++            return result;
+          }
+-         iiRETURNEXPR.CleanUp();
+-         iiRETURNEXPR.Init();
+-         return result;
+-      } else {
+-         iiRETURNEXPR.Init();
+-         throw std::runtime_error("Something went wrong for the saturation");
+       }
+-
++      iiRETURNEXPR.Init();
++      throw std::runtime_error("saturation: unable to parse ideal from return value");
+    }
+ 
+    Array<SingularIdeal_wrap*> primary_decomposition() const