diff --git a/mingw-w64-python-python_ics/PKGBUILD b/mingw-w64-python-python_ics/PKGBUILD index cabd0fee38..bb18f720e0 100644 --- a/mingw-w64-python-python_ics/PKGBUILD +++ b/mingw-w64-python-python_ics/PKGBUILD @@ -6,8 +6,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=4.3 -pkgrel=2 +pkgver=4.6 +pkgrel=1 pkgdesc="Python C Code module for interfacing to the icsneo40 dynamic library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -18,13 +18,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-setuptools") options=('staticlibs' 'strip' '!debug') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/intrepidcs/python_ics/archive/v${pkgver}.tar.gz" - mingw-build.patch) -sha512sums=('0309a1ab9748de83ed69819229cb946384931d7629439003e635b4fbac235d62e20eb3f5d4366912597adabc2aefc5b087cb96bc055a5c31b5d16f46681d2e0d' - '3c8622868fc017ca8d7f4ceb7ab7bfd4e2bfb6cc9be437f0a923b02d525fa23e3349990b5dc055e04a47be79a01ecdcd6358b7169d6e4f23cbaa7e47425b3bd5') + mingw-build.patch + fix-cpp11-error.patch) +sha512sums=('e87ea3412b68f0f3df5bc5bb548ec72c13d98e8571a1d8f98bfb5a91f853d0d25d5de3be8b1d66777dc59a4b09c7f70e51b3620ca9ab550c3565d9ae785e7baf' + '3c8622868fc017ca8d7f4ceb7ab7bfd4e2bfb6cc9be437f0a923b02d525fa23e3349990b5dc055e04a47be79a01ecdcd6358b7169d6e4f23cbaa7e47425b3bd5' + '2515ed236346bd320d476bc030ecafc7952c68120a095cc079d7e36a512dd83d4a29765f2372ad0e9b0dde591e1e02ce25ed169118ec8341529ce9b67dab1cec') prepare() { cd ${_realname}-${pkgver} patch -p1 -i ${srcdir}/mingw-build.patch + patch -p1 -i ${srcdir}/fix-cpp11-error.patch cd "${srcdir}" cp -r "${_realname}-${pkgver}" "python-build-${CARCH}" diff --git a/mingw-w64-python-python_ics/fix-cpp11-error.patch b/mingw-w64-python-python_ics/fix-cpp11-error.patch new file mode 100644 index 0000000000..b9e6e72489 --- /dev/null +++ b/mingw-w64-python-python_ics/fix-cpp11-error.patch @@ -0,0 +1,20 @@ +--- a/include/methods.h ++++ b/include/methods.h +@@ -402,7 +402,7 @@ + "\t:class:`" MODULE_NAME ".RuntimeError`\n" \ + "\n" \ + "Returns:\n" \ +- "\t:class:`" MODULE_NAME "."DEVICE_SETTINGS_OBJECT_NAME"`\n" \ ++ "\t:class:`" MODULE_NAME "." DEVICE_SETTINGS_OBJECT_NAME "`\n" \ + "\n" \ + "\t>>> d = ics.open_device()\n" \ + "\t>>> d.Name\n" \ +@@ -453,7 +453,7 @@ + "\n" \ + "Args:\n" \ + "\tdevice (:class:`" MODULE_NAME "." NEO_DEVICE_OBJECT_NAME "`): :class:`" MODULE_NAME "." NEO_DEVICE_OBJECT_NAME "`\n\n" \ +- "\tsettings (:class:`" MODULE_NAME "."DEVICE_SETTINGS_OBJECT_NAME"`): :class:`" MODULE_NAME "."DEVICE_SETTINGS_OBJECT_NAME"`\n\n" \ ++ "\tsettings (:class:`" MODULE_NAME "." DEVICE_SETTINGS_OBJECT_NAME "`): :class:`" MODULE_NAME "." DEVICE_SETTINGS_OBJECT_NAME "`\n\n" \ + "\n" \ + "Raises:\n" \ + "\t:class:`" MODULE_NAME ".RuntimeError`\n" \