- rel 4; fix python 3.8 build

diff --git a/domoticz-python.patch b/domoticz-python.patch
index 9ef3e7ef4e9eeb02a94078ad08b13a8e5f9e6dc9..2c44d5b3dc650a036e60f9b5d367b9e4b5220a06 100644 (file)
--- a/domoticz-python.patch
+++ b/domoticz-python.patch
@@ -60,3 +60,67 @@ diff -urN domoticz-4.10717.orig/hardware/plugins/DelayedLink.h domoticz-4.10717/
                                        // MacOS
                                        // look for .dylib in /usr/local/lib
                                        if (!shared_lib_)
+From e9bd383ceb63db7cfe8a284014f0cdf8c2bfe4f0 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 1 Nov 2019 10:54:11 +0100
+Subject: [PATCH] DelayedLink.h: fix build with python 3.8
+
+Fix build with python 3.8 by copy/pasting the vim workaround from
+https://github.com/vim/vim/commit/13a1f3fb0c9d08bba6109fe2131c9524e6ba7e15
+
+Fix 3703
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ hardware/plugins/DelayedLink.h | 38 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+
+diff --git a/hardware/plugins/DelayedLink.h b/hardware/plugins/DelayedLink.h
+index 4bf1973281..c90a7d8e69 100644
+--- a/hardware/plugins/DelayedLink.h
++++ b/hardware/plugins/DelayedLink.h
+@@ -14,6 +14,44 @@
+ #include <frameobject.h>
+ #include "../../main/Helper.h"
+ 
++#if PY_VERSION_HEX >= 0x030800f0
++static inline void
++py3__Py_DECREF(const char *filename, int lineno, PyObject *op)
++{
++      (void)filename; /* may be unused, shut up -Wunused-parameter */
++      (void)lineno; /* may be unused, shut up -Wunused-parameter */
++      _Py_DEC_REFTOTAL;
++      if (--op->ob_refcnt != 0)
++      {
++#ifdef Py_REF_DEBUG
++      if (op->ob_refcnt < 0)
++      {
++              _Py_NegativeRefcount(filename, lineno, op);
++      }
++#endif
++      }
++      else
++      {
++              _Py_Dealloc(op);
++      }
++}
++
++#undef Py_DECREF
++#define Py_DECREF(op) py3__Py_DECREF(__FILE__, __LINE__, _PyObject_CAST(op))
++
++static inline void
++py3__Py_XDECREF(PyObject *op)
++{
++      if (op != NULL)
++      {
++              Py_DECREF(op);
++      }
++}
++
++#undef Py_XDECREF
++#define Py_XDECREF(op) py3__Py_XDECREF(_PyObject_CAST(op))
++#endif
++
+ namespace Plugins {
+ 
+ #ifdef WIN32

diff --git a/domoticz.spec b/domoticz.spec
index c7e5c9b96530dc636630180d53cd5e23e11a8112..df1ddb167e30d913eabbb30b239d89ec00f975ec 100644 (file)
--- a/domoticz.spec
+++ b/domoticz.spec
@@ -1,7 +1,7 @@
 Summary:       Open source Home Automation System
 Name:          domoticz
 Version:       4.10717
-Release:       3
+Release:       4
 License:       GPLv3+ and ASL 2.0 and Boost and BSD and MIT
 Group:         Base
 URL:           http://www.domoticz.com