From 94c52defa97551daae6bf467cd7d8d123ec35c2f Mon Sep 17 00:00:00 2001 From: mgondan Date: Sat, 6 Dec 2025 12:00:58 +0100 Subject: [PATCH] swi-prolog: add few packages (libedit, json, odbc) (#26727) * swi-prolog: add few packages (libedit, json, odbc) * Update PKGBUILD --- mingw-w64-swi-prolog/PKGBUILD | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/mingw-w64-swi-prolog/PKGBUILD b/mingw-w64-swi-prolog/PKGBUILD index 6c11e21790..78e45f6a8d 100644 --- a/mingw-w64-swi-prolog/PKGBUILD +++ b/mingw-w64-swi-prolog/PKGBUILD @@ -2,9 +2,9 @@ _realname=swi-prolog pkgbase=mingw-w64-${_realname} -pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-full" "${MINGW_PACKAGE_PREFIX}-${_realname}-core" "${MINGW_PACKAGE_PREFIX}-${_realname}-packages" "${MINGW_PACKAGE_PREFIX}-${_realname}-archive" "${MINGW_PACKAGE_PREFIX}-${_realname}-bdb" "${MINGW_PACKAGE_PREFIX}-${_realname}-pcre2" "${MINGW_PACKAGE_PREFIX}-${_realname}-yaml" "${MINGW_PACKAGE_PREFIX}-${_realname}-json" "${MINGW_PACKAGE_PREFIX}-${_realname}-ssl" "${MINGW_PACKAGE_PREFIX}-${_realname}-x" "${MINGW_PACKAGE_PREFIX}-${_realname}-python" "${MINGW_PACKAGE_PREFIX}-${_realname}-doc" "${MINGW_PACKAGE_PREFIX}-${_realname}-examples" "${MINGW_PACKAGE_PREFIX}-${_realname}-tests" "${MINGW_PACKAGE_PREFIX}-${_realname}-edit") +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-full" "${MINGW_PACKAGE_PREFIX}-${_realname}-core" "${MINGW_PACKAGE_PREFIX}-${_realname}-packages" "${MINGW_PACKAGE_PREFIX}-${_realname}-archive" "${MINGW_PACKAGE_PREFIX}-${_realname}-bdb" "${MINGW_PACKAGE_PREFIX}-${_realname}-pcre2" "${MINGW_PACKAGE_PREFIX}-${_realname}-yaml" "${MINGW_PACKAGE_PREFIX}-${_realname}-json" "${MINGW_PACKAGE_PREFIX}-${_realname}-ssl" "${MINGW_PACKAGE_PREFIX}-${_realname}-x" "${MINGW_PACKAGE_PREFIX}-${_realname}-python" "${MINGW_PACKAGE_PREFIX}-${_realname}-doc" "${MINGW_PACKAGE_PREFIX}-${_realname}-examples" "${MINGW_PACKAGE_PREFIX}-${_realname}-tests" "${MINGW_PACKAGE_PREFIX}-${_realname}-edit" "${MINGW_PACKAGE_PREFIX}-${_realname}-odbc") pkgver=10.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Prolog environment (mingw-w64)" arch=(any) mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -22,6 +22,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-libarchive" "${MINGW_PACKAGE_PREFIX}-pcre2" "${MINGW_PACKAGE_PREFIX}-db" + "${MINGW_PACKAGE_PREFIX}-unixodbc" "${MINGW_PACKAGE_PREFIX}-sdl3-image" "${MINGW_PACKAGE_PREFIX}-cairo" "${MINGW_PACKAGE_PREFIX}-pango" @@ -51,7 +52,6 @@ build() { "${extra_config[@]}" \ -DUSE_GMP=ON \ -DSWIPL_PACKAGES_JAVA=OFF \ - -DSWIPL_PACKAGES_ODBC=OFF \ -DBUILD_TESTING=ON \ -DINSTALL_TESTS=ON \ -DSWIPL_{SHARED,STATIC}_LIB=ON \ @@ -220,6 +220,20 @@ package_swi-prolog-ssl() { cp -R "${srcdir}/OpenSSL_interface${MINGW_PREFIX}"/lib/swipl/* "${pkgdir}${MINGW_PREFIX}"/lib/swipl/ } +package_swi-prolog-odbc() { + depends=("${MINGW_PACKAGE_PREFIX}-${_realname}-core" + "${MINGW_PACKAGE_PREFIX}-${_realname}-packages" + "${MINGW_PACKAGE_PREFIX}-unixodbc") + conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}<9.2.6") + pkgdesc="ODBC binding for SWI-Prolog" + + cd "${srcdir}/build-${MSYSTEM}" + DESTDIR="${srcdir}"/ODBC_interface "${MINGW_PREFIX}"/bin/cmake -DCMAKE_INSTALL_COMPONENT=ODBC_interface -P cmake_install.cmake + + mkdir -p "${pkgdir}${MINGW_PREFIX}/lib/swipl" + cp -R "${srcdir}/ODBC_interface${MINGW_PREFIX}"/lib/swipl/* "${pkgdir}${MINGW_PREFIX}"/lib/swipl/ +} + package_swi-prolog-doc() { depends=("${MINGW_PACKAGE_PREFIX}-${_realname}-core" "${MINGW_PACKAGE_PREFIX}-${_realname}-packages") @@ -273,6 +287,9 @@ package_swi-prolog-full() { "${MINGW_PACKAGE_PREFIX}-${_realname}-python" "${MINGW_PACKAGE_PREFIX}-${_realname}-doc" "${MINGW_PACKAGE_PREFIX}-${_realname}-examples" + "${MINGW_PACKAGE_PREFIX}-${_realname}-edit" + "${MINGW_PACKAGE_PREFIX}-${_realname}-odbc" + "${MINGW_PACKAGE_PREFIX}-${_realname}-json" "${MINGW_PACKAGE_PREFIX}-${_realname}-tests") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")