texmacs-svn 20170303.10620-1

5 files changed, 11 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4207810e2c80..ae443d33b657 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Mar  1 07:38:22 UTC 2017
+# Fri Mar  3 13:24:02 UTC 2017
 pkgbase = texmacs-svn
 	pkgdesc = Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface.
-	pkgver = 20170301.10612
+	pkgver = 20170303.10620
 	pkgrel = 1
 	url = http://www.texmacs.org/
 	arch = i686
@@ -29,11 +29,9 @@ 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 = 289165f7e1256c3fd703372351b2376fafdf8d01
-	sha1sums = 03acb07214f7eba2fce17600a6a7b64bc642fab6
-	sha1sums = 86cfc8b7de70911943143e46cf1bf093406a58f9
+	sha1sums = 57cef50905776f39c26fd7fd9c9ad45cf630233c
+	sha1sums = c755cb0c3f002129ed64df21c0dffbae49a317f0
 
 pkgname = texmacs-svn
 
diff --git a/0001-R-plugin-fix-preprocessor.patch b/0001-R-plugin-fix-preprocessor.patch
index 060efbb1825a..1c8bc2cbf82b 100644
--- a/0001-R-plugin-fix-preprocessor.patch
+++ b/0001-R-plugin-fix-preprocessor.patch
@@ -1,7 +1,7 @@
-From ed5dd2be0a5be4a6001cce41d5cf91da2eb81e81 Mon Sep 17 00:00:00 2001
+From e2175645f43330781d9cbb9b68172024c1ab884f Mon Sep 17 00:00:00 2001
 From: wangjiezhe <wangjiezhe@gmail.com>
 Date: Mon, 23 May 2016 13:36:44 +0800
-Subject: [PATCH 1/3] R plugin: fix preprocessor
+Subject: [PATCH 1/2] R plugin: fix preprocessor
 
 ---
  plugins/r/src/tm_r.c | 3 ++-
diff --git a/0002-Sage-plugin-fix-which-not-found.patch b/0002-Sage-plugin-fix-which-not-found.patch
index 07c12624e5fb..2298de154696 100644
--- a/0002-Sage-plugin-fix-which-not-found.patch
+++ b/0002-Sage-plugin-fix-which-not-found.patch
@@ -1,7 +1,7 @@
-From 913cec746a0e7edb5e0280a385af2069fd32f6db Mon Sep 17 00:00:00 2001
+From f78c8fab781c090221a9eb4d65736eadecfc8a39 Mon Sep 17 00:00:00 2001
 From: wangjiezhe <wangjiezhe@gmail.com>
 Date: Wed, 8 Jun 2016 11:20:42 +0800
-Subject: [PATCH 2/3] Sage plugin: fix `which` not found
+Subject: [PATCH 2/2] Sage plugin: fix `which` not found
 
 ---
  plugins/sage/progs/init-sage.scm | 8 +++++++-
diff --git a/0003-Fix-typo.patch b/0003-Fix-typo.patch
deleted file mode 100644
index fd99a291f32f..000000000000
--- a/0003-Fix-typo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 713a8cd67d5e..f8a7e6a6639c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=texmacs-svn
 _pkgname=texmacs
-pkgver=20170301.10612
+pkgver=20170303.10620
 pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface."
 arch=('i686' 'x86_64')
@@ -21,12 +21,10 @@ 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'
-          '289165f7e1256c3fd703372351b2376fafdf8d01'
-          '03acb07214f7eba2fce17600a6a7b64bc642fab6'
-          '86cfc8b7de70911943143e46cf1bf093406a58f9')
+          '57cef50905776f39c26fd7fd9c9ad45cf630233c'
+          'c755cb0c3f002129ed64df21c0dffbae49a317f0')
 options=('!emptydirs' '!ccache')
 provides=('texmacs')
 conflicts=('texmacs')
@@ -44,7 +42,6 @@ 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