From nobody Tue Oct 19 15:33:08 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DBFD71812238; Tue, 19 Oct 2021 15:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HYd6r5xL4z3rjT; Tue, 19 Oct 2021 15:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AC7C7169B7; Tue, 19 Oct 2021 15:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19JFX8w6009633; Tue, 19 Oct 2021 15:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19JFX81T009632; Tue, 19 Oct 2021 15:33:08 GMT (envelope-from git) Date: Tue, 19 Oct 2021 15:33:08 GMT Message-Id: <202110191533.19JFX81T009632@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 9bd01699c757 - main - devel/RStudio: Update 1.4.1717 -> 2021.09.0+351 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bd01699c75709c713eec22b2b9fd00990e93cc5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9bd01699c75709c713eec22b2b9fd00990e93cc5 commit 9bd01699c75709c713eec22b2b9fd00990e93cc5 Author: Yuri Victorovich AuthorDate: 2021-10-19 15:32:04 +0000 Commit: Yuri Victorovich CommitDate: 2021-10-19 15:33:04 +0000 devel/RStudio: Update 1.4.1717 -> 2021.09.0+351 --- devel/RStudio/Makefile | 4 +-- devel/RStudio/distinfo | 6 ++--- .../files/patch-src_cpp_session_CMakeLists.txt | 29 +++++++++++----------- .../patch-src_cpp_session_SessionHttpMethods.cpp | 6 ++--- .../patch-src_cpp_session_session-config.h.in | 9 +++++-- 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile index 9189621674aa..85991a3985e4 100644 --- a/devel/RStudio/Makefile +++ b/devel/RStudio/Makefile @@ -2,9 +2,7 @@ # Its build is known to succeed with MAX_FILES_RStudio=4096 in poudriere.conf PORTNAME= RStudio -DISTVERSIONPREFIX= v -DISTVERSION= 1.4.1717 -PORTREVISION= 2 +DISTVERSION= 2021.09.0+351 CATEGORIES= devel math java MASTER_SITES= https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \ https://s3.amazonaws.com/rstudio-buildtools/:buildtools diff --git a/devel/RStudio/distinfo b/devel/RStudio/distinfo index caf142ce08d5..e632b0f64c46 100644 --- a/devel/RStudio/distinfo +++ b/devel/RStudio/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1623197060 +TIMESTAMP = 1634620511 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-v1.4.1717_GH0.tar.gz) = 3af234180fd7cef451aef40faac2c7b52860f14a322244c1c7aede029814d261 -SIZE (RStudio-rstudio-v1.4.1717_GH0.tar.gz) = 96928031 +SHA256 (RStudio-rstudio-2021.09.0+351_GH0.tar.gz) = 1fd0c40e9064501a276e0c9a64c1d54bed2957bf4f93174436e309b138222d2d +SIZE (RStudio-rstudio-2021.09.0+351_GH0.tar.gz) = 96590178 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-src_cpp_session_CMakeLists.txt b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt index a0ed7d4a0034..12c21b25b0d8 100644 --- a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt +++ b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/cpp/session/CMakeLists.txt.orig 2021-05-24 22:22:25 UTC +--- src/cpp/session/CMakeLists.txt.orig 2021-09-22 13:58:50 UTC +++ src/cpp/session/CMakeLists.txt -@@ -24,7 +24,7 @@ set(PANDOC_VERSION "2.11.4" CACHE INTERNAL "Pandoc ver +@@ -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") @@ -9,7 +9,7 @@ else() # indirection to help build machine find these libraries? -@@ -40,17 +40,18 @@ else() +@@ -39,18 +39,19 @@ else() set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") endif() @@ -26,15 +26,16 @@ endif() - foreach(DEP "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" - "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}" -- "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}") -+ #"${RSTUDIO_DEPENDENCIES_PANDOC_DIR}" + # validate our dependencies exist + foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR + RSTUDIO_DEPENDENCIES_MATHJAX_DIR +- RSTUDIO_DEPENDENCIES_PANDOC_DIR) ++ #RSTUDIO_DEPENDENCIES_PANDOC_DIR +) - if(NOT EXISTS "${DEP}") - message(FATAL_ERROR "${DEP} not found (re-run install-dependencies script to install") - endif() -@@ -65,19 +66,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) + + # validate existence + if(NOT EXISTS "${${VAR}}") +@@ -71,19 +72,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) endforeach() # verify libclang is installed (Windows only) @@ -66,7 +67,7 @@ # include files file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") -@@ -444,6 +445,9 @@ add_stripped_executable( +@@ -457,6 +458,9 @@ add_stripped_executable( ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES}) @@ -76,7 +77,7 @@ # skip libR RPATH at development time if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE) set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE) -@@ -579,10 +583,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT +@@ -592,10 +596,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") # install pandoc @@ -91,7 +92,7 @@ # install embedded packages foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) -@@ -622,18 +626,18 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT +@@ -635,18 +639,18 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) # install libclang diff --git a/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp b/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp index efd9c4070f7c..fa7b7da86ea8 100644 --- a/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp +++ b/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp @@ -1,6 +1,6 @@ ---- src/cpp/session/SessionHttpMethods.cpp.orig 2020-01-23 23:30:24 UTC +--- src/cpp/session/SessionHttpMethods.cpp.orig 2021-09-22 13:58:50 UTC +++ src/cpp/session/SessionHttpMethods.cpp -@@ -397,7 +397,7 @@ std::string clientVersion() +@@ -437,7 +437,7 @@ std::string clientVersion() return std::string(); // clientVersion is the git revision hash @@ -8,4 +8,4 @@ + return RSTUDIO_VERSION; } - void waitForMethodInitFunction(const ClientEvent& initEvent) + bool protocolDebugEnabled() diff --git a/devel/RStudio/files/patch-src_cpp_session_session-config.h.in b/devel/RStudio/files/patch-src_cpp_session_session-config.h.in index 0085fa4e2794..7ab9ac4d3580 100644 --- a/devel/RStudio/files/patch-src_cpp_session_session-config.h.in +++ b/devel/RStudio/files/patch-src_cpp_session_session-config.h.in @@ -1,12 +1,17 @@ ---- src/cpp/session/session-config.h.in.orig 2020-05-18 18:11:10 UTC +--- src/cpp/session/session-config.h.in.orig 2021-09-22 13:58:50 UTC +++ src/cpp/session/session-config.h.in -@@ -13,11 +13,11 @@ +@@ -13,7 +13,7 @@ * */ -#define RSTUDIO_VERSION "${CPACK_PACKAGE_VERSION}" +#define RSTUDIO_VERSION "${FREEBSD_RSTUDIO_VERSION}" + #define RSTUDIO_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}" + #define RSTUDIO_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}" + #define RSTUDIO_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}" +@@ -21,8 +21,8 @@ #define RSTUDIO_RELEASE_NAME "${RSTUDIO_RELEASE_NAME}" + #define RSTUDIO_BUILD_TYPE "${RSTUDIO_BUILD_TYPE}" #define RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" -#define RSTUDIO_GIT_COMMIT "${RSTUDIO_GIT_COMMIT}" -#define RSTUDIO_BUILD_ID "${RSTUDIO_BUILD_ID}"