From 91f0682c04fa1729f9387dd0f4b634fbb5eaa826 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 25 Sep 2021 20:33:52 +0200 Subject: [PATCH] rstudio: update to 1.4.1717. --- .../0004-unbundle-pandoc-mathjax.patch | 54 ------------------ .../0005-don-t-install-mathjax-pandoc.patch | 57 ++++++++++--------- .../patches/0006-use-system-node.patch | 22 ++++--- srcpkgs/rstudio/template | 12 ++-- 4 files changed, 50 insertions(+), 95 deletions(-) delete mode 100644 srcpkgs/rstudio/patches/0004-unbundle-pandoc-mathjax.patch diff --git a/srcpkgs/rstudio/patches/0004-unbundle-pandoc-mathjax.patch b/srcpkgs/rstudio/patches/0004-unbundle-pandoc-mathjax.patch deleted file mode 100644 index 4d7608ad8fa4..000000000000 --- a/srcpkgs/rstudio/patches/0004-unbundle-pandoc-mathjax.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 16da5903326d13ecc32794b4561967c15bbe8a50 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Mon, 13 Jan 2020 11:27:06 +0100 -Subject: [PATCH 1/8] Unbundle mathjax and pandoc - -Use find_file() & find_program() functions to find the dependencies in the -dependencies/ subdirectory first. If they are not there, use the system paths -instead. ---- - src/cpp/session/CMakeLists.txt | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt -index cb45b35ecc..d0b41b13d2 100644 ---- a/src/cpp/session/CMakeLists.txt -+++ b/src/cpp/session/CMakeLists.txt -@@ -22,13 +22,13 @@ add_subdirectory(workers) - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries") - message(FATAL_ERROR "Dictionaries not found (re-run install-dependencies script to install)") - endif() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27") -+ -+find_file(MATHJAX_JS_LOCATION -+ NAMES MathJax.js -+ PATHS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27" /usr/share/mathjax/) -+if("${MATHJAX_JS_LOCATION}" STREQUAL "MATHJAX_JS_LOCATION-NOTFOUND") - message(FATAL_ERROR "Mathjax 2.7 not found (re-run install-dependencies script to install)") - endif() --set(PANDOC_VERSION "2.11.4" CACHE INTERNAL "Pandoc version") --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") -- message(FATAL_ERROR "pandoc ${PANDOC_VERSION} not found (re-run install-dependencies script to install)") --endif() - - # verify embedded packages are available - foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) -@@ -535,7 +535,7 @@ if (NOT RSTUDIO_SESSION_WIN32) - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - - # install mathjax for local html preview -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27" -+ install(DIRECTORY "${MATHJAX_PATH}" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - - # icons for database connections -@@ -553,6 +553,7 @@ if (NOT RSTUDIO_SESSION_WIN32) - # install pandoc - set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") - file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") -+ set(PANDOC_FILES ${PANDOC_CITEPROC_BIN_LOCATION} ${PANDOC_BIN_LOCATION}) - install(FILES ${PANDOC_FILES} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) --- -2.30.2 diff --git a/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch b/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch index 2532a3ca8dbf..6ddea228c47f 100644 --- a/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch +++ b/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch @@ -1,43 +1,48 @@ -From 4a54997e63577ce3161b8f86f729fe3951d730be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Tue, 14 Jan 2020 14:20:40 +0100 -Subject: [PATCH 2/8] Don't install pandoc and mathjax - -Because we use the system wide version, there's no need to waste time installing -the files. +From 4b9b0aa10768df68e80eb8eb03b41b937bc45e9e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= +Date: Sat, 5 Jun 2021 18:21:24 +0200 +Subject: [PATCH] unbundle dependencies common + --- - src/cpp/session/CMakeLists.txt | 12 ------------ - 1 file changed, 12 deletions(-) - + src/cpp/session/CMakeLists.txt | 22 ---------------------- + 1 file changed, 22 deletions(-) + diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt -index d0b41b13d2..69d6cb2b2b 100644 +index 54d15d9..a6b41cb 100644 --- a/src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt -@@ -534,10 +534,6 @@ if (NOT RSTUDIO_SESSION_WIN32) - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries" +@@ -48,14 +48,11 @@ else() + + endif() + +-foreach(DEP "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" ++foreach(DEP "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}") +- "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}" +- "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}") + if(NOT EXISTS "${DEP}") + message(FATAL_ERROR "${DEP} not found (re-run install-dependencies script to install") + endif() + endforeach() +- + # verify embedded packages are available + foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) + file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") +@@ -574,16 +574,6 @@ + install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - # install mathjax for local html preview -- install(DIRECTORY "${MATHJAX_PATH}" +- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - - # icons for database connections - install(DIRECTORY "resources/connections" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) -@@ -550,14 +546,6 @@ if (NOT RSTUDIO_SESSION_WIN32) - install(DIRECTORY "resources/dependencies" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - - # install pandoc -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") -- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") -- set(PANDOC_FILES ${PANDOC_CITEPROC_BIN_LOCATION} ${PANDOC_BIN_LOCATION}) +- file(GLOB PANDOC_FILES "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/pandoc*") - install(FILES ${PANDOC_FILES} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) +- DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc") - # install embedded packages foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") -- -2.30.2 +2.31.1 diff --git a/srcpkgs/rstudio/patches/0006-use-system-node.patch b/srcpkgs/rstudio/patches/0006-use-system-node.patch index aa3c42c8dfd3..6fdb569599a6 100644 --- a/srcpkgs/rstudio/patches/0006-use-system-node.patch +++ b/srcpkgs/rstudio/patches/0006-use-system-node.patch @@ -1,17 +1,17 @@ -From 05f77b171f06b8a66619f4c00b12f521e87e5d1c Mon Sep 17 00:00:00 2001 +From d947a9e537fd5c0b2c1e9dd28867747b9bffa8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= -Date: Sat, 16 Jan 2021 19:11:23 +0100 -Subject: [PATCH 7/8] use system node +Date: Sat, 5 Jun 2021 18:32:16 +0200 +Subject: [PATCH] use system node --- - src/gwt/build.xml | 14 +------------- - 1 file changed, 1 insertion(+), 13 deletions(-) + src/gwt/build.xml | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/gwt/build.xml b/src/gwt/build.xml -index 899ae7fecd..ac90566667 100644 +index 8092344..d7889d1 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml -@@ -82,19 +82,7 @@ +@@ -82,22 +82,7 @@ @@ -27,10 +27,14 @@ index 899ae7fecd..ac90566667 100644 - - - -- +- + -- -2.30.2 +2.31.1 + diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index c3eade261225..b2c06a205eaa 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,11 +1,12 @@ # Template file for 'rstudio' pkgname=rstudio -version=1.4.1106 +version=1.4.1717 revision=1 build_style=cmake configure_args="-DRSTUDIO_TARGET=Desktop -DRSTUDIO_USE_SYSTEM_BOOST=ON -DRSTUDIO_USE_SYSTEM_SOCI=TRUE + -DRSTUDIO_USE_SYSTEM_YAML_CPP=TRUE -DRSTUDIO_BOOST_SIGNALS_VERSION=2 -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio" @@ -16,7 +17,7 @@ makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel sqlite-devel qt5-plugin-pgsql qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc - soci-devel" + soci-devel yaml-cpp-devel" depends="R mathjax" short_desc="Integrated development environment (IDE) for R" maintainer="John " @@ -24,9 +25,8 @@ license="AGPL-3.0-only" homepage="https://www.rstudio.com" distfiles="https://github.com/rstudio/rstudio/archive/v${version}.tar.gz https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip" -checksum="ac84f77529501ea13f0708f0e8726b0bdfb592cd9217e869a0099031f9a888b8 - 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 - 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7" +checksum="3af234180fd7cef451aef40faac2c7b52860f14a322244c1c7aede029814d261 + 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494" skip_extraction="core-dictionaries.zip" LDFLAGS="-Wl,-z,stack-size=2097152" @@ -34,7 +34,7 @@ LDFLAGS="-Wl,-z,stack-size=2097152" post_extract() { _srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}" - unzip -qd ${wrksrc}/dependencies/common/dictionaries ${_srcdir}/core-dictionaries.zip + unzip -qd ${wrksrc}/dependencies/dictionaries ${_srcdir}/core-dictionaries.zip } pre_configure() {