summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Martin2015-09-04 12:34:47 -0500
committerStephen Martin2015-12-05 16:01:28 -0600
commit213e3582f9f3213f583501397705b06e2a3dfd8d (patch)
treecc37afae4255e57971ed81096439a007ad561f50
parent67b3bbf794c13d16412101ba5fff0b86891e7e97 (diff)
downloadaur-213e3582f9f3213f583501397705b06e2a3dfd8d.tar.gz
Added include patch
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rw-r--r--include.patch13
3 files changed, 27 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b9174b5ad48..d32a1f568be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@
# Sat Dec 5 21:54:22 UTC 2015
pkgbase = jasp-desktop-git
pkgdesc = JASP, a low fat alternative to SPSS, a delicious alternative to R.
- pkgver = v0.7.1.12.r0.g942ebf7
+ pkgver = r1859.547e22b
pkgrel = 1
url = http://jasp-stats.org
install = jasp-desktop-git.install
@@ -27,11 +27,13 @@ pkgbase = jasp-desktop-git
provides = jasp-desktop
conflicts = jasp
conflicts = jasp-desktop
- source = jasp-desktop::git+https://github.com/jasp-stats/jasp-desktop.git
+ source = jasp-desktop::git+https://github.com/jasp-stats/jasp-desktop.git#branch=development
source = jasp-desktop.svg
+ source = include.patch
source = sem.patch
md5sums = SKIP
md5sums = bcaf403001283553bb63b72c268d0290
+ md5sums = b8e84d0193dd415158df137870148817
md5sums = 9e04c417faac1e36f7ddb9f8350620ab
pkgname = jasp-desktop-git
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')
diff --git a/include.patch b/include.patch
new file mode 100644
index 00000000000..5c679d12713
--- /dev/null
+++ b/include.patch
@@ -0,0 +1,13 @@
+diff --git a/JASP-Engine/JASP-Engine.pro b/JASP-Engine/JASP-Engine.pro
+index a030e79..5bdcdad 100644
+--- a/JASP-Engine/JASP-Engine.pro
++++ b/JASP-Engine/JASP-Engine.pro
+@@ -60,7 +60,7 @@ QMAKE_CXXFLAGS += -Wno-c++11-extra-semi
+ win32:QMAKE_CXXFLAGS += -DBOOST_USE_WINDOWS_H
+
+ INCLUDEPATH += \
+- $$R_HOME/include \
++ /usr/include/R \
+ $$R_HOME/library/RInside/include \
+ $$R_HOME/library/Rcpp/include
+