From 8e605eed7137e40d5ebe065b259a261d24262db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 29 Sep 2020 09:58:01 +0100
Subject: [PATCH] latest release

---
 .gitignore                                    |  2 +-
 ...get-to-initialize-this-struct-member.patch | 28 -------------------
 ...f-void-and-pass-it-as-a-compiler-def.patch | 27 ------------------
 liborcus.spec                                 | 12 ++++----
 sources                                       |  2 +-
 5 files changed, 8 insertions(+), 63 deletions(-)
 delete mode 100644 0001-Don-t-forget-to-initialize-this-struct-member.patch
 delete mode 100644 0002-Check-the-size-of-void-and-pass-it-as-a-compiler-def.patch

diff --git a/.gitignore b/.gitignore
index 8308dc9..3642444 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/liborcus-0.16.0.tar.xz
+/liborcus-0.16.1.tar.xz
diff --git a/0001-Don-t-forget-to-initialize-this-struct-member.patch b/0001-Don-t-forget-to-initialize-this-struct-member.patch
deleted file mode 100644
index e89e666..0000000
--- a/0001-Don-t-forget-to-initialize-this-struct-member.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2f3fa91679b449d3079152fb847c71350815df49 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Thu, 24 Sep 2020 20:06:53 -0400
-Subject: [PATCH 1/2] Don't forget to initialize this struct member.
-
-This ended up becoming "true" on a 32-bit debian platform, though
-this is not strictly a 32-bit build issue...
-
-Related to #129.
----
- src/parser/parser_global.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/parser/parser_global.cpp b/src/parser/parser_global.cpp
-index 4699a17b..a98d3dbc 100644
---- a/src/parser/parser_global.cpp
-+++ b/src/parser/parser_global.cpp
-@@ -155,6 +155,7 @@ parse_quoted_string_state parse_string_with_escaped_char(
-     ret.str = nullptr;
-     ret.length = 0;
-     ret.transient = true;
-+    ret.has_control_character = false;
- 
-     // Start the buffer with the string we've parsed so far.
-     buffer.reset();
--- 
-2.25.1
-
diff --git a/0002-Check-the-size-of-void-and-pass-it-as-a-compiler-def.patch b/0002-Check-the-size-of-void-and-pass-it-as-a-compiler-def.patch
deleted file mode 100644
index 6d78474..0000000
--- a/0002-Check-the-size-of-void-and-pass-it-as-a-compiler-def.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0eb2e3f7e81275a14958fa3cab900501c37c404c Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Thu, 24 Sep 2020 19:28:48 -0400
-Subject: [PATCH 2/2] Check the size of void* and pass it as a compiler define.
-
-This is needed in order to link against libixion.  Related to #129.
----
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index f69e7a12..caf82304 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -55,6 +55,9 @@ AC_C_INLINE
- AC_TYPE_MODE_T
- AC_TYPE_SIZE_T
- 
-+AC_CHECK_SIZEOF([void *])
-+CXXFLAGS="$CXXFLAGS -DSIZEOF_VOID_P=$ac_cv_sizeof_void_p"
-+
- # ============================
- # Checks for library functions
- # ============================
--- 
-2.25.1
-
diff --git a/liborcus.spec b/liborcus.spec
index 1610738..841fdf3 100644
--- a/liborcus.spec
+++ b/liborcus.spec
@@ -6,16 +6,13 @@
 %bcond_without python
 
 Name: liborcus
-Version: 0.16.0
-Release: 3%{?dist}
+Version: 0.16.1
+Release: 1%{?dist}
 Summary: Standalone file import filter library for spreadsheet documents
 
 License: MPLv2.0
 URL: https://gitlab.com/orcus/orcus
-Source0: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz
-
-Patch0: 0001-Don-t-forget-to-initialize-this-struct-member.patch
-Patch1: 0002-Check-the-size-of-void-and-pass-it-as-a-compiler-def.patch
+Source0: https://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz
 
 BuildRequires: boost-devel
 BuildRequires: doxygen
@@ -189,6 +186,9 @@ make check %{?_smp_mflags}
 %doc doc/_doxygen/html
 
 %changelog
+* Tue Sep 29 2020 Caolán McNamara <caolanm@redhat.com> - 0.16.1-1
+- latest release
+
 * Fri Sep 25 2020 Caolán McNamara <caolanm@redhat.com> - 0.16.0-3
 - reenable make check
 
diff --git a/sources b/sources
index 30bf7c5..396f66d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (liborcus-0.16.0.tar.xz) = 25d09605e4b2dd058021e063efea5aaa988ccbf5935728e8a22db2e285b3b7ed6156e98b7ad6aa9c2447b8f26d1de2bc5f8cd87e425bab861aa1611d385ce56e
+SHA512 (liborcus-0.16.1.tar.xz) = 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739