Created
September 22, 2017 12:36
-
-
Save anonymous/f591d66e93dea639609414b5e906ed66 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 88c4dc32c4beff1956f620f6912be477684ca7a7 Mon Sep 17 00:00:00 2001 | |
From: MaoCPU <mao.c.pu@gmail.com> | |
Date: Fri, 22 Sep 2017 13:33:22 +0100 | |
Subject: [PATCH] fix compile errors for v1.0.153 | |
--- | |
PKGBUILD | 17 +++++++++-------- | |
trace-cerr.patch | 10 ++++++++++ | |
2 files changed, 19 insertions(+), 8 deletions(-) | |
create mode 100644 trace-cerr.patch | |
diff --git a/PKGBUILD b/PKGBUILD | |
index b2a5a95..e569e45 100644 | |
--- a/PKGBUILD | |
+++ b/PKGBUILD | |
@@ -25,16 +25,16 @@ source=( | |
"https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip" | |
"rroutines-style.patch" | |
"socketproxy-openssl.patch" | |
+ "trace-cerr.patch" | |
) | |
noextract=('core-dictionaries.zip' "gin-$_ginver.zip") | |
-sha256sums=( | |
- '74438e9effff16ec6a5353476a1700c02556423eb62105d242df913888519540' | |
- 'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94' | |
- 'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3' | |
- '4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494' | |
- 'b953527f46320d64425f7de257f774d7f354199b7c6a71f126ed467b6e6dd52b' | |
- '65b9f9b1f159bbfbcb1544f444e210e58549c0d1c0c6421cf750ce3517088134' | |
-) | |
+sha256sums=('099ceec1480c7605285782ba5ecbf96eb6191d6f9a90e988c151578eb8bde9df' | |
+ 'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94' | |
+ 'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3' | |
+ '4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494' | |
+ 'b953527f46320d64425f7de257f774d7f354199b7c6a71f126ed467b6e6dd52b' | |
+ '65b9f9b1f159bbfbcb1544f444e210e58549c0d1c0c6421cf750ce3517088134' | |
+ '42705a30c704d1e36ef7a9b3790e64aea868115ba102c6d1b3d87e0ba0c7f928') | |
_pkgname=rstudio | |
@@ -66,6 +66,7 @@ build() { | |
# https://github.com/rstudio/rstudio/pull/1063/commits/e8c9a7783f3ff44dea2e2464b4bf2904325c72cd | |
# replicating upstream patch | |
patch -p 1 -i "$srcdir/socketproxy-openssl.patch" | |
+ patch -p 1 -i "$srcdir/trace-cerr.patch" | |
install -d src/gwt/lib/{gin/$_ginver,gwt/$_gwtver} | |
diff --git a/trace-cerr.patch b/trace-cerr.patch | |
new file mode 100644 | |
index 0000000..c0e7193 | |
--- /dev/null | |
+++ b/trace-cerr.patch | |
@@ -0,0 +1,10 @@ | |
+--- a/src/cpp/core/Trace.cpp | |
++++ b/src/cpp/core/Trace.cpp | |
+@@ -16,6 +16,7 @@ | |
+ | |
+ #include <core/Trace.hpp> | |
+ | |
++#include <iostream> | |
+ #include <map> | |
+ | |
+ #include <boost/utility.hpp> | |
-- | |
2.14.1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment