diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
2 files changed, 17 insertions, 9 deletions
@@ -1,6 +1,6 @@ pkgbase = rstudio-desktop-git pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language - pkgver = v1.1.371.r729.g401e38621d + pkgver = v1.1.371.r851 pkgrel = 1 url = https://www.rstudio.com/products/rstudio/ install = rstudio-desktop-git.install @@ -34,7 +34,7 @@ pkgbase = rstudio-desktop-git depends = qt5-webengine depends = qt5-xmlpatterns optdepends = git: for git support - optdepends = subversion: for subversion suuport + optdepends = subversion: for subversion support optdepends = openssh-askpass: for a git ssh access provides = rstudio-desktop provides = rstudio-desktop-bin @@ -45,10 +45,12 @@ pkgbase = rstudio-desktop-git source = git+https://github.com/rstudio/rstudio.git 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-buildtools/QtSDK-5.10.0-x86_64.tar.gz source = https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip md5sums = SKIP md5sums = e2617189fe5c138945b8cc95f26bd476 md5sums = ddd572887957fd5cdfde3469bd8c1102 + md5sums = bb822961716efd40d570a07a34c9c373 md5sums = 0e03798b8e53096c4a906bde05e32378 pkgname = rstudio-desktop-git @@ -1,11 +1,13 @@ # Maintainer: Artem Klevtsov <a.a.klevtso@gmail.com> +# Contributor: Conor Anderson <conor@conr.ca> pkgname=rstudio-desktop-git _gitname=rstudio -pkgver=v1.1.371.r729.g401e38621d +pkgver=v1.1.371.r851 _gwtver=2.8.1 _ginver=2.1.2 -_clangver=5.0.0 +_clangver=5.0.1 +_qtver=5.10.0 pkgrel=1 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language" arch=('i686' 'x86_64') @@ -14,7 +16,7 @@ license=('AGPL3') depends=('boost-libs>=1.63' 'r>=2.11.1' hicolor-icon-theme shared-mime-info pango hunspell-en mathjax pandoc clang qt5-base qt5-declarative qt5-location qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns) makedepends=(git 'cmake>=2.8' 'boost>=1.63' java-environment apache-ant unzip openssl libcups pam wget) optdepends=('git: for git support' - 'subversion: for subversion suuport' + 'subversion: for subversion support' 'openssh-askpass: for a git ssh access') provides=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview') conflicts=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview') @@ -23,15 +25,17 @@ install="${pkgname}.install" source=("git+https://github.com/rstudio/rstudio.git" "https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip" "https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip" + "https://s3.amazonaws.com/rstudio-buildtools/QtSDK-${_qtver}-x86_64.tar.gz" "https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip") md5sums=('SKIP' 'e2617189fe5c138945b8cc95f26bd476' 'ddd572887957fd5cdfde3469bd8c1102' + 'bb822961716efd40d570a07a34c9c373' '0e03798b8e53096c4a906bde05e32378') pkgver() { cd "${srcdir}/${_gitname}" - git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g' + git describe --long --tags | sed -r 's/([^-]*)-g.*/r\1/;s/-/./g' } prepare() { @@ -44,7 +48,7 @@ prepare() { unzip -qo "${srcdir}/core-dictionaries.zip" -d dictionaries unzip -qo "${srcdir}/gin-${_ginver}.zip" -d lib/gin/${_ginver} cp -r "${srcdir}/gwt-${_gwtver}/"* lib/gwt/${_gwtver} - + cd "${srcdir}/${_gitname}/dependencies/common" install -d pandoc libclang/{3.5,builtin-headers} @@ -63,10 +67,12 @@ build() { rm -rf "${srcdir}/${_gitname}/build" mkdir "${srcdir}/${_gitname}/build" cd "${srcdir}/${_gitname}/build" + export QT_SDK_DIR="${srcdir}/Qt${_qtver}" cmake -DRSTUDIO_TARGET=Desktop \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio \ - -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 .. + -DQT_QMAKE_EXECUTABLE="${srcdir}/Qt${_qtver}/${_qtver}/gcc_64/bin/qmake" \ + -DRSTUDIO_BUNDLE_QT=TRUE .. } package() { @@ -75,7 +81,7 @@ package() { make DESTDIR="${pkgdir}" install # Install the license install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" - # Creaate symlinks + # Create symlinks install -d "${pkgdir}/usr/bin" ln -sf /usr/lib/rstudio/bin/rstudio "${pkgdir}/usr/bin/rstudio" } |