Fix LD_LIBRARY_PATH error

3 files changed, 24 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f097ab69398..17b29d729c19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Jan 10 01:32:54 UTC 2017
+# Sun Jan 29 14:50:46 UTC 2017
 pkgbase = cadabra2
 	pkgdesc = A computer algebra system designed specifically for the solution of problems encountered in field theory.
 	pkgver = 2.1.2
@@ -18,12 +18,11 @@ pkgbase = cadabra2
 	depends = boost-libs
 	depends = python-sympy
 	depends = texlive-core
-	provides = cadabra2
-	conflicts = cadabra2
+	conflicts = cadabra2-git
 	source = cadabra2::git+https://github.com/kpeeters/cadabra2#tag=2.1.2
 	source = package.patch
 	md5sums = SKIP
-	md5sums = b04444f9ba31aa482dd88473dd90d59b
+	md5sums = 2cf414a7280fd64858d1d19d38d4bd8c
 
 pkgname = cadabra2
 
diff --git a/PKGBUILD b/PKGBUILD
index 6c2d7a2ab9ff..6fbaf57bb421 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,13 +6,12 @@ pkgdesc="A computer algebra system designed specifically for the solution of pro
 arch=('i686' 'x86_64')
 url="http://cadabra.science/"
 license=('GPL')
-provides=('cadabra2')
-conflicts=('cadabra2')
+conflicts=('cadabra2-git')
 depends=('python-matplotlib' 'gtkmm3' 'jsoncpp' 'mathjax' 'boost-libs' 'python-sympy' 'texlive-core')
 makedepends=('cmake' 'boost')
 source=("$pkgname::git+https://github.com/kpeeters/cadabra2#tag=$pkgver" "package.patch")
 md5sums=('SKIP'
-         'b04444f9ba31aa482dd88473dd90d59b')
+         '2cf414a7280fd64858d1d19d38d4bd8c')
 install=package.install
 
 prepare() {
diff --git a/package.patch b/package.patch
index 18a7da30ce26..63320f971205 100644
--- a/package.patch
+++ b/package.patch
@@ -1,9 +1,9 @@
 diff -aur -bZwB -x .git cadabra2.old/frontend/CMakeLists.txt cadabra2/frontend/CMakeLists.txt
---- cadabra2.old/frontend/CMakeLists.txt	2016-06-04 10:24:47.557487173 -0400
-+++ cadabra2/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.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)
@@ -12,3 +12,17 @@ diff -aur -bZwB -x .git cadabra2.old/frontend/CMakeLists.txt cadabra2/frontend/C
  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)