[lilac] updated to 0.16.2-1

1 files changed, 7 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 930e98cdfa2c..48ffe78c4866 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -66,24 +66,25 @@ depends=('r'
 )
 provides=($_pkgname)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jasp-stats/jasp-desktop/archive/refs/tags/v${pkgver}.tar.gz"
-"${_pkgname}".patch
 'jasp.sh'
 "jaspColumnEncoder::git+https://github.com/jasp-stats/jaspColumnEncoder.git"
 'jaspResults::git+https://github.com/jasp-stats/jaspResults.git'
 )
 sha256sums=('6f62db1b2b0741c894a7937f413799887e0d443f25f1b85d59e914847b14fff1'
-            '3e359651595e76790ea287b57cfd629279f027a9934a36b95b2825c2ba3bf43d'
             'e0714d980e7549b4c7dcbae50370e95b6ad2e7f0cf21a534ceb3a5a83ee583fd'
             'SKIP'
             'SKIP')
 
 prepare(){
     cd $srcdir/${pkgname}-${pkgver}
-    patch --strip=1 < ../${_pkgname}.patch
     cp -rf $srcdir/jaspColumnEncoder/*  Common/jaspColumnEncoder
     cp -rf $srcdir/jaspResults/*        R-Interface/jaspResults
 
     find Tools/CMake -name *.cmake -print0 | xargs -0 sed -i "s|/usr/local|/usr|g"
+    sed -i "s|lib='\${R_LIBRARY_PATH}'|lib='${srcdir}/usr/lib/R'|g"  Tools/CMake/R.cmake
+
+    # Do NOT install modules here, they are listed in dependencies
+    find Modules/ -name '*.in' -print0 | xargs -0 sed -i '1,$d;1a print("I am OK!")'
 }
 
 
@@ -91,10 +92,11 @@ build(){
     cd $srcdir/${pkgname}-${pkgver}
     mkdir -p ${srcdir}/usr/lib/R
     cmake -S . -B build -DCUSTOM_R_PATH=/usr/lib/R -DLINUX_LOCAL_BUILD=OFF -DINSTALL_R_MODULES=OFF \
-        -DUSE_LOCAL_R_LIBS_PATH=",lib=\"${srcdir}/usr/lib/R\"" \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr/lib/${pkgname} -DCMAKE_INSTALL_LIBDIR=lib
 
+        # -DBUILD_TESTS=ON does not work on linux.
+
     cmake --build build -- -j 5
 }
 
@@ -118,5 +120,5 @@ package() {
     sed -i "s|^Exec.*|Exec=jasp %f|g" \
         ${pkgdir}/usr/share/applications/org.jaspstats.JASP.desktop
 
-    rm -rf ${pkgdir}/usr/lib/jasp-desktop/{renv-root,renv-cache}
+    rm -rf ${pkgdir}/usr/lib/jasp-desktop/{renv-root,renv-cache,bin/org.jaspstats.JASP}
 }