diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | sagemath-no-doc-check.patch | 62 |
3 files changed, 2 insertions, 70 deletions
@@ -1,6 +1,6 @@ pkgbase = sagemath-git pkgdesc = Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab - pkgver = 8.4.beta5.r0.gca26fcca0f + pkgver = 8.4.beta7.r0.ga1bfef8cf3 pkgrel = 1 url = http://www.sagemath.org arch = x86_64 @@ -104,7 +104,6 @@ pkgbase = sagemath-git source = sagemath-cremona.patch source = sagemath-lcalc-c++11.patch source = sagemath-gap-4.8.patch - source = sagemath-no-doc-check.patch source = sagemath-sphinx-1.8.patch sha256sums = SKIP sha256sums = f483a448c045aeff186bec4b402da8109fa12547ff36219a9aa427c2561ec8e5 @@ -117,7 +116,6 @@ pkgbase = sagemath-git sha256sums = 7efb38ba511037feb3abbd88576323320555ba50235ddc7e3d423ca294dd42ed sha256sums = 5114c912f821900e5bfae1e2cfeb7984de946d0b23e1182b0bf15be1d803dfd0 sha256sums = 3d02f6e349213ff4cea6a3acf5e7f8ec11a37b6ead61b338931f07073ebcb36e - sha256sums = b0d30c0d26a3dc7aeb402f883e49db9ba9a0e9e029852b589ba77dcc1925a0b9 sha256sums = 7dd2ab94fddda8e7c2cdd5250642c4cdd00b7702815d88762fbcd68416bacaee pkgname = sagemath-git @@ -8,7 +8,7 @@ pkgbase=sagemath-git pkgname=(sagemath-git sagemath-jupyter-git) -pkgver=8.4.beta5.r0.gca26fcca0f +pkgver=8.4.beta7.r0.ga1bfef8cf3 pkgrel=1 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab" arch=(x86_64) @@ -46,7 +46,6 @@ source=(git://git.sagemath.org/sage.git#branch=develop sagemath-cremona.patch sagemath-lcalc-c++11.patch sagemath-gap-4.8.patch - sagemath-no-doc-check.patch sagemath-sphinx-1.8.patch) sha256sums=('SKIP' 'f483a448c045aeff186bec4b402da8109fa12547ff36219a9aa427c2561ec8e5' @@ -59,7 +58,6 @@ sha256sums=('SKIP' '7efb38ba511037feb3abbd88576323320555ba50235ddc7e3d423ca294dd42ed' '5114c912f821900e5bfae1e2cfeb7984de946d0b23e1182b0bf15be1d803dfd0' '3d02f6e349213ff4cea6a3acf5e7f8ec11a37b6ead61b338931f07073ebcb36e' - 'b0d30c0d26a3dc7aeb402f883e49db9ba9a0e9e029852b589ba77dcc1925a0b9' '7dd2ab94fddda8e7c2cdd5250642c4cdd00b7702815d88762fbcd68416bacaee') pkgver() { @@ -87,8 +85,6 @@ prepare(){ patch -p1 -i ../sagemath-lcalc-c++11.patch # Adjust paths for gap-4.8 patch -p1 -i ../sagemath-gap-4.8.patch -# don't check for doc presence in doc_search (Gentoo) - patch -p1 -i ../sagemath-no-doc-check.patch # fix introspection with sphinx 1.8 patch -p1 -i ../sagemath-sphinx-1.8.patch diff --git a/sagemath-no-doc-check.patch b/sagemath-no-doc-check.patch deleted file mode 100644 index 9c2ffd2ceb0e..000000000000 --- a/sagemath-no-doc-check.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/sage/misc/sagedoc.py b/sage/misc/sagedoc.py -index fdb5322..f44139c 100644 ---- a/src/sage/misc/sagedoc.py -+++ b/src/sage/misc/sagedoc.py -@@ -846,57 +846,6 @@ def _search_src_or_doc(what, string, extra1='', extra2='', extra3='', - exts = ['html'] - title = 'Documentation' - base_path = os.path.join(SAGE_DOC, 'html') -- doc_path = SAGE_DOC_SRC -- -- from sage_setup.docbuild.build_options import LANGUAGES, OMIT -- # List of languages -- lang = LANGUAGES -- # Documents in SAGE_DOC_SRC/LANG/ to omit -- omit = OMIT -- -- # List of documents, minus the omitted ones -- documents = [] -- for L in lang: -- documents += [os.path.join(L, dir) for dir -- in os.listdir(os.path.join(doc_path, L)) -- if dir not in omit] -- -- # Check to see if any documents are missing. This just -- # checks to see if the appropriate output directory exists, -- # not that it contains a complete build of the docs. -- missing = [os.path.join(base_path, doc) -- for doc in documents if not -- os.path.exists(os.path.join(base_path, doc))] -- num_missing = len(missing) -- if num_missing > 0: -- print("""Warning, the following Sage documentation hasn't been built, --so documentation search results may be incomplete: --""") -- for s in missing: -- print(s) -- if num_missing > 1: -- print(""" --You can build these with 'sage -docbuild DOCUMENT html', --where DOCUMENT is one of""", end=' ') -- for s in missing: -- if s.find('en') != -1: -- print("'{}',".format(os.path.split(s)[-1]), end=' ') -- else: -- print("'{}',".format(os.path.join( -- os.path.split(os.path.split(s)[0])[-1], -- os.path.split(s)[-1])), end=' ') -- print(""" --or you can use 'sage -docbuild all html' to build all of the missing documentation.""") -- else: -- s = missing[0] -- if s.find('en') != -1: -- s = os.path.split(s)[-1] -- else: -- s = os.path.join( -- os.path.split(os.path.split(s)[0])[-1], -- os.path.split(s)[-1]) -- print(""" --You can build this with 'sage -docbuild {} html'.""".format(s)) - - strip = len(base_path) - results = [] |