Date: Sun, 20 Feb 2022 05:49:44 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d72ac00c93c3 - main - devel/RStudio: Update 2021.09.2+382 -> 2022.02.0+443 Message-ID: <202202200549.21K5niu5005482@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d72ac00c93c392732f7eb87129ed0c6eaaaf4d2f commit d72ac00c93c392732f7eb87129ed0c6eaaaf4d2f Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2022-02-20 05:48:59 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2022-02-20 05:49:42 +0000 devel/RStudio: Update 2021.09.2+382 -> 2022.02.0+443 Reported by: portscout --- devel/RStudio/Makefile | 9 ++- devel/RStudio/distinfo | 6 +- devel/RStudio/files/patch-CMakeGlobals.txt | 17 +++- .../files/patch-src_cpp_session_CMakeLists.txt | 90 +++++++++++----------- 4 files changed, 67 insertions(+), 55 deletions(-) diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile index 5b004ef58333..aefe33f79289 100644 --- a/devel/RStudio/Makefile +++ b/devel/RStudio/Makefile @@ -3,7 +3,7 @@ PORTNAME= RStudio DISTVERSIONPREFIX= v -DISTVERSION= 2021.09.2+382 +DISTVERSION= 2022.02.0+443 CATEGORIES= devel math java MASTER_SITES= https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \ https://s3.amazonaws.com/rstudio-buildtools/:buildtools @@ -40,6 +40,7 @@ USES= cmake fortran localbase:ldflags pgsql pkgconfig sqlite ssl USE_JAVA= yes JAVA_VERSION= 8 JAVA_BUILD= yes + USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tl} GH_TUPLE= rstudio:r2d3:v0.2.0:r2d3/dependencies/common/r2d3 \ @@ -84,6 +85,12 @@ SUB_LIST= USER=${USER} USE_RC_SUBR= ${PORTNAME:tl}-server .endif +OPTIONS_DEFINE= WITH_QUARTO + +WITH_QUARTO_DESC= Build with support for Quarto +WITH_QUARTO_CMAKE_BOOL= FREEBSD_QUARTO_ENABLED +WITH_QUARTO_BROKEN= Quarto isn't yet ported + post-extract: @${MKDIR} ${WRKSRC}/dependencies/dictionaries && ${MV} ${WRKDIR}/en_* ${WRKSRC}/dependencies/dictionaries/ @${MV} ${WRKDIR}/mathjax-* ${WRKSRC}/dependencies/ diff --git a/devel/RStudio/distinfo b/devel/RStudio/distinfo index cdb8e4d029f6..87ba8e9c9ecc 100644 --- a/devel/RStudio/distinfo +++ b/devel/RStudio/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1641965613 +TIMESTAMP = 1645290813 SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 SIZE (core-dictionaries.zip) = 876339 SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a @@ -7,8 +7,8 @@ SHA256 (gwt-2.8.1.zip) = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d3723 SIZE (gwt-2.8.1.zip) = 95650299 SHA256 (mathjax-27.zip) = c56cbaa6c4ce03c1fcbaeb2b5ea3c312d2fb7626a360254770cbcb88fb204176 SIZE (mathjax-27.zip) = 3285230 -SHA256 (RStudio-rstudio-v2021.09.2+382_GH0.tar.gz) = 824173fcef6380e1d3c4fce7ae56a6e0a6f3c75b601327a70ec15182581ccd81 -SIZE (RStudio-rstudio-v2021.09.2+382_GH0.tar.gz) = 96592649 +SHA256 (RStudio-rstudio-v2022.02.0+443_GH0.tar.gz) = 36234218f118f5085e417411e137791072c00380bce6a016e551e6ecb404ae4d +SIZE (RStudio-rstudio-v2022.02.0+443_GH0.tar.gz) = 97652556 SHA256 (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 6355a7632134c8c9487056019a9c458db2c98d10388cf66b018d5461d0a947af SIZE (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 21977747 SHA256 (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = b6f6f48dd9930514204739d8957c2737f0b1d110aebf9f89fa31de10598cb29b diff --git a/devel/RStudio/files/patch-CMakeGlobals.txt b/devel/RStudio/files/patch-CMakeGlobals.txt index 60af3c7c1151..fe20cc00af7d 100644 --- a/devel/RStudio/files/patch-CMakeGlobals.txt +++ b/devel/RStudio/files/patch-CMakeGlobals.txt @@ -1,6 +1,6 @@ ---- CMakeGlobals.txt.orig 2021-05-24 22:22:25 UTC +--- CMakeGlobals.txt.orig 2022-02-16 19:26:03 UTC +++ CMakeGlobals.txt -@@ -118,7 +118,7 @@ endif() +@@ -159,7 +159,7 @@ endif() # record git revision hash (cache it since we don't use this in development # mode and we don't want it to force rebuilds there) @@ -9,7 +9,7 @@ find_program(GIT_EXECUTABLE git) if(GIT_EXECUTABLE) execute_process( -@@ -129,6 +129,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS +@@ -170,6 +170,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash") endif() endif() @@ -17,7 +17,16 @@ # record these from Jenkins if available if("$ENV{GIT_COMMIT}" STREQUAL "") -@@ -238,14 +239,14 @@ else() +@@ -223,7 +224,7 @@ if(LINUX AND UNAME_M STREQUAL aarch64) + set(QUARTO_ENABLED FALSE CACHE INTERNAL "") + else() + # enable by default +- set(QUARTO_ENABLED TRUE CACHE INTERNAL "") ++ set(QUARTO_ENABLED ${FREEBSD_QUARTO_ENABLED}) + add_definitions(-DQUARTO_ENABLED) + endif() + +@@ -298,14 +299,14 @@ else() endif() # if the install prefix is /usr/local then tweak as appropriate diff --git a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt index 12c21b25b0d8..6269c5951b93 100644 --- a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt +++ b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt @@ -1,41 +1,37 @@ ---- src/cpp/session/CMakeLists.txt.orig 2021-09-22 13:58:50 UTC +--- src/cpp/session/CMakeLists.txt.orig 2022-02-16 19:26:03 UTC +++ src/cpp/session/CMakeLists.txt -@@ -23,7 +23,7 @@ add_subdirectory(workers) - if(WIN32) - set(RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries") - set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27") -- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") -+ #set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") - else() - - # indirection to help build machine find these libraries? -@@ -39,18 +39,19 @@ else() - set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") - endif() +@@ -55,20 +55,21 @@ endif() + # install pandoc + # - by default, we use quarto + quarto's bundled pandoc + # - if quarto is not enabled, use pandoc fallback +-if(QUARTO_ENABLED) +- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin") +-elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") +- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") +-else() +- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}") +-endif() ++#if(QUARTO_ENABLED) ++# set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin") ++#elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") ++# set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") ++#else() ++# set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}") ++#endif() -- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") -- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") -- else() -- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}") -- endif() -+ #if(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") -+ # set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") -+ #else() -+ # set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}") -+ #endif() - - endif() # validate our dependencies exist foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR RSTUDIO_DEPENDENCIES_MATHJAX_DIR -- RSTUDIO_DEPENDENCIES_PANDOC_DIR) +- RSTUDIO_DEPENDENCIES_PANDOC_DIR +- RSTUDIO_DEPENDENCIES_QUARTO_DIR) + #RSTUDIO_DEPENDENCIES_PANDOC_DIR -+) ++ RSTUDIO_DEPENDENCIES_QUARTO_DIR ++ ) - # validate existence - if(NOT EXISTS "${${VAR}}") -@@ -71,19 +72,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) + + # skip quarto if not enabled +@@ -95,19 +96,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) endforeach() # verify libclang is installed (Windows only) @@ -67,9 +63,9 @@ # include files file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") -@@ -457,6 +458,9 @@ add_stripped_executable( - ${SESSION_SOURCE_FILES} - ${SESSION_HEADER_FILES}) +@@ -528,6 +529,9 @@ else() + + endif() +# additional libraries +target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lprocstat) @@ -77,22 +73,22 @@ # skip libR RPATH at development time if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE) set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE) -@@ -592,10 +596,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - - # install pandoc -- 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") -+ #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") +@@ -688,10 +692,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT + DESTINATION "${RSTUDIO_INSTALL_BIN}" + USE_SOURCE_PERMISSIONS) + endif() +- else() +- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/" +- DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc" +- USE_SOURCE_PERMISSIONS) ++ #else() ++ #install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/" ++ # DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc" ++ # USE_SOURCE_PERMISSIONS) + endif() # install embedded packages - foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) -@@ -635,18 +639,18 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT +@@ -732,18 +736,18 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) # install libclang
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202200549.21K5niu5005482>