summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Martin2017-09-28 11:11:49 -0500
committerStephen Martin2017-09-28 11:11:49 -0500
commitb614a18f3fde3664e4e3c5e2d60c48d09e4641c3 (patch)
treed58489158cff8e0c7b038b2b600ec01d878df807
parenta019d5a2433d69d5b009da986515c6edf2e1cbf2 (diff)
downloadaur-b614a18f3fde3664e4e3c5e2d60c48d09e4641c3.tar.gz
Removed rcpp and rinside
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--rbundle.R2
3 files changed, 6 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef2dfd25418..b1366d018a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sun Jun 4 23:22:59 UTC 2017
+# Thu Sep 28 16:11:30 UTC 2017
pkgbase = jasp-rbundle
pkgdesc = A bundle of R packages needed by JASP desktop
pkgver = 2017.06.04
@@ -9,10 +9,6 @@ pkgbase = jasp-rbundle
makedepends = r
makedepends = gcc-fortran
depends = r
- provides = r-cran-rinside
- provides = r-cran-rcpp
- conflicts = r-cran-rinside
- conflicts = r-cran-rcpp
source = rbundle.R
md5sums = 65a18a87e12c25012d6291b1cea370c4
diff --git a/PKGBUILD b/PKGBUILD
index 46b962d7ffe..cf34a647fd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,9 +12,6 @@ source=("rbundle.R")
pkgver() {
echo $(date +%Y.%m.%d)
}
-provides=('r-cran-rinside' 'r-cran-rcpp')
-conflicts=('r-cran-rinside' 'r-cran-rcpp')
-
prepare(){
mkdir -p $srcdir/usr/lib/JASP/R/library
@@ -28,8 +25,8 @@ build(){
package(){
cp -r $srcdir/usr $pkgdir/
- mkdir -p $pkgdir/usr/lib/R/library
- mv $pkgdir/usr/lib/JASP/R/library/RInside $pkgdir/usr/lib/R/library/
- mv $pkgdir/usr/lib/JASP/R/library/Rcpp $pkgdir/usr/lib/R/library/
+ #mkdir -p $pkgdir/usr/lib/R/library
+ #mv $pkgdir/usr/lib/JASP/R/library/RInside $pkgdir/usr/lib/R/library/
+ #mv $pkgdir/usr/lib/JASP/R/library/Rcpp $pkgdir/usr/lib/R/library/
}
-md5sums=('65a18a87e12c25012d6291b1cea370c4')
+md5sums=('ff779a8742c48bfa73eb4c0423f79cbb')
diff --git a/rbundle.R b/rbundle.R
index a138a5973f1..65495329f89 100644
--- a/rbundle.R
+++ b/rbundle.R
@@ -9,7 +9,7 @@ print(path)
.Library <- ''
#List of R packages to be installed
-libs <- c('BayesFactor','lme4','Rcpp','RInside','afex','base64','car','effects','qgraph','hypergeo','lavaan',
+libs <- c('BayesFactor','lme4','afex','base64','car','effects','qgraph','hypergeo','lavaan',
'logspline','lsmeans','plotrix','rjson','semTools','vcd','vcdExtra','gnm')
#They modified gnm