diff options
| -rw-r--r-- | user/libixion/APKBUILD | 16 | ||||
| -rw-r--r-- | user/libixion/nullptr.patch | 25 |
2 files changed, 8 insertions, 33 deletions
diff --git a/user/libixion/APKBUILD b/user/libixion/APKBUILD index 69d394253..3cc3e2659 100644 --- a/user/libixion/APKBUILD +++ b/user/libixion/APKBUILD @@ -1,21 +1,22 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libixion -pkgver=0.15.0 +pkgver=0.17.0 pkgrel=0 pkgdesc="A general purpose formula parser & interpreter" url="https://gitlab.com/ixion/ixion" arch="all" license="MPL-2.0" depends="" -depends_dev="mdds~1.5" -makedepends="$depends_dev boost-dev spdlog" +depends_dev="mdds" +makedepends="$depends_dev boost-dev spdlog autoconf automake libtool cmd:which" subpackages="$pkgname-dev" -source="http://kohei.us/files/ixion/src/$pkgname-$pkgver.tar.xz - nullptr.patch" +source="https://gitlab.com/ixion/ixion/-/archive/$pkgver/ixion-$pkgver.tar.bz2" + +builddir="$srcdir/ixion-$pkgver" build() { - ./configure \ + ./autogen.sh \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -40,5 +41,4 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543 libixion-0.15.0.tar.xz -1c4c06c1f0d1ef4d34ec7d92a5238dc9ee11cc8cf09262208468d409579696b754d26efc06987c2d66ae47f896b5273fb28cdba08203286265c6ebf85000c3d9 nullptr.patch" +sha512sums="f6216b06342c43ddf937bcc7eb3104e500bc10d6798f9b24c92c423bda575ac3f7bdae68bb81b2826c164e7dd19bbef940a3848581c5f9e969a6e70934e58d0a ixion-0.17.0.tar.bz2" diff --git a/user/libixion/nullptr.patch b/user/libixion/nullptr.patch deleted file mode 100644 index 27540bf30..000000000 --- a/user/libixion/nullptr.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Fri, 23 Aug 2019 08:50:28 -0700 -Subject: [PATCH] Fix build with clang. - ---- - include/ixion/model_context.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp -index 6ff5b678..dc27ed03 100644 ---- a/include/ixion/model_context.hpp -+++ b/include/ixion/model_context.hpp -@@ -61,7 +61,7 @@ public: - } 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. */ --- -2.22.0 - |