Accepting request 720071 from home:tinita:branches:devel:libraries:c_c++

I am a co-maintainer for https://github.com/yaml/libyaml
The patch isn't needed anymore with version 0.2.2, so I removed it.

OBS-URL: https://build.opensuse.org/request/show/720071
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libyaml?expand=0&rev=25
This commit is contained in:
Adam Majer 2019-08-01 13:57:32 +00:00 committed by Git OBS Bridge
parent 61db61feeb
commit 040a560372
3 changed files with 5 additions and 35 deletions

View File

@ -1,32 +0,0 @@
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;
}

View File

@ -1,4 +1,9 @@
-------------------------------------------------------------------
Wed Jul 31 16:12:22 CEST 2019 - Tina Müller <tina.mueller@suse.com>
- Remove patch
* Patch libyaml-revert-emitter-changes.patch is not needed anymore
-------------------------------------------------------------------
Thu Apr 18 13:17:19 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
- update to 0.2.2

View File

@ -24,8 +24,6 @@ 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
@ -51,7 +49,6 @@ a YAML 1.1 parser and emitter written in C.
%prep
%setup -q -n yaml-%{version}
%patch -p1
%build
%configure --disable-static