diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | PKGBUILD | 31 | ||||
| -rw-r--r-- | include.patch | 6 | ||||
| -rw-r--r-- | jasp-desktop-git.install | 8 | ||||
| -rw-r--r-- | rlibrary.patch | 13 | ||||
| -rw-r--r-- | sem.patch | 46 |
6 files changed, 18 insertions, 101 deletions
@@ -1,11 +1,10 @@ # Generated by mksrcinfo v8 -# Tue Nov 8 18:05:23 UTC 2016 +# Sun Jun 4 21:09:38 UTC 2017 pkgbase = jasp-desktop-git pkgdesc = JASP, a low fat alternative to SPSS, a delicious alternative to R. - pkgver = v0.8.0.0.r0.g7df687e - pkgrel = 2 + pkgver = v0.8.1.2.r0.g7401fa07 + pkgrel = 1 url = http://jasp-stats.org - install = jasp-desktop-git.install arch = any license = AGPL3 makedepends = git @@ -28,14 +27,10 @@ pkgbase = jasp-desktop-git conflicts = jasp conflicts = jasp-desktop options = !strip - source = jasp-desktop::git+https://github.com/jasp-stats/jasp-desktop.git#tag=v0.8.0.0 + source = jasp-desktop::git+https://github.com/jasp-stats/jasp-desktop.git#tag=v0.8.1.2 source = include.patch - source = sem.patch - source = rlibrary.patch md5sums = SKIP - md5sums = 55f6dd36a413afa371fd112d3afa038e - md5sums = c7381a233ac6c6d7f6ccd85434f93f41 - md5sums = 7359b62112feac921e59346f52a74b4d + md5sums = a703cd01dddd301d89425b47cb2a0c61 pkgname = jasp-desktop-git @@ -2,8 +2,8 @@ pkgname=jasp-desktop-git _pkgname=jasp-desktop _buildname=jasp-build -pkgver=v0.8.0.0.r0.g7df687e -pkgrel=2 +pkgver=v0.8.1.2.r0.g7401fa07 +pkgrel=1 pkgdesc="JASP, a low fat alternative to SPSS, a delicious alternative to R." arch=('any') url="http://jasp-stats.org" @@ -12,12 +12,9 @@ depends=('qt5-base' 'r' 'libarchive' 'qt5-webkit' 'qt5-declarative' 'qt5-sensors makedepends=('git' 'r' 'gcc-fortran' 'boost' 'jasp-rbundle') provides=('jasp' 'jasp-desktop') conflicts=('jasp' 'jasp-desktop') -install='jasp-desktop-git.install' options=('!strip') -source=("$_pkgname::git+https://github.com/jasp-stats/$_pkgname.git#tag=v0.8.0.0" - "include.patch" - "sem.patch" - "rlibrary.patch") +source=("$_pkgname::git+https://github.com/jasp-stats/$_pkgname.git#tag=v0.8.1.2" + "include.patch") pkgver() { cd "$srcdir/$_pkgname" @@ -31,11 +28,6 @@ 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 - #Patch to allow multiple R libraries - patch -p1 < $srcdir/rlibrary.patch - #Create separate build dir mkdir -p $srcdir/$_buildname cd $srcdir/$_buildname @@ -52,13 +44,12 @@ build() { package() { #Install files cd $srcdir/$_buildname - mkdir -p $pkgdir/usr/share/$_pkgname - cp -r R $pkgdir/usr/share/$_pkgname - cp -r jasp JASPEngine Resources libJASP-Common.a libJASP-Desktop.a $pkgdir/usr/share/$_pkgname/ + mkdir -p $pkgdir/usr/lib/JASP + + cp -r ./R ./jasp ./JASPEngine ./Resources $pkgdir/usr/lib/JASP #Install icon - mkdir -p $pkgdir/usr/share/pixmaps/ - cp $srcdir/$_pkgname/Tools/debian/jasp.svg $pkgdir/usr/share/$_pkgname/Resources/ + cp $srcdir/$_pkgname/Tools/debian/jasp.svg $pkgdir/usr/lib/JASP/Resources/ #Install .desktop file mkdir -p $pkgdir/usr/share/applications @@ -66,9 +57,7 @@ package() { #Install link to binary mkdir -p $pkgdir/usr/bin/ - ln -s /usr/share/$_pkgname/jasp $pkgdir/usr/bin/JASP + ln -s /usr/lib/JASP/jasp $pkgdir/usr/bin/JASP } md5sums=('SKIP' - '55f6dd36a413afa371fd112d3afa038e' - 'c7381a233ac6c6d7f6ccd85434f93f41' - '7359b62112feac921e59346f52a74b4d') + 'a703cd01dddd301d89425b47cb2a0c61') diff --git a/include.patch b/include.patch index 376b5a3ef0b5..3bcfdb03af23 100644 --- a/include.patch +++ b/include.patch @@ -1,12 +1,12 @@ diff --git a/JASP-Engine/JASP-Engine.pro b/JASP-Engine/JASP-Engine.pro -index 3bf44d7..6fe7a09 100644 +index 1eb77cdf..438b206d 100644 --- a/JASP-Engine/JASP-Engine.pro +++ b/JASP-Engine/JASP-Engine.pro -@@ -72,6 +72,7 @@ INCLUDEPATH += \ +@@ -73,6 +73,7 @@ INCLUDEPATH += \ linux:INCLUDEPATH += \ /usr/share/R/include \ + /usr/include/R \ - $$_R_HOME/site-library/RInside/include \ $$_R_HOME/site-library/Rcpp/include + macx:LIBS += \ diff --git a/jasp-desktop-git.install b/jasp-desktop-git.install deleted file mode 100644 index d3041d1cb53f..000000000000 --- a/jasp-desktop-git.install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - echo "JASP was built with simple SEM enabled. This feature is UNSUPPORTED by the developer currently." -} - -post_upgrade() { - post_install -} - diff --git a/rlibrary.patch b/rlibrary.patch deleted file mode 100644 index 3621dabb74b3..000000000000 --- a/rlibrary.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/JASP-Desktop/enginesync.cpp b/JASP-Desktop/enginesync.cpp -index 49e215b..a87db98 100644 ---- a/JASP-Desktop/enginesync.cpp -+++ b/JASP-Desktop/enginesync.cpp -@@ -408,7 +408,7 @@ void EngineSync::startSlaveProcess(int no) - - env.insert("LD_LIBRARY_PATH", rHome.absoluteFilePath("lib") + ";" + rHome.absoluteFilePath("library/RInside/lib") + ";" + rHome.absoluteFilePath("library/Rcpp/lib") + ";" + rHome.absoluteFilePath("site-library/RInside/lib") + ";" + rHome.absoluteFilePath("site-library/Rcpp/lib")); - env.insert("R_HOME", rHome.absolutePath()); -- env.insert("R_LIBS", programDir.absoluteFilePath("R/library") + ":" + rHome.absoluteFilePath("library") + ":" + rHome.absoluteFilePath("site-library")); -+ env.insert("R_LIBS", programDir.absoluteFilePath("R/library") + ":" + rHome.absoluteFilePath("library") + ":" + rHome.absoluteFilePath("site-library") + ":/usr/share/jasp-desktop/R/library"); - - #endif - diff --git a/sem.patch b/sem.patch deleted file mode 100644 index 11cb08db4d4b..000000000000 --- a/sem.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/JASP-Desktop/mainwindow.cpp b/JASP-Desktop/mainwindow.cpp -index 14e56a9..5aed19c 100644 ---- a/JASP-Desktop/mainwindow.cpp -+++ b/JASP-Desktop/mainwindow.cpp -@@ -120,9 +120,7 @@ MainWindow::MainWindow(QWidget *parent) : - ui->tabBar->addTab("Variables"); // variables view - #endif - ui->tabBar->addTab("Common"); --#ifndef __linux__ - ui->tabBar->addOptionsTab(); // no SEM under linux for now --#endif - ui->tabBar->addHelpTab(); - - connect(ui->tabBar, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); -@@ -670,7 +668,6 @@ void MainWindow::tabChanged(int index) - ui->topLevelWidgets->setCurrentIndex(1); - } - #endif --#ifndef __linux__ - else if (index == ui->tabBar->count() - 1) - { - if (_optionsForm == NULL) -@@ -682,7 +679,6 @@ void MainWindow::tabChanged(int index) - - ui->topLevelWidgets->setCurrentWidget(_optionsForm); - } --#endif - else - { - #ifdef QT_DEBUG // if variables tab enabled -@@ -988,15 +984,11 @@ void MainWindow::updateMenuEnabledDisabledStatus() - - void MainWindow::updateUIFromOptions() - { --#ifdef __linux__ -- ui->tabBar->removeTab("SEM"); --#else - QVariant sem = _settings.value("plugins/sem", false); - if (sem.canConvert(QVariant::Bool) && sem.toBool()) - ui->tabBar->addTab("SEM"); - else - ui->tabBar->removeTab("SEM"); --#endif - - QVariant rl = _settings.value("toolboxes/r11tLearn", false); - if (rl.canConvert(QVariant::Bool) && rl.toBool()) |