Index: head/devel/RStudio/Makefile =================================================================== --- head/devel/RStudio/Makefile (revision 526465) +++ head/devel/RStudio/Makefile (revision 526466) @@ -1,106 +1,105 @@ # $FreeBSD$ # This port opens too many files during build, more than the default setting. -# Its build is known to succeed with MAX_FILES_RStudio=4096 in poudriere.conf when ports-mgmt/poudriere-devel is used. +# Its build is known to succeed with MAX_FILES_RStudio=4096 in poudriere.conf PORTNAME= RStudio DISTVERSIONPREFIX= v -DISTVERSION= 1.2.5033 +DISTVERSION= 1.2.5033-2752 +DISTVERSIONSUFFIX= -g29e90c87a2 CATEGORIES= devel math java -MASTER_SITES= https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \ +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-26.zip:buildtools + mathjax-27.zip:buildtools -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 33c2c42d40ad.patch:-p1 - MAINTAINER= yuri@FreeBSD.org COMMENT= Integrated development environment (IDE) for R LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build BROKEN_i386= [ERROR] Line 101: Failed to resolve 'org.rstudio.studio.client.workbench.views.vcs.common.diff.LineActionButtonRenderer.GrayResources' via deferred binding BUILD_DEPENDS= ant:devel/apache-ant \ ${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \ - pandoc:textproc/hs-pandoc + pandoc:textproc/hs-pandoc \ + R-cran-rstudioapi>0:devel/R-cran-rstudioapi LIB_DEPENDS= libR.so:math/R \ libboost_thread.so:devel/boost-libs \ libinotify.so:devel/libinotify \ libuuid.so:misc/e2fsprogs-libuuid -USES= cmake desktop-file-utils fortran pkgconfig qt:5 shared-mime-info ssl +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 \ sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build -USE_JAVA= yes +USE_JAVA= 13 JAVA_BUILD= yes USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tl} GH_TUPLE= rstudio:r2d3:v0.2.0:r2d3/dependencies/common/r2d3 \ rstudio:rmarkdown:aed26ac:rmarkdown/dependencies/common/rmarkdown \ rstudio:rsconnect:03c379b:rsconnect/dependencies/common/rsconnect \ trestletech:plumber:v0.4.6:plumber/dependencies/common/plumber CMAKE_ARGS= -DRSTUDIO_TARGET=Desktop \ -DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \ -DFREEBSD_LIBDIR:STRING=${PREFIX}/lib CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE:STRING=${QMAKE} CMAKE_ARGS+= -DRSTUDIO_BOOST_SIGNALS_VERSION=2 CMAKE_ARGS+= -DFREEBSD_PORT_VERSION:STRING=${DISTVERSION} MAKE_ENV= HOME=${WRKDIR} \ JAVA_HOME=${JAVA_HOME} \ + PATH=${JAVA_HOME}/bin:${PATH} \ ANT_OPTS="-Duser.home=${WRKDIR}" GWT_VERSION= 2.8.1 GIN_VERSION= 2.1.2 post-extract: @${MKDIR} ${WRKSRC}/dependencies/common/dictionaries && ${MV} ${WRKDIR}/en_* ${WRKSRC}/dependencies/common/dictionaries/ @${MV} ${WRKDIR}/mathjax-* ${WRKSRC}/dependencies/common/ @${MKDIR} ${WRKSRC}/src/gwt/lib/gwt && ${MV} ${WRKDIR}/gwt-${GWT_VERSION} ${WRKSRC}/src/gwt/lib/gwt/${GWT_VERSION} - @${MKDIR} ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION} && ${MV} ${WRKDIR}/*.jar ${WRKDIR}/javadoc ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION}/ + @${MKDIR} ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION} && ${MV} ${WRKDIR}/*.jar ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION}/ post-patch: @${REINPLACE_CMD} -e ' \ s|target_link_libraries(rstudio|target_link_libraries(rstudio procstat|; \ s|get_filename_component|#get_filename_component|; \ s|set(CMAKE_PREFIX_PATH "$${QT_BIN_DIR}//..//lib//cmake")|set(CMAKE_PREFIX_PATH "${LOCALBASE}/lib/cmake")|; \ s|/usr/share/|${PREFIX}/share/|g' \ ${WRKSRC}/src/cpp/desktop/CMakeLists.txt @${REINPLACE_CMD} -e ' \ s|||' \ ${WRKSRC}/src/gwt/build.xml @${REINPLACE_CMD} -e '\ s|rHomePaths.push_back|//rHomePaths.push_back|; \ s|//rHomePaths.push_back(FilePath("/usr/local/lib/|rHomePaths.push_back(FilePath("${PREFIX}/lib/|' \ ${WRKSRC}/src/cpp/core/r_util/RVersionsPosix.cpp pre-build: @${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cpp/desktop/global-setenv.h post-install: @(echo "#!/bin/sh"; \ echo ""; \ echo "if ! [ -d /proc/curproc ]; then"; \ echo " echo \"${PORTNAME} needs /proc to be mounted as procfs\" >&2"; \ echo " exit 1"; \ echo "fi"; \ echo ""; \ echo "# workaround for the problem that RStudio passes /lib with LD_LIBRARY_PATH that causes the /lib/libgcc_s.so.1 conflict with gcc"; \ echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so JAVA_HOME=${JAVA_HOME} ${PREFIX}/lib/rstudio/bin/rstudio \"$$@\"" \ ) > ${STAGEDIR}${PREFIX}/bin/rstudio @${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/rstudio @${REINPLACE_CMD} -e 's|^Exec=.*/rstudio|Exec=${PREFIX}/bin/rstudio|' ${STAGEDIR}${PREFIX}/share/applications/rstudio.desktop # Some functions expect the pandoc symlink. @${MKDIR} ${STAGEDIR}${PREFIX}/lib/rstudio/bin/pandoc @cd ${STAGEDIR}${PREFIX}/lib/rstudio/bin/pandoc && ${LN} -s ../../../../bin/pandoc # There is a variability in .js file names due to the use of random numbers, so we use the automatic plist. @${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist | ${GREP} -v ^\/ | ${SED} -e 's|%%WWWDIR%%|www/rstudio|' > ${TMPPLIST} .include Index: head/devel/RStudio/distinfo =================================================================== --- head/devel/RStudio/distinfo (revision 526465) +++ head/devel/RStudio/distinfo (revision 526466) @@ -1,21 +1,19 @@ -TIMESTAMP = 1576659216 +TIMESTAMP = 1582044685 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-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71 -SIZE (mathjax-26.zip) = 3061588 -SHA256 (RStudio-rstudio-v1.2.5033_GH0.tar.gz) = ff5115bda56ee0fdee0ae2eb014ce5379774aeb3714a257a52da5b91a95e4408 -SIZE (RStudio-rstudio-v1.2.5033_GH0.tar.gz) = 20456976 +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 (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 SIZE (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = 2087615 SHA256 (rstudio-rsconnect-03c379b_GH0.tar.gz) = d24b6ee49f32f650f6d10bbfc7b2f61aee258f2fbf45a43c006f9e0a726bcea6 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 (33c2c42d40ad.patch) = d252111e28a7de8602b4df1f66b36dded260061f094b504895e5c789f8681091 -SIZE (33c2c42d40ad.patch) = 4875 Index: head/devel/RStudio/files/patch-CMakeGlobals.txt =================================================================== --- head/devel/RStudio/files/patch-CMakeGlobals.txt (revision 526465) +++ head/devel/RStudio/files/patch-CMakeGlobals.txt (revision 526466) @@ -1,19 +1,19 @@ ---- CMakeGlobals.txt.orig 2019-09-19 13:59:21 UTC +--- CMakeGlobals.txt.orig 2020-01-23 23:30:24 UTC +++ CMakeGlobals.txt -@@ -82,7 +82,7 @@ endif() +@@ -84,7 +84,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) -if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVISION_HASH) +if(FALSE AND NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVISION_HASH) find_program(GIT_EXECUTABLE git) if(GIT_EXECUTABLE) execute_process( -@@ -93,6 +93,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS +@@ -95,6 +95,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() +SET(RSTUDIO_VERSION "${FREEBSD_RSTUDIO_VERSION}" CACHE STRING "FreeBSD RStudio version") # record these from Jenkins if available if("$ENV{GIT_COMMIT}" STREQUAL "") Index: head/devel/RStudio/files/patch-src_cpp_core_CMakeLists.txt =================================================================== --- head/devel/RStudio/files/patch-src_cpp_core_CMakeLists.txt (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_core_CMakeLists.txt (revision 526466) @@ -1,19 +1,19 @@ ---- src/cpp/core/CMakeLists.txt.orig 2019-02-16 02:00:24 UTC +--- src/cpp/core/CMakeLists.txt.orig 2020-01-23 23:30:24 UTC +++ src/cpp/core/CMakeLists.txt -@@ -156,12 +156,14 @@ if (UNIX) +@@ -152,12 +152,14 @@ if (UNIX) # platform introspection check_symbol_exists(SA_NOCLDWAIT "signal.h" HAVE_SA_NOCLDWAIT) check_symbol_exists(SO_PEERCRED "sys/socket.h" HAVE_SO_PEERCRED) + set(CMAKE_REQUIRED_LIBRARIES ${FREEBSD_LIBDIR}/libinotify.so) check_function_exists(inotify_init1 HAVE_INOTIFY_INIT1) + set(CMAKE_REQUIRED_LIBRARIES "") check_function_exists(getpeereid HAVE_GETPEEREID) check_function_exists(setresuid HAVE_SETRESUID) - if(EXISTS "/proc/self") + #if(EXISTS "/proc/self") set(HAVE_PROCSELF TRUE) - endif() + #endif() # find packages and libraries find_library(PTHREAD_LIBRARIES pthread) Index: head/devel/RStudio/files/patch-src_cpp_core_r__util_RSessionContext.cpp =================================================================== --- head/devel/RStudio/files/patch-src_cpp_core_r__util_RSessionContext.cpp (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_core_r__util_RSessionContext.cpp (revision 526466) @@ -1,13 +1,13 @@ ---- src/cpp/core/r_util/RSessionContext.cpp.orig 2017-11-16 21:40:37 UTC +--- src/cpp/core/r_util/RSessionContext.cpp.orig 2020-01-23 23:30:24 UTC +++ src/cpp/core/r_util/RSessionContext.cpp -@@ -138,8 +138,8 @@ bool isSharedPath(const std::string& pro +@@ -186,8 +186,8 @@ bool isSharedPath(const std::string& projectPath, // not shared if we're in any of the groups that own the directory // (note that this checks supplementary group IDs only, so the check // against the primary group ID above is still required) - if (::group_member(st.st_gid)) - return false; +// if (::group_member(st.st_gid)) +// return false; #endif // if we got this far, we likely have access due to project sharing Index: head/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp =================================================================== --- head/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp (revision 526466) @@ -1,55 +1,56 @@ ---- src/cpp/core/system/PosixSched.cpp.orig 2017-11-16 21:40:37 UTC +--- src/cpp/core/system/PosixSched.cpp.orig 2020-01-23 23:30:24 UTC +++ src/cpp/core/system/PosixSched.cpp -@@ -15,7 +15,11 @@ +@@ -15,8 +15,12 @@ #include +#define _GNU_SOURCE + #include #include +#include +#include // w/out this fails on i386 with error: use of undeclared identifier 'NBBY' +#include - #include + #include -@@ -41,9 +45,10 @@ bool isCpuAffinityEmpty(const CpuAffinit +@@ -42,9 +46,10 @@ bool isCpuAffinityEmpty(const CpuAffinity& cpus) Error getCpuAffinity(CpuAffinity* pCpus) { #ifndef __APPLE__ - cpu_set_t cs; +/* + cpuset_t cs; CPU_ZERO(&cs); - if (::sched_getaffinity(0, sizeof(cs), &cs) == -1) + if (sched_getaffinity(0, sizeof(cs), &cs) == -1) return systemError(errno, ERROR_LOCATION); pCpus->clear(); -@@ -55,7 +60,7 @@ Error getCpuAffinity(CpuAffinity* pCpus) +@@ -56,7 +61,7 @@ Error getCpuAffinity(CpuAffinity* pCpus) else pCpus->push_back(false); } - +*/ return Success(); #else return systemError(boost::system::errc::not_supported, ERROR_LOCATION); -@@ -66,7 +71,8 @@ Error getCpuAffinity(CpuAffinity* pCpus) +@@ -67,7 +72,8 @@ Error getCpuAffinity(CpuAffinity* pCpus) Error setCpuAffinity(const CpuAffinity& cpus) { #ifndef __APPLE__ - cpu_set_t cs; +/* + cpuset_t cs; CPU_ZERO(&cs); for (std::size_t i=0; i +@@ -47,13 +47,18 @@ + #include #endif -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) #include #include #include #include #endif +#if defined(__FreeBSD__) +#include +#include +#endif + #include #include #include -@@ -920,7 +925,7 @@ Error executablePath(const char * argv0, +@@ -917,7 +922,7 @@ Error executablePath(const char * argv0, #elif defined(HAVE_PROCSELF) - executablePath = std::string("/proc/self/exe"); + executablePath = std::string("/proc/curproc/file"); #else -@@ -1429,7 +1434,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit +@@ -1426,7 +1431,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit case CpuLimit: *pLimit = RLIMIT_CPU; break; -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) case NiceLimit: *pLimit = RLIMIT_NICE; break; -@@ -1502,7 +1507,7 @@ Error systemInformation(SysInfo* pSysInfo) +@@ -1499,7 +1504,7 @@ Error systemInformation(SysInfo* pSysInfo) { pSysInfo->cores = boost::thread::hardware_concurrency(); -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) struct sysinfo info; if (::sysinfo(&info) == -1) return systemError(errno, ERROR_LOCATION); -@@ -1942,7 +1947,7 @@ Error restrictCoreDumps() +@@ -1939,7 +1944,7 @@ Error restrictCoreDumps() return error; // no ptrace core dumps permitted -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) int res = ::prctl(PR_SET_DUMPABLE, 0); if (res == -1) return systemError(errno, ERROR_LOCATION); -@@ -1953,7 +1958,7 @@ Error restrictCoreDumps() +@@ -1950,7 +1955,7 @@ Error restrictCoreDumps() Error enableCoreDumps() { -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) int res = ::prctl(PR_SET_DUMPABLE, 1); if (res == -1) return systemError(errno, ERROR_LOCATION); -@@ -1979,7 +1984,7 @@ void printCoreDumpable(const std::string& context) +@@ -1976,7 +1981,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, NULL, NULL, NULL, NULL); + int dumpable = ::prctl(PR_GET_DUMPABLE, nullptr, nullptr, nullptr, nullptr); if (dumpable == -1) LOG_ERROR(systemError(errno, ERROR_LOCATION)); Index: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp =================================================================== --- head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp (revision 526466) @@ -1,27 +1,27 @@ ---- src/cpp/desktop/DesktopMain.cpp.orig 2019-09-19 13:59:21 UTC +--- src/cpp/desktop/DesktopMain.cpp.orig 2020-01-23 23:30:24 UTC +++ src/cpp/desktop/DesktopMain.cpp -@@ -41,6 +41,7 @@ - #include "DesktopProgressActivator.hpp" +@@ -46,6 +46,7 @@ #include "DesktopNetworkProxyFactory.hpp" #include "DesktopActivationOverlay.hpp" + #include "DesktopSessionServersOverlay.hpp" +#include "global-setenv.h" #ifdef _WIN32 #include -@@ -367,7 +368,7 @@ QString inferDefaultRenderingEngine() +@@ -372,7 +373,7 @@ QString inferDefaultRenderingEngine() #endif -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) QString inferDefaultRenderingEngine() { -@@ -426,6 +427,7 @@ void initializeRenderingEngine(std::vector* pAr +@@ -461,6 +462,7 @@ std::string getSessionUrl() int main(int argc, char* argv[]) { + GLOBAL_SETENV core::system::initHook(); try Index: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopWebView.cpp =================================================================== --- head/devel/RStudio/files/patch-src_cpp_desktop_DesktopWebView.cpp (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopWebView.cpp (revision 526466) @@ -1,29 +1,29 @@ ---- src/cpp/desktop/DesktopWebView.cpp.orig 2019-02-18 00:53:59 UTC +--- src/cpp/desktop/DesktopWebView.cpp.orig 2020-01-23 23:30:24 UTC +++ src/cpp/desktop/DesktopWebView.cpp -@@ -257,7 +257,7 @@ void WebView::contextMenuEvent(QContextM +@@ -272,7 +272,7 @@ void WebView::contextMenuEvent(QContextMenuEvent* even case QWebEngineContextMenuData::MediaTypeAudio: -#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) && !defined(__FreeBSD__) // FreeBSD stayed with qt5-webengine-5.9.5_14 while Qt advanced to 5.12.0 if (data.mediaFlags().testFlag(QWebEngineContextMenuData::MediaPaused)) menu->addAction(label(tr("&Play")), [&]() { triggerPageAction(QWebEnginePage::ToggleMediaPlayPause); }); else -@@ -274,7 +274,7 @@ void WebView::contextMenuEvent(QContextM +@@ -289,7 +289,7 @@ void WebView::contextMenuEvent(QContextMenuEvent* even case QWebEngineContextMenuData::MediaTypeVideo: -#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) && !defined(__FreeBSD__) // FreeBSD stayed with qt5-webengine-5.9.5_14 while Qt advanced to 5.12.0 if (data.mediaFlags().testFlag(QWebEngineContextMenuData::MediaPaused)) menu->addAction(label(tr("&Play")), [&]() { triggerPageAction(QWebEnginePage::ToggleMediaPlayPause); }); else -@@ -332,7 +332,7 @@ void WebView::contextMenuEvent(QContextM +@@ -347,7 +347,7 @@ void WebView::contextMenuEvent(QContextMenuEvent* even menu->addAction(selectAll); } -#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) && !defined(__FreeBSD__) // FreeBSD stayed with qt5-webengine-5.9.5_14 while Qt advanced to 5.12.0 menu->addSeparator(); menu->addAction(label(tr("&Reload")), [&]() { triggerPageAction(QWebEnginePage::Reload); }); menu->addAction(label(tr("I&nspect element")), [&]() { Index: head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt =================================================================== --- head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt (revision 526466) @@ -1,10 +1,10 @@ ---- src/cpp/diagnostics/CMakeLists.txt.orig 2019-09-19 13:59:21 UTC +--- src/cpp/diagnostics/CMakeLists.txt.orig 2020-01-23 23:30:24 UTC +++ src/cpp/diagnostics/CMakeLists.txt -@@ -62,6 +62,7 @@ endif() +@@ -57,6 +57,7 @@ add_stripped_executable(diagnostics # set link dependencies target_link_libraries(diagnostics rstudio-core + procstat ) if(NOT RSTUDIO_SESSION_WIN32) install(TARGETS diagnostics DESTINATION ${RSTUDIO_INSTALL_BIN}) Index: head/devel/RStudio/files/patch-src_cpp_server_CMakeLists.txt =================================================================== --- head/devel/RStudio/files/patch-src_cpp_server_CMakeLists.txt (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_server_CMakeLists.txt (revision 526466) @@ -1,12 +1,12 @@ ---- src/cpp/server/CMakeLists.txt.orig 2017-11-16 21:40:37 UTC +--- src/cpp/server/CMakeLists.txt.orig 2020-01-23 23:30:24 UTC +++ src/cpp/server/CMakeLists.txt -@@ -124,6 +124,9 @@ include_directories( +@@ -156,6 +156,9 @@ include_directories( # define executable - add_executable(rserver ${SERVER_SOURCE_FILES} ${SERVER_HEADER_FILES}) + add_stripped_executable(rserver ${SERVER_SOURCE_FILES} ${SERVER_HEADER_FILES}) +# additional libraries +target_link_libraries(rserver -L${FREEBSD_LIBDIR} -linotify) + - # add origin rpath for suse/sles - if(RSTUDIO_PACKAGE_VARIANT STREQUAL "SLES") - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + # set link dependencies + target_link_libraries(rserver + rstudio-core Index: head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt =================================================================== --- head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt (revision 526466) @@ -1,74 +1,83 @@ ---- src/cpp/session/CMakeLists.txt.orig 2019-09-19 13:59:21 UTC +--- src/cpp/session/CMakeLists.txt.orig 2020-01-23 23:30:24 UTC +++ src/cpp/session/CMakeLists.txt -@@ -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)") +@@ -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)") endif() -if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") - message(FATAL_ERROR "pandoc 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)") +#endif() - # we often install embedded versions of these packages but don't do so currently + # 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() -@@ -39,19 +39,19 @@ endif() - # endif() - # verify libclang is installed (Windows only) -if(WIN32) - set(LIBCLANG_VERSION "5.0.2") - 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() +#if(WIN32) +# set(LIBCLANG_VERSION "5.0.2") +# 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*") -@@ -366,6 +366,9 @@ endif() +@@ -390,6 +390,9 @@ endif() # define executable - add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES}) + add_stripped_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES}) +# additional libraries +target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lprocstat) + # skip libR RPATH at development time if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE) set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE) -@@ -497,11 +500,11 @@ if (NOT RSTUDIO_SESSION_WIN32) - set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version") - endif() +@@ -518,11 +521,11 @@ if (NOT RSTUDIO_SESSION_WIN32) + # install pandoc + set(PANDOC_VERSION "2.7.3" CACHE INTERNAL "Pandoc version") - set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") - file(GLOB PANDOC_FILES "${PANDOC_BIN}/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) + #set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") + #file(GLOB PANDOC_FILES "${PANDOC_BIN}/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) - # install rmarkdown package - # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") + # install embedded packages + foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) Index: head/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp =================================================================== --- head/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp (revision 526466) @@ -1,11 +1,11 @@ ---- src/cpp/session/SessionHttpMethods.cpp.orig 2017-11-16 21:40:37 UTC +--- src/cpp/session/SessionHttpMethods.cpp.orig 2020-01-23 23:30:24 UTC +++ src/cpp/session/SessionHttpMethods.cpp -@@ -326,7 +326,7 @@ std::string clientVersion() +@@ -397,7 +397,7 @@ std::string clientVersion() return std::string(); // clientVersion is the git revision hash - return RSTUDIO_GIT_REVISION_HASH; + return RSTUDIO_VERSION; } void waitForMethodInitFunction(const ClientEvent& initEvent) Index: head/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp =================================================================== --- head/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp (revision 526466) @@ -1,14 +1,14 @@ ---- src/cpp/session/SessionMain.cpp.orig 2019-09-19 13:59:21 UTC +--- src/cpp/session/SessionMain.cpp.orig 2020-01-23 23:30:24 UTC +++ src/cpp/session/SessionMain.cpp -@@ -1633,7 +1633,11 @@ int main (int argc, char * const argv[]) +@@ -1711,7 +1711,11 @@ int main (int argc, char * const argv[]) // move to own process group #ifndef _WIN32 +#if defined(__FreeBSD__) + ::setpgrp(0, 0); +#else ::setpgrp(); +#endif #endif // get main thread id (used to distinguish forks which occur Index: head/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt =================================================================== --- head/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt (revision 526466) @@ -1,10 +1,10 @@ ---- src/cpp/session/postback/CMakeLists.txt.orig 2018-05-31 21:11:21 UTC +--- src/cpp/session/postback/CMakeLists.txt.orig 2020-01-23 23:30:24 UTC +++ src/cpp/session/postback/CMakeLists.txt -@@ -43,6 +43,7 @@ endif() +@@ -36,6 +36,7 @@ add_executable(rpostback ${POSTBACK_SOURCE_FILES} ${PO # set link dependencies target_link_libraries(rpostback rstudio-core + procstat ) if (RSTUDIO_SERVER) Index: head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in =================================================================== --- head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in (revision 526465) +++ head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in (revision 526466) @@ -1,17 +1,17 @@ ---- src/cpp/session/session-config.h.in.orig 2019-10-25 22:16:29 UTC +--- src/cpp/session/session-config.h.in.orig 2020-01-23 23:30:24 UTC +++ src/cpp/session/session-config.h.in @@ -13,11 +13,11 @@ * */ -#define RSTUDIO_VERSION "${CPACK_PACKAGE_VERSION}" +#define RSTUDIO_VERSION "${FREEBSD_RSTUDIO_VERSION}" #define RSTUDIO_RELEASE_NAME "${RSTUDIO_RELEASE_NAME}" #define RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" -#define RSTUDIO_GIT_COMMIT "${RSTUDIO_GIT_COMMIT}" -#define RSTUDIO_BUILD_ID "${RSTUDIO_BUILD_ID}" +#define RSTUDIO_GIT_COMMIT "n/a" +#define RSTUDIO_BUILD_ID "FreeBSD-port-version-${FREEBSD_RSTUDIO_VERSION}" #define RSTUDIO_BUILD_DATE "${CPACK_BUILD_DATE}" #define RSTUDIO_COPYRIGHT_YEAR "${CPACK_COPYRIGHT_YEAR}" - #cmakedefine RSTUDIO_SERVER + #define RSTUDIO_PACKAGE_OS "Unknown OS"