rstudio changes, builds now with openjdk7

This commit is contained in:
abveritas 2013-01-29 21:00:55 +00:00
parent de8d336696
commit 0ae086a6f6

View File

@ -13,21 +13,13 @@ arch=('x86_64')
url="http://www.rstudio.org/" url="http://www.rstudio.org/"
license=('AGPL') license=('AGPL')
depends=('boost-libs' 'java-environment' 'qtwebkit' 'r') depends=('boost-libs' 'java-environment' 'qtwebkit' 'r')
makedepends=('apache-ant' 'boost' 'bzip2' 'cmake' 'git' 'icu' 'openssl' 'pam' 'unzip' 'wget') makedepends=('apache-ant' 'boost' 'bzip2' 'cmake' 'git' 'icu' 'openssl' 'pam' 'unzip' 'wget' 'libcups')
provides=('rstudio-desktop') provides=('rstudio-desktop')
categories=('programming') categories=('programming')
source=("https://github.com/$pkgname/$pkgname/tarball/v$pkgver") source=("https://github.com/$pkgname/$pkgname/tarball/v$pkgver")
md5sums=('2714b2f1bdd6de50f4d0cb1764d55332') md5sums=('2714b2f1bdd6de50f4d0cb1764d55332')
build() { build() {
cd $srcdir/$_pkgname-$_pkgver
source /etc/profile.d/apache-ant.sh
#Checking for ANT and Java can be found.
which ant > /dev/null
which java > /dev/null
# Install gwt
cd $srcdir/$_pkgname-$_pkgver/dependencies/common cd $srcdir/$_pkgname-$_pkgver/dependencies/common
sh install-gwt sh install-gwt
sh install-dictionaries sh install-dictionaries
@ -36,7 +28,7 @@ build() {
# Configure and build. # Configure and build.
cd $srcdir/$_pkgname-$_pkgver cd $srcdir/$_pkgname-$_pkgver
mkdir build #mkdir build
cd build cd build
unset LDFLAGS unset LDFLAGS
cmake \ cmake \