pcr/rstudio-desktop: updated to 1.1.419

1 files changed, 88 insertions, 28 deletions

diff --git a/pcr/rstudio-desktop/PKGBUILD b/pcr/rstudio-desktop/PKGBUILD
index 4d3d04d77..3d50d59c5 100644
--- a/pcr/rstudio-desktop/PKGBUILD
+++ b/pcr/rstudio-desktop/PKGBUILD
@@ -1,38 +1,98 @@
-# Maintainer (Arch):  TDY <tdy@archlinux.info>
-# Contributor (Arch): Ben Ward <benjamin.ward@bathspa.org>
+# Contributor (AUR): Ben Ward <benjamin.ward@bathspa.org>
+# Contributor (AUR): Alexsandr Pavlov <kidoz at mail dot ru>
+# Maintainer (AUR): Philipp A. <flying-sheep@web.de>
+
+# parabola changes and rationale:
+#  - added .install file to update desktop database
 
 pkgname=rstudio-desktop
-pkgver=0.97.332
-_commit=e65a459
+pkgver=1.1.419
+_gwtver=2.7.0
+_ginver=1.5
+_clangver=3.6.1
 pkgrel=1
-pkgdesc="A powerful and productive user interface for R"
-arch=('i686' 'x86_64')
-url="http://www.rstudio.org/"
-license=('AGPL')
-depends=('r>=2.11.1' 'qtwebkit' 'boost-libs>=1.50' 'shared-mime-info')
-makedepends=('git' 'cmake>=2.8' 'boost>=1.50' 'java-environment' 'apache-ant' 'unzip' 'openssl' 'pam' 'wget')
+pkgdesc="Open source and enterprise-ready professional software for the R community"
+arch=(i686 x86_64 armv7h)
+url="http://www.rstudio.com/"
+license=(AGPL)
+depends=(
+	'r>=2.11.1' 'boost-libs>=1.63'
+	pango shared-mime-info mathjax pandoc clang
+	qt5-base qt5-declarative qt5-location qt5-sensors qt5-svg qt5-webkit qt5-xmlpatterns
+)
+makedepends=('cmake>=2.8' 'boost>=1.63' java-environment apache-ant openssl pam)
+conflicts=(rstudio-desktop-bin rstudio-desktop-git rstudio-desktop-preview-bin)
 install=rstudio.install
-source=($pkgname-$pkgver.tgz::https://github.com/rstudio/rstudio/tarball/v$pkgver)
-md5sums=('0197506486c76ed1bff71a534072e0e9')
+source=(
+	"rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/tarball/v$pkgver"
+	"https://s3.amazonaws.com/rstudio-buildtools/gin-$_ginver.zip"
+	"https://s3.amazonaws.com/rstudio-buildtools/gwt-$_gwtver.zip"
+	'https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip'
+)
+noextract=('core-dictionaries.zip' "gin-$_ginver.zip")
+sha256sums=('597c373092ea3416da2e44fada07734e106b40f961784bf5d951641c18c29f3a'
+            'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94'
+            'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3'
+            '4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494')
 
-build() {
-  cd "$srcdir/rstudio-rstudio-$_commit/dependencies/common"
-  sh install-gwt
-  sh install-dictionaries
-  sh install-mathjax
+_pkgname=rstudio
 
-  rm -rf "$srcdir/rstudio-rstudio-$_commit/build"
-  install -dm755 "$srcdir/rstudio-rstudio-$_commit/build"
-  cd "$srcdir/rstudio-rstudio-$_commit/build"
-  cmake -DRSTUDIO_TARGET=Desktop \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio ..
+_check_version() {
+	local varname=$1
+	local real=$2
+	local path=$3
+	msg2 "Checking if $varname in file “$path” is “$real”"
+	
+	local test=$(grep -P "$varname=[\\d.]+" "$path" | cut -d= -f2)
+	if [[ "$test" != "$real" ]]; then
+		msg2 "Check failed: $varname is $test" >&2
+		exit 1
+	fi
 }
 
-package() {
-  cd "$srcdir/rstudio-rstudio-$_commit/build"
-  make DESTDIR="$pkgdir/" install
-  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+prepare() {
+	cd "$srcdir/$_pkgname-$_pkgname-"*
+	_check_version GIN_VER     $_ginver 'dependencies/common/install-gwt' || exit 1
+	_check_version GWT_SDK_VER $_gwtver 'dependencies/common/install-gwt' || exit 1
+	unzip -o "$srcdir/gin-$_ginver.zip" -d "../gin-$_ginver"
+}
+
+build() {
+	cd "$srcdir/$_pkgname-$_pkgname-"*
+	
+	install -d src/gwt/lib/{gin/$_ginver,gwt/$_gwtver}
+	
+	cp -r "$srcdir/gin-$_ginver/"* "src/gwt/lib/gin/$_ginver"
+	cp -r "$srcdir/gwt-$_gwtver/"* "src/gwt/lib/gwt/$_gwtver"
+	
+	(
+		cd 'dependencies/common'
+		install -d dictionaries libclang/{3.5,builtin-headers}
+		
+		unzip -qfod 'dictionaries' "$srcdir/core-dictionaries.zip"
+		
+		ln -sfT '/usr/share/mathjax'                mathjax-26
+		ln -sfT '/usr/bin'                          pandoc
+		ln -sfT '/usr/lib/libclang.so'              libclang/3.5/libclang.so
+		ln -sfT "/usr/lib/clang/$_clangver/include" libclang/builtin-headers/3.5
+		
+		#TODO: https://github.com/rstudio/rsconnect.git
+		#TODO: https://github.com/rstudio/rmarkdown.git
+		bash 'install-packages'
+	)
+	
+	cmake -DRSTUDIO_TARGET=Desktop \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
+		-DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio
 }
 
-# vim:set ts=2 sw=2 et:
+package() {
+	cd "$srcdir/$_pkgname-$_pkgname-"*
+	
+	make DESTDIR="$pkgdir/" install
+	
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+	install -d "$pkgdir/usr/bin"
+	ln -sfT ../lib/rstudio/bin/rstudio "$pkgdir/usr/bin/rstudio"
+}