Updated to 2.2.7

4 files changed, 27 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b08f620f2f9..cf5d5653d4ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,18 @@
 pkgbase = cadabra2
-	pkgdesc = A computer algebra system designed specifically for the solution of problems encountered in field theory.
-	pkgver = 2.2.0
+	pkgdesc = A field-theory motivated approach to computer algebra
+	pkgver = 2.2.7
 	pkgrel = 1
-	url = http://cadabra.science/
-	arch = i686
+	url = http://cadabra.science
 	arch = x86_64
 	license = GPL
-	makedepends = boost
 	makedepends = cmake
-	makedepends = git
-	depends = boost-libs
-	depends = glibmm
-	depends = gmp
+	depends = python
+	depends = sqlite3
+	depends = boost
 	depends = gtkmm3
-	depends = jsoncpp
-	depends = mathjax
-	depends = pcre
-	depends = python-matplotlib
-	depends = python-sympy
-	depends = texlive-core
 	conflicts = cadabra2-git
-	source = cadabra2::git+https://github.com/kpeeters/cadabra2#tag=2.2.0
-	source = package.patch
-	md5sums = SKIP
-	md5sums = 2cf414a7280fd64858d1d19d38d4bd8c
+	source = https://github.com/kpeeters/cadabra2/archive/2.2.7.tar.gz
+	sha256sums = 9baec68c52fca1e7bcda70448b8596f335ef004f4fc670a1def4721e6d8ac035
 
 pkgname = cadabra2
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d72de53f94e..5d661ad8b1c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,32 @@
-# Maintainer: Tarn Burton <twburton at gmail dot com>
+# Maintainer: Anton Kudelin <kudelin at protonmail dot com>
+# Contributor: Tarn Burton <twburton at gmail dot com>
+
 pkgname='cadabra2'
-pkgver=2.2.0
+pkgver=2.2.7
 pkgrel=1
-pkgdesc="A computer algebra system designed specifically for the solution of problems encountered in field theory."
-arch=('i686' 'x86_64')
-url="http://cadabra.science/"
+pkgdesc="A field-theory motivated approach to computer algebra"
+arch=('x86_64')
+url="http://cadabra.science"
 license=('GPL')
 conflicts=('cadabra2-git')
-depends=(
-  'boost-libs'
-  'glibmm'
-  'gmp'
-  'gtkmm3'
-  'jsoncpp'
-  'mathjax'
-  'pcre'
-  'python-matplotlib'
-  'python-sympy'
-  'texlive-core'
-)
-makedepends=(
-  'boost'
-  'cmake'
-  'git'
-)
-source=("$pkgname::git+https://github.com/kpeeters/cadabra2#tag=$pkgver" "package.patch")
-md5sums=('SKIP'
-         '2cf414a7280fd64858d1d19d38d4bd8c')
-# install=package.install
-
-# prepare() {
-#   cd "${srcdir}/${pkgname}"
-#   patch -Np1 -i ../package.patch
-# }
+depends=('python' 'sqlite3' 'boost' 'gtkmm3')
+makedepends=('cmake')
+source=("https://github.com/kpeeters/$pkgname/archive/$pkgver.tar.gz")
+sha256sums=('9baec68c52fca1e7bcda70448b8596f335ef004f4fc670a1def4721e6d8ac035')
 
 build() {
-  cd $pkgname
+  cd $pkgname-$pkgver
   mkdir -p build
   cd build
-  cmake -DCMAKE_SKIP_RPATH=true -DCMAKE_INSTALL_PREFIX=/usr ..
+  cmake ..\
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DSQLITE3_INCLUDE_DIR=/usr/include
   make
 }
 
 package() {
-  cd "${pkgname}/build"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver/build
+  make DESTDIR=$pkgdir install
+  mv $pkgdir/usr/man $pkgdir/usr/share/$pkgname
 }
+
diff --git a/package.install b/package.install
deleted file mode 100644
index bcc3dee5aab4..000000000000
--- a/package.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  mktexlsr
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/package.patch b/package.patch
deleted file mode 100644
index 63320f971205..000000000000
--- a/package.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -aur -bZwB -x .git cadabra2.old/frontend/CMakeLists.txt cadabra2/frontend/CMakeLists.txt
---- cadabra2.old/frontend/CMakeLists.txt	2017-01-29 09:40:31.904324635 -0500
-+++ cadabra2/frontend/CMakeLists.txt	2017-01-29 09:40:54.937598647 -0500
-@@ -25,8 +25,8 @@
-   execute_process(COMMAND kpsewhich -var-value=TEXMFLOCAL OUTPUT_VARIABLE INSTALL_LATEX_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
- endif()
- # Get the last path in the LaTeX install dir, if there is more than one separated by a ':'.
--#string(REPLACE ":" ";" INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}")
--#list(GET INSTALL_LATEX_DIR -1 INSTALL_LATEX_DIR)
-+string(REPLACE ":" ";" INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}")
-+list(GET INSTALL_LATEX_DIR -1 INSTALL_LATEX_DIR)
- set(INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}/tex/latex/cadabra2")
- message("-- Installing LaTeX style files in ${INSTALL_LATEX_DIR}")
- install(DIRECTORY DESTINATION ${INSTALL_LATEX_DIR} DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-diff -aur -bZwB -x .git cadabra2.old/tests/CMakeLists.txt cadabra2/tests/CMakeLists.txt
---- cadabra2.old/tests/CMakeLists.txt	2017-01-29 09:40:31.907657960 -0500
-+++ cadabra2/tests/CMakeLists.txt	2017-01-29 09:40:54.937598647 -0500
-@@ -37,8 +37,8 @@
- foreach(NBTEST ${NBTESTS})
-   add_custom_command(OUTPUT  ${CDBOUT}/${NBTEST}.cdb
- 	 DEPENDS ${CNBIN}/${NBTEST}.cnb ${DC}
--	 COMMAND cadabra2cadabra
--	 ARGS    ${CNBIN}/${NBTEST}.cnb ${CDBOUT}/${NBTEST}.cdb
-+   COMMAND env
-+   ARGS    LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/client_server ${CMAKE_BINARY_DIR}/client_server/cadabra2cadabra ${CNBIN}/${NBTEST}.cnb ${CDBOUT}/${NBTEST}.cdb
- 	 COMMENT "Creating ${NBTEST} notebook...")
-   add_custom_target("${NBTEST}_test" ALL echo -n DEPENDS ${CDBOUT}/${NBTEST}.cdb)
-   add_test(${NBTEST}  ${CMAKE_SOURCE_DIR}/core/cadabra2 ${CDBOUT}/${NBTEST}.cdb)