From 0d1e85b35c2fa902c5c13f866a2e4b96423e8ee3 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 17:30:26 +0100 Subject: [PATCH] automatic version update by autodist [release 2022.07.1+554-1mamba;Wed Aug 24 2022] --- rstudio-2022.07.1+554-pandoc_version.patch | 11 ++ rstudio.spec | 136 +++++++++++++++------ 2 files changed, 112 insertions(+), 35 deletions(-) create mode 100644 rstudio-2022.07.1+554-pandoc_version.patch diff --git a/rstudio-2022.07.1+554-pandoc_version.patch b/rstudio-2022.07.1+554-pandoc_version.patch new file mode 100644 index 0000000..c3110a0 --- /dev/null +++ b/rstudio-2022.07.1+554-pandoc_version.patch @@ -0,0 +1,11 @@ +--- rstudio-2022.07.0-548/CMakeGlobals.txt 2022-07-07 07:59:49.000000000 +1200 ++++ rstudio-2022.07.0-548.patched/CMakeGlobals.txt 2022-07-08 09:24:27.069195093 +1200 +@@ -231,7 +231,7 @@ + endif() + + # pandoc version +-set(PANDOC_VERSION "2.18" CACHE INTERNAL "Pandoc version") ++set(PANDOC_VERSION "current" CACHE INTERNAL "Pandoc version") + + # detect Centos 7, because we don't support Quarto on Centos7 + set(IS_CENTOS7 FALSE) diff --git a/rstudio.spec b/rstudio.spec index 34745e2..e09f7d7 100644 --- a/rstudio.spec +++ b/rstudio.spec @@ -1,41 +1,50 @@ -%global ver_major 0 -%global ver_minor 98 -%global ver_patch 1103 +%global ver_major %(echo %version | cut -d. -f1) +%global ver_minor %(echo %version | cut -d. -f2) +%global ver_patch %(echo %version | cut -d. -f1 | cut -d. -f3) +%global ver_suffix %(echo %version | cut -d+ -f2) +%define _nodever 16.14.0 Name: rstudio -Version: %{ver_major}.%{ver_minor}.%{ver_patch} +Version: 2022.07.1+554 Release: 1mamba Summary: RStudio is an integrated development environment (IDE) for R Group: Graphical Desktop/Applications/Scientific Vendor: openmamba Distribution: openmamba -Packager: Davide Madrisan -URL: http://www.rstudio.org +Packager: Silvan Calarco +URL: https://www.rstudio.com/ Source0: https://github.com/rstudio/rstudio/tarball/v%{version}/%{name}-%{version}.tar.gz # see: dependencies/common/install-common # ./install-gwt -Source1: https://s3.amazonaws.com/rstudio-buildtools/gwt-2.6.0.zip -Source2: https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip -# ./install-dictionaries -Source3: https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip -# ./install-mathjax -Source4: https://s3.amazonaws.com/rstudio-buildtools/mathjax-23.zip +#Source1: https://s3.amazonaws.com/rstudio-buildtools/gwt-2.6.0.zip +#Source2: https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip +Source3: https://nodejs.org/dist/v%{_nodever}/node-v%{_nodever}-linux-x64.tar.gz # ./install-pandoc -Source5: https://s3.amazonaws.com/rstudio-buildtools/pandoc-1.12.4.2.zip -# patch created by executing the command: -# find . \( -name *.cpp -or -name *.hpp \) -exec sed \ -# -e 's@= 2.11.1 #BuildRequires: java-junit3, java-junit48 #BuildRequires: jdk +BuildRequires: mathjax2 +BuildRequires: pandoc +BuildRequires: libsoci-devel Requires: R >= 2.11.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description RStudio is an integrated development environment (IDE) for the R programming language. +%debug_package + %prep -%setup -q -%patch0 -p1 -install -d src/gwt/lib/gwt -install -d src/gwt/lib/gin/1.5 -unzip -qq %{S:1} -d src/gwt/lib/gwt -unzip -qq %{S:2} -d src/gwt/lib/gin/1.5 -mv src/gwt/lib/gwt/gwt-2.6.0 src/gwt/lib/gwt/2.6.0 +%setup -q -c a0 -a3 +#-D -T +#:<< _EOF +mv rstudio-rstudio-*/* . -install -d dependencies/common/dictionaries -unzip -qq %{S:3} -d dependencies/common/dictionaries -unzip -qq %{S:4} -d dependencies/common +#%patch0 -p1 +%patch1 -p1 -b .pandoc_version + +#install -d src/gwt/lib/gwt +#install -d src/gwt/lib/gin/1.5 +#unzip -qq %{S:1} -d src/gwt/lib/gwt +#unzip -qq %{S:2} -d src/gwt/lib/gin/1.5 +#mv src/gwt/lib/gwt/gwt-2.6.0 src/gwt/lib/gwt/2.6.0 + +#install -d dependencies/common/dictionaries +#unzip -qq %{S:3} -d dependencies/common/dictionaries +#unzip -qq %{S:4} -d dependencies/common -# see: src/cpp/session/CMakeLists.txt install -d dependencies/common/{pandoc,rmarkdown,packrat,shinyapps} +ln -sfT %{_datadir}/myspell/dicts dependencies/common/dictionaries +ln -sfT %{_datadir}/mathjax2 dependencies/common/mathjax-27 + +install -d dependencies/common/pandoc/current +ln -sfT %{_bindir}/pandoc dependencies/common/pandoc/current/pandoc + +# Fix links for src/cpp/session/CMakeLists.txt +ln -sfT %{_datadir}/myspell/dicts dependencies/dictionaries +ln -sfT %{_datadir}/mathjax2 dependencies/mathjax-27 +mkdir -p dependencies/pandoc/current +ln -sfT %{_bindir}/pandoc dependencies/pandoc/current/pandoc + +# Nodejs +install -d node/%{_nodever} +cp -r node-v%{_nodever}-linux-x64/* node/%{_nodever} +cd src/gwt/panmirror/src/editor +yarn config set ignore-engines true +yarn install +cd ../../../../.. +ln -sf ../../node dependencies/common/node + +# Download and install R packages +export R_LIBS_USER="${PWD}/dependencies/R" +_JOBS="$(grep -oP -- "-j\s*\K[0-9]+" <<< "${MAKEFLAGS}")" || _JOBS="1" +mkdir -p "${R_LIBS_USER}" +for RPKG in rmarkdown renv testthat xml2 yaml; do + RINSTALLCMD="if("'!'"require($RPKG, quietly = TRUE)) { options(Ncpus = ${_JOBS} ); install.packages('$RPKG', lib='$R_LIBS_USER', repos='https://cran.rstudio.com/') }" + echo "> $RINSTALLCMD" + Rscript -e "$RINSTALLCMD" +done + %build +#:<< _EOF + export PATH="$PATH:%{_datadir}/ant/bin" export RSTUDIO_VERSION_MAJOR=%{ver_major} export RSTUDIO_VERSION_MINOR=%{ver_minor} export RSTUDIO_VERSION_PATCH=%{ver_patch} +export RSTUDIO_VERSION_SUFFIX=%{ver_suffix} +export PACKAGE_OS=$(uname -om) + %cmake -d build \ -DRSTUDIO_TARGET=Desktop \ -DCMAKE_BUILD_TYPE=Release \ + -DRSTUDIO_USE_SYSTEM_BOOST=yes \ + -DRSTUDIO_USE_SYSTEM_YAML_CPP=yes \ + -DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DQUARTO_ENABLED=FALSE \ + -DRSTUDIO_BUNDLE_QT=FALSE \ + -DRSTUDIO_USE_SYSTEM_SOCI=yes \ -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} BOOST_SIGNALS_NO_DEPRECATION_WARNING=1; \ export BOOST_SIGNALS_NO_DEPRECATION_WARNING \ + %make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -make -C build install/fast DESTDIR=%{buildroot} +%makeinstall -C build +#install/fast DESTDIR=%{buildroot} install -d %{buildroot}%{_bindir} ln -s %{_libdir}/%{name}/bin/rstudio %{buildroot}%{_bindir} @@ -137,6 +200,9 @@ rm -f %{buildroot}%{_libdir}/rstudio/www/.gitignore %doc COPYING %changelog +* Wed Aug 24 2022 Automatic Build System 2022.07.1+554-1mamba +- automatic version update by autodist + * Sun Mar 08 2015 Davide Madrisan 0.98.1103-1mamba - update to 0.98.1103