diff options
| -rw-r--r-- | pcr/rstudio-desktop/PKGBUILD | 74 |
1 files changed, 36 insertions, 38 deletions
diff --git a/pcr/rstudio-desktop/PKGBUILD b/pcr/rstudio-desktop/PKGBUILD index 2c28de774..ddd15c174 100644 --- a/pcr/rstudio-desktop/PKGBUILD +++ b/pcr/rstudio-desktop/PKGBUILD @@ -4,43 +4,35 @@ # parabola changes and rationale: -# - added .install file to update desktop database -# - frozen at the last version to support webkit (v1.1.463) +# - use webkit rather than webengine pkgname=rstudio-desktop -pkgver=1.1.463 -_gwtver=2.7.0 -_ginver=1.5 +pkgver=1.3.1093 _clangver=3.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Open source and enterprise-ready professional software for the R community" arch=(i686 x86_64) arch+=(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 + 'r>=3.0.1' 'boost-libs>=1.63' + pango shared-mime-info mathjax clang + 'qt5-base>=5.12.5' 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) +depends=(${depends[*]/qt5-webengine/qt5-webkit}) +makedepends=('cmake>=3.4.3' 'boost>=1.69' 'java-environment=8' 'patchelf>=0.9' apache-ant openssl pam r-testthat) conflicts=(rstudio-desktop-bin rstudio-desktop-git rstudio-desktop-preview-bin) 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' + 'https://gist.githubusercontent.com/trap000d/22b11a58c064046478967e60b3394214/raw/8bd457515431ec8c139e8f07fd86b0d2cb420d5d/rstudio-aee4453_libboost175.diff' ) -source+=(boost-signals.patch) noextract=('core-dictionaries.zip' "gin-$_ginver.zip") -sha256sums=( - '13225d7e12bd8e273a10951f121ed117fbfe25f3a7ce12003b3aff7bcc64af44' - 'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94' - 'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3' - '4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494' -) -sha256sums+=('68af1d1e8e7750dea9cae30f7bff7128a84420fddd62ffc86cec9dfb79643dcb') +sha256sums=('6ea169a0d59f0c3eba408d74a2590f7bf9f1e6f911b266a02f6266bf4975cec9' + '4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494' + '77e3e1cfec3c3ffebc9151f62b80db2840db022c84359c7bf17e92c288ab4973') _pkgname=rstudio @@ -57,33 +49,21 @@ _check_version() { fi } -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" - - # Could not find a package configuration file provided by "boost_signals" - # Could not find a package configuration file provided by "boost_signals2" - echo "applying boost-signals.patch" - patch -Np1 < "$srcdir"/boost-signals.patch -} - build() { + if [[ $(archlinux-java get) != 'java-8'* ]]; then + echo 'You need to have Java 8 active when building this package.' >&2 + echo 'Please execute `sudo archlinux-java set java-8-openjdk`' >&2 + exit 1 + fi 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/share/mathjax' mathjax-27 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 @@ -93,7 +73,25 @@ build() { bash 'install-packages' ) + # The previous comparison doesn’t seem to work with Boost_VERSION being 1.71.0 + sed -i 's/Boost_VERSION LESS 106900/Boost_VERSION VERSION_LESS 1.69.0/g' src/cpp/CMakeLists.txt + patch -p1 <'../rstudio-aee4453_libboost175.diff' + + # 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" + + # Set information for Cmake and build + local shortver="${pkgver%.*}" + export RSTUDIO_VERSION_MAJOR="${pkgver%%.*}" + export RSTUDIO_VERSION_MINOR="${shortver#*.}" + export RSTUDIO_VERSION_PATCH="${pkgver##*.}" + export GIT_COMMIT="${PWD##*-}" + export BUILD_ID="local" + export PACKAGE_OS="Arch Linux" cmake -DRSTUDIO_TARGET=Desktop \ + -Wno-dev \ + -DRSTUDIO_USE_SYSTEM_BOOST=Yes \ -DCMAKE_BUILD_TYPE=Release \ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \ -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio |