diff --git a/ansible-core/0001-ctypes-cdll-loadlibrary-msys2.patch b/ansible-core/0001-ctypes-cdll-loadlibrary-msys2.patch new file mode 100644 index 00000000..f783104f --- /dev/null +++ b/ansible-core/0001-ctypes-cdll-loadlibrary-msys2.patch @@ -0,0 +1,13 @@ +diff --git a/lib/ansible/utils/display.py b/lib/ansible/utils/display.py +index 7d98ad47e9..6e6294cfca 100644 +--- a/lib/ansible/utils/display.py ++++ b/lib/ansible/utils/display.py +@@ -44,7 +44,7 @@ from ansible.utils.unsafe_proxy import wrap_var + from functools import wraps + + +-_LIBC = ctypes.cdll.LoadLibrary(ctypes.util.find_library('c')) ++_LIBC = ctypes.cdll.LoadLibrary('msys-2.0.dll') + # Set argtypes, to avoid segfault if the wrong type is provided, + # restype is assumed to be c_int + _LIBC.wcwidth.argtypes = (ctypes.c_wchar,) diff --git a/ansible-core/PKGBUILD b/ansible-core/PKGBUILD index dc670df9..5807f512 100644 --- a/ansible-core/PKGBUILD +++ b/ansible-core/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: Alexandre Ferreira pkgname=ansible-core -pkgver=2.14.5 +pkgver=2.15.0 pkgrel=1 pkgdesc='Radically simple IT automation platform' arch=('any') url='https://pypi.org/project/ansible-core' license=('spdx:GPL-3.0-or-later') -depends=('python' 'python-yaml' 'python-jinja' 'python-packaging' 'msys2-runtime-devel') +depends=('python' 'python-yaml' 'python-jinja' 'python-packaging') provides=('python-ansible' 'ansible-base') optdepends=( 'sshpass: for ssh connections with password' @@ -15,12 +15,28 @@ optdepends=( makedepends=('tar' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel') replaces=('ansible-base') backup=('etc/ansible/ansible.cfg') -source=("https://pypi.python.org/packages/source/a/ansible-core/ansible-core-${pkgver}.tar.gz") -sha512sums=('130a0de925c7229dee350ddbf4382d87802d86aab4817ed595105db8ed5071153847dac0478f20a994670e59e53a07b77d0bf35855d309ebc222fbb61233b7db') +source=("https://pypi.python.org/packages/source/a/ansible-core/ansible-core-${pkgver}.tar.gz" + "0001-ctypes-cdll-loadlibrary-msys2.patch") +sha512sums=('aebb43840380854e7759656a0b08579a8fbdddbf2d204c47fb16cdb73ffd540df5ad56e5bf4a78a338804a3d40f9b042ea50b2b1853aaef6b7c2f0aab7a95432' + 'f129850ecf75b48dd89b2f43e7f09a2585d63959be807299f5c1ddcdb12ecafafa4a230dc0d8a9c284d5d6fec21eae22eb4c0c8c5fde37a09d7bdac7b8503b98') noextract=("${pkgname}-${pkgver}.tar.gz") +apply_patch_with_msg() { + for _fname in "$@" + do + msg2 "Applying ${_fname}" + patch -Nbp1 -i "${srcdir}"/${_fname} + done +} + prepare() { tar zxf "${srcdir}/${pkgname}-${pkgver}.tar.gz" || tar zxf "${srcdir}/${pkgname}-${pkgver}.tar.gz" + + cd "${srcdir}/${pkgname}-${pkgver}" + + # Patches + apply_patch_with_msg \ + 0001-ctypes-cdll-loadlibrary-msys2.patch } build() { @@ -39,4 +55,4 @@ package() { install -d "${pkgdir}"/usr/share/man/man1 cp -dpr --no-preserve=ownership docs/man/man1/*.1 "${pkgdir}"/usr/share/man/man1 -} +} \ No newline at end of file