python-python_ics: update to 909.8

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.6
-pkgrel=3
+pkgver=909.8
+pkgrel=1
 pkgdesc="Python C Code module for interfacing to the icsneo40 dynamic library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -16,31 +16,23 @@ license=('MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-clang")
 options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/intrepidcs/python_ics/archive/v${pkgver}.tar.gz"
-        mingw-build.patch
-        fix-cpp11-error.patch)
-sha512sums=('e87ea3412b68f0f3df5bc5bb548ec72c13d98e8571a1d8f98bfb5a91f853d0d25d5de3be8b1d66777dc59a4b09c7f70e51b3620ca9ab550c3565d9ae785e7baf'
-            '3c8622868fc017ca8d7f4ceb7ab7bfd4e2bfb6cc9be437f0a923b02d525fa23e3349990b5dc055e04a47be79a01ecdcd6358b7169d6e4f23cbaa7e47425b3bd5'
-            '2515ed236346bd320d476bc030ecafc7952c68120a095cc079d7e36a512dd83d4a29765f2372ad0e9b0dde591e1e02ce25ed169118ec8341529ce9b67dab1cec')
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/intrepidcs/python_ics/archive/v${pkgver}.tar.gz")
+sha512sums=('15976de11b571cc1614671935ef9e4a00bf23d5dcab6c769ca0546b41ea4b889f188991405dfb978bc49e201d5bb6e69660052af239896865362aa53f40a34b5')
 
 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}"
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  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

mingw-w64-python-python_ics/fix-cpp11-error.patch

@@ -1,20 +0,0 @@
---- 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" \

mingw-w64-python-python_ics/mingw-build.patch

@@ -1,177 +0,0 @@
-diff -Naur python_ics-2.15/src/methods.cpp python2-build-x86_64/src/methods.cpp
---- python_ics-2.15/src/methods.cpp	2018-12-21 13:58:55.346242300 +0300
-+++ python2-build-x86_64/src/methods.cpp	2018-12-21 13:56:07.033930100 +0300
-@@ -38,7 +38,7 @@
- extern PyTypeObject spy_message_object_type;
- // __func__, __FUNCTION__ and __PRETTY_FUNCTION__ are not preprocessor macros.
- // but MSVC doesn't follow c standard and treats __FUNCTION__ as a string literal macro...
--#if (defined(_WIN32) || defined(__WIN32__))
-+#if defined(_MSC_VER)
- #define arg_parse(a,f) a f
- #else
- const char* arg_parse(const char* args, const char* func)
-@@ -182,7 +182,7 @@
-     if (device_type && PyLong_Check(device_type))
- #else
-     if (device_type && PyInt_Check(device_type))
--#endif PY_MAJOR_VERSION >= 3
-+#endif // PY_MAJOR_VERSION >= 3
-     {
-         legacy_dev_type = PyLong_AsLong(device_type);
-         use_legacy_device_type = true;
-@@ -1297,7 +1297,7 @@
- }
- 
- #define _get_vcan3_settings(handle) __get_vcan3_settings(handle, __FUNCTION__);
--static PyObject* __get_vcan3_settings(ICS_HANDLE handle, char* func_name)
-+static PyObject* __get_vcan3_settings(ICS_HANDLE handle, const char* func_name)
- {
-     PyObject* settings = PyObject_CallObject((PyObject*)&vcan3_settings_object_type, NULL);
-     if (!settings) {
-@@ -1334,7 +1334,7 @@
- }
- 
- #define _get_vcan412_settings(handle) __get_vcan412_settings(handle, __FUNCTION__);
--static PyObject* __get_vcan412_settings(ICS_HANDLE handle, char* func_name)
-+static PyObject* __get_vcan412_settings(ICS_HANDLE handle, const char* func_name)
- {
-     PyObject* settings = PyObject_CallObject((PyObject*)&vcan412_settings_object_type, NULL);
-     if (!settings) {
-@@ -1377,7 +1377,7 @@
- 
- #if 0 // Not implemented in 802
- #define _get_vcan4_settings(handle) __get_vcan4_settings(handle, __FUNCTION__);
--static PyObject* __get_vcan4_settings(ICS_HANDLE handle, char* func_name)
-+static PyObject* __get_vcan4_settings(ICS_HANDLE handle, const char* func_name)
- {
-     PyObject* settings = PyObject_CallObject((PyObject*)&vcan4_settings_object_type, NULL);
-     if (!settings) {
-@@ -1430,7 +1430,7 @@
- #endif // 0
- 
- #define _get_vcanrf_settings(handle) __get_vcanrf_settings(handle, __FUNCTION__);
--static PyObject* __get_vcanrf_settings(ICS_HANDLE handle, char* func_name)
-+static PyObject* __get_vcanrf_settings(ICS_HANDLE handle, const char* func_name)
- {
-     PyObject* settings = PyObject_CallObject((PyObject*)&vcanrf_settings_object_type, NULL);
-     if (!settings) {
-@@ -1496,7 +1496,7 @@
- }
- 
- #define _get_fire_settings(handle) __get_fire_settings(handle, __FUNCTION__);
--static PyObject* __get_fire_settings(ICS_HANDLE handle, char* func_name)
-+static PyObject* __get_fire_settings(ICS_HANDLE handle, const char* func_name)
- {
-     PyObject* settings = PyObject_CallObject((PyObject*)&fire_settings_object_type, NULL);
-     if (!settings) {
-@@ -1593,7 +1593,7 @@
- }
- 
- #define _get_cyan_settings(handle) __get_cyan_settings(handle, __FUNCTION__);
--static PyObject* __get_cyan_settings(ICS_HANDLE handle, char* func_name)
-+static PyObject* __get_cyan_settings(ICS_HANDLE handle, const char* func_name)
- {
-     PyObject* settings = PyObject_CallObject((PyObject*)&cyan_settings_object_type, NULL);
-     if (!settings) {
-@@ -1706,7 +1706,7 @@
- }
- 
- #define _get_rad_galaxy_settings(handle) __get_rad_galaxy_settings(handle, __FUNCTION__);
--static PyObject* __get_rad_galaxy_settings(ICS_HANDLE handle, char* func_name)
-+static PyObject* __get_rad_galaxy_settings(ICS_HANDLE handle, const char* func_name)
- {
-     PyObject* settings = PyObject_CallObject((PyObject*)&rad_galaxy_settings_object_type, NULL);
-     if (!settings) {
-@@ -1792,7 +1792,7 @@
- }
- 
- #define _get_vividcan_settings(handle) __get_vividcan_settings(handle, __FUNCTION__);
--static PyObject* __get_vividcan_settings(ICS_HANDLE handle, char* func_name)
-+static PyObject* __get_vividcan_settings(ICS_HANDLE handle, const char* func_name)
- {
-     PyObject* settings = PyObject_CallObject((PyObject*)&vividcan_settings_object_type, NULL);
-     if (!settings) {
-@@ -1914,7 +1914,7 @@
-     return set_ics_exception(exception_runtime_error(), "This is a bug!");
- }
- 
--static PyObject* __set_vcan3_settings(ICS_HANDLE handle, PyObject* settings, int& save, char* func_name)
-+static PyObject* __set_vcan3_settings(ICS_HANDLE handle, PyObject* settings, int& save, const char* func_name)
- {
-     try
-     {
-@@ -1945,7 +1945,7 @@
- }
- #define _set_vcan3_settings(handle, settings, save) __set_vcan3_settings(handle, settings, save, __FUNCTION__);
- 
--static PyObject* __set_vcan412_settings(ICS_HANDLE handle, PyObject* settings, int& save, char* func_name)
-+static PyObject* __set_vcan412_settings(ICS_HANDLE handle, PyObject* settings, int& save, const char* func_name)
- {
-     try
-     {
-@@ -1982,7 +1982,7 @@
- #define _set_vcan412_settings(handle, settings, save) __set_vcan412_settings(handle, settings, save, __FUNCTION__);
- 
- #if 0 // not implemented in 802
--static PyObject* __set_vcan4_settings(ICS_HANDLE handle, PyObject* settings, int& save, char* func_name)
-+static PyObject* __set_vcan4_settings(ICS_HANDLE handle, PyObject* settings, int& save, const char* func_name)
- {
-     try
-     {
-@@ -2029,7 +2029,7 @@
- #define _set_vcan4_settings(handle, settings, save) __set_vcan4_settings(handle, settings, save, __FUNCTION__);
- #endif // 0
- 
--static PyObject* __set_vcanrf_settings(ICS_HANDLE handle, PyObject* settings, int& save, char* func_name)
-+static PyObject* __set_vcanrf_settings(ICS_HANDLE handle, PyObject* settings, int& save, const char* func_name)
- {
-     try
-     {
-@@ -2081,7 +2081,7 @@
- }
- #define _set_vcanrf_settings(handle, settings, save) __set_vcanrf_settings(handle, settings, save, __FUNCTION__);
- 
--static PyObject* __set_fire_settings(ICS_HANDLE handle, PyObject* settings, int& save, char* func_name)
-+static PyObject* __set_fire_settings(ICS_HANDLE handle, PyObject* settings, int& save, const char* func_name)
- {
-     try
-     {
-@@ -2156,7 +2156,7 @@
- }
- #define _set_fire_settings(handle, settings, save) __set_fire_settings(handle, settings, save, __FUNCTION__);
- 
--static PyObject* __set_cyan_settings(ICS_HANDLE handle, PyObject* settings, int& save, char* func_name)
-+static PyObject* __set_cyan_settings(ICS_HANDLE handle, PyObject* settings, int& save, const char* func_name)
- {
-     try
-     {
-@@ -2248,7 +2248,7 @@
- }
- #define _set_cyan_settings(handle, settings, save) __set_cyan_settings(handle, settings, save, __FUNCTION__);
- 
--static PyObject* __set_rad_galaxy_settings(ICS_HANDLE handle, PyObject* settings, int& save, char* func_name)
-+static PyObject* __set_rad_galaxy_settings(ICS_HANDLE handle, PyObject* settings, int& save, const char* func_name)
- {
-     try
-     {
-@@ -2324,7 +2324,7 @@
- }
- #define _set_rad_galaxy_settings(handle, settings, save) __set_rad_galaxy_settings(handle, settings, save, __FUNCTION__);
- 
--static PyObject* __set_vividcan_settings(ICS_HANDLE handle, PyObject* settings, int& save, char* func_name)
-+static PyObject* __set_vividcan_settings(ICS_HANDLE handle, PyObject* settings, int& save, const char* func_name)
- {
-     try
-     {
-diff -Naur python_ics-2.15/include/object_vcanrf_settings.h python2-build-x86_64/include/object_vcanrf_settings.h
---- python_ics-2.15/include/object_vcanrf_settings.h	2018-07-16 21:07:55.000000000 +0300
-+++ python2-build-x86_64/include/object_vcanrf_settings.h	2018-12-21 13:24:14.969597400 +0300
-@@ -63,7 +63,7 @@
-     { "idle_wakeup_network_enables_1", T_USHORT, offsetof(vcanrf_settings_object, s.idle_wakeup_network_enables_1), 0, "" },
-     { "idle_wakeup_network_enables_2", T_USHORT, offsetof(vcanrf_settings_object, s.idle_wakeup_network_enables_2), 0, "" },
-     //{ "reservedZero", T_USHORT, offsetof(vcanrf_settings_object, s.reservedZero), 0, "" },
--    { NULL, 0, 0, 0, 0 },
-+    { NULL, 0, 0, 0, NULL },
- };
- 
- static int vcanrf_settings_object_init(vcanrf_settings_object* self, PyObject* args, PyObject* kwds)