texmacs-svn 20170301.10612-1

Fix for octave plugin

5 files changed, 43 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17721cb7f9a5..4207810e2c80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Feb 25 13:07:10 UTC 2017
+# Wed Mar  1 07:38:22 UTC 2017
 pkgbase = texmacs-svn
 	pkgdesc = Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface.
-	pkgver = 20170225.10610
+	pkgver = 20170301.10612
 	pkgrel = 1
 	url = http://www.texmacs.org/
 	arch = i686
@@ -29,9 +29,11 @@ pkgbase = texmacs-svn
 	source = texmacs::svn://svn.savannah.gnu.org/texmacs/trunk/src
 	source = 0001-R-plugin-fix-preprocessor.patch
 	source = 0002-Sage-plugin-fix-which-not-found.patch
+	source = 0003-Fix-typo.patch
 	sha1sums = SKIP
-	sha1sums = c13ef7e1d7821145c230533e1bc8adedfe814600
-	sha1sums = e18d952f5d6c6f0c9124a2b56221412a17789866
+	sha1sums = 289165f7e1256c3fd703372351b2376fafdf8d01
+	sha1sums = 03acb07214f7eba2fce17600a6a7b64bc642fab6
+	sha1sums = 86cfc8b7de70911943143e46cf1bf093406a58f9
 
 pkgname = texmacs-svn
 
diff --git a/0001-R-plugin-fix-preprocessor.patch b/0001-R-plugin-fix-preprocessor.patch
index 8b7c7f62a53e..060efbb1825a 100644
--- a/0001-R-plugin-fix-preprocessor.patch
+++ b/0001-R-plugin-fix-preprocessor.patch
@@ -1,7 +1,7 @@
-From c572c8cf1ee548b8bbcb05544d4bb96bf2a2c706 Mon Sep 17 00:00:00 2001
+From ed5dd2be0a5be4a6001cce41d5cf91da2eb81e81 Mon Sep 17 00:00:00 2001
 From: wangjiezhe <wangjiezhe@gmail.com>
 Date: Mon, 23 May 2016 13:36:44 +0800
-Subject: [PATCH 1/2] R plugin: fix preprocessor
+Subject: [PATCH 1/3] R plugin: fix preprocessor
 
 ---
  plugins/r/src/tm_r.c | 3 ++-
@@ -22,5 +22,5 @@ index 342d2d1f3..4f9283b68 100644
  #endif
  
 -- 
-2.11.0
+2.12.0
 
diff --git a/0002-Sage-plugin-fix-which-not-found.patch b/0002-Sage-plugin-fix-which-not-found.patch
index 219f157a63d7..07c12624e5fb 100644
--- a/0002-Sage-plugin-fix-which-not-found.patch
+++ b/0002-Sage-plugin-fix-which-not-found.patch
@@ -1,7 +1,7 @@
-From 279abf2c8d4f3cf1032dab47457194095cc92b0e Mon Sep 17 00:00:00 2001
+From 913cec746a0e7edb5e0280a385af2069fd32f6db Mon Sep 17 00:00:00 2001
 From: wangjiezhe <wangjiezhe@gmail.com>
 Date: Wed, 8 Jun 2016 11:20:42 +0800
-Subject: [PATCH 2/2] Sage plugin: fix `which` not found
+Subject: [PATCH 2/3] Sage plugin: fix `which` not found
 
 ---
  plugins/sage/progs/init-sage.scm | 8 +++++++-
@@ -30,5 +30,5 @@ index f3fb9224e..b18bf07c9 100644
    (:session "Sage")
    (:scripts "Sage"))
 -- 
-2.11.0
+2.12.0
 
diff --git a/0003-Fix-typo.patch b/0003-Fix-typo.patch
new file mode 100644
index 000000000000..fd99a291f32f
--- /dev/null
+++ b/0003-Fix-typo.patch
@@ -0,0 +1,25 @@
+From 0c749dee4b7a84fdbf0e0dfc9323cadd4cfc8fc1 Mon Sep 17 00:00:00 2001
+From: wangjiezhe <wangjiezhe@gmail.com>
+Date: Tue, 28 Feb 2017 11:54:36 +0800
+Subject: [PATCH 3/3] Fix typo
+
+---
+ TeXmacs/progs/link/link-edit.scm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/TeXmacs/progs/link/link-edit.scm b/TeXmacs/progs/link/link-edit.scm
+index b36563d55..c78503907 100644
+--- a/TeXmacs/progs/link/link-edit.scm
++++ b/TeXmacs/progs/link/link-edit.scm
+@@ -154,7 +154,7 @@
+ (define (link-remove-participant nr)
+   (with p (ahash-ref link-participants nr)
+     (ahash-remove! link-participants nr)
+-    (when (oberver? p)
++    (when (observer? p)
+       (tree-pointer-detach p))))
+ 
+ (define (link-clean nr)
+-- 
+2.12.0
+
diff --git a/PKGBUILD b/PKGBUILD
index dacb0e309554..713a8cd67d5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=texmacs-svn
 _pkgname=texmacs
-pkgver=20170225.10610
+pkgver=20170301.10612
 pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface."
 arch=('i686' 'x86_64')
@@ -21,10 +21,12 @@ makedepends=('ghostscript')
 source=("${_pkgname}::svn://svn.savannah.gnu.org/texmacs/trunk/src"
         "0001-R-plugin-fix-preprocessor.patch"
         "0002-Sage-plugin-fix-which-not-found.patch"
+        "0003-Fix-typo.patch"
         )
 sha1sums=('SKIP'
-          'c13ef7e1d7821145c230533e1bc8adedfe814600'
-          'e18d952f5d6c6f0c9124a2b56221412a17789866')
+          '289165f7e1256c3fd703372351b2376fafdf8d01'
+          '03acb07214f7eba2fce17600a6a7b64bc642fab6'
+          '86cfc8b7de70911943143e46cf1bf093406a58f9')
 options=('!emptydirs' '!ccache')
 provides=('texmacs')
 conflicts=('texmacs')
@@ -42,6 +44,7 @@ prepare() {
 
   patch -Np1 -i ../0001-R-plugin-fix-preprocessor.patch
   patch -Np1 -i ../0002-Sage-plugin-fix-which-not-found.patch
+  patch -Np1 -i ../0003-Fix-typo.patch
 
   autoreconf