summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorStephen Martin2015-09-04 12:34:47 -0500
committerStephen Martin2015-12-05 16:01:28 -0600
commit213e3582f9f3213f583501397705b06e2a3dfd8d (patch)
treecc37afae4255e57971ed81096439a007ad561f50 /PKGBUILD
parent67b3bbf794c13d16412101ba5fff0b86891e7e97 (diff)
downloadaur-213e3582f9f3213f583501397705b06e2a3dfd8d.tar.gz
Added include patch
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD13
1 files changed, 10 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index c6c5dc4f58a..90491ecb7f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=jasp-desktop-git
_pkgname=jasp-desktop
_buildname=jasp-build
-pkgver=v0.7.1.12.r0.g942ebf7
+pkgver=r1859.547e22b
pkgrel=1
pkgdesc="JASP, a low fat alternative to SPSS, a delicious alternative to R."
arch=('any')
@@ -13,8 +13,9 @@ makedepends=('git' 'qtchooser' 'r' 'gcc-fortran' 'boost')
provides=('jasp' 'jasp-desktop')
conflicts=('jasp' 'jasp-desktop')
install=('jasp-desktop-git.install')
-source=("$_pkgname::git+https://github.com/jasp-stats/$_pkgname.git"
+source=("$_pkgname::git+https://github.com/jasp-stats/$_pkgname.git#branch=development"
"jasp-desktop.svg"
+ "include.patch"
"sem.patch")
pkgver() {
@@ -27,7 +28,12 @@ pkgver() {
prepare() {
cd $srcdir/$_pkgname
+ #Patch the R include path
+ patch -p1 < $srcdir/include.patch
+ #Patch simplesem back into the linux version
patch -p1 < $srcdir/sem.patch
+
+ #Create separate build dir
mkdir -p $srcdir/$_buildname
cd $srcdir/$_buildname
@@ -44,7 +50,7 @@ package() {
#Install files
cd $srcdir/$_buildname
mkdir -p $pkgdir/usr/share/$_pkgname
- cp -r ./Help ./JASP ./JASPEngine ./Resources $pkgdir/usr/share/$_pkgname/
+ cp -r JASP JASPR ./JASPEngine ./Resources $pkgdir/usr/share/$_pkgname/
#Install icon
mkdir -p $pkgdir/usr/share/pixmaps/
@@ -65,4 +71,5 @@ EOF
}
md5sums=('SKIP'
'bcaf403001283553bb63b72c268d0290'
+ 'b8e84d0193dd415158df137870148817'
'9e04c417faac1e36f7ddb9f8350620ab')