[lilac] updated to 0.17.0-3

2 files changed, 21 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9fbae4ed541e..8179be506c87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jasp-desktop
 	pkgdesc = A complete statistical package for both Bayesian and Frequentist statistical methods
-	pkgver = 0.16.4
-	pkgrel = 5
+	pkgver = 0.17.0
+	pkgrel = 3
 	url = https://github.com/jasp-stats/jasp-desktop
 	arch = x86_64
 	arch = aarch64
@@ -19,6 +19,7 @@ pkgbase = jasp-desktop
 	makedepends = qtcreator
 	makedepends = git
 	makedepends = patchelf
+	makedepends = ninja
 	depends = r
 	depends = qt6-5compat
 	depends = readstat
@@ -55,14 +56,11 @@ pkgbase = jasp-desktop
 	depends = r-jaspsem
 	depends = r-jaspsummarystatistics
 	depends = r-jaspvisualmodeling
+	depends = r-jaspacceptancesampling
 	provides = jasp
-	source = jasp-desktop-0.16.4.tar.gz::https://github.com/jasp-stats/jasp-desktop/archive/refs/tags/v0.16.4.tar.gz
+	source = jasp-desktop-0.17.0.tar.gz::https://github.com/jasp-stats/jasp-desktop/archive/refs/tags/v0.17.0.tar.gz
 	source = jasp.sh
-	source = jaspColumnEncoder::git+https://github.com/jasp-stats/jaspColumnEncoder.git
-	source = Qt640.patch::https://github.com/jasp-stats/jasp-desktop/compare/v0.16.4..f2956103.diff
-	sha256sums = 8671a8f73669e40c0ef4a9e088591a45559bc84bc6a3c745367ffcbca992602d
+	sha256sums = 6f4a8496e54a77daeae1e3826581559b7d122dde1cae67e08a30cc9b4842c239
 	sha256sums = e0714d980e7549b4c7dcbae50370e95b6ad2e7f0cf21a534ceb3a5a83ee583fd
-	sha256sums = SKIP
-	sha256sums = 2e53de4fa2983b1a519b6ca0126cbac743e8048211369dcf9d3d58e0f786616d
 
 pkgname = jasp-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 9db98240a79f..60c42518ec5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 #Maintainer: sukanka <su975853527 AT gmail.com>
 
 _pkgname=jasp
-_pkgver=0.16.4
+_pkgver=0.17.0
 pkgname=jasp-desktop
-pkgver=0.16.4
-pkgrel=5
+pkgver=0.17.0
+pkgrel=3
 pkgdesc="A complete statistical package for both Bayesian and Frequentist statistical methods"
 arch=('x86_64' 'aarch64')
 url="https://github.com/jasp-stats/jasp-desktop"
@@ -20,6 +20,7 @@ makedepends=("cmake" 'boost' 'jsoncpp'
 'qtcreator'
 'git'
 'patchelf'
+'ninja'
 )
 depends=('r'
 'qt6-5compat'
@@ -63,23 +64,17 @@ depends=('r'
 "r-jaspsem"
 "r-jaspsummarystatistics"
 "r-jaspvisualmodeling"
+"r-jaspacceptancesampling"
 )
 provides=($_pkgname)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jasp-stats/jasp-desktop/archive/refs/tags/v${pkgver}.tar.gz"
 'jasp.sh'
-"jaspColumnEncoder::git+https://github.com/jasp-stats/jaspColumnEncoder.git"
-# only needed in v0.16.4
-"Qt640.patch::https://github.com/jasp-stats/jasp-desktop/compare/v0.16.4..f2956103.diff"
 )
-sha256sums=('8671a8f73669e40c0ef4a9e088591a45559bc84bc6a3c745367ffcbca992602d'
-            'e0714d980e7549b4c7dcbae50370e95b6ad2e7f0cf21a534ceb3a5a83ee583fd'
-            'SKIP'
-            '2e53de4fa2983b1a519b6ca0126cbac743e8048211369dcf9d3d58e0f786616d')
+sha256sums=('6f4a8496e54a77daeae1e3826581559b7d122dde1cae67e08a30cc9b4842c239'
+            'e0714d980e7549b4c7dcbae50370e95b6ad2e7f0cf21a534ceb3a5a83ee583fd')
 
 prepare(){
     cd $srcdir/${pkgname}-${pkgver}
-    patch --strip=1 < ../Qt640.patch || true
-    cp -rf $srcdir/jaspColumnEncoder/*  Common/jaspColumnEncoder
 
     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
@@ -91,19 +86,23 @@ prepare(){
 
 build(){
     cd $srcdir/${pkgname}-${pkgver}
+    # this makes non-sense, but we need it.
+    export GITHUB_PAT="None"
+
     mkdir -p ${srcdir}/usr/lib/R
     cmake -S . -B build -DCUSTOM_R_PATH=/usr/lib/R -DLINUX_LOCAL_BUILD=OFF -DINSTALL_R_MODULES=OFF \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr/lib/${pkgname} -DCMAKE_INSTALL_LIBDIR=lib
+        -DCMAKE_INSTALL_PREFIX=/usr/lib/${pkgname} -DCMAKE_INSTALL_LIBDIR=lib \
+        -GNinja
 
         # -DBUILD_TESTS=ON does not work on linux.
-
-    cmake --build build
+    cd build
+    ninja
 }
 
 package() {
     cd $srcdir/${pkgname}-${pkgver}/build
-    make install DESTDIR=${pkgdir}
+    DESTDIR=${pkgdir} ninja -C . install
     install -Dm755 $srcdir/jasp.sh ${pkgdir}/usr/bin/jasp
 
     cd ${pkgdir}/usr/lib/${pkgname}