rstudio: unbreak i686

This commit is contained in:
Michael Gehring 2017-09-24 23:41:49 +00:00
parent 59cc470675
commit c4d6a1c403
3 changed files with 36 additions and 14 deletions

View file

@ -0,0 +1,36 @@
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/core/Trace.cpp.orig 2017-04-13 16:16:15.000000000 +0000
+++ src/cpp/core/Trace.cpp 2017-09-17 16:36:36.663370924 +0000
@@ -16,6 +16,7 @@
#include <core/Trace.hpp>
+#include <iostream>
#include <map>
#include <boost/utility.hpp>

View file

@ -52,10 +52,6 @@ skip_extraction="core-dictionaries.zip
selenium-server-standalone-${_selenium_version}.jar
chromedriver-linux"
case "$XBPS_TARGET_MACHINE" in
i686) broken="https://build.voidlinux.eu/builders/i686_builder/builds/5009/steps/shell_3/logs/stdio" ;;
esac
post_extract() {
_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"