From nobody Sat Jul 09 16:09:47 2022 X-Original-To: dev-commits-ports-main@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 2DAC317FE33D; Sat, 9 Jul 2022 16:09:48 +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 4LgFTm0mm2z3Zvy; Sat, 9 Jul 2022 16:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657382988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4xz8hJ8i1OYxxvlHGtViF6vVJcjNk463rtEqWc2jgQ=; b=yaQ7ExOlIl1RudrTV032HTh0a4cgnIcGEjJvPxq7m25PSalbH6nVhf4vOX46EnB3oD8i8T Irg8sCX5cpuBkvIiX+3Mt5LkQAngD2/6Y26nzrycPd1xYMAtrXbDR3XJCrK0t8CfTvOVvc wXtvmGEb4hqohcbTfCFbQH8eQ/zGdyUEcIE4M/L2MucCWDqDAru7hdYuzENQrJJaN1uHPe T2Dk+itLrsKDg6HC2FLukO96cmI06P1+ZvIQm0Q5RKbexK4dPYmniAksKwBKUdpcAc8PlS Q9mqjoQ+C1/7Lgo+kIvHBJ4nmrGwDy9BRoa0VgXyPqt7aB/MmMn6PdfkgpaRig== 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 4LgFTl6wJ6zry1; Sat, 9 Jul 2022 16:09:47 +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 269G9lLO092088; Sat, 9 Jul 2022 16:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 269G9lQ7092087; Sat, 9 Jul 2022 16:09:47 GMT (envelope-from git) Date: Sat, 9 Jul 2022 16:09:47 GMT Message-Id: <202207091609.269G9lQ7092087@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: 101b5242a040 - main - devel/RStudio: Update 2022.02.3+492 -> 2022.07.0+548 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 101b5242a040d0486fb944757f92d14bf2dc2e01 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657382988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4xz8hJ8i1OYxxvlHGtViF6vVJcjNk463rtEqWc2jgQ=; b=n3Hqn0v3sYTPv4rV/8INSfsRK+1EsJEWdMwq0Ben0ysbsdIUGjPwu0OcffSp4evOWtXcyC KPHjHuzIL51yrcE4kEjA/5t8gcLw/nyY/0IgigN2ghkYcP4luAJsLP2wj8WrN5xDtZLcYw y/Lsc5MybT/0gjz75vCngcELi3HxtM8wssMvsDA9XylqsHW47NySp7Wz3ZgpguVQ63FRey fBzmddbxuI86V5Fz5zOIPJ/otwRrfuHD5Z2EAjzJGCypvNp3B/+22K2qgRlMC+ds+hx7O4 2rO9mBWeKOPVbHX008fBvt534rc4UOoNLDtEonOAn4nOD9AWunHw1hgS129Nug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657382988; a=rsa-sha256; cv=none; b=jmRgvbvlfMXaCFNXiKgKToktq2j6DHoymDn0Hy2vlodE1m8idZ8oH+eaKEvS2TU36c8p+1 1UCuFT2sW8jxNq0PSWFopKBfCsA8FcHddqm2qGYhpROp2a4dulXMUH+uBVcQtR+Llv9OZ6 Sdn95xGfdQAY9m4Vhxx2hxSKmHvRKWSeNm6Jxcs63CmZUYiQgFUEHxtpri+jiQAMDuNz1c kgfrQ4OvalrAWQ7o8QiBtlXZGta64YlBpYMAy1RtTqDS+r3qh6Pz7Sn37rRYHG+Nb/s0V1 XPdrjtiQ8PRgSJiuxY8NRBpUTtZEnYg5wC3M967PHgD7S9ztxQXGcGtCoYCvyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=101b5242a040d0486fb944757f92d14bf2dc2e01 commit 101b5242a040d0486fb944757f92d14bf2dc2e01 Author: Yuri Victorovich AuthorDate: 2022-07-09 16:08:38 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-09 16:09:45 +0000 devel/RStudio: Update 2022.02.3+492 -> 2022.07.0+548 Reported by: portscout --- devel/RStudio/Makefile | 2 +- devel/RStudio/distinfo | 6 +-- devel/RStudio/files/patch-CMakeGlobals.txt | 12 ++--- ...patch-src_cpp_core_system_PosixChildProcess.cpp | 22 ++++---- .../files/patch-src_cpp_session_CMakeLists.txt | 62 +++++++--------------- 5 files changed, 43 insertions(+), 61 deletions(-) diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile index 03c4159fc6ba..929ce07ed0c5 100644 --- a/devel/RStudio/Makefile +++ b/devel/RStudio/Makefile @@ -3,7 +3,7 @@ PORTNAME= RStudio DISTVERSIONPREFIX= v -DISTVERSION= 2022.02.3+492 +DISTVERSION= 2022.07.0+548 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 b1dc9b3146b4..5f294d50fee3 100644 --- a/devel/RStudio/distinfo +++ b/devel/RStudio/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1654197748 +TIMESTAMP = 1657349042 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-v2022.02.3+492_GH0.tar.gz) = e0e520d992445db85dc30bdfe3fb6477f50605ce96f0b89eac19b618860032d9 -SIZE (RStudio-rstudio-v2022.02.3+492_GH0.tar.gz) = 97657933 +SHA256 (RStudio-rstudio-v2022.07.0+548_GH0.tar.gz) = 51061c4b92b6ec11bc07ca01b260c0b332d5b069aefd01b012182ae4086e9983 +SIZE (RStudio-rstudio-v2022.07.0+548_GH0.tar.gz) = 100379637 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 fe20cc00af7d..10b2da0c4b02 100644 --- a/devel/RStudio/files/patch-CMakeGlobals.txt +++ b/devel/RStudio/files/patch-CMakeGlobals.txt @@ -1,6 +1,6 @@ ---- CMakeGlobals.txt.orig 2022-02-16 19:26:03 UTC +--- CMakeGlobals.txt.orig 2022-07-06 19:59:49 UTC +++ CMakeGlobals.txt -@@ -159,7 +159,7 @@ endif() +@@ -168,7 +168,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( -@@ -170,6 +170,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS +@@ -179,6 +179,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,7 @@ # record these from Jenkins if available if("$ENV{GIT_COMMIT}" STREQUAL "") -@@ -223,7 +224,7 @@ if(LINUX AND UNAME_M STREQUAL aarch64) +@@ -254,7 +255,7 @@ elseif(IS_CENTOS7) set(QUARTO_ENABLED FALSE CACHE INTERNAL "") else() # enable by default @@ -26,7 +26,7 @@ add_definitions(-DQUARTO_ENABLED) endif() -@@ -298,14 +299,14 @@ else() +@@ -341,14 +342,14 @@ else() endif() # if the install prefix is /usr/local then tweak as appropriate @@ -35,7 +35,7 @@ if(APPLE) set(CMAKE_INSTALL_PREFIX "/Applications") elseif(UNIX) - if(RSTUDIO_DESKTOP) + if(RSTUDIO_DESKTOP OR RSTUDIO_ELECTRON) - set(CMAKE_INSTALL_PREFIX "/usr/local/lib/rstudio") + set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/rstudio") else() diff --git a/devel/RStudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp b/devel/RStudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp index 0eed50ff5611..c16e45354db3 100644 --- a/devel/RStudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp +++ b/devel/RStudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp @@ -1,23 +1,27 @@ ---- src/cpp/core/system/PosixChildProcess.cpp.orig 2017-11-16 21:40:37 UTC +--- src/cpp/core/system/PosixChildProcess.cpp.orig 2022-07-06 19:59:49 UTC +++ src/cpp/core/system/PosixChildProcess.cpp -@@ -19,14 +19,18 @@ - #include - #include - #include -+#include - - #ifdef __APPLE__ - #include +@@ -25,9 +25,12 @@ #include #include #else -#include -#include +-#include +//#include +//#include ++//#include +#include +#include +#include #endif #include +@@ -807,7 +810,7 @@ Error ChildProcess::run() + + if (options_.exitWithParent) + { +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + // set a bit indicating we want to die when our parent dies + if (::prctl(PR_SET_PDEATHSIG, SIGTERM) == -1) + LOG_ERROR(systemError(errno, ERROR_LOCATION)); diff --git a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt index 6269c5951b93..ec905847548a 100644 --- a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt +++ b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt @@ -1,18 +1,18 @@ ---- src/cpp/session/CMakeLists.txt.orig 2022-02-16 19:26:03 UTC +--- src/cpp/session/CMakeLists.txt.orig 2022-07-06 19:59:49 UTC +++ src/cpp/session/CMakeLists.txt -@@ -55,20 +55,21 @@ endif() +@@ -55,19 +55,19 @@ 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") +- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools") -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") ++# set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools") +#elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") +# set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") +#else() @@ -24,46 +24,32 @@ foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR RSTUDIO_DEPENDENCIES_MATHJAX_DIR - RSTUDIO_DEPENDENCIES_PANDOC_DIR -- RSTUDIO_DEPENDENCIES_QUARTO_DIR) + #RSTUDIO_DEPENDENCIES_PANDOC_DIR -+ RSTUDIO_DEPENDENCIES_QUARTO_DIR -+ ) + RSTUDIO_DEPENDENCIES_QUARTO_DIR) - # skip quarto if not enabled -@@ -95,19 +96,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) +@@ -95,13 +95,13 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) endforeach() # verify libclang is installed (Windows only) -if(WIN32) -- set(LIBCLANG_VERSION "5.0.2") +- set(LIBCLANG_VERSION "13.0.1") - set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") - if(NOT EXISTS "${LIBCLANG_DIR}") - message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") - endif() +-endif() +#if(WIN32) -+# set(LIBCLANG_VERSION "5.0.2") ++# set(LIBCLANG_VERSION "13.0.1") +# set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") +# if(NOT EXISTS "${LIBCLANG_DIR}") +# message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") +# endif() -+# -+# set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") -+# if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -+# message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") -+# endif() +#endif() -- set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") -- if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") -- endif() --endif() -- # include files file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") - -@@ -528,6 +529,9 @@ else() +@@ -528,6 +528,9 @@ else() endif() @@ -73,7 +59,7 @@ # skip libR RPATH at development time if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE) set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE) -@@ -688,10 +692,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT +@@ -697,10 +700,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT DESTINATION "${RSTUDIO_INSTALL_BIN}" USE_SOURCE_PERMISSIONS) endif() @@ -88,7 +74,7 @@ endif() # install embedded packages -@@ -732,18 +736,18 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT +@@ -741,14 +744,14 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) # install libclang @@ -99,23 +85,15 @@ - file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*") - install(PROGRAMS ${LIBCLANG_64_FILES} - DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -- -- # install libclang builtin-headers -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") - endif() -+# if(WIN32) -+# file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*") -+# install(PROGRAMS ${LIBCLANG_32_FILES} -+# DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) -+# file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*") -+# install(PROGRAMS ${LIBCLANG_64_FILES} -+# DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -+# -+# # install libclang builtin-headers -+# install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -+# DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") -+# endif() ++ #if(WIN32) ++ # file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*") ++ # install(PROGRAMS ${LIBCLANG_32_FILES} ++ # DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) ++ # file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*") ++ # install(PROGRAMS ${LIBCLANG_64_FILES} ++ # DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) ++ #endif() # install winpty on windows if(WIN32)