diff --git a/mingw-w64-libsbml/01-cast-to-long.patch b/mingw-w64-libsbml/01-cast-to-long.patch deleted file mode 100644 index caf12a06dc..0000000000 --- a/mingw-w64-libsbml/01-cast-to-long.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libsbml-5.18.0/src/sbml/math/FormulaParser.cpp.orig 2019-11-11 21:41:57.046424400 +0300 -+++ libsbml-5.18.0/src/sbml/math/FormulaParser.cpp 2019-11-11 21:42:30.568341700 +0300 -@@ -417,7 +417,7 @@ - - while (1) - { -- state = (long) Stack_peek(stack); -+ state = (long)(intptr_t) Stack_peek(stack); - action = FormulaParser_getAction(state, token); - - if (action == ACCEPT_STATE) -@@ -460,7 +460,7 @@ - { - rule = -action; - node = FormulaParser_reduceStackByRule(stack, rule); -- state = (long) Stack_peek(stack); -+ state = (long)(intptr_t) Stack_peek(stack); - - Stack_push( stack, node ); - Stack_push( stack, (void *) FormulaParser_getGoto(state, rule) ); diff --git a/mingw-w64-libsbml/02-install-layout.patch b/mingw-w64-libsbml/02-install-layout.patch index b92cf7743a..aacdec0af6 100644 --- a/mingw-w64-libsbml/02-install-layout.patch +++ b/mingw-w64-libsbml/02-install-layout.patch @@ -36,6 +36,6 @@ set(PYTHON_PACKAGE_INSTALL_DIR) -if (UNIX OR CYGWIN) +if (UNIX OR CYGWIN OR MINGW) - execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys;import platform; sys.stdout.write(platform.python_version()[:3])" + execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('{}.{}'.format(*sys.version_info[:2]))" OUTPUT_VARIABLE PYTHON_VERSION) set(PYTHON_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/site-packages) diff --git a/mingw-w64-libsbml/PKGBUILD b/mingw-w64-libsbml/PKGBUILD index 677e2f6719..313a8ab143 100644 --- a/mingw-w64-libsbml/PKGBUILD +++ b/mingw-w64-libsbml/PKGBUILD @@ -3,28 +3,25 @@ _realname=libsbml pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=5.18.0 +pkgver=5.19.0 pkgrel=1 pkgdesc="A file format for exchanging computational models in systems biology (mingw-w64)" arch=('any') license=("custom") url="http://sbml.org/Software/libSBML/" source=("http://sourceforge.net/projects/sbml/files/libsbml/${pkgver}/stable/libSBML-${pkgver}-core-plus-packages-src.tar.gz" - 01-cast-to-long.patch 02-install-layout.patch) -sha256sums=('6c01be2306ec0c9656b59cb082eb7b90176c39506dd0f912b02e08298a553360' - '2fa6e8d32818645cc42169d39d1e1d50764cc023ece438cdc1d4234e866e085d' - 'a53fa04481ec72348c5d23a12b395d9908cd4f996911dc046a6f926d1d34777d') +sha256sums=('a7f0e18be78ff0e064e4cdb1cd86634d08bc33be5250db4a1878bd81eeb8b547' + 'c007b7fec2d95a76600aa34eb62aec9bc44bdbeb228818d6d3f3e789a2cd8a9f') depends=("${MINGW_PACKAGE_PREFIX}-libxml2") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('staticlibs' 'strip') prepare() { cd "${srcdir}/${_realname}-${pkgver}-Source" - patch -p1 -i ${srcdir}/01-cast-to-long.patch patch -p1 -i ${srcdir}/02-install-layout.patch }