From 5eb3e08ae773783a289f5d1a0d0279ff267b01ac Mon Sep 17 00:00:00 2001 From: Philipp A Date: Wed, 28 Sep 2016 11:42:25 +0200 Subject: [PATCH] 1.0.28 --- .SRCINFO | 6 +++--- PKGBUILD | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6e81278607794..a78c5ce0f6bfc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = rstudio-desktop pkgdesc = Open source and enterprise-ready professional software for the R community - pkgver = 0.99.491 + pkgver = 1.0.28 pkgrel = 1 url = http://www.rstudio.com/ install = rstudio-desktop.install @@ -32,12 +32,12 @@ pkgbase = rstudio-desktop conflicts = rstudio-desktop-preview-bin noextract = core-dictionaries.zip noextract = gin-1.5.zip - source = rstudio-0.99.491.tar.gz::https://github.com/rstudio/rstudio/tarball/v0.99.491 + source = rstudio-1.0.28.tar.gz::https://github.com/rstudio/rstudio/tarball/v1.0.28 source = https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip source = https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip source = qdatastream.patch - sha256sums = 78ce1a5b6288d61332781c9dac7a894c322950e476322bc5268c4d8866892ac1 + sha256sums = 075506216b23a0424297a8fa5bc01668749db441e67aabd0e623d4e52b894926 sha256sums = f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94 sha256sums = aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3 sha256sums = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 diff --git a/PKGBUILD b/PKGBUILD index 97b9f2b92abb1..a2fc908aaa636 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Ben Ward # Maintainer: Alexsandr Pavlov pkgname=rstudio-desktop -pkgver=0.99.491 +pkgver=1.0.28 _gwtver=2.7.0 _ginver=1.5 _clangver=3.6.1 @@ -25,7 +25,7 @@ source=("rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/tarball/v$pk "qdatastream.patch") noextract=('core-dictionaries.zip' "gin-$_ginver.zip") -sha256sums=('78ce1a5b6288d61332781c9dac7a894c322950e476322bc5268c4d8866892ac1' +sha256sums=('075506216b23a0424297a8fa5bc01668749db441e67aabd0e623d4e52b894926' 'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94' 'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3' '4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494' @@ -40,8 +40,6 @@ prepare() { build() { cd "$srcdir/$_pkgname-$_pkgname-"* - patch -p 1 -i "$srcdir/qdatastream.patch" - install -d src/gwt/lib/{gin/$_ginver,gwt/$_gwtver} cp -r "$srcdir/gin-$_ginver/"* "src/gwt/lib/gin/$_ginver" @@ -53,11 +51,13 @@ build() { unzip -qfod "dictionaries" "$srcdir/core-dictionaries.zip" - ln -sfT "/usr/share/mathjax" mathjax-23 + 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" )