svn commit: r532612 - in head/devel/RStudio: . files
Yuri Victorovich
yuri at FreeBSD.org
Thu Apr 23 03:28:14 UTC 2020
Author: yuri
Date: Thu Apr 23 03:28:12 2020
New Revision: 532612
URL: https://svnweb.freebsd.org/changeset/ports/532612
Log:
devel/RStudio: Update 1.2.5033-2752 -> 1.2.5042
Reported by: portscout
Modified:
head/devel/RStudio/Makefile
head/devel/RStudio/distinfo
head/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp
head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp
head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in
Modified: head/devel/RStudio/Makefile
==============================================================================
--- head/devel/RStudio/Makefile Thu Apr 23 02:42:15 2020 (r532611)
+++ head/devel/RStudio/Makefile Thu Apr 23 03:28:12 2020 (r532612)
@@ -5,16 +5,18 @@
PORTNAME= RStudio
DISTVERSIONPREFIX= v
-DISTVERSION= 1.2.5033-2752
-DISTVERSIONSUFFIX= -g29e90c87a2
+DISTVERSION= 1.2.5042
CATEGORIES= devel math java
MASTER_SITES= https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
https://s3.amazonaws.com/rstudio-buildtools/:buildtools
DISTFILES= core-dictionaries.zip:dictionaries \
gin-${GIN_VERSION}.zip:buildtools \
gwt-${GWT_VERSION}.zip:buildtools \
- mathjax-27.zip:buildtools
+ mathjax-26.zip:buildtools
+PATCH_SITES= https://github.com/rstudio/rstudio/commit/
+PATCHFILES+= 33c2c42d40ad97d97ca3907df51059cd2ce76fe3.patch:-p1 # https://github.com/rstudio/rstudio/commit/33c2c42d40ad97d97ca3907df51059cd2ce76fe3
+
MAINTAINER= yuri at FreeBSD.org
COMMENT= Integrated development environment (IDE) for R
@@ -33,9 +35,10 @@ LIB_DEPENDS= libR.so:math/R \
libuuid.so:misc/e2fsprogs-libuuid
USES= cmake desktop-file-utils fortran localbase:ldflags pkgconfig qt:5 shared-mime-info ssl
-USE_QT= core dbus declarative gui location network opengl printsupport sensors \
+USE_QT= core dbus declarative gui location network opengl printsupport quickcontrols sensors \
sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build
-USE_JAVA= 13
+USE_JAVA= yes
+JAVA_VERSION= 8
JAVA_BUILD= yes
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME:tl}
Modified: head/devel/RStudio/distinfo
==============================================================================
--- head/devel/RStudio/distinfo Thu Apr 23 02:42:15 2020 (r532611)
+++ head/devel/RStudio/distinfo Thu Apr 23 03:28:12 2020 (r532612)
@@ -1,14 +1,14 @@
-TIMESTAMP = 1582044685
+TIMESTAMP = 1587507394
SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
SIZE (core-dictionaries.zip) = 876339
SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
SIZE (gin-2.1.2.zip) = 1341053
SHA256 (gwt-2.8.1.zip) = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7
SIZE (gwt-2.8.1.zip) = 95650299
-SHA256 (mathjax-27.zip) = c56cbaa6c4ce03c1fcbaeb2b5ea3c312d2fb7626a360254770cbcb88fb204176
-SIZE (mathjax-27.zip) = 3285230
-SHA256 (RStudio-rstudio-v1.2.5033-2752-g29e90c87a2_GH0.tar.gz) = 0b5c722769c759b1a0e1c0d2b5c1ffcbe17acc0cfb60fe5a3934732a8416f111
-SIZE (RStudio-rstudio-v1.2.5033-2752-g29e90c87a2_GH0.tar.gz) = 89541008
+SHA256 (mathjax-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71
+SIZE (mathjax-26.zip) = 3061588
+SHA256 (RStudio-rstudio-v1.2.5042_GH0.tar.gz) = 2bcd1d525d92e9ce42f4c7a57383c025e10d34313f8ed245429f02980b47c1fc
+SIZE (RStudio-rstudio-v1.2.5042_GH0.tar.gz) = 20456999
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
@@ -17,3 +17,5 @@ SHA256 (rstudio-rsconnect-03c379b_GH0.tar.gz) = d24b6e
SIZE (rstudio-rsconnect-03c379b_GH0.tar.gz) = 220711
SHA256 (trestletech-plumber-v0.4.6_GH0.tar.gz) = 7bcbfdf5a8a2e3a051d2c673ac5ac51a483ed888afe73116cba7741dbb5f63a6
SIZE (trestletech-plumber-v0.4.6_GH0.tar.gz) = 83332
+SHA256 (33c2c42d40ad97d97ca3907df51059cd2ce76fe3.patch) = d252111e28a7de8602b4df1f66b36dded260061f094b504895e5c789f8681091
+SIZE (33c2c42d40ad97d97ca3907df51059cd2ce76fe3.patch) = 4875
Modified: head/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp
==============================================================================
--- head/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp Thu Apr 23 02:42:15 2020 (r532611)
+++ head/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp Thu Apr 23 03:28:12 2020 (r532612)
@@ -1,19 +1,20 @@
---- src/cpp/core/system/PosixSched.cpp.orig 2020-01-23 23:30:24 UTC
+--- src/cpp/core/system/PosixSched.cpp.orig 2020-04-01 16:16:24 UTC
+++ src/cpp/core/system/PosixSched.cpp
-@@ -15,8 +15,12 @@
+@@ -15,8 +15,13 @@
#include <core/system/PosixSched.hpp>
+#define _GNU_SOURCE
- #include <algorithm>
#include <sched.h>
+#include <sys/types.h>
+#include <sys/param.h> // w/out this fails on i386 with error: use of undeclared identifier 'NBBY'
+#include <sys/cpuset.h>
- #include <shared_core/Error.hpp>
++
+ #include <core/Error.hpp>
-@@ -42,9 +46,10 @@ bool isCpuAffinityEmpty(const CpuAffinity& cpus)
+ namespace rstudio {
+@@ -41,9 +46,10 @@ bool isCpuAffinityEmpty(const CpuAffinity& cpus)
Error getCpuAffinity(CpuAffinity* pCpus)
{
#ifndef __APPLE__
@@ -26,7 +27,7 @@
return systemError(errno, ERROR_LOCATION);
pCpus->clear();
-@@ -56,7 +61,7 @@ Error getCpuAffinity(CpuAffinity* pCpus)
+@@ -55,7 +61,7 @@ Error getCpuAffinity(CpuAffinity* pCpus)
else
pCpus->push_back(false);
}
@@ -35,7 +36,7 @@
return Success();
#else
return systemError(boost::system::errc::not_supported, ERROR_LOCATION);
-@@ -67,7 +72,8 @@ Error getCpuAffinity(CpuAffinity* pCpus)
+@@ -66,7 +72,8 @@ Error getCpuAffinity(CpuAffinity* pCpus)
Error setCpuAffinity(const CpuAffinity& cpus)
{
#ifndef __APPLE__
@@ -45,7 +46,7 @@
CPU_ZERO(&cs);
for (std::size_t i=0; i<cpus.size(); i++)
-@@ -80,7 +86,7 @@ Error setCpuAffinity(const CpuAffinity& cpus)
+@@ -79,7 +86,7 @@ Error setCpuAffinity(const CpuAffinity& cpus)
if (::sched_setaffinity(0, sizeof(cs), &cs) == -1)
return systemError(errno, ERROR_LOCATION);
Modified: head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp
==============================================================================
--- head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp Thu Apr 23 02:42:15 2020 (r532611)
+++ head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp Thu Apr 23 03:28:12 2020 (r532612)
@@ -1,7 +1,7 @@
---- src/cpp/core/system/PosixSystem.cpp.orig 2020-01-23 23:30:24 UTC
+--- src/cpp/core/system/PosixSystem.cpp.orig 2020-04-01 16:16:24 UTC
+++ src/cpp/core/system/PosixSystem.cpp
-@@ -47,13 +47,18 @@
- #include <gsl/gsl>
+@@ -46,13 +46,18 @@
+ #include <libproc.h>
#endif
-#ifndef __APPLE__
@@ -20,7 +20,7 @@
#include <boost/thread.hpp>
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
-@@ -917,7 +922,7 @@ Error executablePath(const char * argv0,
+@@ -920,7 +925,7 @@ Error executablePath(const char * argv0,
#elif defined(HAVE_PROCSELF)
@@ -29,7 +29,7 @@
#else
-@@ -1426,7 +1431,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit
+@@ -1429,7 +1434,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit
case CpuLimit:
*pLimit = RLIMIT_CPU;
break;
@@ -38,7 +38,7 @@
case NiceLimit:
*pLimit = RLIMIT_NICE;
break;
-@@ -1499,7 +1504,7 @@ Error systemInformation(SysInfo* pSysInfo)
+@@ -1502,7 +1507,7 @@ Error systemInformation(SysInfo* pSysInfo)
{
pSysInfo->cores = boost::thread::hardware_concurrency();
@@ -47,7 +47,7 @@
struct sysinfo info;
if (::sysinfo(&info) == -1)
return systemError(errno, ERROR_LOCATION);
-@@ -1939,7 +1944,7 @@ Error restrictCoreDumps()
+@@ -1942,7 +1947,7 @@ Error restrictCoreDumps()
return error;
// no ptrace core dumps permitted
@@ -56,7 +56,7 @@
int res = ::prctl(PR_SET_DUMPABLE, 0);
if (res == -1)
return systemError(errno, ERROR_LOCATION);
-@@ -1950,7 +1955,7 @@ Error restrictCoreDumps()
+@@ -1953,7 +1958,7 @@ Error restrictCoreDumps()
Error enableCoreDumps()
{
@@ -65,12 +65,12 @@
int res = ::prctl(PR_SET_DUMPABLE, 1);
if (res == -1)
return systemError(errno, ERROR_LOCATION);
-@@ -1976,7 +1981,7 @@ void printCoreDumpable(const std::string& context)
+@@ -1979,7 +1984,7 @@ void printCoreDumpable(const std::string& context)
ostr << " hard limit: " << rLimitHard << std::endl;
// ptrace
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- int dumpable = ::prctl(PR_GET_DUMPABLE, nullptr, nullptr, nullptr, nullptr);
+ int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL);
if (dumpable == -1)
LOG_ERROR(systemError(errno, ERROR_LOCATION));
Modified: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
==============================================================================
--- head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp Thu Apr 23 02:42:15 2020 (r532611)
+++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp Thu Apr 23 03:28:12 2020 (r532612)
@@ -1,14 +1,15 @@
---- src/cpp/desktop/DesktopMain.cpp.orig 2020-01-23 23:30:24 UTC
+--- src/cpp/desktop/DesktopMain.cpp.orig 2020-04-01 16:16:24 UTC
+++ src/cpp/desktop/DesktopMain.cpp
-@@ -46,6 +46,7 @@
+@@ -42,6 +42,8 @@
#include "DesktopNetworkProxyFactory.hpp"
#include "DesktopActivationOverlay.hpp"
- #include "DesktopSessionServersOverlay.hpp"
-+#include "global-setenv.h"
++#include "global-setenv.h"
++
#ifdef _WIN32
#include <core/system/RegistryKey.hpp>
-@@ -372,7 +373,7 @@ QString inferDefaultRenderingEngine()
+ #include <Windows.h>
+@@ -367,7 +369,7 @@ QString inferDefaultRenderingEngine()
#endif
@@ -17,7 +18,7 @@
QString inferDefaultRenderingEngine()
{
-@@ -461,6 +462,7 @@ std::string getSessionUrl()
+@@ -426,6 +428,7 @@ void initializeRenderingEngine(std::vector<char*>* pAr
int main(int argc, char* argv[])
{
Modified: head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
==============================================================================
--- head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt Thu Apr 23 02:42:15 2020 (r532611)
+++ head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt Thu Apr 23 03:28:12 2020 (r532612)
@@ -1,8 +1,8 @@
---- src/cpp/session/CMakeLists.txt.orig 2020-01-23 23:30:24 UTC
+--- src/cpp/session/CMakeLists.txt.orig 2020-04-01 16:16:24 UTC
+++ src/cpp/session/CMakeLists.txt
-@@ -25,32 +25,32 @@ endif()
- if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27")
- message(FATAL_ERROR "Mathjax 2.7 not found (re-run install-dependencies script to install)")
+@@ -25,9 +25,9 @@ endif()
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
+ message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)")
endif()
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
@@ -11,20 +11,11 @@
+# message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
+#endif()
- # verify embedded packages are available
--foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
-- file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
-- if(NOT PKG_FILES)
-- message(FATAL_ERROR "${PKG} package not found (re-run install-dependencies script to install)")
-- endif()
--endforeach()
-+#foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
-+# file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
-+# if(NOT PKG_FILES)
-+# message(FATAL_ERROR "${PKG} package not found (re-run install-dependencies script to install)")
-+# endif()
-+#endforeach()
+ # we often install embedded versions of these packages but don't do so currently
+@@ -39,19 +39,19 @@ endif()
+ # endif()
+
# verify libclang is installed (Windows only)
-if(WIN32)
- set(LIBCLANG_VERSION "5.0.2")
@@ -54,9 +45,9 @@
# include files
file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*")
-@@ -390,6 +390,9 @@ endif()
+@@ -366,6 +366,9 @@ endif()
# define executable
- add_stripped_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES})
+ add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES})
+# additional libraries
+target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lprocstat)
@@ -64,9 +55,9 @@
# skip libR RPATH at development time
if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE)
set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE)
-@@ -518,11 +521,11 @@ if (NOT RSTUDIO_SESSION_WIN32)
- # install pandoc
- set(PANDOC_VERSION "2.7.3" CACHE INTERNAL "Pandoc version")
+@@ -497,11 +500,11 @@ if (NOT RSTUDIO_SESSION_WIN32)
+ set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
+ endif()
- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
@@ -79,5 +70,36 @@
+ # PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ # DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc)
- # install embedded packages
- foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
+ # install rmarkdown package
+ # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
+@@ -534,18 +537,18 @@ if (NOT RSTUDIO_SESSION_WIN32)
+ DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+
+ # install libclang
+- 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)
++#
++# # install libclang builtin-headers
++# install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
++# DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
++# endif()
+
+ # install winpty on windows
+ if(WIN32)
Modified: head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in
==============================================================================
--- head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in Thu Apr 23 02:42:15 2020 (r532611)
+++ head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in Thu Apr 23 03:28:12 2020 (r532612)
@@ -1,4 +1,4 @@
---- src/cpp/session/session-config.h.in.orig 2020-01-23 23:30:24 UTC
+--- src/cpp/session/session-config.h.in.orig 2020-04-01 16:16:24 UTC
+++ src/cpp/session/session-config.h.in
@@ -13,11 +13,11 @@
*
@@ -14,4 +14,4 @@
+#define RSTUDIO_BUILD_ID "FreeBSD-port-version-${FREEBSD_RSTUDIO_VERSION}"
#define RSTUDIO_BUILD_DATE "${CPACK_BUILD_DATE}"
#define RSTUDIO_COPYRIGHT_YEAR "${CPACK_COPYRIGHT_YEAR}"
- #define RSTUDIO_PACKAGE_OS "Unknown OS"
+ #cmakedefine RSTUDIO_SERVER
More information about the svn-ports-head
mailing list