Attachment 183916 Details for Bug 220359 – shar

shar

rstudio.shar (text/plain), 22.73 KB, created by Yuri Victorovich on 2017-06-29 16:08:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2017-06-29 16:08:06 UTC

Size: 22.73 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	devel/rstudio
>#	devel/rstudio/distinfo
>#	devel/rstudio/Makefile
>#	devel/rstudio/pkg-descr
>#	devel/rstudio/files
>#	devel/rstudio/files/patch-CMakeGlobals.txt
>#	devel/rstudio/files/patch-CMakeLists.txt
>#	devel/rstudio/files/patch-src_cpp_CMakeLists.txt
>#	devel/rstudio/files/patch-src_cpp_core_Backtrace.cpp
>#	devel/rstudio/files/patch-src_cpp_core_CMakeLists.txt
>#	devel/rstudio/files/patch-src_cpp_core_include_core_r__util_RTokenizer.hpp
>#	devel/rstudio/files/patch-src_cpp_core_r__util_RSessionContext.cpp
>#	devel/rstudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp
>#	devel/rstudio/files/patch-src_cpp_core_system_PosixSched.cpp
>#	devel/rstudio/files/patch-src_cpp_core_system_PosixSystem.cpp
>#	devel/rstudio/files/patch-src_cpp_desktop_DesktopMain.cpp
>#	devel/rstudio/files/patch-src_cpp_server_CMakeLists.txt
>#	devel/rstudio/files/patch-src_cpp_session_CMakeLists.txt
>#	devel/rstudio/files/global-setenv.h
>#	devel/rstudio/files/patch-src_cpp_session_SessionHttpMethods.cpp
>#	devel/rstudio/files/patch-src_cpp_session_session-config.h.in
>#
>echo c - devel/rstudio
>mkdir -p devel/rstudio > /dev/null 2>&1
>echo x - devel/rstudio/distinfo
>sed 's/^X//' >devel/rstudio/distinfo << 'ca81feb1cde858e67fe1ecc0d727bf30'
>XTIMESTAMP = 1498638263
>XSHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
>XSIZE (core-dictionaries.zip) = 876339
>XSHA256 (mathjax-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71
>XSIZE (mathjax-26.zip) = 3061588
>XSHA256 (pandoc-1.19.2.1.zip) = d32b162d49f6b28e09cf2f895dc7004b4205a40d4546c20d267906ce6ff79aea
>XSIZE (pandoc-1.19.2.1.zip) = 137279644
>XSHA256 (gin-1.5.zip) = f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94
>XSIZE (gin-1.5.zip) = 1055663
>XSHA256 (gwt-2.7.0.zip) = aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3
>XSIZE (gwt-2.7.0.zip) = 108818328
>XSHA256 (rstudio-rstudio-v1.1.286_GH0.tar.gz) = 6e189a62d1a6498312fa58e9bbc21f14b88632bee22b43be8306d3fa82f4e9ef
>XSIZE (rstudio-rstudio-v1.1.286_GH0.tar.gz) = 20141262
>XSHA256 (rstudio-rmarkdown-3276760_GH0.tar.gz) = 17813998d2fee0511a801781f1bd22a7ef723d9be8c501d8d2297383932cc146
>XSIZE (rstudio-rmarkdown-3276760_GH0.tar.gz) = 2066043
>XSHA256 (rstudio-rsconnect-3a17151_GH0.tar.gz) = acb938bfc8c8e887b2fbddadfb17a34b9db7bfc7193b466eed22117d564f96a2
>XSIZE (rstudio-rsconnect-3a17151_GH0.tar.gz) = 211628
>ca81feb1cde858e67fe1ecc0d727bf30
>echo x - devel/rstudio/Makefile
>sed 's/^X//' >devel/rstudio/Makefile << '251ca172736335180074e3003013e5c0'
>X# Created by: Yuri Victorovich <yuri@rawbw.com>
>X# $FreeBSD$
>X
>XPORTNAME=	rstudio
>XPORTVERSION=	1.1.286
>XDISTVERSIONPREFIX=	v
>XCATEGORIES=	devel math java
>XMASTER_SITES=	https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \
>X		https://s3.amazonaws.com/rstudio-buildtools/:mathjax \
>X		https://s3.amazonaws.com/rstudio-buildtools/:pandoc \
>X		https://s3.amazonaws.com/rstudio-buildtools/:gin \
>X		https://s3.amazonaws.com/rstudio-buildtools/:gwt
>XDISTFILES=	core-dictionaries.zip:dictionaries \
>X		mathjax-26.zip:mathjax \
>X		pandoc-1.19.2.1.zip:mathjax \
>X		gin-1.5.zip:gin \
>X		gwt-2.7.0.zip:gwt
>X
>XMAINTAINER=	yuri@rawbw.com
>XCOMMENT=	Integrated development environment (IDE) for R
>X
>XLICENSE=	GPLv3
>XLICENSE_FILE=	${WRKSRC}/COPYING
>X
>XBUILD_DEPENDS=	${LOCALBASE}/bin/R:math/R \
>X		${LOCALBASE}/bin/ant:devel/apache-ant \
>X		${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo
>XLIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
>X		libinotify.so:devel/libinotify \
>X		libuuid.so:misc/e2fsprogs-libuuid
>XRUN_DEPENDS=	${LOCALBASE}/lib/R/lib/libR.so:math/R
>X
>XUSES=		cmake execinfo ninja pkgconfig desktop-file-utils shared-mime-info
>XUSE_QT5=	core dbus gui location network opengl printsupport quick sensors svg \
>X		webchannel qmake qml sql webkit widgets xml xmlpatterns buildtools_build
>XUSE_JAVA=	yes
>XUSE_GITHUB=	yes
>XGH_TUPLE+=	rstudio:rmarkdown:3276760:rmarkdown
>XGH_TUPLE+=	rstudio:rsconnect:3a17151:rsconnect
>XCMAKE_ARGS+=	-DRSTUDIO_TARGET=Desktop
>XCMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
>XCMAKE_ARGS+=	-DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION}
>XCMAKE_ARGS+=	-DFREEBSD_LIBDIR:STRING=${PREFIX}/lib
>XMAKE_ENV+=	HOME=${WRKDIR}
>XMAKE_ENV+=	ANT_OPTS="-Duser.home=${WRKDIR}"
>X
>Xpost-extract:
>X	@${MKDIR} ${WRKSRC}/dependencies/common/dictionaries && ${MV} ${WRKDIR}/en_* ${WRKSRC}/dependencies/common/dictionaries/
>X	@${MV} ${WRKDIR}/mathjax-26 ${WRKSRC}/dependencies/common/
>X	@${MV} ${WRKDIR}/pandoc-* ${WRKSRC}/dependencies/common/pandoc
>X	@${MV} ${WRKDIR}/rmarkdown-3276760 ${WRKSRC}/dependencies/common/rmarkdown
>X	@${MV} ${WRKDIR}/rsconnect-3a17151 ${WRKSRC}/dependencies/common/rsconnect
>X	@${MKDIR} ${WRKSRC}/src/gwt/lib/gwt && ${MV} ${WRKDIR}/gwt-2.7.0 ${WRKSRC}/src/gwt/lib/gwt/2.7.0
>X	@${MKDIR} ${WRKSRC}/src/gwt/lib/gin/1.5 && ${MV} ${WRKDIR}/*.jar ${WRKDIR}/javadoc ${WRKSRC}/src/gwt/lib/gin/1.5/
>X	@${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/
>X
>Xpost-patch:
>X	@${REINPLACE_CMD} -i "" -e 's|get_filename_component|#get_filename_component|g' ${WRKSRC}/src/cpp/desktop/CMakeLists.txt
>X	@${REINPLACE_CMD} -i "" -e 's|set(CMAKE_PREFIX_PATH "$${QT_BIN_DIR}//..//lib//cmake")|set(CMAKE_PREFIX_PATH "${LOCALBASE}/lib/cmake")|g' ${WRKSRC}/src/cpp/desktop/CMakeLists.txt
>X	@${REINPLACE_CMD} -i "" -e 's|/usr/share/|${PREFIX}/share/|g' ${WRKSRC}/src/cpp/desktop/CMakeLists.txt
>X	@${REINPLACE_CMD} -i "" -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cpp/desktop/global-setenv.h
>X
>Xpost-build:
>X	# MAKE_ENV+=ANT_OPTS="-Duser.home=${WRKDIR}" doesn't help, ~/.java is still created for some reason
>X	@${RM} -r ~/.java
>X
>Xpost-stage:
>X	@${RM} -r ~/.java
>X
>Xpost-install:
>X	@${LN} -s ${PREFIX}/lib/rstudio/bin/rstudio ${STAGEDIR}${PREFIX}/bin/rstudio
>X	@${REINPLACE_CMD} -i "" -e 's|^Exec=.*/rstudio|Exec=${PREFIX}/bin/rstudio|' ${STAGEDIR}${PREFIX}/share/applications/rstudio.desktop
>X	# There is a variability in .js file names due to the use of random numbers, so we use the automatic plist.
>X	@${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist | ${GREP} -v ^\/ | ${SED} -e 's|%%WWWDIR%%|www/rstudio|' > ${TMPPLIST}
>X
>X.include <bsd.port.mk>
>251ca172736335180074e3003013e5c0
>echo x - devel/rstudio/pkg-descr
>sed 's/^X//' >devel/rstudio/pkg-descr << '4e068c43cf189f5da40ffa31d3d9cf01'
>XRStudio is an integrated development environment (IDE) for R.
>XIt includes a console, syntax-highlighting editor that supports direct
>Xcode execution, as well as tools for plotting, history, debugging and
>Xworkspace management. Click here to see more RStudio features.
>X
>XWWW: https://www.rstudio.org
>4e068c43cf189f5da40ffa31d3d9cf01
>echo c - devel/rstudio/files
>mkdir -p devel/rstudio/files > /dev/null 2>&1
>echo x - devel/rstudio/files/patch-CMakeGlobals.txt
>sed 's/^X//' >devel/rstudio/files/patch-CMakeGlobals.txt << 'f6c7e1db80d3b17fdae05f0f458923ef'
>X--- CMakeGlobals.txt.orig	2017-06-23 22:43:30 UTC
>X+++ CMakeGlobals.txt
>X@@ -65,15 +65,7 @@ endif()
>X 
>X # record git revision hash (cache it since we don't use this in development
>X # mode and we don't want it to force rebuilds there)
>X-if(NOT RSTUDIO_SESSION_WIN64 AND NOT RSTUDIO_GIT_REVISION_HASH)
>X-   find_program(GIT_EXECUTABLE git)
>X-   if(GIT_EXECUTABLE)
>X-      exec_program(git ARGS rev-parse HEAD
>X-                   OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH)
>X-      SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash")
>X-   endif()
>X-endif()
>X-
>X+SET(RSTUDIO_VERSION "${FREEBSD_RSTUDIO_VERSION}" CACHE STRING "FreeBSD RStudio version")
>X 
>X # required R version
>X set(RSTUDIO_R_MAJOR_VERSION_REQUIRED 2)
>f6c7e1db80d3b17fdae05f0f458923ef
>echo x - devel/rstudio/files/patch-CMakeLists.txt
>sed 's/^X//' >devel/rstudio/files/patch-CMakeLists.txt << '2c6804e997808112c6e3a2467a83780d'
>X--- CMakeLists.txt.orig	2017-06-23 22:43:30 UTC
>X+++ CMakeLists.txt
>X@@ -31,8 +31,7 @@ endif()
>X if (NOT RSTUDIO_SESSION_WIN64)
>X    # dynamically configure SOURCE with the git revision hash
>X    INSTALL(CODE "
>X-      exec_program(git ARGS rev-parse HEAD
>X-                   OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH)
>X+      set(RSTUDIO_VERSION ${FREEBSD_RSTUDIO_VERSION})
>X       configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in\"
>X                       \"${CMAKE_CURRENT_BINARY_DIR}/SOURCE\")
>X     ")
>X@@ -57,8 +56,6 @@ add_subdirectory(package)
>X 
>X 
>X 
>X-
>X-
>X    
>X 
>X 
>2c6804e997808112c6e3a2467a83780d
>echo x - devel/rstudio/files/patch-src_cpp_CMakeLists.txt
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_CMakeLists.txt << 'c80d53bd8b2278bd5336af9faf60a8a2'
>X--- src/cpp/CMakeLists.txt.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/CMakeLists.txt
>X@@ -91,7 +91,6 @@ if(UNIX)
>X       add_definitions(-Wformat -Wformat-security)
>X       add_definitions(-D_FORTIFY_SOURCE=2)
>X       add_definitions(-fstack-protector --param ssp-buffer-size=4)
>X-      add_definitions(-pie -fPIE)
>X       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
>X    endif()
>X 
>c80d53bd8b2278bd5336af9faf60a8a2
>echo x - devel/rstudio/files/patch-src_cpp_core_Backtrace.cpp
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_core_Backtrace.cpp << '231f70833b349636976fe4090e1aaad7'
>X--- src/cpp/core/Backtrace.cpp.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/core/Backtrace.cpp
>X@@ -46,7 +46,7 @@ std::string demangle(const std::string& 
>X 
>X void printBacktrace(std::ostream& os)
>X {
>X-#ifndef _WIN32
>X+#if !defined(_WIN32) && !defined(__FreeBSD__)
>X    
>X    os << "Backtrace (most recent calls first):" << std::endl << std::endl;
>X    
>231f70833b349636976fe4090e1aaad7
>echo x - devel/rstudio/files/patch-src_cpp_core_CMakeLists.txt
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_core_CMakeLists.txt << '3955dae7fad09cdb933122dbdb823378'
>X--- src/cpp/core/CMakeLists.txt.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/core/CMakeLists.txt
>X@@ -143,16 +143,16 @@ if (UNIX)
>X    }
>X    "
>X    HAVE_SCANDIR_POSIX)
>X-
>X+   set(CMAKE_REQUIRED_LIBRARIES /usr/local/lib/libinotify.so /usr/lib/libexecinfo.so)
>X    # platform introspection
>X    check_symbol_exists(SA_NOCLDWAIT "signal.h" HAVE_SA_NOCLDWAIT)
>X-   check_symbol_exists(SO_PEERCRED "sys/socket.h" HAVE_SO_PEERCRED)
>X+   #check_symbol_exists(SO_PEERCRED "sys/socket.h" HAVE_SO_PEERCRED)
>X    check_function_exists(inotify_init1 HAVE_INOTIFY_INIT1)
>X    check_function_exists(getpeereid HAVE_GETPEEREID)
>X    check_function_exists(setresuid HAVE_SETRESUID)
>X-   if(EXISTS "/proc/self")
>X+   #if(EXISTS "/proc/self")
>X       set(HAVE_PROCSELF TRUE)
>X-   endif()
>X+   #endif()
>X    configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
>X                    ${CMAKE_CURRENT_BINARY_DIR}/config.h)
>X 
>3955dae7fad09cdb933122dbdb823378
>echo x - devel/rstudio/files/patch-src_cpp_core_include_core_r__util_RTokenizer.hpp
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_core_include_core_r__util_RTokenizer.hpp << 'ae740bfddad78bdd43fc4f5e14028753'
>X--- src/cpp/core/include/core/r_util/RTokenizer.hpp.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/core/include/core/r_util/RTokenizer.hpp
>X@@ -35,7 +35,7 @@
>X 
>X // On Linux confirm that wchar_t is Unicode
>X #if !defined(_WIN32) && !defined(__APPLE__) && !defined(__STDC_ISO_10646__)
>X-   #error "wchar_t is not Unicode"
>X+//   #error "wchar_t is not Unicode"
>X #endif
>X 
>X namespace rstudio {
>ae740bfddad78bdd43fc4f5e14028753
>echo x - devel/rstudio/files/patch-src_cpp_core_r__util_RSessionContext.cpp
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_core_r__util_RSessionContext.cpp << '00d7b882131efca90b48fae5deabfb7b'
>X--- src/cpp/core/r_util/RSessionContext.cpp.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/core/r_util/RSessionContext.cpp
>X@@ -138,8 +138,8 @@ bool isSharedPath(const std::string& pro
>X       // not shared if we're in any of the groups that own the directory
>X       // (note that this checks supplementary group IDs only, so the check
>X       // against the primary group ID above is still required)
>X-      if (::group_member(st.st_gid))
>X-         return false;
>X+//      if (::group_member(st.st_gid))
>X+//         return false;
>X #endif 
>X 
>X       // if we got this far, we likely have access due to project sharing
>00d7b882131efca90b48fae5deabfb7b
>echo x - devel/rstudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_core_system_PosixChildProcess.cpp << '83e548b23a791efb9630923c04cf4cf7'
>X--- src/cpp/core/system/PosixChildProcess.cpp.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/core/system/PosixChildProcess.cpp
>X@@ -19,14 +19,18 @@
>X #include <fcntl.h>
>X #include <signal.h>
>X #include <unistd.h>
>X+#include <termios.h>
>X 
>X #ifdef __APPLE__
>X #include <util.h>
>X #include <sys/ttycom.h>
>X #include <sys/ioctl.h>
>X #else
>X-#include <pty.h>
>X-#include <asm/ioctls.h>
>X+//#include <pty.h>
>X+//#include <asm/ioctls.h>
>X+#include <sys/tty.h>
>X+#include <sys/ttycom.h>
>X+#include <libutil.h>
>X #endif
>X 
>X #include <sys/wait.h>
>83e548b23a791efb9630923c04cf4cf7
>echo x - devel/rstudio/files/patch-src_cpp_core_system_PosixSched.cpp
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_core_system_PosixSched.cpp << '5225c75defe78475b38f0b73166b6eb7'
>X--- src/cpp/core/system/PosixSched.cpp.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/core/system/PosixSched.cpp
>X@@ -15,7 +15,10 @@
>X 
>X #include <core/system/PosixSched.hpp>
>X 
>X+#define _GNU_SOURCE
>X #include <sched.h>
>X+#include <sys/types.h>
>X+#include <sys/cpuset.h>
>X 
>X #include <core/Error.hpp>
>X 
>X@@ -41,9 +44,10 @@ bool isCpuAffinityEmpty(const CpuAffinit
>X Error getCpuAffinity(CpuAffinity* pCpus)
>X {
>X #ifndef __APPLE__
>X-   cpu_set_t cs;
>X+/*
>X+   cpuset_t cs;
>X    CPU_ZERO(&cs);
>X-   if (::sched_getaffinity(0, sizeof(cs), &cs) == -1)
>X+   if (sched_getaffinity(0, sizeof(cs), &cs) == -1)
>X       return systemError(errno, ERROR_LOCATION);
>X 
>X    pCpus->clear();
>X@@ -55,7 +59,7 @@ Error getCpuAffinity(CpuAffinity* pCpus)
>X       else
>X          pCpus->push_back(false);
>X    }
>X-
>X+*/
>X    return Success();
>X #else
>X    return systemError(boost::system::errc::not_supported, ERROR_LOCATION);
>X@@ -66,7 +70,8 @@ Error getCpuAffinity(CpuAffinity* pCpus)
>X Error setCpuAffinity(const CpuAffinity& cpus)
>X {
>X #ifndef __APPLE__
>X-   cpu_set_t cs;
>X+/*
>X+   cpuset_t cs;
>X    CPU_ZERO(&cs);
>X 
>X    for (std::size_t i=0; i<cpus.size(); i++)
>X@@ -79,7 +84,7 @@ Error setCpuAffinity(const CpuAffinity& 
>X 
>X    if (::sched_setaffinity(0, sizeof(cs), &cs) == -1)
>X       return systemError(errno, ERROR_LOCATION);
>X-
>X+*/
>X    return Success();
>X #else
>X    return systemError(boost::system::errc::not_supported, ERROR_LOCATION);
>5225c75defe78475b38f0b73166b6eb7
>echo x - devel/rstudio/files/patch-src_cpp_core_system_PosixSystem.cpp
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_core_system_PosixSystem.cpp << '00bcd51fb16b96d4caae2444a25ce9eb'
>X--- src/cpp/core/system/PosixSystem.cpp.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/core/system/PosixSystem.cpp
>X@@ -36,6 +36,7 @@
>X #include <ifaddrs.h>
>X #include <sys/socket.h>
>X #include <netdb.h>
>X+#include <netinet/in.h>
>X 
>X #include <uuid/uuid.h>
>X 
>X@@ -46,9 +47,9 @@
>X #endif
>X 
>X #ifndef __APPLE__
>X-#include <sys/prctl.h>
>X+//#include <sys/prctl.h>
>X #include <sys/sysinfo.h>
>X-#include <linux/kernel.h>
>X+//#include <linux/kernel.h>
>X #include <dirent.h>
>X #endif
>X 
>X@@ -668,7 +669,7 @@ Error executablePath(const char * argv0,
>X 
>X #elif defined(HAVE_PROCSELF)
>X 
>X-   executablePath = std::string("/proc/self/exe");
>X+   executablePath = std::string("/proc/curproc/file");
>X 
>X #else
>X 
>X@@ -1019,7 +1020,7 @@ Error osResourceLimit(ResourceLimit limi
>X       case CpuLimit:
>X          *pLimit = RLIMIT_CPU;
>X          break;
>X-#ifndef __APPLE__
>X+#if !defined(__APPLE__) && !defined(__FreeBSD__)
>X       case NiceLimit:
>X          *pLimit = RLIMIT_NICE;
>X          break;
>X@@ -1092,7 +1093,7 @@ Error systemInformation(SysInfo* pSysInf
>X {
>X    pSysInfo->cores = boost::thread::hardware_concurrency();
>X 
>X-#ifndef __APPLE__
>X+#if !defined(__APPLE__) && !defined(__FreeBSD__)
>X    struct sysinfo info;
>X    if (::sysinfo(&info) == -1)
>X       return systemError(errno, ERROR_LOCATION);
>X@@ -1412,9 +1413,9 @@ Error restrictCoreDumps()
>X 
>X    // no ptrace core dumps permitted
>X #ifndef __APPLE__
>X-   int res = ::prctl(PR_SET_DUMPABLE, 0);
>X-   if (res == -1)
>X-      return systemError(errno, ERROR_LOCATION);
>X+//   int res = ::prctl(PR_SET_DUMPABLE, 0);
>X+//   if (res == -1)
>X+//      return systemError(errno, ERROR_LOCATION);
>X #endif
>X 
>X    return Success();
>X@@ -1438,10 +1439,10 @@ void printCoreDumpable(const std::string
>X 
>X    // ptrace
>X #ifndef __APPLE__
>X-   int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL);
>X-   if (dumpable == -1)
>X-      LOG_ERROR(systemError(errno, ERROR_LOCATION));
>X-   ostr << "  pr_get_dumpable: " << dumpable << std::endl;
>X+//   int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL);
>X+//   if (dumpable == -1)
>X+//      LOG_ERROR(systemError(errno, ERROR_LOCATION));
>X+//   ostr << "  pr_get_dumpable: " << dumpable << std::endl;
>X #endif
>X 
>X    std::cerr << ostr.str();
>00bcd51fb16b96d4caae2444a25ce9eb
>echo x - devel/rstudio/files/patch-src_cpp_desktop_DesktopMain.cpp
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_desktop_DesktopMain.cpp << 'c3dbc6f43f3f4a256e2c6a4efdfd2d7d'
>X--- src/cpp/desktop/DesktopMain.cpp.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/desktop/DesktopMain.cpp
>X@@ -42,6 +42,7 @@
>X #include "DesktopSessionLauncher.hpp"
>X #include "DesktopProgressActivator.hpp"
>X #include "DesktopNetworkProxyFactory.hpp"
>X+#include "global-setenv.h"
>X 
>X QProcess* pRSessionProcess;
>X QString sharedSecret;
>X@@ -198,6 +199,7 @@ bool isNonProjectFilename(QString filena
>X 
>X int main(int argc, char* argv[])
>X {
>X+   GLOBAL_SETENV
>X    core::system::initHook();
>X 
>X    try
>c3dbc6f43f3f4a256e2c6a4efdfd2d7d
>echo x - devel/rstudio/files/patch-src_cpp_server_CMakeLists.txt
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_server_CMakeLists.txt << 'f9f522c37755987b1e0933478dc93ceb'
>X--- src/cpp/server/CMakeLists.txt.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/server/CMakeLists.txt
>X@@ -124,6 +124,9 @@ include_directories(
>X # define executable
>X add_executable(rserver ${SERVER_SOURCE_FILES} ${SERVER_HEADER_FILES})
>X 
>X+# additional libraries
>X+target_link_libraries(rserver -L${FREEBSD_LIBDIR} -linotify)
>X+
>X # add origin rpath for suse/sles
>X if(RSTUDIO_PACKAGE_VARIANT STREQUAL "SLES")
>X    set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
>f9f522c37755987b1e0933478dc93ceb
>echo x - devel/rstudio/files/patch-src_cpp_session_CMakeLists.txt
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_session_CMakeLists.txt << '8850a93a5edaeef2a53cc6d0eac677aa'
>X--- src/cpp/session/CMakeLists.txt.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/session/CMakeLists.txt
>X@@ -36,19 +36,19 @@ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DI
>X endif()
>X 
>X # verify libclang is installed
>X-if(WIN32)
>X-   set(LIBCLANG_VERSION "3.4")
>X-else()
>X-   set(LIBCLANG_VERSION "3.5")
>X-endif()
>X-set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}")
>X-if(NOT EXISTS "${LIBCLANG_DIR}")
>X-  message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found  (re-run install-dependencies script to install)")
>X-endif()
>X-set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers")
>X-if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
>X-  message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
>X-endif()
>X+#if(WIN32)
>X+#   set(LIBCLANG_VERSION "3.4")
>X+#else()
>X+#   set(LIBCLANG_VERSION "3.5")
>X+#endif()
>X+set(LIBCLANG_DIR "/usr/local")
>X+#if(NOT EXISTS "${LIBCLANG_DIR}")
>X+#  message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found  (re-run install-dependencies script to install)")
>X+#endif()
>X+set(LIBCLANG_HEADERS_DIR "/usr/local/include")
>X+#if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
>X+#  message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
>X+#endif()
>X 
>X 
>X # include files
>X@@ -357,6 +357,9 @@ endif()
>X # define executable
>X add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES})
>X 
>X+# additional libraries
>X+target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lRblas)
>X+
>X # skip libR RPATH at development time
>X if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE)
>X    set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE)
>X@@ -504,14 +507,14 @@ if (NOT RSTUDIO_SESSION_WIN64)
>X       install(PROGRAMS ${LIBCLANG_64_FILES}
>X               DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64)
>X    else()
>X-      file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*")
>X-      install(PROGRAMS ${LIBCLANG_FILES}
>X-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang)
>X+      #file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*")
>X+      #install(PROGRAMS ${LIBCLANG_FILES}
>X+      #        DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang)
>X    endif()
>X 
>X    # install libclang builtin-headers
>X-   install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
>X-           DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
>X+   #install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
>X+   #        DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
>X 
>X    # install winpty on windows
>X    if(WIN32)
>8850a93a5edaeef2a53cc6d0eac677aa
>echo x - devel/rstudio/files/global-setenv.h
>sed 's/^X//' >devel/rstudio/files/global-setenv.h << '6acaa68c37d4298252c8cc45e8d67f0e'
>X
>X#define GLOBAL_SETENV \
>X  setenv("R_USER", ::getenv("HOME"), 0); \
>X  setenv("R_HOME", "%%PREFIX%%/lib/R", 0); \
>X  setenv("R_INCLUDE_DIR", "%%PREFIX%%/lib/R/include", 0); \
>X  setenv("R_LIBS", "%%PREFIX%%/lib/R", 0); \
>X  setenv("R_DOC_DIR", "%%PREFIX%%/share/doc/R", 0);
>6acaa68c37d4298252c8cc45e8d67f0e
>echo x - devel/rstudio/files/patch-src_cpp_session_SessionHttpMethods.cpp
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_session_SessionHttpMethods.cpp << 'a5828f48923d954d2bc084b3427d31e5'
>X--- src/cpp/session/SessionHttpMethods.cpp.orig	2017-06-23 22:43:30 UTC
>X+++ src/cpp/session/SessionHttpMethods.cpp
>X@@ -326,7 +326,7 @@ std::string clientVersion()
>X       return std::string();
>X 
>X    // clientVersion is the git revision hash
>X-   return RSTUDIO_GIT_REVISION_HASH;
>X+   return RSTUDIO_VERSION;
>X }
>X 
>X void waitForMethodInitFunction(const ClientEvent& initEvent)
>a5828f48923d954d2bc084b3427d31e5
>echo x - devel/rstudio/files/patch-src_cpp_session_session-config.h.in
>sed 's/^X//' >devel/rstudio/files/patch-src_cpp_session_session-config.h.in << '5d52127596b105e33b75d9145d4172e7'
>X--- src/cpp/session/session-config.h.in.orig	2017-06-29 13:10:12 UTC
>X+++ src/cpp/session/session-config.h.in
>X@@ -13,8 +13,7 @@
>X  *
>X  */
>X 
>X-#define RSTUDIO_VERSION "${CPACK_PACKAGE_VERSION}"
>X-#define RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}"
>X+#define RSTUDIO_VERSION "${RSTUDIO_VERSION}"
>X #cmakedefine RSTUDIO_SERVER
>X #cmakedefine RSTUDIO_UNVERSIONED_BUILD
>X #cmakedefine TRACE_PACKRAT_OUTPUT
>5d52127596b105e33b75d9145d4172e7
>exit
>

Actions: View

Attachments on bug 220359: 183916 | 183917 | 183969 | 184002 | 184063 | 187532 | 187542 | 187585 | 188078 | 188079