v1.2.1335

This commit is contained in:
Philipp A 2019-04-10 13:02:31 +02:00
parent 8c80ba20e2
commit 2998b34e38
3 changed files with 28 additions and 18 deletions

View file

@ -1,6 +1,6 @@
pkgbase = rstudio-desktop
pkgdesc = Open source and enterprise-ready professional software for the R community
pkgver = 1.1.463
pkgver = 1.2.1335
pkgrel = 1
url = http://www.rstudio.com/
arch = i686
@ -8,7 +8,7 @@ pkgbase = rstudio-desktop
license = AGPL
makedepends = cmake>=2.8
makedepends = boost>=1.63
makedepends = java-environment
makedepends = java-environment=8
makedepends = apache-ant
makedepends = openssl
makedepends = pam
@ -24,20 +24,20 @@ pkgbase = rstudio-desktop
depends = qt5-location
depends = qt5-sensors
depends = qt5-svg
depends = qt5-webkit
depends = qt5-webengine
depends = qt5-xmlpatterns
conflicts = rstudio-desktop-bin
conflicts = rstudio-desktop-git
conflicts = rstudio-desktop-preview-bin
noextract = core-dictionaries.zip
noextract = gin-1.5.zip
source = rstudio-1.1.463.tar.gz::https://github.com/rstudio/rstudio/tarball/v1.1.463
source = https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip
source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip
noextract = gin-2.1.2.zip
source = rstudio-1.2.1335.tar.gz::https://github.com/rstudio/rstudio/tarball/v1.2.1335
source = https://s3.amazonaws.com/rstudio-buildtools/gin-2.1.2.zip
source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.1.zip
source = https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
sha256sums = 13225d7e12bd8e273a10951f121ed117fbfe25f3a7ce12003b3aff7bcc64af44
sha256sums = f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94
sha256sums = aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3
sha256sums = 466d547d1330a39138f25ef0a3ac6d2120cbacafdc71843f257e6a48ddc7c5ae
sha256sums = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
sha256sums = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7
sha256sums = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
pkgname = rstudio-desktop

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
/src/
/pkg/
/*.log
/*.pkg.tar.xz
/rstudio-*.tar.gz
/gin-*.zip

View file

@ -2,21 +2,27 @@
# Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
# Maintainer: Philipp A. <flying-sheep@web.de>
pkgname=rstudio-desktop
pkgver=1.1.463
_gwtver=2.7.0
_ginver=1.5
pkgver=1.2.1335
_gwtver=2.8.1
_ginver=2.1.2
_clangver=3.6.1
pkgrel=1
pkgdesc="Open source and enterprise-ready professional software for the R community"
arch=(i686 x86_64)
url="http://www.rstudio.com/"
license=(AGPL)
# TODO: what to remove? extra-x86_64-build says
# - it doesnt need mathjax, pandoc, clang, qt5-{sensors,svg,xmlpatterns}
# - and qt5-{base,declarative,location}, pango, shared-mime-info are auto-included
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
qt5-base qt5-declarative qt5-location qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns
)
makedepends=('cmake>=2.8' 'boost>=1.63' java-environment apache-ant openssl pam)
# java-environment=8 prevents:
# [ERROR] Hint: Check that your module inherits 'com.google.gwt.core.Core'
# either directly or indirectly (most often by inheriting module 'com.google.gwt.user.User')
makedepends=('cmake>=2.8' 'boost>=1.63' 'java-environment=8' apache-ant openssl pam)
conflicts=(rstudio-desktop-bin rstudio-desktop-git rstudio-desktop-preview-bin)
source=(
"rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/tarball/v$pkgver"
@ -26,9 +32,9 @@ source=(
)
noextract=('core-dictionaries.zip' "gin-$_ginver.zip")
sha256sums=(
'13225d7e12bd8e273a10951f121ed117fbfe25f3a7ce12003b3aff7bcc64af44'
'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94'
'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3'
'466d547d1330a39138f25ef0a3ac6d2120cbacafdc71843f257e6a48ddc7c5ae'
'b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a'
'0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7'
'4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494'
)
@ -78,6 +84,9 @@ build() {
bash 'install-packages'
)
# Prevent java error: “Could not lock User prefs. Lock file access denied.”
# Because gwt desperately needs to add a “firstLaunch” entry there…
export JAVA_TOOL_OPTIONS="-Djava.util.prefs.userRoot=$srcdir"
cmake -DRSTUDIO_TARGET=Desktop \
-DCMAKE_BUILD_TYPE=Release \
-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \