diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2020-11-04 18:00:39 +0100 |
|---|---|---|
| committer | Bart Ribbers <bribbers@disroot.org> | 2021-10-15 08:32:25 +0200 |
| commit | 41405ab39054c8f91cf3140c31337856e2df04db (patch) | |
| tree | 8f0a2bb45f0ebe43a4426ddafb783d2d876ebea5 | |
| parent | 32b530bd567687f9801f9f16fb9772a312dde29d (diff) | |
community/libixion: upgrade to 0.16.1
| -rw-r--r-- | community/libixion/APKBUILD | 15 | ||||
| -rw-r--r-- | community/libixion/fix-nullptr_t.patch | 32 |
2 files changed, 26 insertions, 21 deletions
diff --git a/community/libixion/APKBUILD b/community/libixion/APKBUILD index d396fa435fc..04a7d40edb8 100644 --- a/community/libixion/APKBUILD +++ b/community/libixion/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libixion -pkgver=0.15.0 -pkgrel=2 +pkgver=0.16.1 +pkgrel=0 pkgdesc="A general purpose formula parser & interpreter" url="https://gitlab.com/ixion/ixion" arch="all" license="MPL-2.0" -makedepends="$depends_dev boost-dev mdds-dev spdlog-dev" +makedepends="boost-dev mdds-dev" +checkdepends="bash" subpackages="$pkgname-dev" source="https://kohei.us/files/ixion/src/libixion-$pkgver.tar.xz fix-nullptr_t.patch @@ -32,6 +33,10 @@ build() { make } +check() { + make check +} + package() { make DESTDIR="$pkgdir" install } @@ -42,5 +47,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543 libixion-0.15.0.tar.xz -bd8c1a3159e57f315e10d44e0e2f1a28f7022485ced3603fdd0ff223cac8cfb2bb135e6e6c0d5ec5a99595c27a8c1c3948ad92d2f383dd90c6922964afd1136d fix-nullptr_t.patch" +sha512sums="979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de libixion-0.16.1.tar.xz +3f1887da7db0591bae7c7072a39624b16474be128c868816544ee554cb40501f10eafde9e1fb0e7ee519f719b6cc1f06113c942b27e1e86630756ec80d32d8ad fix-nullptr_t.patch" diff --git a/community/libixion/fix-nullptr_t.patch b/community/libixion/fix-nullptr_t.patch index b7ab0498946..d426ca2a825 100644 --- a/community/libixion/fix-nullptr_t.patch +++ b/community/libixion/fix-nullptr_t.patch @@ -1,25 +1,25 @@ -From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001 +From 1992b8ab9c7765b8da06b6054bb3c0ab990c62f7 Mon Sep 17 00:00:00 2001 From: orbea <orbea@riseup.net> -Date: Fri, 23 Aug 2019 08:50:28 -0700 +Date: Wed, 28 Oct 2020 08:13:31 -0700 Subject: [PATCH] Fix build with clang. --- - include/ixion/model_context.hpp | 2 +- + src/libixion/model_context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp -index 6ff5b67..dc27ed0 100644 ---- a/include/ixion/model_context.hpp -+++ b/include/ixion/model_context.hpp -@@ -61,7 +61,7 @@ public: - } value; +diff --git a/src/libixion/model_context.cpp b/src/libixion/model_context.cpp +index 0fcbb31..f6eb3cf 100644 +--- a/src/libixion/model_context.cpp ++++ b/src/libixion/model_context.cpp +@@ -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; -- -2.24.1 +GitLab |