[arch-commits] Commit in sagemath/trunk (PKGBUILD sagemath-tdlib-0.9.patch)

[Antonio Rojas]

    Date: Sunday, September 4, 2022 @ 11:36:17
  Author: arojas
Revision: 1292829

upgpkg: sagemath 9.6-10: Rebuild with tdlib 0.9

Added:
  sagemath/trunk/sagemath-tdlib-0.9.patch
Modified:
  sagemath/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   10 +++++++---
 sagemath-tdlib-0.9.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-04 11:10:01 UTC (rev 1292828)
+++ PKGBUILD	2022-09-04 11:36:17 UTC (rev 1292829)
@@ -7,7 +7,7 @@
 
 pkgname=sagemath
 pkgver=9.6
-pkgrel=9
+pkgrel=10
 pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab'
 arch=(x86_64)
 url='http://www.sagemath.org'
@@ -60,7 +60,8 @@
         sagemath-tachyon-0.99.patch
         sagemath-jupyter-jsmol.patch
         sagemath-gap-4.12.patch
-        sagemath-ipywidgets-8.patch)
+        sagemath-ipywidgets-8.patch
+        sagemath-tdlib-0.9.patch)
 sha256sums=('c6225d48f70ac955fceed5c1fddfdd7294001d460b43a686329d5d44d836f6a3'
             'e24c075a9f8e562fe9d85e6fd5b01eac4691683c01d4d22c83cde145b63f4dba'
             'bd188af45ce31579b82407adee8e9bf6033a996f7ea6e328fabca526f31c08ba'
@@ -70,7 +71,8 @@
             '4ee8071efd7b9ad66ac5bbfe081fe670cc58cfcac8fb783d5a40b6da3593cbf4'
             '14431ef93a68324ed276d79d7be66b0fb6b73df74f0e049be522480153e22afa'
             'dfa0288904504065ffae13e19ccd11e625f5b4a61fd07bf2f78f90ca2e2cb0be'
-            '9d6ac3b241eaf6c110a090807d99643eae83b20708baa35f322cdfb70ac2b565')
+            '9d6ac3b241eaf6c110a090807d99643eae83b20708baa35f322cdfb70ac2b565'
+            '56a83abecf2ff5a500442adc7a50abbb70006037dd39c39dcdb04b3ca9fb51e2')
 
 prepare(){
   cd sage-$pkgver
@@ -96,6 +98,8 @@
   patch -p1 -i ../latte-count.patch
 # port to new jupyter-jsmol extension name
   patch -p1 -i ../sagemath-jupyter-jsmol.patch
+# update to tdlib 0.9 (Fedora)
+  patch -p1 -i ../sagemath-tdlib-0.9.patch
 
   cd build/pkgs/sagelib
   ./bootstrap

Added: sagemath-tdlib-0.9.patch
===================================================================
--- sagemath-tdlib-0.9.patch	                        (rev 0)
+++ sagemath-tdlib-0.9.patch	2022-09-04 11:36:17 UTC (rev 1292829)
@@ -0,0 +1,28 @@
+diff -up src/sage/graphs/graph_decompositions/sage_tdlib.cpp.orig src/sage/graphs/graph_decompositions/sage_tdlib.cpp
+--- a/src/sage/graphs/graph_decompositions/sage_tdlib.cpp	2021-05-09 16:00:11.000000000 -0600
++++ b/src/sage/graphs/graph_decompositions/sage_tdlib.cpp	2021-06-16 08:33:47.325415307 -0600
+@@ -2,8 +2,8 @@
+ #include <map>
+ 
+ #include <boost/graph/adjacency_list.hpp>
+-#include "tdlib/TD_combinations.hpp"
+-#include "tdlib/TD_misc.hpp"
++#include <treedec/combinations.hpp>
++#include <treedec/misc.hpp>
+ 
+ #ifndef TD_STRUCT_VERTEX
+ #define TD_STRUCT_VERTEX
+@@ -16,13 +16,6 @@ struct Vertex{
+ 
+ typedef boost::adjacency_list<boost::setS, boost::vecS, boost::undirectedS, Vertex> TD_graph_t;
+ 
+-struct bag{
+-    std::set<unsigned int> bag;
+-};
+-
+-typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS, bag> TD_tree_dec_t;
+-
+-
+ void make_tdlib_graph(TD_graph_t &G, std::vector<unsigned int> &V, std::vector<unsigned int> &E){
+     unsigned int max = 0;
+     for(unsigned int i = 0; i < V.size(); i++)