[arch-commits] Commit in sagemath-doc/trunk (3 files)
Antonio Rojas
arojas at archlinux.org
Thu Jan 12 19:16:07 UTC 2017
Date: Thursday, January 12, 2017 @ 19:16:06
Author: arojas
Revision: 207062
Update to 7.5
Modified:
sagemath-doc/trunk/PKGBUILD
sagemath-doc/trunk/is-package-installed.patch
sagemath-doc/trunk/package.patch
----------------------------+
PKGBUILD | 32 +++++++-------------------------
is-package-installed.patch | 7 +++----
package.patch | 6 ++----
3 files changed, 12 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-12 18:29:09 UTC (rev 207061)
+++ PKGBUILD 2017-01-12 19:16:06 UTC (rev 207062)
@@ -3,8 +3,8 @@
pkgbase=sagemath-doc
pkgname=(sagemath-doc sagemath-src)
-pkgver=7.4
-pkgrel=2
+pkgver=7.5
+pkgrel=1
arch=(any)
url="http://www.sagemath.org"
license=(GPL)
@@ -11,15 +11,13 @@
makedepends=(sagemath sage-notebook python2-pyzmq python2-pillow python2-docutils
python2-jupyter_client python2-pkgconfig cython2 python2-sphinx thebe)
source=("$pkgbase-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
- package.patch disable-fes.patch docbuild_main.patch is-package-installed.patch
- ecm-7.patch sagemath-singular4.patch)
-md5sums=('8311ee35a309dbc668b5148795211254'
- '493a9e0eae9b2ef87544b42785ae11ea'
+ package.patch disable-fes.patch docbuild_main.patch is-package-installed.patch ecm-7.patch)
+md5sums=('bff1fb8793ebc2934d14cf1efdcfbea3'
+ 'ccfd5b1bc4796f414f1531be52504dd7'
'06a67e611d10aa2381efe1f08ea4ffd9'
'f3bf3fa4e11e5af2bd0573cf2620e1f8'
- '5dca842e4440e4ef235ae18c1b1f20e3'
- '0c9a57d35de80c2cd418ebec912efbbb'
- '4bd7305e8b69add8356f9751470cf587')
+ '409b0a2c520eb33281b5f262afcb6c76'
+ '0c9a57d35de80c2cd418ebec912efbbb')
prepare() {
cd sage-$pkgver
@@ -27,8 +25,6 @@
# Arch-specific patches
# assume all optional packages are installed
patch -p0 -i ../package.patch
-# supress warning about GAP install dir
- sed -e "s|gapdir = os.path.join(SAGE_LOCAL, 'gap', 'latest')|gapdir = '/usr/lib/gap'|" -i src/sage/libs/gap/util.pyx
# fix regressions with ECM 7
patch -p1 -i ../ecm-7.patch
@@ -39,8 +35,6 @@
patch -p0 -i ../disable-fes.patch
# replace is_package_installed usage http://trac.sagemath.org/ticket/20377
patch -p1 -i ../is-package-installed.patch
-# port to Singular 4 https://trac.sagemath.org/ticket/17254
- patch -p1 -i ../sagemath-singular4.patch
# fix relative imports
patch -p0 -i ../docbuild_main.patch
@@ -79,18 +73,6 @@
cp -r en/introspect "$pkgdir"/usr/share/doc/sage/en
cp -r common "$pkgdir"/usr/share/doc/sage
cp -r html "$pkgdir"/usr/share/doc/sage
-
-# Replace duplicated files by symlinks (Gentoo)
- cd "$pkgdir"/usr/share/doc/sage
- mv html/en/_static{,.tmp}
- for _dir in `find -name _static` ; do
- rm -r $_dir
- ln -s /usr/share/doc/sage/html/en/_static $_dir
- done
- mv html/en/_static{.tmp,}
-
-# Remove unneeded files
- find html -name '*.py' -exec rm -r {} \;
}
package_sagemath-src() {
Modified: is-package-installed.patch
===================================================================
--- is-package-installed.patch 2017-01-12 18:29:09 UTC (rev 207061)
+++ is-package-installed.patch 2017-01-12 19:16:06 UTC (rev 207062)
@@ -287,14 +287,13 @@
index 90e6985..21daeb0 100644
--- a/src/sage/misc/all.py
+++ b/src/sage/misc/all.py
-@@ -53,11 +53,6 @@ from fpickle import pickle_function, unpickle_function
+@@ -53,10 +53,6 @@ from fpickle import pickle_function, unpickle_function
from .dist import install_scripts
--from .package import (install_package,
-- installed_packages, is_package_installed,
+-from .package import (installed_packages, is_package_installed,
- standard_packages, optional_packages, experimental_packages,
-- upgrade, package_versions)
+- package_versions)
-
from .pager import pager
Modified: package.patch
===================================================================
--- package.patch 2017-01-12 18:29:09 UTC (rev 207061)
+++ package.patch 2017-01-12 19:16:06 UTC (rev 207062)
@@ -20,11 +20,10 @@
class CythonizeExtension(Extension):
"""
-@@ -75,15 +73,7 @@
- try:
+@@ -76,14 +74,7 @@
condition = kwds.pop("condition")
except KeyError:
-- pkg = kwds.pop("package")
+ pkg = kwds.pop("package")
- try:
- pkginfo = all_packages[pkg]
- except KeyError:
@@ -37,4 +36,3 @@
if condition:
return Extension(*args, **kwds)
else:
-
More information about the arch-commits
mailing list