40519 new

Author: GMS103

build/pkgs/gap_packages/spkg-install.in

@@ -92,7 +92,7 @@ install_compiled_pkg()
 #
 # These packages have an old ./configure that take the GAP_ROOT as a positional
 # argument
-for pkg in cohomolo crypting grape orb datastructures
+for pkg in cohomolo crypting grape guava orb datastructures
 do
     echo "Building GAP package $pkg"
     CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
@@ -104,14 +104,6 @@ do
     cd "$PKG_SRC_DIR"
 done
 
-echo "Building GAP package guava"
-export CFLAGS="-std=gnu17 $CFLAGS -Wno-implicit-function-declaration"
-cd "$PKG_SRC_DIR/guava"
-./configure "$GAP_ROOT"
-sdh_make
-install_compiled_pkg "guava"
-cd "$PKG_SRC_DIR"
-
 # These packages have a new-style autoconf ./configure
 # that takes --with-gaproot
 

build/pkgs/qhull/patches/qhull_cmake.patch

@@ -1,4 +1,4 @@
 tarball=symengine-VERSION.tar.gz
-sha1=e53aa2677bcad5a5dc075a94d4a4f9ef95b5fe07
-sha256=11c5f64e9eec998152437f288b8429ec001168277d55f3f5f1df78e3cf129707
+sha1=2dfee07108509963f3dbe3d9cad9de76d85e551f
+sha256=f6972acd6a65354f6414e69460d2e175729470632bdac05919bc2f7f32e48cbd
 upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz

build/pkgs/symengine/checksums.ini

@@ -1 +1 @@
-0.14.0
+0.11.2

build/pkgs/symengine/package-version.txt

@@ -198,13 +198,16 @@ def pytest_collect_file(
                 # This is an executable file.
                 return IgnoreCollector.from_parent(parent)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
             if file_path.name == "conftest_inputtest.py":
                 # This is an input file for testing the doctest machinery (and contains broken doctests).
                 return IgnoreCollector.from_parent(parent)
 
 >>>>>>> 96245a0e185 (conftest.py)
+=======
+>>>>>>> 8705d5701a7 (40519 new)
             if (
                 (
                     file_path.name == "finite_dimensional_lie_algebras_with_basis.py"