pool/libyaml
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 667048 from home:iznogood:branches:devel:libraries:c_c++

Browse Source 
- Add libyaml-revert-emitter-changes.patch: Revert "This code is not needed and breaks tests" (gh#yaml/libyaml#122). 
Fixes build of python-PyYAML.

OBS-URL: https://build.opensuse.org/request/show/667048
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libyaml?expand=0&rev=20
This commit is contained in:
Adam Majer 2019-01-28 12:34:06 +00:00 committed by Git OBS Bridge
parent d51fd044c7
commit 12cf39b97e
3 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
libyaml-revert-emitter-changes.patch Normal file
View File

@ -0,0 +1,64 @@
From 8ee83c0da22fe9aa7dea667be8f899a7e32ffb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tina=20M=C3=BCller?= <cpan2@tinita.de>
Date: Fri, 29 Jun 2018 21:44:19 +0200
Subject: [PATCH 1/2] Revert removing of open_ended after top level plain
scalar
See also issue #60
Revert "This code is not needed and breaks tests"
This reverts commit 56400d976a1999156b1abfd674c3122843980260.
---
src/emitter.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/emitter.c b/src/emitter.c
index d31e075..32fe07c 100644
--- a/src/emitter.c
+++ b/src/emitter.c
@@ -1946,6 +1946,10 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
emitter->whitespace = 0;
emitter->indention = 0;
+ if (emitter->root_context)
+ {
+ emitter->open_ended = 1;
+ }
return 1;
}
From 56f4b17221868593d6903ee58d6d679b690cf4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tina=20M=C3=BCller?= <cpan2@tinita.de>
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;

6
libyaml.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 17 13:23:23 UTC 2019 - bjorn.lie@gmail.com
- Add libyaml-revert-emitter-changes.patch: Revert "This code is
not needed and breaks tests" (gh#yaml/libyaml#122).
-------------------------------------------------------------------
Tue Dec 4 08:48:50 UTC 2018 - Ondřej Súkup <mimi.vx@gmail.com>

5
libyaml.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libyaml
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -24,6 +24,8 @@ License: MIT
Group: Development/Libraries/C and C++
URL: http://pyyaml.org/wiki/LibYAML
Source: http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz
# PATCH-FIX-UPSTREAM libyaml-revert-emitter-changes.patch -- gh#yaml/libyaml#122
Patch: libyaml-revert-emitter-changes.patch
BuildRequires: pkgconfig
%description
@ -52,6 +54,7 @@ This package holds the development files for libyaml.
%prep
%setup -q -n yaml-%{version}
%patch -p1
%build
%configure --with-pic --disable-static