Fix LD_LIBRARY_PATH error

3 files changed, 24 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57c6c6436a8d..84051ea73644 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jan 10 11:11:04 UTC 2017
+# Sun Jan 29 14:47:55 UTC 2017
 pkgbase = cadabra2-git
 	pkgdesc = A computer algebra system (pre-release version) designed specifically for the solution of problems encountered in field theory.
-	pkgver = r1133.85e3381a2
+	pkgver = r1162.9b7e34177
 	pkgrel = 1
 	url = http://cadabra.science/
 	install = package.install
@@ -22,7 +22,7 @@ pkgbase = cadabra2-git
 	source = cadabra2-git::git+https://github.com/kpeeters/cadabra2
 	source = package.patch
 	md5sums = SKIP
-	md5sums = 15cbc4a33a34434058fb702bc7d92393
+	md5sums = f18d2d5c9c70064e422cdbd7954ecd59
 
 pkgname = cadabra2-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 588e09ac1c0e..ad18729d24f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Tarn Burton <twburton at gmail dot com>
 pkgname='cadabra2-git'
-pkgver=r1133.85e3381a2
+pkgver=r1162.9b7e34177
 pkgrel=1
 pkgdesc="A computer algebra system (pre-release version) designed specifically for the solution of problems encountered in field theory."
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ depends=('python-matplotlib' 'gtkmm3' 'jsoncpp' 'mathjax' 'boost-libs' 'python-s
 makedepends=('cmake' 'boost')
 source=("$pkgname::git+https://github.com/kpeeters/cadabra2" "package.patch")
 md5sums=('SKIP'
-         '15cbc4a33a34434058fb702bc7d92393')
+         'f18d2d5c9c70064e422cdbd7954ecd59')
 install=package.install
 
 
diff --git a/package.patch b/package.patch
index 7471bac4aaa5..7be69f549f25 100644
--- a/package.patch
+++ b/package.patch
@@ -1,9 +1,9 @@
 diff -aur -bZwB -x .git cadabra2-git.old/frontend/CMakeLists.txt cadabra2-git/frontend/CMakeLists.txt
---- cadabra2-git.old/frontend/CMakeLists.txt	2016-06-04 10:24:47.557487173 -0400
-+++ cadabra2-git/frontend/CMakeLists.txt	2016-06-04 10:25:19.020696432 -0400
-@@ -21,8 +21,8 @@
- 
- execute_process(COMMAND kpsewhich -var-value=TEXMFLOCAL OUTPUT_VARIABLE INSTALL_LATEX_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+--- cadabra2-git.old/frontend/CMakeLists.txt	2017-01-29 09:40:31.904324635 -0500
++++ cadabra2-git/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)
@@ -12,3 +12,17 @@ diff -aur -bZwB -x .git cadabra2-git.old/frontend/CMakeLists.txt cadabra2-git/fr
  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-git.old/tests/CMakeLists.txt cadabra2-git/tests/CMakeLists.txt
+--- cadabra2-git.old/tests/CMakeLists.txt	2017-01-29 09:40:31.907657960 -0500
++++ cadabra2-git/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)