diff --git a/build/pkgs/gap_packages/spkg-install.in b/build/pkgs/gap_packages/spkg-install.in index c67a1176a69..314a784c5c7 100644 --- a/build/pkgs/gap_packages/spkg-install.in +++ b/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 guava orb datastructures +for pkg in cohomolo crypting grape orb datastructures do echo "Building GAP package $pkg" CFLAGS="$CFLAGS -Wno-implicit-function-declaration" @@ -104,6 +104,14 @@ 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 diff --git a/build/pkgs/qhull/patches/qhull_cmake.patch b/build/pkgs/qhull/patches/qhull_cmake.patch new file mode 100644 index 00000000000..575c220b7d2 --- /dev/null +++ b/build/pkgs/qhull/patches/qhull_cmake.patch @@ -0,0 +1,22 @@ +*** src/CMakeLists.txt.orig Thu May 8 13:21:24 2025 +--- src/CMakeLists.txt Thu May 8 13:25:39 2025 +*************** +*** 67,74 **** + # $Id: //main/2019/qhull/CMakeLists.txt#21 $$Change: 3039 $ + # $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $ + + project(qhull) +- cmake_minimum_required(VERSION 3.0) + + # Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt + # qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm +--- 67,75 ---- + # $Id: //main/2019/qhull/CMakeLists.txt#21 $$Change: 3039 $ + # $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $ + ++ cmake_minimum_required(VERSION 3.25...4.0.3) ++ + project(qhull) + + # Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt + # qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm diff --git a/build/pkgs/symengine/checksums.ini b/build/pkgs/symengine/checksums.ini index 72907d5595e..35f51ec6115 100644 --- a/build/pkgs/symengine/checksums.ini +++ b/build/pkgs/symengine/checksums.ini @@ -1,4 +1,4 @@ tarball=symengine-VERSION.tar.gz -sha1=2dfee07108509963f3dbe3d9cad9de76d85e551f -sha256=f6972acd6a65354f6414e69460d2e175729470632bdac05919bc2f7f32e48cbd +sha1=e53aa2677bcad5a5dc075a94d4a4f9ef95b5fe07 +sha256=11c5f64e9eec998152437f288b8429ec001168277d55f3f5f1df78e3cf129707 upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz diff --git a/build/pkgs/symengine/package-version.txt b/build/pkgs/symengine/package-version.txt index a8839f70de0..0548fb4e9b2 100644 --- a/build/pkgs/symengine/package-version.txt +++ b/build/pkgs/symengine/package-version.txt @@ -1 +1 @@ -0.11.2 \ No newline at end of file +0.14.0 \ No newline at end of file