rstudio: update to 1.1.383 (#8486)

This commit is contained in:
ivierlin 2017-10-24 07:05:47 +02:00 committed by Juan RP
parent 49757b3ad9
commit d35ff70c09
3 changed files with 4 additions and 50 deletions

View file

@ -1,36 +0,0 @@
From 90701c01101e96933729f57f2f39364d60a31162 Mon Sep 17 00:00:00 2001
From: Randy Lai <randy.cs.lai@gmail.com>
Date: Sat, 9 Sep 2017 00:27:46 -0400
Subject: [PATCH] build with boost 1.65
---
src/cpp/core/Trace.cpp | 2 ++
src/cpp/session/modules/SessionSVN.cpp | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/cpp/core/Trace.cpp b/src/cpp/core/Trace.cpp
index 2a62c30695..9eb985e308 100644
--- src/cpp/core/Trace.cpp
+++ src/cpp/core/Trace.cpp
@@ -22,6 +22,8 @@
#include <core/Thread.hpp>
+#include <iostream>
+
namespace rstudio {
namespace core {
namespace trace {
diff --git a/src/cpp/session/modules/SessionSVN.cpp b/src/cpp/session/modules/SessionSVN.cpp
index ce8badb01f..a630a395ba 100644
--- src/cpp/session/modules/SessionSVN.cpp
+++ src/cpp/session/modules/SessionSVN.cpp
@@ -1190,7 +1190,7 @@ struct CommitInfo
std::string author;
std::string subject;
std::string description;
- boost::posix_time::time_duration::sec_type date;
+ boost::uint64_t date;
};
bool commitIsMatch(const std::vector<std::string>& patterns,

View file

@ -1,10 +0,0 @@
--- src/cpp/r/RRoutines.cpp.orig 2017-04-13 16:16:15.000000000 +0000
+++ src/cpp/r/RRoutines.cpp 2017-04-23 08:48:22.700317995 +0000
@@ -59,7 +59,6 @@
nullMethodDef.fun = NULL ;
nullMethodDef.numArgs = 0 ;
nullMethodDef.types = NULL;
- nullMethodDef.styles = NULL;
s_cMethods.push_back(nullMethodDef);
pCMethods = &s_cMethods[0];
}

View file

@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.0.143
revision=3
version=1.1.383
revision=1
only_for_archs="i686 x86_64"
build_style=cmake
make_install_args="INSTALL_ROOT=${DESTDIR} \
@ -16,7 +16,7 @@ makedepends="R zlib-devel libuuid-devel libressl-devel pam-devel
boost-devel pango-devel mathjax hunspell-devel pandoc
openjdk apache-ant
qt5-devel qt5-qmake qt5-webkit-devel qt5-declarative-devel qt5-location-devel
qt5-sensors-devel qt5-svg-devel qt5-xmlpatterns-devel"
qt5-sensors-devel qt5-svg-devel qt5-xmlpatterns-devel qt5-webchannel-devel"
depends="R"
short_desc="Integrated development environment (IDE) for R"
maintainer="ivierlin <github@ivierlin.de>"
@ -36,7 +36,7 @@ distfiles="https://github.com/rstudio/rstudio/archive/v${version}.tar.gz
${_aws}/rstudio-buildtools/selenium-java-${_selenium_version}.zip
${_aws}/rstudio-buildtools/selenium-server-standalone-${_selenium_version}.jar
${_aws}/rstudio-buildtools/chromedriver-linux"
checksum="e177527fab2aadd82358161233a930d706cfb48700b6413d289a8b533d07e2ff
checksum="6edc85f98366a94f0c9939dde8d25950c65580c9eed7ac245903e0aa1205c818
4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94
aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3