[r-cran-yaml] 03/04: Add extra declaration from r-cran-yaml to enable compiling the source - but that's definitely hackisch. Not sure if we should do this ... :-(
Andreas Tille
tille at debian.org
Thu Dec 1 08:40:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-yaml.
commit da99677e5fc724cb54d5f9f4d3786fd28cfb1df9
Author: Andreas Tille <tille at debian.org>
Date: Thu Dec 1 09:37:07 2016 +0100
Add extra declaration from r-cran-yaml to enable compiling the source - but that's definitely hackisch. Not sure if we should do this ... :-(
---
...extra_declaration_from_r-cran-yaml_yaml.h.patch | 27 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 28 insertions(+)
diff --git a/debian/patches/add_extra_declaration_from_r-cran-yaml_yaml.h.patch b/debian/patches/add_extra_declaration_from_r-cran-yaml_yaml.h.patch
new file mode 100644
index 0000000..bd5432a
--- /dev/null
+++ b/debian/patches/add_extra_declaration_from_r-cran-yaml_yaml.h.patch
@@ -0,0 +1,27 @@
+Authors: Andreas Tille <tille at debian.org>
+Las-Update: Tue, 29 Nov 2016 16:39:02 +0100
+Description: Upstream of r-cran-yaml has sneaked in an additional
+ declaration into yaml.h which makes compiling fail when using official
+ yaml.h. This patch provides this declaration right inside the C source
+ code.
+ .
+ PLEASE TAKE THIS WITH CARE AND TEST SERIOUSLY!
+
+--- a/src/r-ext.c
++++ b/src/r-ext.c
+@@ -1,5 +1,15 @@
+ #include "r-ext.h"
+
++/*
++ * Set whether or not to indent block sequences in mapping context.
++ *
++ * @param[in,out] emitter An emitter object.
++ * @param[in] indent_mapping_sequence Boolean.
++ */
++
++YAML_DECLARE(void)
++yaml_emitter_set_indent_mapping_sequence(yaml_emitter_t *emitter, int indent_mapping_sequence);
++
+ static SEXP R_yoink(SEXP vec, int index);
+
+ /* Compare two R objects (with the R identical function).
diff --git a/debian/patches/series b/debian/patches/series
index b672b8e..1f461de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
use_debian_packaged_libyaml.patch
+add_extra_declaration_from_r-cran-yaml_yaml.h.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-yaml.git
More information about the debian-science-commits
mailing list