Index: head/devel/RStudio/Makefile
===================================================================
--- head/devel/RStudio/Makefile (revision 471194)
+++ head/devel/RStudio/Makefile (revision 471195)
@@ -1,97 +1,100 @@
# $FreeBSD$
# This port opens too many files during build, more than the default setting.
# Its build is known to succeed with MAX_FILES_RStudio=2048 in poudriere.conf when ports-mgmt/poudriere-devel is used.
PORTNAME= RStudio
DISTVERSIONPREFIX= v
-DISTVERSION= 1.1.453
-PORTREVISION= 1
+DISTVERSION= 1.2.637
CATEGORIES= devel math java
MASTER_SITES= https://s3.amazonaws.com/rstudio-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
PATCH_SITES= https://github.com/${PORTNAME}/${GH_PROJECT}/commit/
-PATCHFILES= ab3d4355ab5c7f4bc7af1f7aeabe62c3d1bbccec.patch:-p1
+PATCHFILES= ab3d4355ab5c7f4bc7af1f7aeabe62c3d1bbccec.patch:-p1 \
+ 85896f38b7d25661dd29f76b2bbf1b64d5e34fa4.patch:-p1 \
+ 8967d0e4979b81b4792093e869ae9a6bf6d96397.patch:-p1
MAINTAINER= yuri@FreeBSD.org
COMMENT= Integrated development environment (IDE) for R
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ant:devel/apache-ant \
${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \
pandoc:textproc/hs-pandoc
LIB_DEPENDS= libR.so:math/R \
libboost_thread.so:devel/boost-libs \
libinotify.so:devel/libinotify \
libuuid.so:misc/e2fsprogs-libuuid
-USES= cmake:outsource desktop-file-utils fortran pkgconfig shared-mime-info
+USES= cmake:outsource desktop-file-utils fortran pkgconfig shared-mime-info ssl
USE_QT5= core dbus gui location network opengl printsupport qml quick sensors \
- sql svg webchannel webkit widgets xml xmlpatterns buildtools_build qmake_build
+ sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build
USE_JAVA= yes
JAVA_BUILD= yes
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME:tl}
-GH_TUPLE= rstudio:rmarkdown:aed26ac:rmarkdown/dependencies/common/rmarkdown \
+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
CMAKE_ARGS= -DRSTUDIO_TARGET=Desktop \
-DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \
-DFREEBSD_LIBDIR:STRING=${PREFIX}/lib
MAKE_ENV= HOME=${WRKDIR} \
ANT_OPTS="-Duser.home=${WRKDIR}"
-GWT_VERSION= 2.7.0
-GIN_VERSION= 1.5
+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}/
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/gcc6/libgcc_s.so ${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 471194)
+++ head/devel/RStudio/distinfo (revision 471195)
@@ -1,17 +1,23 @@
-TIMESTAMP = 1526611455
+TIMESTAMP = 1527743852
SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
SIZE (core-dictionaries.zip) = 876339
-SHA256 (gin-1.5.zip) = f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94
-SIZE (gin-1.5.zip) = 1055663
-SHA256 (gwt-2.7.0.zip) = aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3
-SIZE (gwt-2.7.0.zip) = 108818328
+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.1.453_GH0.tar.gz) = aec3f20594e57e46cfcd98a64e675c1934e53195738a908ec652f720129fa81e
-SIZE (RStudio-rstudio-v1.1.453_GH0.tar.gz) = 20200360
+SHA256 (RStudio-rstudio-v1.2.637_GH0.tar.gz) = 1197138a92bf541bb8e12b897543ffd4d1090c268edaaa9dfc121c6208a5717d
+SIZE (RStudio-rstudio-v1.2.637_GH0.tar.gz) = 20076660
+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 (ab3d4355ab5c7f4bc7af1f7aeabe62c3d1bbccec.patch) = e00e0ba8bd342da7951d0f699d318d67cebd55436df6827ccf219b8d969e09a9
SIZE (ab3d4355ab5c7f4bc7af1f7aeabe62c3d1bbccec.patch) = 3096
+SHA256 (85896f38b7d25661dd29f76b2bbf1b64d5e34fa4.patch) = 9b69e25400b60d8fec22a9fd4655546f564ecfc315479cad1405825ba0fea80f
+SIZE (85896f38b7d25661dd29f76b2bbf1b64d5e34fa4.patch) = 974
+SHA256 (8967d0e4979b81b4792093e869ae9a6bf6d96397.patch) = 7b49ee51fb9ce78f079067cddb537965cf0356147a0dcdfbe3bd2dd5af796ebb
+SIZE (8967d0e4979b81b4792093e869ae9a6bf6d96397.patch) = 1279
Index: head/devel/RStudio/files/patch-src_cpp_CMakeLists.txt
===================================================================
--- head/devel/RStudio/files/patch-src_cpp_CMakeLists.txt (revision 471194)
+++ head/devel/RStudio/files/patch-src_cpp_CMakeLists.txt (nonexistent)
@@ -1,10 +0,0 @@
---- src/cpp/CMakeLists.txt.orig 2017-11-16 21:40:37 UTC
-+++ src/cpp/CMakeLists.txt
-@@ -101,7 +101,6 @@ if(UNIX)
- add_definitions(-Wformat -Wformat-security)
- add_definitions(-D_FORTIFY_SOURCE=2)
- add_definitions(-fstack-protector --param ssp-buffer-size=4)
-- add_definitions(-pie -fPIE)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
- endif()
-
Property changes on: head/devel/RStudio/files/patch-src_cpp_CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/RStudio/files/patch-boost-1.67
===================================================================
--- head/devel/RStudio/files/patch-boost-1.67 (revision 471194)
+++ head/devel/RStudio/files/patch-boost-1.67 (nonexistent)
@@ -1,62 +0,0 @@
-Regressed by https://github.com/boostorg/date_time/commit/f9f2aaf5216c
-
-src/cpp/core/DateTime.cpp:68:26: error: no matching conversion for functional-style cast from 'double' to 'boost::posix_time::seconds'
- return time_t_epoch + seconds(sec);
- ^~~~~~~~~~~
-src/cpp/core/file_lock/FileLock.cpp:136:34: error: no matching conversion for functional-style cast from 'double' to 'boost::posix_time::seconds'
- FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-src/cpp/core/file_lock/FileLock.cpp:140:30: error: no matching conversion for functional-style cast from 'double' to 'boost::posix_time::seconds'
- FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-src/cpp/core/file_lock/FileLock.cpp:215:38: error: no matching constructor for initialization of 'boost::posix_time::seconds'
-boost::posix_time::seconds FileLock::s_timeoutInterval(kDefaultTimeoutInterval);
- ^ ~~~~~~~~~~~~~~~~~~~~~~~
-src/cpp/core/file_lock/FileLock.cpp:216:38: error: no matching constructor for initialization of 'boost::posix_time::seconds'
-boost::posix_time::seconds FileLock::s_refreshRate(kDefaultRefreshRate);
- ^ ~~~~~~~~~~~~~~~~~~~
-/usr/local/include/boost/date_time/posix_time/posix_time_duration.hpp:53:30: note: candidate constructor (the implicit copy constructor) not viable: no known conversion from 'double' to 'const boost::posix_time::seconds' for 1st argument
- class BOOST_SYMBOL_VISIBLE seconds : public time_duration
- ^
-/usr/local/include/boost/date_time/posix_time/posix_time_duration.hpp:58:37: note: candidate template ignored: disabled by 'enable_if' [with T = double]
- typename boost::enable_if, void>::type* = 0) :
- ^
-
---- src/cpp/core/DateTime.cpp.orig 2018-04-16 22:26:34 UTC
-+++ src/cpp/core/DateTime.cpp
-@@ -65,7 +65,7 @@ boost::posix_time::ptime timeFromSecondsSinceEpoch(dou
- using namespace boost::posix_time;
-
- ptime time_t_epoch(date(1970,1,1));
-- return time_t_epoch + seconds(sec);
-+ return time_t_epoch + seconds(long(sec));
- }
-
- boost::posix_time::ptime timeFromMillisecondsSinceEpoch(int64_t ms)
---- src/cpp/core/file_lock/FileLock.cpp.orig 2018-04-16 22:26:34 UTC
-+++ src/cpp/core/file_lock/FileLock.cpp
-@@ -46,8 +46,8 @@ const char * const kLockTypeLinkBased = "linkbased";
- #endif
-
- const char * const kLocksConfPath = "/etc/rstudio/file-locks";
--const double kDefaultRefreshRate = 20.0;
--const double kDefaultTimeoutInterval = 30.0;
-+const long kDefaultRefreshRate = 20;
-+const long kDefaultTimeoutInterval = 30;
-
- std::string lockTypeToString(FileLock::LockType type)
- {
-@@ -132,11 +132,11 @@ void FileLock::initialize(const Settings& settings)
- FileLock::s_defaultType = stringToLockType(settings.get("lock-type", kLockTypeDefault));
-
- // timeout interval
-- double timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval);
-+ long timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval);
- FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval);
-
- // refresh rate
-- double refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate);
-+ long refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate);
- FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate);
-
- // logging
Property changes on: head/devel/RStudio/files/patch-boost-1.67
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp
===================================================================
--- head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp (revision 471194)
+++ head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp (revision 471195)
@@ -1,77 +1,137 @@
---- src/cpp/core/system/PosixSystem.cpp.orig 2017-11-16 21:40:37 UTC
+--- src/cpp/core/system/PosixSystem.cpp.orig 2018-05-16 18:21:36 UTC
+++ src/cpp/core/system/PosixSystem.cpp
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
-@@ -46,9 +47,9 @@
+@@ -45,13 +46,22 @@
+ #include
#endif
- #ifndef __APPLE__
--#include
-+//#include
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include
#include
--#include
-+//#include
+ #include
#include
#endif
-@@ -670,7 +671,7 @@ Error executablePath(const char * argv0,
++#if defined(__FreeBSD__)
++#include
++#include
++#include
++#include
++#include
++#include
++#endif
++
+ #include
+ #include
+ #include
+@@ -569,7 +579,35 @@ Error getOpenFds(std::vector* pFds)
++{
++ struct procstat *prstat;
++ struct kinfo_proc *kipp, *p;
++ struct filestat_list *head;
++ struct filestat *fst;
++ unsigned i, cnt;
++
++ prstat = procstat_open_sysctl();
++ p = procstat_getprocs(prstat, KERN_PROC_PROC, pid, &cnt);
++
++ for (i = 0; i < cnt; i++) {
++ kipp = &p[i];
++ if (kipp->ki_pid == pid) {
++ head = procstat_getfiles(prstat, kipp, 0);
++ if (head != NULL)
++ STAILQ_FOREACH(fst, head, next)
++ if (fst->fs_fd >= 0)
++ pFds->push_back(fst->fs_fd);
++ }
++ }
++
++ procstat_freeprocs(prstat, p);
++ procstat_close(prstat);
++
++ return Success();
++}
++#elif !defined(__APPLE__)
+ Error getOpenFds(pid_t pid, std::vector* pFds)
+ {
+ std::string pidStr = safe_convert::numberToString(pid);
+@@ -859,7 +897,11 @@ Error executablePath(const char * argv0,
+
#elif defined(HAVE_PROCSELF)
-- executablePath = std::string("/proc/self/exe");
++#if defined(__FreeBSD__)
+ executablePath = std::string("/proc/curproc/file");
++#else
+ executablePath = std::string("/proc/self/exe");
++#endif
#else
-@@ -1102,7 +1103,7 @@ Error osResourceLimit(ResourceLimit limi
+@@ -1296,7 +1338,7 @@ Error osResourceLimit(ResourceLimit limi
case CpuLimit:
*pLimit = RLIMIT_CPU;
break;
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
case NiceLimit:
*pLimit = RLIMIT_NICE;
break;
-@@ -1175,7 +1176,7 @@ Error systemInformation(SysInfo* pSysInf
+@@ -1369,7 +1411,7 @@ Error systemInformation(SysInfo* pSysInf
{
pSysInfo->cores = boost::thread::hardware_concurrency();
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
struct sysinfo info;
if (::sysinfo(&info) == -1)
return systemError(errno, ERROR_LOCATION);
-@@ -1495,9 +1496,9 @@ Error restrictCoreDumps()
+@@ -1402,7 +1444,7 @@ void toPids(const std::vector* pPids)
+ {
+ // use pidof to capture pids
+@@ -1711,7 +1753,7 @@ Error restrictCoreDumps()
+ return error;
+
// no ptrace core dumps permitted
- #ifndef __APPLE__
-- int res = ::prctl(PR_SET_DUMPABLE, 0);
-- if (res == -1)
-- return systemError(errno, ERROR_LOCATION);
-+// int res = ::prctl(PR_SET_DUMPABLE, 0);
-+// if (res == -1)
-+// return systemError(errno, ERROR_LOCATION);
- #endif
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ int res = ::prctl(PR_SET_DUMPABLE, 0);
+ if (res == -1)
+ return systemError(errno, ERROR_LOCATION);
+@@ -1722,7 +1764,7 @@ Error restrictCoreDumps()
- return Success();
-@@ -1521,10 +1522,10 @@ void printCoreDumpable(const std::string
+ Error enableCoreDumps()
+ {
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ int res = ::prctl(PR_SET_DUMPABLE, 1);
+ if (res == -1)
+ return systemError(errno, ERROR_LOCATION);
+@@ -1748,7 +1790,7 @@ void printCoreDumpable(const std::string
+ ostr << " hard limit: " << rLimitHard << std::endl;
// ptrace
- #ifndef __APPLE__
-- int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL);
-- if (dumpable == -1)
-- LOG_ERROR(systemError(errno, ERROR_LOCATION));
-- ostr << " pr_get_dumpable: " << dumpable << std::endl;
-+// int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL);
-+// if (dumpable == -1)
-+// LOG_ERROR(systemError(errno, ERROR_LOCATION));
-+// ostr << " pr_get_dumpable: " << dumpable << std::endl;
- #endif
-
- std::cerr << ostr.str();
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL);
+ if (dumpable == -1)
+ LOG_ERROR(systemError(errno, ERROR_LOCATION));
Index: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopDownloadItemHelper.cpp
===================================================================
--- head/devel/RStudio/files/patch-src_cpp_desktop_DesktopDownloadItemHelper.cpp (nonexistent)
+++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopDownloadItemHelper.cpp (revision 471195)
@@ -0,0 +1,15 @@
+--- src/cpp/desktop/DesktopDownloadItemHelper.cpp.orig 2018-05-30 17:56:35 UTC
++++ src/cpp/desktop/DesktopDownloadItemHelper.cpp
+@@ -37,9 +37,9 @@ DownloadHelper::DownloadHelper(QWebEngin
+
+ connect(item, &QWebEngineDownloadItem::finished,
+ this, &DownloadHelper::onFinished);
+-
+- connect(item, &QWebEngineDownloadItem::isPausedChanged,
+- this, &DownloadHelper::onPausedChanged);
++ // exists from 5.10, while FreeBSD kept qt5-webengine at 5.9.5, the handler is empty anyway
++ //connect(item, &QWebEngineDownloadItem::isPausedChanged,
++ // this, &DownloadHelper::onPausedChanged);
+
+ connect(item, &QWebEngineDownloadItem::stateChanged,
+ this, &DownloadHelper::onStateChanged);
Property changes on: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopDownloadItemHelper.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
===================================================================
--- head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp (revision 471194)
+++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp (revision 471195)
@@ -1,18 +1,18 @@
---- src/cpp/desktop/DesktopMain.cpp.orig 2017-11-16 21:40:37 UTC
+--- src/cpp/desktop/DesktopMain.cpp.orig 2018-05-16 18:21:36 UTC
+++ src/cpp/desktop/DesktopMain.cpp
-@@ -42,6 +42,7 @@
- #include "DesktopSessionLauncher.hpp"
+@@ -40,6 +40,7 @@
#include "DesktopProgressActivator.hpp"
#include "DesktopNetworkProxyFactory.hpp"
+ #include "DesktopActivationOverlay.hpp"
+#include "global-setenv.h"
QProcess* pRSessionProcess;
QString sharedSecret;
-@@ -198,6 +199,7 @@ bool isNonProjectFilename(QString filena
+@@ -262,6 +263,7 @@ bool useChromiumDevtools()
int main(int argc, char* argv[])
{
+ GLOBAL_SETENV
core::system::initHook();
try
Index: head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt
===================================================================
--- head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt (nonexistent)
+++ head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt (revision 471195)
@@ -0,0 +1,10 @@
+--- src/cpp/diagnostics/CMakeLists.txt.orig 2018-05-30 06:20:49 UTC
++++ src/cpp/diagnostics/CMakeLists.txt
+@@ -62,6 +62,7 @@ endif()
+ # set link dependencies
+ target_link_libraries(diagnostics
+ rstudio-core
++ procstat
+ )
+ if(NOT RSTUDIO_SESSION_WIN64)
+ install(TARGETS diagnostics DESTINATION ${RSTUDIO_INSTALL_BIN})
Property changes on: head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
===================================================================
--- head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt (revision 471194)
+++ head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt (revision 471195)
@@ -1,95 +1,95 @@
---- src/cpp/session/CMakeLists.txt.orig 2017-11-16 21:40:37 UTC
+--- src/cpp/session/CMakeLists.txt.orig 2018-05-16 18:21:36 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)")
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
-@@ -39,19 +39,19 @@ endif()
- # endif()
+@@ -42,19 +42,19 @@ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DI
+ endif()
# verify libclang is installed
-if(WIN32)
- set(LIBCLANG_VERSION "3.4")
-else()
- set(LIBCLANG_VERSION "3.5")
-endif()
-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()
+#if(WIN32)
+# set(LIBCLANG_VERSION "3.4")
+#else()
+# set(LIBCLANG_VERSION "3.5")
+#endif()
+set(LIBCLANG_DIR ${CMAKE_INSTALL_PREFIX})
+#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 "${CMAKE_INSTALL_PREFIX}/include")
+#if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
+# message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)")
+#endif()
# include files
-@@ -360,6 +360,9 @@ endif()
+@@ -362,6 +362,9 @@ endif()
# define executable
add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES})
+# additional libraries
-+target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify)
++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)
-@@ -466,11 +469,11 @@ if (NOT RSTUDIO_SESSION_WIN64)
+@@ -474,11 +477,11 @@ if (NOT RSTUDIO_SESSION_WIN64)
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
# install pandoc
-- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.19.2.1")
+- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/2.2.1")
- 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 "${}/common/pandoc/1.19.2.1")
++ #set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/2.2.1")
+ #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")
-@@ -511,14 +514,14 @@ if (NOT RSTUDIO_SESSION_WIN64)
+@@ -524,14 +527,14 @@ if (NOT RSTUDIO_SESSION_WIN64)
install(PROGRAMS ${LIBCLANG_64_FILES}
DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64)
else()
- file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*")
- install(PROGRAMS ${LIBCLANG_FILES}
- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang)
+ #file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*")
+ #install(PROGRAMS ${LIBCLANG_FILES}
+ # DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang)
endif()
# install libclang builtin-headers
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
+ #install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
+ # DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
# install winpty on windows
if(WIN32)
Index: head/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt
===================================================================
--- head/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt (nonexistent)
+++ head/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt (revision 471195)
@@ -0,0 +1,10 @@
+--- src/cpp/session/postback/CMakeLists.txt.orig 2018-05-30 18:06:27 UTC
++++ src/cpp/session/postback/CMakeLists.txt
+@@ -43,6 +43,7 @@ endif()
+ # set link dependencies
+ target_link_libraries(rpostback
+ rstudio-core
++ procstat
+ )
+
+ # configure postback scripts for development mode
Property changes on: head/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property