Skip to content

Commit afd02dc

Browse files
authored
Merge branch 'develop' into update-fricas-version
2 parents a686b54 + 4a2dac0 commit afd02dc

File tree

39 files changed

+75
-45
lines changed

39 files changed

+75
-45
lines changed

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ title: SageMath
44
abstract: SageMath is a free open-source mathematics software system.
55
authors:
66
- name: "The SageMath Developers"
7-
version: 10.7.rc0
7+
version: 10.7.rc1
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2025-08-02
9+
date-released: 2025-08-05
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.7.rc0, Release Date: 2025-08-02
1+
SageMath version 10.7.rc1, Release Date: 2025-08-05

build/pkgs/configure/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=eb43008c539589aa31cdb6ec98b47a2c43c60486
3-
sha256=3f7b71621144bf2c62983c5276e00fe941e2be8f33005ae4594c269b71bccd1b
2+
sha1=ea1470c9298ac2667b946e2c16ea51b9d6b33a90
3+
sha256=bc00e50844bc61c8e4328f91873b67f1c37579dec6ca76daa545a42b89bf431a
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1e5e8e6b859ca8064b05738793074b5695012653
1+
bcdffce78b70b3172eec630ddee1eca5a4b08109

build/pkgs/gap_packages/spkg-install.in

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ install_compiled_pkg()
9292
#
9393
# These packages have an old ./configure that take the GAP_ROOT as a positional
9494
# argument
95-
for pkg in cohomolo crypting grape guava orb datastructures
95+
for pkg in cohomolo crypting grape orb datastructures
9696
do
9797
echo "Building GAP package $pkg"
9898
CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
@@ -104,6 +104,14 @@ do
104104
cd "$PKG_SRC_DIR"
105105
done
106106

107+
echo "Building GAP package guava"
108+
export CFLAGS="-std=gnu17 $CFLAGS -Wno-implicit-function-declaration"
109+
cd "$PKG_SRC_DIR/guava"
110+
./configure "$GAP_ROOT"
111+
sdh_make
112+
install_compiled_pkg "guava"
113+
cd "$PKG_SRC_DIR"
114+
107115
# These packages have a new-style autoconf ./configure
108116
# that takes --with-gaproot
109117

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
*** src/CMakeLists.txt.orig Thu May 8 13:21:24 2025
2+
--- src/CMakeLists.txt Thu May 8 13:25:39 2025
3+
***************
4+
*** 67,74 ****
5+
# $Id: //main/2019/qhull/CMakeLists.txt#21 $$Change: 3039 $
6+
# $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $
7+
8+
project(qhull)
9+
- cmake_minimum_required(VERSION 3.0)
10+
11+
# Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt
12+
# qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm
13+
--- 67,75 ----
14+
# $Id: //main/2019/qhull/CMakeLists.txt#21 $$Change: 3039 $
15+
# $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $
16+
17+
+ cmake_minimum_required(VERSION 3.25...4.0.3)
18+
+
19+
project(qhull)
20+
21+
# Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt
22+
# qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the update-version script
2-
sage-conf ~= 10.7rc0
2+
sage-conf ~= 10.7rc1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the update-version script
2-
sage-docbuild ~= 10.7rc0
2+
sage-docbuild ~= 10.7rc1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the update-version script
2-
sage-setup ~= 10.7rc0
2+
sage-setup ~= 10.7rc1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the update-version script
2-
sagemath-standard ~= 10.7rc0
2+
sagemath-standard ~= 10.7rc1

0 commit comments

Comments
 (0)