diff options
author | GoliathLabs | 2020-06-29 17:20:34 +0200 |
---|---|---|
committer | GoliathLabs | 2020-06-29 17:20:34 +0200 |
commit | da433a7169faaeda891c634344f87e03c0991cf9 (patch) | |
tree | 68d4b41c1a93ca0e3f1d3e0468a44e883cabd7f6 | |
parent | a56ea98514af74b1aa2ad16a1c47df3045e22301 (diff) | |
download | aur-da433a7169faaeda891c634344f87e03c0991cf9.tar.gz |
Updated: PKGBUILD
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rw-r--r-- | rinclude.patch | 35 |
3 files changed, 38 insertions, 37 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Mon Jan 22 20:58:58 UTC 2018 pkgbase = jamovi-git - pkgdesc = Open Source Software to bridge the gap between researcher and statistician - pkgver = r716.8774368 + pkgdesc = Open Source Software to bridge the gap between researcher and statistician (Git) + pkgver = r1277.7744a02 pkgrel = 1 url = https://www.jamovi.org/ arch = any @@ -11,7 +9,7 @@ pkgbase = jamovi-git makedepends = npm makedepends = cython makedepends = git - makedepends = r-cran-rinside + makedepends = r-rinside depends = electron depends = python depends = python-protobuf @@ -21,7 +19,7 @@ pkgbase = jamovi-git depends = boost-libs depends = python-chardet depends = python-scipy - depends = r-cran-rinside + depends = r-rinside depends = gcc6-libs optdepends = jamovi-rbundle: R backend for various analyses provides = jamovi @@ -30,10 +28,10 @@ pkgbase = jamovi-git source = env.conf source = jamovi.sh source = rinclude.patch - md5sums = SKIP - md5sums = 75dc797390f0697fd9bc71c82563f857 - md5sums = 38fec18885de4ecbb91aef1f201c20d7 - md5sums = f873dbb9ac296cd6f563ed03f018fe97 + sha512sums = SKIP + sha512sums = 22b77987ace79ed7ddfa51319f61da3090e200c364cf6a3715a8d412757943bd0aa4d212178713afd3c55670414854314aa45c94a4ed788281e73cefbec0f1d5 + sha512sums = e4a3cc021f2914779e7521c0b3c462aa53af24b1e3eda79396e64f681ddd887c23ac439607235a2f4400ae57242aa8d8360c1390026a491143d00f5fd3dca3ab + sha512sums = 4fce631eb557420525ab5d138124cf48c6a20627b419f66c6c07bcc38bccc979d081e5e2ca75392a0dd84450ef29871183628174043aefc61b2fe6d55a4abb55 pkgname = jamovi-git @@ -1,25 +1,28 @@ -# Maintainer: Stephen Martin <stephenSRMMartin at gmail dot com> +# Maintainer: +# Contributor: Felix Golatofski <contact@xdfr.de> +# Contributor: Stephen Martin <stephenSRMMartin at gmail dot com> + pkgname=jamovi-git _pkgname=jamovi -pkgver=r716.8774368 +pkgver=r1277.7744a02 pkgrel=1 -pkgdesc="Open Source Software to bridge the gap between researcher and statistician" +pkgdesc="Open Source Software to bridge the gap between researcher and statistician (Git)" arch=('any') url="https://www.jamovi.org/" license=('GPL') -depends=('electron' 'python' 'python-protobuf' 'python-tornado' 'python-nanomsg' 'python-yaml' 'boost-libs' 'python-chardet' 'python-scipy' 'r-cran-rinside' 'gcc6-libs') #gcc6 libs added for libgfortran.so.3 +depends=('electron' 'python' 'python-protobuf' 'python-tornado' 'python-nanomsg' 'python-yaml' 'boost-libs' 'python-chardet' 'python-scipy' 'r-rinside' 'gcc6-libs') #gcc6 libs added for libgfortran.so.3 optdepends=("jamovi-rbundle: R backend for various analyses") -makedepends=('boost' 'npm' 'cython' 'git' 'r-cran-rinside') +makedepends=('boost' 'npm' 'cython' 'git' 'r-rinside') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") source=(git+https://github.com/jamovi/jamovi.git "env.conf" "jamovi.sh" "rinclude.patch") -md5sums=('SKIP' - '75dc797390f0697fd9bc71c82563f857' - '38fec18885de4ecbb91aef1f201c20d7' - 'f873dbb9ac296cd6f563ed03f018fe97') +sha512sums=('SKIP' + '22b77987ace79ed7ddfa51319f61da3090e200c364cf6a3715a8d412757943bd0aa4d212178713afd3c55670414854314aa45c94a4ed788281e73cefbec0f1d5' + 'e4a3cc021f2914779e7521c0b3c462aa53af24b1e3eda79396e64f681ddd887c23ac439607235a2f4400ae57242aa8d8360c1390026a491143d00f5fd3dca3ab' + '4fce631eb557420525ab5d138124cf48c6a20627b419f66c6c07bcc38bccc979d081e5e2ca75392a0dd84450ef29871183628174043aefc61b2fe6d55a4abb55') pkgver() { cd "$srcdir/${pkgname%-git}" @@ -44,6 +47,7 @@ build() { npm install # Engine cd ../engine + ./configure --prefix=/usr make } diff --git a/rinclude.patch b/rinclude.patch index d4a8ac71155a..dc65b6e90d76 100644 --- a/rinclude.patch +++ b/rinclude.patch @@ -1,24 +1,23 @@ -diff --git a/engine/Makefile b/engine/Makefile -index e7dce5b..7ec569f 100644 ---- a/engine/Makefile -+++ b/engine/Makefile -@@ -35,9 +35,9 @@ ifeq ($(os),OSX) - +diff --git a/engine/Makefile.in b/engine/Makefile.in +@@ -52,11 +52,11 @@ + CXXFLAGS += -mmacosx-version-min=10.10 else ifeq ($(os),Linux) -- R_HOME = $(SRCDIR)/../../../lib/R -+ R_HOME = /usr/lib/R - LIBS = -L$(R_HOME)/lib \ -- -L$(SRCDIR)/../../modules/base/R/RInside/lib \ -+ -L$(R_HOME)/library/RInside/lib \ - -lboost_filesystem \ - -lboost_system \ - -lpthread \ -@@ -65,6 +65,7 @@ INCLUDES += \ +- R_HOME ?= $(SRCDIR)/../../../lib/R ++ R_HOME ?= /usr/lib/R + BASE_MODULE_PATH ?= $(SRCDIR)/../../modules/base/R + R_PATH ?= $$ORIGIN/../lib $$ORIGIN/../Resources/modules/base/R/RInside/lib + LDFLAGS += -L$(R_HOME)/lib \ +- -L$(BASE_MODULE_PATH)/RInside/lib \ ++ -L$(R_HOME)/library/RInside/lib \ + -lboost_filesystem \ + -lboost_system \ + -lpthread \ +@@ -84,6 +84,7 @@ -I$(SRCDIR)/../../../include \ -I$(SRCDIR)/../server/jamovi/common \ -I$(R_HOME)/include \ + -I /usr/include/R \ - -I$(SRCDIR)/../../modules/base/R/RInside/include \ - -I$(SRCDIR)/../../modules/base/R/Rcpp/include \ - -I$(R_HOME)/library/RInside/include \ + -I$(BASE_MODULE_PATH)/RInside/include \ + -I$(BASE_MODULE_PATH)/Rcpp/include \ + -I/usr/share/R/include |