From 61db61feeb45596db27218ba9d3322e4a0567f741e0156ee6f7106b7eee0b5a5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 1 May 2019 06:32:59 +0000 Subject: [PATCH] Accepting request 695728 from home:mimi_vx:branches:devel:libraries:c_c++ - update to 0.2.2 - refreshed libyaml-revert-emitter-changes.patch * Fix comparison in tests/run-emitter.c * Allow colons in plain scalars inside flow collections * The closing single quote needs to be indented... * Revert removing of open_ended after top level plain scalar OBS-URL: https://build.opensuse.org/request/show/695728 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libyaml?expand=0&rev=23 --- libyaml-revert-emitter-changes.patch | 32 ---------------------------- libyaml.changes | 10 +++++++++ libyaml.spec | 2 +- yaml-0.2.1.tar.gz | 3 --- yaml-0.2.2.tar.gz | 3 +++ 5 files changed, 14 insertions(+), 36 deletions(-) delete mode 100644 yaml-0.2.1.tar.gz create mode 100644 yaml-0.2.2.tar.gz diff --git a/libyaml-revert-emitter-changes.patch b/libyaml-revert-emitter-changes.patch index 6acabe5..7dc08c4 100644 --- a/libyaml-revert-emitter-changes.patch +++ b/libyaml-revert-emitter-changes.patch @@ -29,36 +29,4 @@ index d31e075..32fe07c 100644 return 1; } -From 56f4b17221868593d6903ee58d6d679b690cf4df Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tina=20M=C3=BCller?= -Date: Fri, 29 Jun 2018 23:16:26 +0200 -Subject: [PATCH 2/2] Don't emit document-end marker at the end of stream - -(only when explicitly requested) - -@jrtc27++ for the patch. - -See #60 ---- - src/emitter.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/emitter.c b/src/emitter.c -index 32fe07c..2744495 100644 ---- a/src/emitter.c -+++ b/src/emitter.c -@@ -649,13 +649,6 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter, - - else if (event->type == YAML_STREAM_END_EVENT) - { -- if (emitter->open_ended) -- { -- if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0)) -- return 0; -- if (!yaml_emitter_write_indent(emitter)) -- return 0; -- } - - if (!yaml_emitter_flush(emitter)) - return 0; diff --git a/libyaml.changes b/libyaml.changes index 17a921e..9b999b9 100644 --- a/libyaml.changes +++ b/libyaml.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Apr 18 13:17:19 UTC 2019 - Ondřej Súkup + +- update to 0.2.2 +- refreshed libyaml-revert-emitter-changes.patch + * Fix comparison in tests/run-emitter.c + * Allow colons in plain scalars inside flow collections + * The closing single quote needs to be indented... + * Revert removing of open_ended after top level plain scalar + ------------------------------------------------------------------- Mon Jan 28 13:21:05 UTC 2019 - Jan Engelhardt diff --git a/libyaml.spec b/libyaml.spec index 67de8ec..590988a 100644 --- a/libyaml.spec +++ b/libyaml.spec @@ -17,7 +17,7 @@ Name: libyaml -Version: 0.2.1 +Version: 0.2.2 Release: 0 Summary: A YAML 1.1 parser and emitter written in C License: MIT diff --git a/yaml-0.2.1.tar.gz b/yaml-0.2.1.tar.gz deleted file mode 100644 index 64fef99..0000000 --- a/yaml-0.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78281145641a080fb32d6e7a87b9c0664d611dcb4d542e90baf731f51cbb59cd -size 599727 diff --git a/yaml-0.2.2.tar.gz b/yaml-0.2.2.tar.gz new file mode 100644 index 0000000..3c6ef6c --- /dev/null +++ b/yaml-0.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a9100ab61047fd9bd395bcef3ce5403365cafd55c1e0d0299cde14958e47be9 +size 609359