From d7226b912ae603dc48fe6af78844e3d7a28d2e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Mar 2021 15:27:02 +0100
Subject: [PATCH] libixion: update to 0.16.1

---
 common/shlibs                            |  2 +-
 srcpkgs/libixion/patches/nullptr_t.patch | 20 ++++++++++----------
 srcpkgs/libixion/template                |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 858957c29f7..ffe94ecf481 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2546,7 +2546,7 @@ libCbc.so.3 CoinMP-1.8.3_1
 libOsiCommonTests.so.1 CoinMP-1.8.3_1
 libCbcSolver.so.3 CoinMP-1.8.3_1
 libmwaw-0.3.so.3 libmwaw-0.3.7_1
-libixion-0.15.so.0 libixion-0.15.0_2
+libixion-0.16.so.0 libixion-0.16.1_1
 liborcus-parser-0.15.so.0 liborcus-0.15.3_1
 liborcus-mso-0.15.so.0 liborcus-0.15.3_1
 liborcus-0.15.so.0 liborcus-0.15.3_1
diff --git a/srcpkgs/libixion/patches/nullptr_t.patch b/srcpkgs/libixion/patches/nullptr_t.patch
index 585a6c2b652..e030577768a 100644
--- a/srcpkgs/libixion/patches/nullptr_t.patch
+++ b/srcpkgs/libixion/patches/nullptr_t.patch
@@ -1,11 +1,11 @@
---- include/ixion/model_context.hpp	2019-03-09 05:05:04.000000000 +0100
-+++ include/ixion/model_context.hpp	2020-01-29 21:50:49.831725062 +0100
-@@ -61,7 +61,7 @@
-         } value;
+--- src/libixion/model_context.cpp	2020-08-28 23:23:48.000000000 +0200
++++ src/libixion/model_context.cpp	2021-03-01 16:14:44.955570528 +0100
+@@ -17,7 +17,7 @@
  
-         /** Initializes the cell to be empty. */
--        input_cell(nullptr_t);
-+        input_cell(std::nullptr_t);
-         /** Boolean cell value. */
-         input_cell(bool b);
-         /** The char array must be null-terminated. */
+ namespace ixion {
+ 
+-model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {}
++model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {}
+ model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean)
+ {
+     value.boolean = b;
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 63604118bbf..2d709b3f88b 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
 # Template file for 'libixion'
 pkgname=libixion
-version=0.15.0
-revision=3
+version=0.16.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0"
 homepage="https://gitlab.com/ixion/ixion/"
 distfiles="http://kohei.us/files/ixion/src/${pkgname}-${version}.tar.xz"
-checksum=b1f60af61be875e3bfa7ad18203a6c8ccdeb9922a531e196029fc42fbfa0b9e6
+checksum=426c643b3c346d546027c0226619abb2e59848e94470b9b5aa6365e26125089f
 replaces="libixion11>=0"
 
 libixion-devel_package() {