summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authororbea <orbea@riseup.net>2020-10-28 10:42:34 -0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2020-10-31 11:15:45 +0700
commita180aedd42e5a633d91fb511fb05df4c8e404446 (patch)
tree32c229aaaf2c7d24371da673fba8a3162bbbe931 /libraries
parent57154cf137315b66e67a31dd07414a18c096e76c (diff)
downloadslackbuilds-a180aedd42e5a633d91fb511fb05df4c8e404446.tar.gz
libraries/libixion: Updated for version 0.16.1.
Signed-off-by: orbea <orbea@riseup.net> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/libixion/fmt.patch24
-rw-r--r--libraries/libixion/libixion.SlackBuild17
-rw-r--r--libraries/libixion/libixion.info8
3 files changed, 10 insertions, 39 deletions
diff --git a/libraries/libixion/fmt.patch b/libraries/libixion/fmt.patch
deleted file mode 100644
index c97576bbf4..0000000000
--- a/libraries/libixion/fmt.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0891528c3ebbf59b0634d01b57499183bac1974b Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 23 Sep 2019 12:09:37 -0700
-Subject: [PATCH] Fix build with gcc and an external fmt.
-
----
- src/libixion/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libixion/Makefile.am b/src/libixion/Makefile.am
-index 1121e5f0..bb310b3f 100644
---- a/src/libixion/Makefile.am
-+++ b/src/libixion/Makefile.am
-@@ -3,6 +3,7 @@ AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/src/include \
- -DIXION_BUILD \
-+ -DFMT_HEADER_ONLY \
- $(MDDS_CFLAGS) \
- $(SPDLOG_CFLAGS) \
- $(BOOST_CPPFLAGS)
---
-2.22.0
-
diff --git a/libraries/libixion/libixion.SlackBuild b/libraries/libixion/libixion.SlackBuild
index 3b9407fa1e..890e6269f6 100644
--- a/libraries/libixion/libixion.SlackBuild
+++ b/libraries/libixion/libixion.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for libixion
-# Copyright 2015-2019 Hunter Sezen California, USA
+# Copyright 2015-2020 Hunter Sezen California, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libixion
-VERSION=${VERSION:-0.15.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.16.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -70,14 +70,9 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fix build with clang.
-# https://gitlab.com/ixion/ixion/merge_requests/9
-# https://gitlab.com/ixion/ixion/commit/a8fe2c542b16ee30723ab3d7f3b643ee479e9723
-sed -i 's/nullptr_t/std::nullptr_t/' include/ixion/model_context.hpp
-
-# Fix build with gcc and an external fmt.
-# https://gitlab.com/ixion/ixion/merge_requests/10
-# https://gitlab.com/ixion/ixion/commit/0891528c3ebbf59b0634d01b57499183bac1974b
-patch -p1 < $CWD/fmt.patch
+# https://gitlab.com/ixion/ixion/-/merge_requests/31
+# https://gitlab.com/ixion/ixion/commit/1992b8ab9c7765b8da06b6054bb3c0ab990c62f7
+sed -i 's/nullptr_t/std::nullptr_t/' src/libixion/model_context.cpp
autoreconf -fi
diff --git a/libraries/libixion/libixion.info b/libraries/libixion/libixion.info
index ff67d2d7f5..457bdde4c0 100644
--- a/libraries/libixion/libixion.info
+++ b/libraries/libixion/libixion.info
@@ -1,10 +1,10 @@
PRGNAM="libixion"
-VERSION="0.15.0"
+VERSION="0.16.1"
HOMEPAGE="https://gitlab.com/ixion/ixion"
-DOWNLOAD="https://kohei.us/files/ixion/src/libixion-0.15.0.tar.xz"
-MD5SUM="68edc5952ee1b172d83e5926ecc0554a"
+DOWNLOAD="https://kohei.us/files/ixion/src/libixion-0.16.1.tar.xz"
+MD5SUM="6aef823752990d193e5cf80a87d0ef58"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="mdds python3 spdlog"
+REQUIRES="mdds python3"
MAINTAINER="Hunter Sezen"
EMAIL="orbea@riseup.net"