[arch-commits] Commit in sagemath-doc/trunk (PKGBUILD docbuild_main.patch)

Antonio Rojas arojas at archlinux.org
Thu Mar 11 18:24:40 UTC 2021


    Date: Thursday, March 11, 2021 @ 18:24:40
  Author: arojas
Revision: 887560

Simplify build, rebuild with current sphinx to fix some images file names

Modified:
  sagemath-doc/trunk/PKGBUILD
Deleted:
  sagemath-doc/trunk/docbuild_main.patch

---------------------+
 PKGBUILD            |   30 +++++++++---------------------
 docbuild_main.patch |    6 ------
 2 files changed, 9 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-11 18:18:47 UTC (rev 887559)
+++ PKGBUILD	2021-03-11 18:24:40 UTC (rev 887560)
@@ -2,7 +2,7 @@
 
 pkgname=sagemath-doc
 pkgver=9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="HTML documentation for SageMath"
 arch=(any)
 url="http://www.sagemath.org"
@@ -9,37 +9,25 @@
 license=(GPL)
 depends=(gap-doc python-pplpy)
 makedepends=(sagemath python-pyzmq python-docutils python-jupyter_client python-pkgconfig cython python-ipywidgets thebe)
-source=(sagemath-$pkgver.tar.gz::"https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
-        docbuild_main.patch)
-sha256sums=('edc89776461247cf74a16473851378e70a2de867309978ca2346ef6f93af0f90'
-            'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b')
-options=(!strip)
+source=(https://github.com/sagemath/sage/archive/$pkgver/sagemath-$pkgver.tar.gz)
+sha256sums=('edc89776461247cf74a16473851378e70a2de867309978ca2346ef6f93af0f90')
+options=(!strip) # nothing to strip, save packaging time
 
 prepare() {
   cd sage-$pkgver
 
-# fix relative imports
-  patch -p0 -i ../docbuild_main.patch
-# use sage_setup imports from sagemath source, but use system sage ones (which include compiled modules)
-  mkdir -p local-python
-  ln -sr src/sage_setup local-python
-
   SAGE_ROOT="$PWD" PATH="$PWD/build/bin:$PATH" src/doc/bootstrap
 }
 
 build() {
-  cd sage-$pkgver/src
+  cd sage-$pkgver
 
-  export SAGE_LOCAL="/usr" \
-         SAGE_ROOT="/usr" \
-         SAGE_SRC="$PWD" \
-         SAGE_DOC_SRC="$PWD"/doc \
-         SAGE_DOC="$PWD"/doc \
-         MATHJAX_DIR="/usr/share/mathjax2" \
-         PYTHONPATH="$srcdir"/sage-$pkgver/local-python \
+  export SAGE_SRC="$PWD"/src \
+         SAGE_DOC="$PWD"/src/doc \
+         MATHJAX_DIR=/usr/share/mathjax2 \
          SAGE_NUM_THREADS=10 \
          LANG=C
-  python sage_setup/docbuild --no-pdf-links --mathjax all html
+  python -m src.sage_setup.docbuild --no-pdf-links --mathjax all html
 }
 
 package() {

Deleted: docbuild_main.patch
===================================================================
--- docbuild_main.patch	2021-03-11 18:18:47 UTC (rev 887559)
+++ docbuild_main.patch	2021-03-11 18:24:40 UTC (rev 887560)
@@ -1,6 +0,0 @@
---- src/sage_setup/docbuild/__main__.py.orig
-+++ src/sage_setup/docbuild/__main__.py
-@@ -1,2 +1,2 @@
--from . import main
-+from sage_setup.docbuild import main
- main()



More information about the arch-commits mailing list