Update patch for sage

4 files changed, 35 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b8537797f86c..3138223d43c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Mar 30 02:04:18 UTC 2018
+# Sat Dec  8 12:48:24 UTC 2018
 pkgbase = texmacs-svn
 	pkgdesc = Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface.
-	pkgver = 20180323.11047
+	pkgver = 20181208.11311
 	pkgrel = 1
 	url = http://www.texmacs.org/
 	arch = x86_64
@@ -27,9 +27,9 @@ pkgbase = texmacs-svn
 	options = !emptydirs
 	options = !ccache
 	source = texmacs::svn://svn.savannah.gnu.org/texmacs/trunk/src
-	source = 0001-Sage-plugin-fix-which-not-found.patch
+	source = 0001-Fix-sage.patch
 	sha1sums = SKIP
-	sha1sums = 8a6e4f423a56a870136c1b2357b0e6cbd46e6d51
+	sha1sums = 31252d8a147c7414f683d168873bccfac9d2ad6c
 
 pkgname = texmacs-svn
 
diff --git a/0001-Fix-sage.patch b/0001-Fix-sage.patch
new file mode 100644
index 000000000000..2909298e6d5b
--- /dev/null
+++ b/0001-Fix-sage.patch
@@ -0,0 +1,27 @@
+From 350e3b35da6ba3697d9c2b28813b0b91599483e0 Mon Sep 17 00:00:00 2001
+From: wangjiezhe <wangjiezhe@gmail.com>
+Date: Sat, 8 Dec 2018 20:37:54 +0800
+Subject: [PATCH] Fix sage
+
+---
+ plugins/sage/bin/tm_sage | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/sage/bin/tm_sage b/plugins/sage/bin/tm_sage
+index 24ec37f6c..bf24d05ca 100755
+--- a/plugins/sage/bin/tm_sage
++++ b/plugins/sage/bin/tm_sage
+@@ -2,7 +2,7 @@
+ 
+ BRIDGE=plugins/sage/bin/bridge.py
+ USER_SAGE_PY=$HOME/.TeXmacs/${BRIDGE}
+-SYS_SAGE_PY=$TEXMACS_PATH/${BRIDGE}
++SYS_SAGE_PY=$TEXMACS_BIN_PATH/bin/bridge.py
+ 
+-[ -e $USER_SAGE_PY ] && /usr/bin/env sage -python $USER_SAGE_PY && exit 0
+-[ -e $SYS_SAGE_PY ] && /usr/bin/env sage -python $SYS_SAGE_PY && exit 0
++[[ -e $USER_SAGE_PY ]] && /usr/bin/env sage -python $USER_SAGE_PY && exit 0
++[[ -e $SYS_SAGE_PY ]] && /usr/bin/env sage -python $SYS_SAGE_PY && exit 0
+-- 
+2.19.2
+
diff --git a/0001-Sage-plugin-fix-which-not-found.patch b/0001-Sage-plugin-fix-which-not-found.patch
deleted file mode 100644
index 7498ad58d528..000000000000
--- a/0001-Sage-plugin-fix-which-not-found.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9fe7daa2c6f1ee21bcecb94eda583ada13686e97 Mon Sep 17 00:00:00 2001
-From: wangjiezhe <wangjiezhe@gmail.com>
-Date: Wed, 8 Jun 2016 11:20:42 +0800
-Subject: [PATCH] Sage plugin: fix `which` not found
-
----
- plugins/sage/progs/init-sage.scm | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/sage/progs/init-sage.scm b/plugins/sage/progs/init-sage.scm
-index f3fb9224e..b18bf07c9 100644
---- a/plugins/sage/progs/init-sage.scm
-+++ b/plugins/sage/progs/init-sage.scm
-@@ -12,10 +12,16 @@
- ;;
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- 
-+(define (sage-launcher)
-+  (with path "$TEXMACS_BIN_PATH/bin/tm_sage"
-+    (string-append
-+      "sage -python "
-+      (url-concretize (unix->url path)))))
-+
- (plugin-configure sage
-   (:macpath "Sage*" "Contents/Resources/sage")
-   (:require (url-exists-in-path? "sage"))
--  (:launch "sage -python `which tm_sage`")
-+  (:launch ,(sage-launcher))
-   (:tab-completion #t)
-   (:session "Sage")
-   (:scripts "Sage"))
--- 
-2.15.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 698b1aaadf5e..0359558edef1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=texmacs-svn
 _pkgname=texmacs
-pkgver=20180323.11047
+pkgver=20181208.11311
 pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface."
 arch=('x86_64')
@@ -19,10 +19,10 @@ optdepends=('transfig: convert images using fig2ps'
             'aspell: spell checking')
 makedepends=('ghostscript' 'cmake')
 source=("${_pkgname}::svn://svn.savannah.gnu.org/texmacs/trunk/src"
-        "0001-Sage-plugin-fix-which-not-found.patch"
+        "0001-Fix-sage.patch"
         )
 sha1sums=('SKIP'
-          '8a6e4f423a56a870136c1b2357b0e6cbd46e6d51')
+          '31252d8a147c7414f683d168873bccfac9d2ad6c')
 options=('!emptydirs' '!ccache')
 provides=('texmacs')
 conflicts=('texmacs')
@@ -38,7 +38,7 @@ prepare() {
 
   cd ${_pkgname}-build
 
-  patch -Np1 -i ../0001-Sage-plugin-fix-which-not-found.patch
+  patch -Np1 -i ../0001-Fix-sage.patch
 
   sed -i 's/env python/env python2/' \
     plugins/{mathematica/bin/realpath.py,python/bin/tm_python,sage/bin/tm_sage} \