[arch-commits] Commit in sage-notebook/trunk (PKGBUILD sagenb-deprecated.patch)

[Antonio Rojas]

    Date: Wednesday, October 17, 2018 @ 16:10:50
  Author: arojas
Revision: 395054

Update to 1.0.4

Modified:
  sage-notebook/trunk/PKGBUILD
Deleted:
  sage-notebook/trunk/sagenb-deprecated.patch

-------------------------+
 PKGBUILD                |   14 +++++---------
 sagenb-deprecated.patch |   18 ------------------
 2 files changed, 5 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-17 16:09:36 UTC (rev 395053)
+++ PKGBUILD	2018-10-17 16:10:50 UTC (rev 395054)
@@ -2,8 +2,8 @@
 # Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
 
 pkgname=sage-notebook
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
 pkgdesc='Browser-based notebook interface for SageMath'
 arch=(any)
 url='http://www.sagemath.org'
@@ -11,11 +11,9 @@
 depends=(sagemath python2-twisted python2-flask-oldsessions python2-flask-openid python2-flask-autoindex python2-flask-babel mathjax jsmol)
 optdepends=('python2-pyopenssl: to use the notebook in secure mode')
 makedepends=(gendesk)
-source=($pkgname-$pkgver::"https://github.com/sagemath/sagenb/archive/$pkgver.tar.gz" sage.service
-        sagenb-deprecated.patch)
-sha256sums=('416c8c53629e8100d6f485a07d08c55e07f93fcbe21aa67506802c15ab271b38'
-            '2cf8668fa77a96fe562dafd50cab41aad03f53ee8b91587b1b45ecd193c1517a'
-            'b5cfaa3412a10acebc287bcc94b1a3e86509bf1d06c5415cc58d7cb504d1bd6d')
+source=($pkgname-$pkgver::"https://github.com/sagemath/sagenb/archive/$pkgver.tar.gz" sage.service)
+sha256sums=('440033b213bcf55146efb2f3c124a58332271e1b595b2e220174b82d989b104f'
+            '2cf8668fa77a96fe562dafd50cab41aad03f53ee8b91587b1b45ecd193c1517a')
 
 prepare() {
 # create *.desktop file
@@ -28,8 +26,6 @@
           --categories="Education;Science;Math"
 
   cd sagenb-$pkgver
-  patch -p1 -i ../sagenb-deprecated.patch # Fix deprecated imports
-
 # Use python2
   find -name '*.py' | xargs sed -e 's|#! /usr/bin/python|#! /usr/bin/python2|' -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
     -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -i

Deleted: sagenb-deprecated.patch
===================================================================
--- sagenb-deprecated.patch	2018-10-17 16:09:36 UTC (rev 395053)
+++ sagenb-deprecated.patch	2018-10-17 16:10:50 UTC (rev 395054)
@@ -1,18 +0,0 @@
-diff --git a/sagenb/flask_version/base.py b/sagenb/flask_version/base.py
-index da6a990c..fdc5382a 100755
---- a/sagenb/flask_version/base.py
-+++ b/sagenb/flask_version/base.py
-@@ -10,10 +10,10 @@ from .decorators import global_lock
- # Make flask use the old session foo from <=flask-0.9
- from flask_oldsessions import OldSecureCookieSessionInterface
- 
--from flask.ext.autoindex import AutoIndex
-+from flask_autoindex import AutoIndex
- from sage.env import SAGE_SRC, SAGE_DOC
- SRC = os.path.join(SAGE_SRC, 'sage')
--from flask.ext.openid import OpenID
-+from flask_openid import OpenID
- from flask_babel import Babel, gettext, ngettext, lazy_gettext, get_locale
- from sagenb.misc.misc import SAGENB_ROOT, DATA, translations_path, N_, nN_, unicode_str
- from json import dumps
-