From c50abb8d5446bd96b372a512bb50e03db15caa6b Mon Sep 17 00:00:00 2001 From: mgondan Date: Sun, 7 Apr 2024 09:29:32 +0200 Subject: [PATCH] swi-prolog: update to 9.2.3 --- mingw-w64-swi-prolog/01-plhome.patch | 19 ------------------- mingw-w64-swi-prolog/PKGBUILD | 21 ++++++--------------- 2 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 mingw-w64-swi-prolog/01-plhome.patch diff --git a/mingw-w64-swi-prolog/01-plhome.patch b/mingw-w64-swi-prolog/01-plhome.patch deleted file mode 100644 index a360091733..0000000000 --- a/mingw-w64-swi-prolog/01-plhome.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- swipl-9.2.1/cmake/port/Windows.cmake 2024-02-15 07:31:29.593572000 +0100 -+++ swipl-9.2.1/cmake/port/Windows.cmake 2024-02-15 07:30:51.689756700 +0100 -@@ -17,6 +17,8 @@ - if(MINGW_ROOT) - include(port/MinGW) - elseif(CONDA) - include(port/CondaWindows) -+elseif(MSYS2) -+ include(port/msys2) - endif() - - if(NOT PLHOME) - -+++ swipl-9.2.1/cmake/port/msys2.cmake 2024-02-15 07:32:00.0 +0100 -@@ -0,0 +1,4 @@ -+message("Building for MSYS2") -+ -+set(PLHOME no-home) -+set(PLRELHOME ../lib/${SWIPL_INSTALL_DIR}) diff --git a/mingw-w64-swi-prolog/PKGBUILD b/mingw-w64-swi-prolog/PKGBUILD index 0f6901cfa8..0890ddfc70 100755 --- a/mingw-w64-swi-prolog/PKGBUILD +++ b/mingw-w64-swi-prolog/PKGBUILD @@ -3,15 +3,13 @@ _realname=swi-prolog pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=9.2.2 +pkgver=9.2.3 pkgrel=1 pkgdesc="Prolog environment (mingw-w64)" arch=(any) mingw_arch=('mingw64' 'ucrt64' 'clang64') url="https://www.swi-prolog.org/" -msys2_references=( - "cpe: cpe:/a:swi-prolog:swi-prolog" -) +msys2_references=("cpe: cpe:/a:swi-prolog:swi-prolog") license=('spdx:BSD-2-Clause') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git" @@ -27,19 +25,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-libarchive" "${MINGW_PACKAGE_PREFIX}-libyaml" + "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-db" "${MINGW_PACKAGE_PREFIX}-pcre2" "${MINGW_PACKAGE_PREFIX}-pkgconf") -source=("https://www.swi-prolog.org/download/stable/src/swipl-${pkgver}.tar.gz" - "01-plhome.patch") +source=("https://www.swi-prolog.org/download/stable/src/swipl-${pkgver}.tar.gz") -sha256sums=('896fd51196fd3becd574486da75a924f272e8d63332459292b305986cf101fc3' - '78aba8c14b2e32d96381e751783f6c529e10fcaca73b60c449512e6677bdd684') - -prepare() { - cd ${srcdir}/swipl-${pkgver} - patch -p1 < ${srcdir}/01-plhome.patch -} +sha256sums=('28329039526a93c10a160be5c7d90ca4fb7d1514e4a009a0852c6d237292e724') build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" @@ -61,7 +53,6 @@ build() { -DSWIPL_PACKAGES_JAVA=OFF \ -DSWIPL_PACKAGES_X=OFF \ -DINSTALL_DOCUMENTATION=OFF \ - -DVMI_FUNCTIONS=ON \ -DSWIPL_{SHARED,STATIC}_LIB=ON \ ../swipl-${pkgver} @@ -87,5 +78,5 @@ package() { check() { cd "${srcdir}/build-${MSYSTEM}" - "${MINGW_PREFIX}"/bin/cmake.exe --build . --target test + PYTHONHOME="${MINGW_PREFIX}" "${MINGW_PREFIX}"/bin/cmake.exe --build . --target test }