diff --git a/mingw-w64-python-skia-pathops/001-mingw-setup-fixes.patch b/mingw-w64-python-skia-pathops/001-mingw-setup-fixes.patch index 17633c3578..0ab0fc3160 100644 --- a/mingw-w64-python-skia-pathops/001-mingw-setup-fixes.patch +++ b/mingw-w64-python-skia-pathops/001-mingw-setup-fixes.patch @@ -18,12 +18,3 @@ from distutils._msvccompiler import _get_vc_env # for Windows, we want to build a shared skia.dll. If we build a static lib -@@ -323,7 +323,7 @@ - - extra_compile_args = { - "": [ -- "-std=c++14", -+ "-std=c++17", - ] - + ( - [ diff --git a/mingw-w64-python-skia-pathops/PKGBUILD b/mingw-w64-python-skia-pathops/PKGBUILD index 6a21e9eaaf..06e656cfd0 100644 --- a/mingw-w64-python-skia-pathops/PKGBUILD +++ b/mingw-w64-python-skia-pathops/PKGBUILD @@ -3,8 +3,8 @@ _realname=skia-pathops pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=0.7.4 -pkgrel=5 +pkgver=0.8.0.post2 +pkgrel=1 pkgdesc='Python access to operations on paths using the Skia library (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') @@ -14,47 +14,44 @@ msys2_references=( ) license=('spdx:BSD-3-Clause') depends=( + "${MINGW_PACKAGE_PREFIX}-cc-libs" "${MINGW_PACKAGE_PREFIX}-python" - "${MINGW_PACKAGE_PREFIX}-libpng" - "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" - "${MINGW_PACKAGE_PREFIX}-libwebp" + "${MINGW_PACKAGE_PREFIX}-skia" ) makedepends=( - "${MINGW_PACKAGE_PREFIX}-skia" "${MINGW_PACKAGE_PREFIX}-python-build" "${MINGW_PACKAGE_PREFIX}-python-installer" "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm" - "${MINGW_PACKAGE_PREFIX}-cython0" + "${MINGW_PACKAGE_PREFIX}-cython" "${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-pkgconf" ) -options=(!strip) +options=('!strip') source=("https://github.com/fonttools/skia-pathops/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz" "001-mingw-setup-fixes.patch") -sha256sums=('ab4dcaa6821c040ece818da71bf37318c74b066904db1231ac89d094e90047fc' - 'd8e85cac77e7b0c6b0230c73088429d6996a982862d7a6eaaacaf13419faad30') +sha256sums=('f005181bcfd269d9dbd67198199dd5e0d41604aedb29d48e45c26e881dcc77eb' + '33fa2af008f72ae9949448ac93836d8c61ff448be2feba76b22fb69a7f11e414') -prepare() { - rm -rf python-build-${MSYSTEM} | true - cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" +prepare() { + cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} - cd "${srcdir}/python-build-${MSYSTEM}" - patch -p1 -i "${srcdir}"/001-mingw-setup-fixes.patch + patch -p1 -i ../001-mingw-setup-fixes.patch } build() { - cd "${srcdir}/python-build-${MSYSTEM}" + cd "python-build-${MSYSTEM}" BUILD_SKIA_FROM_SOURCE=0 \ - ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation + python -m build --wheel --skip-dependency-check --no-isolation } package() { - cd "${srcdir}/python-build-${MSYSTEM}" + cd "python-build-${MSYSTEM}" + MSYS2_ARG_CONV_EXCL="--prefix=" \ - "${MINGW_PREFIX}"/bin/python -m installer --prefix=${MINGW_PREFIX} \ + python -m installer --prefix=${MINGW_PREFIX} \ --destdir="${pkgdir}" dist/*.whl install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"