From f114138ba15d6686a643a6836d39b99942d57f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de> Date: Wed, 29 Jan 2020 23:19:09 +0100 Subject: [PATCH] libixion: update to 0.15.0 Revision 2 because 0.15.0_1 already existed once. --- common/shlibs | 2 +- srcpkgs/libixion/patches/nullptr_t.patch | 11 +++++++++++ srcpkgs/libixion/template | 9 ++++----- 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/libixion/patches/nullptr_t.patch diff --git a/common/shlibs b/common/shlibs index 624e885d73..bb0d41d258 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2503,7 +2503,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.14.so.0 libixion-0.14.1_1 +libixion-0.15.so.0 libixion-0.15.0_2 liborcus-parser-0.14.so.0 liborcus-0.14.1_1 liborcus-mso-0.14.so.0 liborcus-0.14.1_1 liborcus-0.14.so.0 liborcus-0.14.1_1 diff --git a/srcpkgs/libixion/patches/nullptr_t.patch b/srcpkgs/libixion/patches/nullptr_t.patch new file mode 100644 index 0000000000..585a6c2b65 --- /dev/null +++ b/srcpkgs/libixion/patches/nullptr_t.patch @@ -0,0 +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; + + /** 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. */ diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index cd7a6db00c..316e90ea74 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -1,17 +1,16 @@ # Template file for 'libixion' pkgname=libixion -reverts="0.15.0_1" -version=0.14.1 -revision=4 +version=0.15.0 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config python3" -makedepends="boost-devel mdds python3-devel" +makedepends="boost-devel mdds python3-devel spdlog" short_desc="General purpose formula parser and interpreter" 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=6ad1384fcf813083c6d981a16b2643c953f9bac4c2caf1ed1682921d9b69ed91 +checksum=b1f60af61be875e3bfa7ad18203a6c8ccdeb9922a531e196029fc42fbfa0b9e6 replaces="libixion11>=0" libixion-devel_package() {