texmacs-svn 20190518.11675-1

3 files changed, 4 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3138223d43c5..f7f44d2d2570 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# 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 = 20181208.11311
+	pkgver = 20190518.11675
 	pkgrel = 1
 	url = http://www.texmacs.org/
 	arch = x86_64
@@ -27,9 +25,7 @@ pkgbase = texmacs-svn
 	options = !emptydirs
 	options = !ccache
 	source = texmacs::svn://svn.savannah.gnu.org/texmacs/trunk/src
-	source = 0001-Fix-sage.patch
 	sha1sums = SKIP
-	sha1sums = 31252d8a147c7414f683d168873bccfac9d2ad6c
 
 pkgname = texmacs-svn
 
diff --git a/0001-Fix-sage.patch b/0001-Fix-sage.patch
deleted file mode 100644
index 2909298e6d5b..000000000000
--- a/0001-Fix-sage.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/PKGBUILD b/PKGBUILD
index 0359558edef1..bc3d82b8bd93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=texmacs-svn
 _pkgname=texmacs
-pkgver=20181208.11311
+pkgver=20190518.11675
 pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface."
 arch=('x86_64')
@@ -19,10 +19,8 @@ optdepends=('transfig: convert images using fig2ps'
             'aspell: spell checking')
 makedepends=('ghostscript' 'cmake')
 source=("${_pkgname}::svn://svn.savannah.gnu.org/texmacs/trunk/src"
-        "0001-Fix-sage.patch"
         )
-sha1sums=('SKIP'
-          '31252d8a147c7414f683d168873bccfac9d2ad6c')
+sha1sums=('SKIP')
 options=('!emptydirs' '!ccache')
 provides=('texmacs')
 conflicts=('texmacs')
@@ -38,7 +36,7 @@ prepare() {
 
   cd ${_pkgname}-build
 
-  patch -Np1 -i ../0001-Fix-sage.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} \