Fix for TEXMFLOCAL

4 files changed, 27 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adca45f3d652..7e6ea229f028 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri May 27 19:20:08 UTC 2016
+# Mon May 30 15:08:44 UTC 2016
 pkgbase = cadabra2-git
 	pkgdesc = A computer algebra system (pre-release version) designed specifically for the solution of problems encountered in field theory.
 	pkgver = r741.5f9eb01
-	pkgrel = 1
+	pkgrel = 3
 	url = http://cadabra.phi-sci.com/
 	install = package.install
 	arch = i686
@@ -17,10 +17,13 @@ pkgbase = cadabra2-git
 	depends = mathjax
 	depends = boost-libs
 	depends = python-sympy
+	depends = texlive-core
 	provides = cadabra2
 	conflicts = cadabra2
 	source = cadabra2-git::git+https://github.com/kpeeters/cadabra2
+	source = package.patch
 	md5sums = SKIP
+	md5sums = fd4a86673fc5b435df28c62f927f3946
 
 pkgname = cadabra2-git
 
diff --git a/.gitignore b/.gitignore
index b31bfcb71a3b..2a61bf723ac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ src
 cadabra2-git-*.pkg.tar.xz
 *.bak
 *.log
+*.sh
diff --git a/PKGBUILD b/PKGBUILD
index d5bd29f35040..b0ca77993261 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tarn Burton <twburton at gmail dot com>
 pkgname='cadabra2-git'
 pkgver=r741.5f9eb01
-pkgrel=2
+pkgrel=3
 pkgdesc="A computer algebra system (pre-release version) designed specifically for the solution of problems encountered in field theory."
 arch=('i686' 'x86_64')
 url="http://cadabra.phi-sci.com/"
@@ -10,8 +10,9 @@ provides=('cadabra2')
 conflicts=('cadabra2')
 depends=('python-matplotlib' 'gtkmm3' 'jsoncpp' 'mathjax' 'boost-libs' 'python-sympy' 'texlive-core')
 makedepends=('cmake' 'boost')
-source=("$pkgname::git+https://github.com/kpeeters/cadabra2")
-md5sums=('SKIP')
+source=("$pkgname::git+https://github.com/kpeeters/cadabra2" "package.patch")
+md5sums=('SKIP'
+         'fd4a86673fc5b435df28c62f927f3946')
 install=package.install
 
 
@@ -20,6 +21,11 @@ pkgver() {
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "${srcdir}/${pkgname}"
+  patch -Np1 -i ../package.patch
+}
+
 build() {
   cd $pkgname
   mkdir -p build
diff --git a/package.patch b/package.patch
new file mode 100644
index 000000000000..861fc3968192
--- /dev/null
+++ b/package.patch
@@ -0,0 +1,12 @@
+diff -aur -bZwB -x .git cadabra2-git.old/frontend/CMakeLists.txt cadabra2-git/frontend/CMakeLists.txt
+--- cadabra2-git.old/frontend/CMakeLists.txt	2016-05-30 11:00:31.934410709 -0400
++++ cadabra2-git/frontend/CMakeLists.txt	2016-05-30 11:01:00.657633955 -0400
+@@ -20,6 +20,8 @@
+ # endif(APPLE)
+ 
+ execute_process(COMMAND kpsewhich -var-value=TEXMFLOCAL OUTPUT_VARIABLE INSTALL_LATEX_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
++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