diff --git a/mingw-w64-sip/003-template-error.patch b/mingw-w64-sip/003-template-error.patch deleted file mode 100644 index 7b1ac5f45e..0000000000 --- a/mingw-w64-sip/003-template-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sipbuild/generator/instantiations.py b/sipbuild/generator/instantiations.py -index b351a29b..de38c0cf 100644 ---- a/sipbuild/generator/instantiations.py -+++ b/sipbuild/generator/instantiations.py -@@ -461,7 +461,7 @@ def _superclass_from_class(klass, p, symbol, tmpl_names, template, pm): - # Only deal with undefined classes with unscoped names which is how - # template argument names are passed. - if klass.iface_file.module is None and superclass_name.is_simple: -- superclass = _find_argument_value(superclass_name, p, symbol, -+ superclass = _find_argument_value(superclass_name.base_name, p, symbol, - tmpl_names, template, pm) - - if superclass is None: diff --git a/mingw-w64-sip/PKGBUILD b/mingw-w64-sip/PKGBUILD index a0c99b66ed..a548b6ebad 100644 --- a/mingw-w64-sip/PKGBUILD +++ b/mingw-w64-sip/PKGBUILD @@ -5,8 +5,8 @@ _realname=sip pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=6.11.1 -pkgrel=2 +pkgver=6.12.0 +pkgrel=1 pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -26,12 +26,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" options=(!strip) source=(https://pypi.python.org/packages/source/s/sip/sip-${pkgver}.tar.gz 001-mingw-python.patch - 002-wrappers.patch - 003-template-error.patch) -sha256sums=('3dae4baaf9e9f781d84bf293e0e2938dc7f44b826837889026eba53bd36c81b5' + 002-wrappers.patch) +sha256sums=('083ced94f85315493231119a63970b2ba42b1d38b38e730a70e02a99191a89c6' '15d64d0ff5253096a3fb5d3d4584eab8f93b9e9ffbcfee1c02dce00d695e6027' - 'ba695df87296ad5be7a64d57ce0a8f54db3867a9b69b303b76482f2ac48bb7d6' - 'e6cf27433d9a742a3164aeabee26a158675d1c10109439acaf58ff06a09cd10e') + 'ba695df87296ad5be7a64d57ce0a8f54db3867a9b69b303b76482f2ac48bb7d6') apply_patch_with_msg() { for _patch in "$@" @@ -49,10 +47,6 @@ prepare() { 001-mingw-python.patch \ 002-wrappers.patch - # https://github.com/Python-SIP/sip/issues/77#issuecomment-2909587858 - apply_patch_with_msg \ - 003-template-error.patch - cd "${srcdir}" rm -rf python-build-${MSYSTEM} | true cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"