diff --git a/mingw-w64-python-diff-match-patch/PKGBUILD b/mingw-w64-python-diff-match-patch/PKGBUILD index e58c8f87f6..971b3ffea7 100644 --- a/mingw-w64-python-diff-match-patch/PKGBUILD +++ b/mingw-w64-python-diff-match-patch/PKGBUILD @@ -3,26 +3,26 @@ _realname=diff-match-patch pkgbase=mingw-w64-python-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-python-${_realname} -pkgver=20230430 -pkgrel=3 +pkgver=20241021 +pkgrel=1 pkgdesc='A high-performance library in multiple languages that manipulates plain text (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') +url='https://github.com/diff-match-patch-python/diff-match-patch' msys2_references=( 'pypi: diff-match-patch' ) license=('spdx:Apache-2.0') -url='https://github.com//diff-match-patch-python/diff-match-patch' depends=("${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" "${MINGW_PACKAGE_PREFIX}-python-installer" "${MINGW_PACKAGE_PREFIX}-python-flit-core") -source=("https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz") -sha256sums=('953019cdb9c9d2c9e47b5b12bcff3cf4746fc4598eb406076fa1fc27e6a1f15c') +source=("https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname//-/_}-${pkgver}.tar.gz") +sha256sums=('beae57a99fa48084532935ee2968b8661db861862ec82c6f21f4acdd6d835073') prepare() { rm -rf python-build-${MSYSTEM} | true - cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" + cp -r "${_realname//-/_}-${pkgver}" "python-build-${MSYSTEM}" } build() { diff --git a/mingw-w64-python-three-merge/PKGBUILD b/mingw-w64-python-three-merge/PKGBUILD index 13dd126bd6..e74472aba1 100644 --- a/mingw-w64-python-three-merge/PKGBUILD +++ b/mingw-w64-python-three-merge/PKGBUILD @@ -7,34 +7,33 @@ pkgver=0.1.1 pkgrel=4 pkgdesc='Simple library for merging two strings with respect to a base one (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') -license=('BSD') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') +license=('spdx:MIT') url='https://github.com/spyder-ide/three-merge' msys2_references=( 'pypi: three-merge' ) depends=( + ${MINGW_PACKAGE_PREFIX}-python ${MINGW_PACKAGE_PREFIX}-python-diff-match-patch) makedepends=( - ${MINGW_PACKAGE_PREFIX}-python ${MINGW_PACKAGE_PREFIX}-python-setuptools) source=("https://github.com/spyder-ide/${_realname}/archive/v${pkgver}.tar.gz") sha256sums=('b6ab2231fd349cdf03be5be04f28c1d59d5a475f7396dcf8fd8b0597981d113e') prepare() { cd "${srcdir}" - rm -rf python-build-${CARCH} | true - cp -r "${_realname}-${pkgver}" "python-build-${CARCH}" + rm -rf python-build-${MSYSTEM} | true + cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" } build() { - msg "Python build for ${CARCH}" - cd "${srcdir}/python-build-${CARCH}" + cd "${srcdir}/python-build-${MSYSTEM}" ${MINGW_PREFIX}/bin/python setup.py build } package() { - cd "${srcdir}/python-build-${CARCH}" + cd "${srcdir}/python-build-${MSYSTEM}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \ --root="${pkgdir}" --optimize=1 --skip-build