Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / 
sagemath


Commits:
733bfeba by Antonio Rojas at 2024-05-13T00:39:36+02:00
upgpkg: 10.3-3: singular 4.4 rebuild

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = sagemath
        pkgdesc = Open Source Mathematics Software, free alternative to Magma, 
Maple, Mathematica, and Matlab
        pkgver = 10.3
-       pkgrel = 2
+       pkgrel = 3
        url = http://www.sagemath.org
        arch = x86_64
        license = GPL-2.0-or-later
@@ -9,6 +9,7 @@ pkgbase = sagemath
        makedepends = boost
        makedepends = coxeter
        makedepends = cython
+       makedepends = git
        makedepends = mcqd
        makedepends = python-jinja
        makedepends = python-pkgconfig
@@ -124,11 +125,11 @@ pkgbase = sagemath
        optdepends = shared_meataxe: faster matrix arithmetic over finite fields
        optdepends = sirocco: for computing the fundamental group of the 
complement of a plane curve
        optdepends = topcom: to compute triangulations of point configurations
-       source = 
https://github.com/sagemath/sage/archive/10.3/sagemath-10.3.tar.gz
+       source = git+https://github.com/sagemath/sage#tag=10.3
        source = latte-count.patch
        source = sagemath-tdlib-0.9.patch
        source = singular-4.4.patch
-       sha256sums = 
59feb92c05e74d6db7a75f398c45c24b5157b1ecd3d8ac198806e2e6add77d96
+       sha256sums = 
48ec08216ebdd148ad84724a6b94feb65d6cd92011fb89b8ca3e2feed3013ab0
        sha256sums = 
5cd2f88965d7ebab9dfab6f5c2040d363a4a5ae41230219cc7070b907381da5a
        sha256sums = 
4840a88a8af87d01e159443e32c4d30c6e52e4f43c9bfa401ccff9f125bfeee7
        sha256sums = 
2fd97d454a15f3ef0a974418189fdc1345d7ebb4394fab11caf2e3723f6efb02


=====================================
PKGBUILD
=====================================
@@ -7,7 +7,7 @@
 
 pkgname=sagemath
 pkgver=10.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab'
 arch=(x86_64)
 url='http://www.sagemath.org'
@@ -124,6 +124,7 @@ makedepends=(bliss
              boost
              coxeter
              cython
+             git
              mcqd
              python-jinja
              python-pkgconfig
@@ -131,11 +132,11 @@ makedepends=(bliss
              shared_meataxe
              sirocco
              tdlib)
-source=(https://github.com/sagemath/sage/archive/$pkgver/$pkgname-$pkgver.tar.gz
+source=(git+https://github.com/sagemath/sage#tag=$pkgver
         latte-count.patch
         sagemath-tdlib-0.9.patch
         singular-4.4.patch)
-sha256sums=('59feb92c05e74d6db7a75f398c45c24b5157b1ecd3d8ac198806e2e6add77d96'
+sha256sums=('48ec08216ebdd148ad84724a6b94feb65d6cd92011fb89b8ca3e2feed3013ab0'
             '5cd2f88965d7ebab9dfab6f5c2040d363a4a5ae41230219cc7070b907381da5a'
             '4840a88a8af87d01e159443e32c4d30c6e52e4f43c9bfa401ccff9f125bfeee7'
             '2fd97d454a15f3ef0a974418189fdc1345d7ebb4394fab11caf2e3723f6efb02')
@@ -148,7 +149,7 @@ _pkgs=(standard
        tdlib)
 
 prepare(){
-  cd sage-$pkgver
+  cd sage
 
 # use correct latte-count binary name
   patch -p1 -i ../latte-count.patch
@@ -156,29 +157,32 @@ prepare(){
   patch -p1 -i ../sagemath-tdlib-0.9.patch
 # Adapt to Singular changes
   patch -p1 -i ../singular-4.4.patch
+# Fix build with GCC 14
+  git cherry-pick -n e87fd8466d10c21d8f16bd08187c11b4dc116020
+  git cherry-pick -n cec595ef953bb9e180aadee8583ad5a2fa5577d3
 
   ./bootstrap
 }
 
 build() {
   export SAGE_NUM_THREADS=$(($(nproc)/2))
-  export PYTHONPATH="$PWD"/sage-$pkgver/pkgs/sage-setup
+  export PYTHONPATH="$PWD"/sage/pkgs/sage-setup
 
   for _pkg in ${_pkgs[@]}; do
-    cd "$srcdir"/sage-$pkgver/pkgs/sagemath-$_pkg
+    cd "$srcdir"/sage/pkgs/sagemath-$_pkg
     python setup.py build
   done
 }
 
 package() {
   for _pkg in ${_pkgs[@]}; do
-    cd "$srcdir"/sage-$pkgver/pkgs/sagemath-$_pkg
+    cd "$srcdir"/sage/pkgs/sagemath-$_pkg
     python setup.py install --root="$pkgdir" --optimize=1
   done
 
 # fix symlinks to assets
   _pythonpath=`python -c "from sysconfig import get_path; 
print(get_path('platlib'))"`
-  for _i in $(ls "$srcdir"/sage-$pkgver/src/sage/ext_data/notebook-ipython); do
+  for _i in $(ls "$srcdir"/sage/src/sage/ext_data/notebook-ipython); do
     rm "$pkgdir"/usr/share/jupyter/kernels/sagemath/$_i
     ln -s $_pythonpath/sage/ext_data/notebook-ipython/$_i 
"$pkgdir"/usr/share/jupyter/kernels/sagemath/
   done



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/sagemath/-/commit/733bfeba9f1b6dc3f2ebca4aac1e6327c6cf0421

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/sagemath/-/commit/733bfeba9f1b6dc3f2ebca4aac1e6327c6cf0421
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to