revision 14054 misses a needed file, so stick to 14053 for now, subversion makedep added

2 files changed, 23 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adb4f69a740a..b7c07a91d6b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = texmacs-svn
 	pkgdesc = Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface.
-	pkgver = 20220528.13877
-	pkgrel = 2
+	pkgver = 20221031.14053
+	pkgrel = 1
 	url = http://www.texmacs.org/
 	arch = x86_64
-	license = GPL
+	license = GPL3
 	makedepends = ghostscript
 	makedepends = cmake
+	makedepends = subversion
 	depends = perl
 	depends = guile1.8
 	depends = texlive-core
@@ -24,7 +25,7 @@ pkgbase = texmacs-svn
 	conflicts = texmacs
 	options = !emptydirs
 	options = !ccache
-	source = texmacs::svn://svn.savannah.gnu.org/texmacs/trunk/src
-	sha1sums = SKIP
+	source = texmacs::svn://svn.savannah.gnu.org/texmacs/trunk/src#revision=14053
+	sha256sums = SKIP
 
 pkgname = texmacs-svn
diff --git a/PKGBUILD b/PKGBUILD
index 816e8bf8f0f7..4dbd1c66ce04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,55 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Christopher Reimer <c.reimer1993@gmail.com>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# Contributor: Christopher Reimer <c.reimer1993@gmail.com>
 # Contributor: wangjiezhe <wangjiezhe AT yandex DOT com>
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=texmacs-svn
 _pkgname=texmacs
-pkgver=20220528.13877
-pkgrel=2
+pkgver=20221031.14053
+pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface."
 arch=('x86_64')
 url="http://www.texmacs.org/"
-license=('GPL')
+license=('GPL3')
 depends=('perl' 'guile1.8' 'texlive-core' 'python' 'libxext' 'freetype2'
 	 'qt5-svg' 'hicolor-icon-theme' 'gawk')
-# do not remove texlive-core dependency, as it is needed!
+
 optdepends=('transfig: convert images using fig2ps'
             'ghostscript: rendering ps files'
             'imagemagick: convert images'
             'aspell: spell checking')
-makedepends=('ghostscript' 'cmake')
-source=("${_pkgname}::svn://svn.savannah.gnu.org/texmacs/trunk/src"
-        )
-sha1sums=('SKIP')
+makedepends=('ghostscript' 'cmake' 'subversion')
+source=("${_pkgname}::svn://svn.savannah.gnu.org/texmacs/trunk/src#revision=14053")
+sha256sums=('SKIP')
 options=('!emptydirs' '!ccache')
 provides=('texmacs')
 conflicts=('texmacs')
 
 pkgver() {
   cd ${_pkgname}
-  LANG=en svn info | awk '/Revision/{r=$2}/Date/{gsub(/-/,"");d=$4}END{print d"."r}'
+  LANG=C svn info | awk '/Revision/{r=$2}/Date/{gsub(/-/,"");d=$4}END{print d"."r}'
 }
 
 prepare() {
-  rm -rf ${_pkgname}-build
-  svn export ${_pkgname} ${_pkgname}-build
-
-  cd ${_pkgname}-build
+  cd ${_pkgname}
   sed -e 's/-Wno-deprecated-register//' -i src/CMakeLists.txt # Remove wrong flag on Linux
 }
 
 build() {
-  cd ${_pkgname}-build
+  cd ${_pkgname}
 
-  mkdir -p build
+  [[ -d build ]] || mkdir build
   cd build
 
   cmake .. \
         -DCMAKE_BUILD_TYPE=RELEASE \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DGUILECONFIG_EXECUTABLE=/usr/bin/guile-config1.8
+        -DCMAKE_INSTALL_PREFIX=/usr 
   make
 }
 
 package() {
-  cd ${_pkgname}-build/build
+  cd ${_pkgname}/build
   make DESTDIR=${pkgdir} install
 
   # fix fig2ps script