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

[Antonio Rojas]

    Date: Thursday, May 4, 2017 @ 21:13:32
  Author: arojas
Revision: 227066

Adapt to changes in upcoming sagemath 8

Modified:
  sage-notebook/trunk/PKGBUILD
  sage-notebook/trunk/jmol.patch

------------+
 PKGBUILD   |   19 +++++++++----------
 jmol.patch |   12 ++++++------
 2 files changed, 15 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-04 21:06:17 UTC (rev 227065)
+++ PKGBUILD	2017-05-04 21:13:32 UTC (rev 227066)
@@ -4,7 +4,7 @@
 
 pkgname=sage-notebook
 pkgver=0.13
-pkgrel=3
+pkgrel=4
 pkgdesc='Browser-based notebook interface for SageMath'
 arch=(any)
 url='http://www.sagemath.org'
@@ -13,10 +13,10 @@
 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 jmol.patch sagenb-flask-0.11.patch)
-md5sums=('f72cd81add5373f74b459957a64074ce'
-         '61620179a7ecd85401d8e5a6ece3ea41'
-         'b29760c97a5328faa179a46008391bf0'
-         'a63fe71bfd4b36384ef5b802f592e319')
+sha256sums=('8e88c66a244c027256c0c6c944414ef63d6c28c4f03c118c9964d610357896a6'
+            '8f16928bbb5989ffd99a81ed76c6d391dfe32ea74f626a24bc27dff348412de7'
+            '3e7d7437d5dd4e139add01dc21b367de391b8c4472a3af3827b2466489779e3c'
+            '931be5497fdb722fba1211c4dcb359519fd618a2e36bd1a80cc0cdb5302bb51d')
 
 prepare() {
 # create *.desktop file
@@ -24,12 +24,9 @@
           --pkgname="sage-notebook" \
           --pkgdesc="SageMath notebook" \
           --name="SageMath" \
-          --exec="/usr/bin/sage -notebook" \
+          --exec="/usr/bin/sage -notebook=sagenb" \
           --terminal=true \
-          --categories="Education;Science;Math" \
-          --custom="X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username="
+          --categories="Education;Science;Math"
 
   cd sagenb-$pkgver
   
@@ -65,4 +62,6 @@
   install -Dm644 "${srcdir}/sage-notebook.desktop" "$pkgdir/usr/share/applications/sage-notebook.desktop"
   install -Dm644 "$pkgdir/usr/lib/python2.7/site-packages/sagenb/data/sage/images/icon48x48.png" \
                  "$pkgdir/usr/share/pixmaps/sage-notebook.png"
+# remove sage3d
+  rm -r "$pkgdir"/usr/bin
 }

Modified: jmol.patch
===================================================================
--- jmol.patch	2017-05-04 21:06:17 UTC (rev 227065)
+++ jmol.patch	2017-05-04 21:13:32 UTC (rev 227066)
@@ -10,12 +10,12 @@
 -        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
 -        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
 -        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s","core"))
-+        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"share","jmol"))
-+        self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol"))
-+        self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","js"))
-+        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s"))
-+        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s"))
-+        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s","core"))
++        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_SHARE"],"jmol"))
++        self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_SHARE"],"jsmol"))
++        self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_SHARE"],"jsmol","js"))
++        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s"))
++        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s"))
++        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s","core"))
          import mimetypes
          mimetypes.add_type('text/plain','.jmol')