Browse Source

Merge pull request #15884 from neheb/dom

domoticz: update to 2021.1 and fix other packages
Rosen Penev 1 month ago
parent
commit
2ed47b5414

+ 1 - 7
libs/jsoncpp/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jsoncpp
 PKG_VERSION:=1.9.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/open-source-parsers/jsoncpp/tar.gz/$(PKG_VERSION)?
@@ -19,9 +19,6 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_PARALLEL:=1
-CMAKE_INSTALL:=1
-
 PKG_BUILD_DEPENDS:=meson/host
 
 include $(INCLUDE_DIR)/package.mk
@@ -49,11 +46,8 @@ endef
 
 MESON_ARGS += \
 	-Db_lto=true \
-	-Dcpp_eh=none \
-	-Dcpp_rtti=false \
 	-Dtests=false
 
-TARGET_CXXFLAGS += -DJSON_USE_EXCEPTION=0
 TARGET_LDFLAGS += -Wl,--gc-sections
 
 define Build/InstallDev

+ 3 - 3
libs/minizip/Makefile

@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minizip-ng
-PKG_VERSION:=3.0.1
+PKG_VERSION:=3.0.2
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/zlib-ng/minizip-ng/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=96c95b274dd535984ce0e87691691388f2b976106e8cf8d527b15da552ac94e4
+PKG_HASH:=6ba4b6629c107c27ab526e517bdb105612232f0965a6747f60150e5a04c2fe5a
 
 PKG_MAINTAINER:=David Woodhouse <dwmw2@infradead.org>
 PKG_LICENSE:=Zlib
@@ -26,7 +26,7 @@ CMAKE_OPTIONS += \
 	-DINSTALL_INC_DIR=/usr/include/minizip \
 	-DBUILD_SHARED_LIBS=ON \
 	-DMZ_BZIP2=OFF \
-	-DMZ_COMPAT=OFF \
+	-DMZ_COMPAT=ON \
 	-DMZ_ICONV=OFF \
 	-DMZ_LIBBSD=OFF \
 	-DMZ_LZMA=OFF \

+ 8 - 5
utils/domoticz/Makefile

@@ -8,13 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=domoticz
-PKG_VERSION:=2020.2
-PKG_RELEASE:=3
+PKG_VERSION:=2021.1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/domoticz/domoticz/archive/$(PKG_VERSION)/$(PKG_SOURCE)
-PKG_HASH:=a02f589daad4eebff1f5e93815c1acd1864cf068f8f5c3185bcdd20207ae395e
+PKG_HASH:=c4dc3455edae8bf00d2e950002f70d5b90ac577b1559ef7ada6870d970069fbb
 
+PKG_MAINTAINER:=David Woodhouse <dwmw2@infradead.org>
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=License.txt
 
@@ -29,7 +30,6 @@ define Package/domoticz
   CATEGORY:=Utilities
   TITLE:=Open Source Home Automation System
   URL:=http://domoticz.com/
-  MAINTAINER:=David Woodhouse <dwmw2@infradead.org>
   USERID:=domoticz=6144:domoticz=6144
   DEPENDS:= \
 	+boost \
@@ -39,8 +39,9 @@ define Package/domoticz
 	+jsoncpp \
 	+libcurl \
 	+python3 \
-	+minizip @BROKEN \
+	+minizip \
 	+lua5.3 \
+	+libfmt \
 	+libmosquitto \
 	+libopenssl \
 	+libopenzwave \
@@ -57,11 +58,13 @@ endef
 CMAKE_OPTIONS += \
 	-DBUILD_SHARED_LIBS=yes \
 	-DBoost_NO_BOOST_CMAKE=yes \
+	-DGIT_SUBMODULE=no \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DUSE_BUILTIN_MQTT=no \
 	-DUSE_BUILTIN_SQLITE=no \
 	-DUSE_BUILTIN_JSONCPP=no \
 	-DUSE_BUILTIN_MINIZIP=no \
+	-DUSE_BUILTIN_LIBFMT=no \
 	-DUSE_LUA_STATIC=no \
 	-DUSE_STATIC_BOOST=no \
 	-DUSE_STATIC_LIBSTDCXX=no \

+ 0 - 742
utils/domoticz/patches/010-boost-173.patch

@@ -1,742 +0,0 @@
-From bbcf7fd0646d74b7f169b3aa4231d9150028ed0d Mon Sep 17 00:00:00 2001
-From: Rob Peters <info@domoticz.com>
-Date: Sun, 17 May 2020 11:46:37 +0200
-Subject: [PATCH] Avoid deprecated bind placeholders in global namespace
-
----
- hardware/ASyncSerial.cpp              | 2 +-
- hardware/ASyncTCP.cpp                 | 4 +++-
- hardware/Comm5Serial.cpp              | 2 ++
- hardware/CurrentCostMeterSerial.cpp   | 4 +++-
- hardware/DavisLoggerSerial.cpp        | 4 +++-
- hardware/DenkoviUSBDevices.cpp        | 2 ++
- hardware/EnOceanESP2.cpp              | 4 +++-
- hardware/EnOceanESP3.cpp              | 4 +++-
- hardware/EvohomeRadio.cpp             | 3 +++
- hardware/EvohomeSerial.cpp            | 2 ++
- hardware/KMTronic433.cpp              | 4 +++-
- hardware/KMTronicBase.cpp             | 2 +-
- hardware/KMTronicSerial.cpp           | 4 +++-
- hardware/MQTT.cpp                     | 2 ++
- hardware/Meteostick.cpp               | 4 +++-
- hardware/MySensorsBase.cpp            | 2 +-
- hardware/MySensorsSerial.cpp          | 4 +++-
- hardware/OTGWBase.cpp                 | 2 +-
- hardware/OTGWSerial.cpp               | 4 +++-
- hardware/OpenWebNetUSB.cpp            | 3 ++-
- hardware/P1MeterSerial.cpp            | 4 +++-
- hardware/Pinger.cpp                   | 2 ++
- hardware/RAVEn.cpp                    | 2 ++
- hardware/RFLinkSerial.cpp             | 2 ++
- hardware/RFXComSerial.cpp             | 4 +++-
- hardware/RFXComTCP.cpp                | 2 --
- hardware/Rego6XXSerial.cpp            | 4 +++-
- hardware/S0MeterBase.cpp              | 2 +-
- hardware/S0MeterSerial.cpp            | 4 +++-
- hardware/TCPProxy/tcpproxy_server.cpp | 2 ++
- hardware/TeleinfoSerial.cpp           | 4 +++-
- hardware/USBtin.cpp                   | 4 +++-
- hardware/XiaomiGateway.cpp            | 2 +-
- hardware/Yeelight.h                   | 1 -
- hardware/ZiBlueSerial.cpp             | 2 ++
- hardware/plugins/PluginTransports.cpp | 2 ++
- main/WebServer.cpp                    | 4 +++-
- main/mainworker.cpp                   | 2 ++
- push/FibaroPush.cpp                   | 2 ++
- push/GooglePubSubPush.cpp             | 2 ++
- push/HttpPush.cpp                     | 2 ++
- push/InfluxPush.cpp                   | 2 ++
- push/WebsocketPush.cpp                | 2 ++
- tcpserver/TCPServer.cpp               | 2 +-
- webserver/cWebem.cpp                  | 2 +-
- webserver/connection.cpp              | 4 +++-
- webserver/connection_manager.cpp      | 4 +++-
- webserver/proxyclient.cpp             | 2 ++
- webserver/server.cpp                  | 4 +++-
- 49 files changed, 107 insertions(+), 32 deletions(-)
-
---- a/hardware/ASyncSerial.cpp
-+++ b/hardware/ASyncSerial.cpp
-@@ -34,7 +34,7 @@
- #include <algorithm>
- #include <iostream>
- #include <boost/asio.hpp>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/function.hpp>
- #include <boost/thread.hpp>
- #include <boost/smart_ptr/shared_array.hpp>  // for shared_array
---- a/hardware/ASyncTCP.cpp
-+++ b/hardware/ASyncTCP.cpp
-@@ -1,10 +1,12 @@
- #include "stdafx.h"
- #include "ASyncTCP.h"
- #include <boost/asio.hpp>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/system/error_code.hpp>     // for error_code
- #include "../main/Logger.h"
- 
-+//using namespace boost::placeholders;
-+
- struct hostent;
- 
- #ifndef WIN32
---- a/hardware/Comm5Serial.cpp
-+++ b/hardware/Comm5Serial.cpp
-@@ -5,6 +5,8 @@
- #include "../main/Logger.h"
- #include "../main/RFXtrx.h"
- 
-+using namespace boost::placeholders;
-+
- /*
- 	This driver allows Domoticz to control any I/O module from the MA-4xxx Family
- 
---- a/hardware/CurrentCostMeterSerial.cpp
-+++ b/hardware/CurrentCostMeterSerial.cpp
-@@ -10,10 +10,12 @@
- 
- #include <string>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- 
- #include <ctime>
- 
-+using namespace boost::placeholders;
-+
- //
- //Class CurrentCostMeterSerial
- //
---- a/hardware/DavisLoggerSerial.cpp
-+++ b/hardware/DavisLoggerSerial.cpp
-@@ -8,13 +8,15 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- 
- #include "../main/localtime_r.h"
- #include "../main/mainworker.h"
- 
- #include <ctime>
- 
-+using namespace boost::placeholders;
-+
- #ifdef _DEBUG
- //#define DEBUG_DAVIS
- #endif
---- a/hardware/DenkoviUSBDevices.cpp
-+++ b/hardware/DenkoviUSBDevices.cpp
-@@ -5,6 +5,8 @@
- #include "../main/localtime_r.h"
- #include "../main/mainworker.h"
- 
-+using namespace boost::placeholders;
-+
- #define MAX_POLL_INTERVAL 3600*1000
- 
- #define DAE_IO_TYPE_RELAY		2
---- a/hardware/EnOceanESP2.cpp
-+++ b/hardware/EnOceanESP2.cpp
-@@ -8,7 +8,7 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include "hardwaretypes.h"
- #include "../main/localtime_r.h"
- 
-@@ -16,6 +16,8 @@
- #include <cmath>
- #include <ctime>
- 
-+using namespace boost::placeholders;
-+
- #define ENOCEAN_RETRY_DELAY 30
- 
- #define round(a) ( int ) ( a + .5 )
---- a/hardware/EnOceanESP3.cpp
-+++ b/hardware/EnOceanESP3.cpp
-@@ -8,7 +8,7 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include "hardwaretypes.h"
- #include "../main/localtime_r.h"
- 
-@@ -16,6 +16,8 @@
- #include <cmath>
- #include <ctime>
- 
-+using namespace boost::placeholders;
-+
- #if _DEBUG
- 	#define ENOCEAN_BUTTON_DEBUG
- #endif
---- a/hardware/EvohomeRadio.cpp
-+++ b/hardware/EvohomeRadio.cpp
-@@ -23,6 +23,9 @@
- #include "../main/WebServer.h"
- #include "../webserver/cWebem.h"
- #include <json/json.h>
-+#include <boost/bind/bind.hpp>
-+
-+using namespace boost::placeholders;
- 
- extern std::string szUserDataFolder;
- 
---- a/hardware/EvohomeSerial.cpp
-+++ b/hardware/EvohomeSerial.cpp
-@@ -7,6 +7,8 @@
- #include "../main/localtime_r.h"
- #include <boost/exception/diagnostic_information.hpp>
- 
-+using namespace boost::placeholders;
-+
- CEvohomeSerial::CEvohomeSerial(const int ID, const std::string &szSerialPort, const int baudrate, const std::string &UserContID) :
- CEvohomeRadio(ID, UserContID)
- {
---- a/hardware/KMTronic433.cpp
-+++ b/hardware/KMTronic433.cpp
-@@ -9,11 +9,13 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/exception/diagnostic_information.hpp>
- 
- #include <ctime>
- 
-+using namespace boost::placeholders;
-+
- //#define DEBUG_KMTronic
- 
- #define RETRY_DELAY 30
---- a/hardware/KMTronicBase.cpp
-+++ b/hardware/KMTronicBase.cpp
-@@ -10,7 +10,7 @@
- #include <sstream>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- 
- #include <ctime>
- 
---- a/hardware/KMTronicSerial.cpp
-+++ b/hardware/KMTronicSerial.cpp
-@@ -10,12 +10,14 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/exception/diagnostic_information.hpp>
- #include <ctime>
- 
- //#define DEBUG_KMTronic
- 
-+using namespace boost::placeholders;
-+
- #define RETRY_DELAY 30
- 
- KMTronicSerial::KMTronicSerial(const int ID, const std::string& devname)
---- a/hardware/MQTT.cpp
-+++ b/hardware/MQTT.cpp
-@@ -11,6 +11,8 @@
- #define __STDC_FORMAT_MACROS
- #include <inttypes.h>
- 
-+using namespace boost::placeholders;
-+
- #define RETRY_DELAY 30
- 
- #define CLIENTID	"Domoticz"
---- a/hardware/Meteostick.cpp
-+++ b/hardware/Meteostick.cpp
-@@ -9,12 +9,14 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include "../main/localtime_r.h"
- #include "../main/mainworker.h"
- 
- #include <ctime>
- 
-+using namespace boost::placeholders;
-+
- #define RETRY_DELAY 30
- 
- #define round(a) ( int ) ( a + .5 )
---- a/hardware/MySensorsBase.cpp
-+++ b/hardware/MySensorsBase.cpp
-@@ -13,7 +13,7 @@
- #include <sstream>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include "../webserver/cWebem.h"
- #include <json/json.h>
- 
---- a/hardware/MySensorsSerial.cpp
-+++ b/hardware/MySensorsSerial.cpp
-@@ -8,12 +8,14 @@
- #include "hardwaretypes.h"
- 
- #include <algorithm>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/exception/diagnostic_information.hpp>
- #include <ctime>
- #include <iostream>
- #include <string>
- 
-+using namespace boost::placeholders;
-+
- //#define DEBUG_MYSENSORS
- 
- #define RETRY_DELAY 30
---- a/hardware/OTGWBase.cpp
-+++ b/hardware/OTGWBase.cpp
-@@ -12,7 +12,7 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <json/json.h>
- 
- #include <ctime>
---- a/hardware/OTGWSerial.cpp
-+++ b/hardware/OTGWSerial.cpp
-@@ -8,12 +8,14 @@
- #include "../main/localtime_r.h"
- 
- #include <algorithm>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/exception/diagnostic_information.hpp>
- #include <ctime>
- #include <iostream>
- #include <string>
- 
-+using namespace boost::placeholders;
-+
- #define RETRY_DELAY 30
- #define OTGW_READ_INTERVAL 10
- 
---- a/hardware/OpenWebNetUSB.cpp
-+++ b/hardware/OpenWebNetUSB.cpp
-@@ -19,11 +19,12 @@ License: Public domain
- 
- #include <algorithm>
- #include <ctime>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/exception/diagnostic_information.hpp>
- #include <iostream>
- #include <string>
- 
-+using namespace boost::placeholders;
- 
- COpenWebNetUSB::COpenWebNetUSB(const int ID, const std::string& devname, unsigned int baud_rate)
- {
---- a/hardware/P1MeterSerial.cpp
-+++ b/hardware/P1MeterSerial.cpp
-@@ -14,10 +14,12 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- 
- #include <ctime>
- 
-+using namespace boost::placeholders;
-+
- #ifdef _DEBUG
- //#define DEBUG_P1_R
- #endif
---- a/hardware/Pinger.cpp
-+++ b/hardware/Pinger.cpp
-@@ -19,6 +19,8 @@
- 
- #include <iostream>
- 
-+using namespace boost::placeholders;
-+
- #if BOOST_VERSION >= 107000
- #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
- #else
---- a/hardware/RAVEn.cpp
-+++ b/hardware/RAVEn.cpp
-@@ -8,6 +8,8 @@
- #include "../tinyxpath/tinyxml.h"
- #include "hardwaretypes.h"
- 
-+using namespace boost::placeholders;
-+
- //Rainforest RAVEn USB ZigBee Smart Meter Adapter
- //https://rainforestautomation.com/rfa-z106-raven/
- 
---- a/hardware/RFLinkSerial.cpp
-+++ b/hardware/RFLinkSerial.cpp
-@@ -5,6 +5,8 @@
- #include "../main/localtime_r.h"
- #include <boost/exception/diagnostic_information.hpp>
- 
-+using namespace boost::placeholders;
-+
- CRFLinkSerial::CRFLinkSerial(const int ID, const std::string& devname) :
- m_szSerialPort(devname)
- {
---- a/hardware/RFXComSerial.cpp
-+++ b/hardware/RFXComSerial.cpp
-@@ -12,7 +12,7 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- 
- #include <ctime>
- 
-@@ -23,6 +23,8 @@
- #include <pwd.h>
- #endif
- 
-+using namespace boost::placeholders;
-+
- #define RETRY_DELAY 30
- 
- #define RFX_WRITE_DELAY 300
---- a/hardware/RFXComTCP.cpp
-+++ b/hardware/RFXComTCP.cpp
-@@ -1,8 +1,6 @@
- #include "stdafx.h"
- #include "RFXComTCP.h"
- #include "../main/Logger.h"
--//#include <boost/bind.hpp>
--//#include <boost/asio.hpp>
- #include "../main/Helper.h"
- #include "../main/localtime_r.h"
- #include "../main/mainworker.h"
---- a/hardware/Rego6XXSerial.cpp
-+++ b/hardware/Rego6XXSerial.cpp
-@@ -16,11 +16,13 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include "hardwaretypes.h"
- 
- #include <ctime>
- 
-+using namespace boost::placeholders;
-+
- #define Rego6XX_RETRY_DELAY 30
- #define Rego6XX_COMMAND_DELAY 5
- #define Rego6XX_READ_BUFFER_MASK (Rego6XX_READ_BUFFER_SIZE - 1)
---- a/hardware/S0MeterBase.cpp
-+++ b/hardware/S0MeterBase.cpp
-@@ -13,7 +13,7 @@
- #include <string>
- #include <algorithm>
- #include <iostream>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- 
- #include <ctime>
- 
---- a/hardware/S0MeterSerial.cpp
-+++ b/hardware/S0MeterSerial.cpp
-@@ -8,11 +8,13 @@
- 
- #include <algorithm>
- #include <ctime>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/exception/diagnostic_information.hpp>
- #include <iostream>
- #include <string>
- 
-+using namespace boost::placeholders;
-+
- #ifdef _DEBUG
- 	//#define DEBUG_S0
- 	#define TOT_DEBUG_LINES 6
---- a/hardware/TCPProxy/tcpproxy_server.cpp
-+++ b/hardware/TCPProxy/tcpproxy_server.cpp
-@@ -15,6 +15,8 @@
- #include "stdafx.h"
- #include "tcpproxy_server.h"
- 
-+using namespace boost::placeholders;
-+
- #if BOOST_VERSION >= 107000
- #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
- #else
---- a/hardware/TeleinfoSerial.cpp
-+++ b/hardware/TeleinfoSerial.cpp
-@@ -28,9 +28,11 @@ History :
- #include "../main/localtime_r.h"
- #include "../main/Logger.h"
- 
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/exception/diagnostic_information.hpp>
- 
-+using namespace boost::placeholders;
-+
- CTeleinfoSerial::CTeleinfoSerial(const int ID, const std::string& devname, const int datatimeout, unsigned int baud_rate, const bool disable_crc, const int ratelimit)
- {
- 	m_HwdID = ID;
---- a/hardware/USBtin.cpp
-+++ b/hardware/USBtin.cpp
-@@ -27,7 +27,7 @@ History :
- #include "../main/SQLHelper.h"
- 
- #include <algorithm>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/exception/diagnostic_information.hpp>
- #include <cstdlib>
- #include <ctime>
-@@ -35,6 +35,8 @@ History :
- #include <string>
- #include <time.h>
- 
-+using namespace boost::placeholders;
-+
- #define USBTIN_BAUD_RATE         115200
- #define USBTIN_PARITY            boost::asio::serial_port_base::parity::none
- #define USBTIN_CARACTER_SIZE      8
---- a/hardware/XiaomiGateway.cpp
-+++ b/hardware/XiaomiGateway.cpp
-@@ -12,7 +12,7 @@
- #include "XiaomiHardware.h"
- #include <openssl/aes.h>
- #include <boost/asio.hpp>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- 
- #ifndef WIN32
- #include <ifaddrs.h>
---- a/hardware/Yeelight.h
-+++ b/hardware/Yeelight.h
-@@ -2,7 +2,6 @@
- 
- #include "DomoticzHardware.h"
- #include <boost/asio.hpp>
--#include <boost/bind.hpp>
- 
- class Yeelight : public CDomoticzHardwareBase
- {
---- a/hardware/ZiBlueSerial.cpp
-+++ b/hardware/ZiBlueSerial.cpp
-@@ -6,6 +6,8 @@
- 
- #include <boost/exception/diagnostic_information.hpp>
- 
-+using namespace boost::placeholders;
-+
- #define ZiBlue_RETRY_DELAY 30
- 
- CZiBlueSerial::CZiBlueSerial(const int ID, const std::string& devname) :
---- a/hardware/plugins/PluginTransports.cpp
-+++ b/hardware/plugins/PluginTransports.cpp
-@@ -13,6 +13,8 @@
- #include "icmp_header.hpp"
- #include "ipv4_header.hpp"
- 
-+using namespace boost::placeholders;
-+
- namespace Plugins {
- 
- 	void CPluginTransport::handleRead(const boost::system::error_code& e, std::size_t bytes_transferred)
---- a/main/WebServer.cpp
-+++ b/main/WebServer.cpp
-@@ -1,7 +1,7 @@
- #include "stdafx.h"
- #include "WebServer.h"
- #include "WebServerHelper.h"
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <iostream>
- #include <fstream>
- #include "mainworker.h"
-@@ -65,6 +65,8 @@
- #define __STDC_FORMAT_MACROS
- #include <inttypes.h>
- 
-+using namespace boost::placeholders;
-+
- #define round(a) ( int ) ( a + .5 )
- 
- extern std::string szStartupFolder;
---- a/main/mainworker.cpp
-+++ b/main/mainworker.cpp
-@@ -174,6 +174,8 @@
- #include <fstream>
- #endif
- 
-+using namespace boost::placeholders;
-+
- #define round(a) ( int ) ( a + .5 )
- 
- extern std::string szStartupFolder;
---- a/push/FibaroPush.cpp
-+++ b/push/FibaroPush.cpp
-@@ -14,6 +14,8 @@
- #define __STDC_FORMAT_MACROS
- #include <inttypes.h>
- 
-+using namespace boost::placeholders;
-+
- CFibaroPush::CFibaroPush()
- {
- 	m_PushType = PushType::PUSHTYPE_FIBARO;
---- a/push/GooglePubSubPush.cpp
-+++ b/push/GooglePubSubPush.cpp
-@@ -21,6 +21,8 @@ extern "C" {
- #include <boost/python.hpp>
- #endif
- 
-+using namespace boost::placeholders;
-+
- extern std::string szUserDataFolder;
- 
- // this should be filled in by the preprocessor
---- a/push/HttpPush.cpp
-+++ b/push/HttpPush.cpp
-@@ -15,6 +15,8 @@
- #define __STDC_FORMAT_MACROS
- #include <inttypes.h>
- 
-+using namespace boost::placeholders;
-+
- CHttpPush::CHttpPush()
- {
- 	m_PushType = PushType::PUSHTYPE_HTTP;
---- a/push/InfluxPush.cpp
-+++ b/push/InfluxPush.cpp
-@@ -15,6 +15,8 @@
- #define __STDC_FORMAT_MACROS
- #include <inttypes.h>
- 
-+using namespace boost::placeholders;
-+
- CInfluxPush::CInfluxPush() :
- 	m_InfluxPort(8086),
- 	m_bInfluxDebugActive(false)
---- a/push/WebsocketPush.cpp
-+++ b/push/WebsocketPush.cpp
-@@ -3,6 +3,8 @@
- #include "../webserver/WebsocketHandler.h"
- #include "../main/mainworker.h"
- 
-+using namespace boost::placeholders;
-+
- extern boost::signals2::signal<void(const std::string &Subject, const std::string &Text, const std::string &ExtraData, const int Priority, const std::string & Sound, const bool bFromNotification)> sOnNotificationReceived;
- 
- 
---- a/tcpserver/TCPServer.cpp
-+++ b/tcpserver/TCPServer.cpp
-@@ -11,7 +11,7 @@
- #include "../main/localtime_r.h"
- #include <boost/asio.hpp>
- #include <algorithm>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- 
- namespace tcp {
- namespace server {
---- a/webserver/cWebem.cpp
-+++ b/webserver/cWebem.cpp
-@@ -5,7 +5,7 @@
- //Modified, extended etc by Robbert E. Peters/RTSS B.V.
- #include "stdafx.h"
- #include "cWebem.h"
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include "reply.hpp"
- #include "request.hpp"
- #include "mime_types.hpp"
---- a/webserver/connection.cpp
-+++ b/webserver/connection.cpp
-@@ -9,7 +9,7 @@
- //
- #include "stdafx.h"
- #include "connection.hpp"
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/algorithm/string.hpp>
- #include "connection_manager.hpp"
- #include "request_handler.hpp"
-@@ -17,6 +17,8 @@
- #include "../main/localtime_r.h"
- #include "../main/Logger.h"
- 
-+using namespace boost::placeholders;
-+
- namespace http {
- 	namespace server {
- 		extern std::string convert_to_http_date(time_t time);
---- a/webserver/connection_manager.cpp
-+++ b/webserver/connection_manager.cpp
-@@ -10,10 +10,12 @@
- #include "stdafx.h"
- #include "connection_manager.hpp"
- #include <algorithm>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <iostream>
- #include "../main/Logger.h"
- 
-+using namespace boost::placeholders;
-+
- namespace http {
- namespace server {
- 
---- a/webserver/proxyclient.cpp
-+++ b/webserver/proxyclient.cpp
-@@ -8,6 +8,8 @@
- #include "../tcpserver/TCPServer.h"
- #include "sha1.hpp"
- 
-+using namespace boost::placeholders;
-+
- // RK: some defines to make mydomoticz also work when openssl not compiled in
- #ifdef WWW_ENABLE_SSL
- #define PROXY_PORT 443
---- a/webserver/server.cpp
-+++ b/webserver/server.cpp
-@@ -3,7 +3,7 @@
- // ~~~~~~~~~~
- //
- #include "stdafx.h"
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include "server.hpp"
- #include <fstream>
- #include "../main/Logger.h"
-@@ -11,6 +11,8 @@
- #include "../main/localtime_r.h"
- #include "../main/mainworker.h"
- 
-+using namespace boost::placeholders;
-+
- extern bool g_bIsWSL;
- 
- namespace http {

+ 0 - 118
utils/domoticz/patches/011-openzwave-include.patch

@@ -1,118 +0,0 @@
-From 632695fe3ee704c1c1c539d79172ac0f9f9ce77b Mon Sep 17 00:00:00 2001
-From: David Woodhouse <dwmw2@infradead.org>
-Date: Thu, 4 Jun 2020 12:41:27 +0100
-Subject: [PATCH] Fix up OpenZWave include path handling
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The path specified by the pkg-config file will be, for example,
-/usr/include/openzwave.
-
-That directory needs to be on the compiler's include path, because
-OpenZWave's own include files assume they can include each other
-simply as (e.g.) "ValueIDIndexes.h"; not "openzwave/ValueIDIndexes.h"
-
-Our own files do include <openzwave/Foo.h> though, which means that
-the *parent* directory needs to be on the compilers's include path
-too. We generally get lucky because /usr/include is automatically
-included, so we find /usr/include/openzwave/Foo.h anyway.
-
-Fix our C files to rely on the correct include path discovered from
-pkg-config, and to include OpenZWave headers by name without the
-erroneous openzwave/ prefix.
-
-That means we can fix the ../open-zwave-read-only static build to use
-the header files directly from there just like it does the static
-library .a file, without requiring the 'sudo make install' step — and
-without suffering a mismatch of static openzwave build vs. headers of
-a different version that were installed on the system, which could
-previously happen.
-
-Tested with both static and dynamic builds of OpenZWave.
----
- CMakeLists.txt                             | 11 ++++-------
- hardware/OpenZWave.cpp                     |  8 ++++----
- hardware/openzwave/control_panel/ozwcp.cpp | 10 +++++-----
- hardware/openzwave/control_panel/ozwcp.h   |  4 ++--
- 4 files changed, 15 insertions(+), 18 deletions(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -694,6 +694,7 @@ endif(WITH_LIBUSB)
- #
- if(USE_STATIC_OPENZWAVE)
-   find_library(OpenZWave NAMES libopenzwave.a HINTS "../open-zwave-read-only" "../open-zwave-read-only/cpp/build")
-+  find_path(OPENZWAVE_INCLUDE_DIRS NAMES OZWException.h HINTS "../open-zwave-read-only/cpp/src")
-   set(OPENZWAVE_LIB ${OpenZWave})
- else()
-   pkg_check_modules(OPENZWAVE libopenzwave)
-@@ -707,16 +708,12 @@ IF(OpenZWave)
-   message(STATUS "OpenZWave library found at: ${OpenZWave}")
-   target_link_libraries(domoticz ${OpenZWave})
- 
--  find_path(OPENZWAVE_INCLUDE_DIRS NAMES openzwave/Manager.h)
-+  find_path(OPENZWAVE_INCLUDE_DIRS NAMES OZWException.h)
-   if (OPENZWAVE_INCLUDE_DIRS)
--    IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
--      include_directories(${OPENZWAVE_INCLUDE_DIRS})
--    ELSE()
--      include_directories(${OPENZWAVE_INCLUDE_DIRS}/openzwave)
--    ENDIF()
-+    include_directories(${OPENZWAVE_INCLUDE_DIRS})
-     message(STATUS "OpenZWave includes found at: ${OPENZWAVE_INCLUDE_DIRS}")
-   else()
--    message(FATAL_ERROR "OpenZWave includes not found. Did you not issue 'sudo make install' after building OpenZWave?")
-+    message(FATAL_ERROR "OpenZWave includes not found.")
-   endif (OPENZWAVE_INCLUDE_DIRS)
-   add_definitions(-DWITH_OPENZWAVE)
- ELSE()
---- a/hardware/OpenZWave.cpp
-+++ b/hardware/OpenZWave.cpp
-@@ -22,10 +22,10 @@
- #include "../main/localtime_r.h"
- 
- //OpenZWave includes
--#include <openzwave/Options.h>
--#include <openzwave/Manager.h>
--#include <openzwave/platform/Log.h>
--#include <openzwave/ValueIDIndexesDefines.h>
-+#include <Options.h>
-+#include <Manager.h>
-+#include <platform/Log.h>
-+#include <ValueIDIndexesDefines.h>
- 
- #include "ZWaveCommands.h"
- 
---- a/hardware/openzwave/control_panel/ozwcp.cpp
-+++ b/hardware/openzwave/control_panel/ozwcp.cpp
-@@ -39,11 +39,11 @@
- #include <stdlib.h>
- #include <time.h>
- #include <string.h>
--#include <openzwave/Options.h>
--#include <openzwave/Manager.h>
--#include <openzwave/Node.h>
--#include <openzwave/Group.h>
--#include <openzwave/Notification.h>
-+#include <Options.h>
-+#include <Manager.h>
-+#include <Node.h>
-+#include <Group.h>
-+#include <Notification.h>
- #include "../../../main/Logger.h"
- 
- #include <sys/stat.h>
---- a/hardware/openzwave/control_panel/ozwcp.h
-+++ b/hardware/openzwave/control_panel/ozwcp.h
-@@ -38,8 +38,8 @@
- 
- #include <list>
- #include <algorithm>
--#include <openzwave/Driver.h>
--#include <openzwave/Notification.h>
-+#include <Driver.h>
-+#include <Notification.h>
- 
- #define MAX_NODES 255
- 

+ 1 - 1
utils/domoticz/patches/012-minizip-overflow.patch

@@ -30,7 +30,7 @@ Reduce the buffer size to 65535 bytes instead.
 
 --- a/main/unzip_stream.h
 +++ b/main/unzip_stream.h
-@@ -135,7 +135,7 @@ namespace clx {
+@@ -143,7 +143,7 @@ namespace clx {
  		basic_unzip_stream& open(handler_type h) {
  			handler_ = h;
  			if (handler_) {

+ 0 - 27
utils/domoticz/patches/020-python39.patch

@@ -1,27 +0,0 @@
---- a/hardware/plugins/DelayedLink.h
-+++ b/hardware/plugins/DelayedLink.h
-@@ -14,6 +14,16 @@
- #include <frameobject.h>
- #include "../../main/Helper.h"
- 
-+#ifndef _Py_DEC_REFTOTAL
-+  /* _Py_DEC_REFTOTAL macro has been removed from Python 3.9 by:
-+    https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 */
-+#  ifdef Py_REF_DEBUG
-+#    define _Py_DEC_REFTOTAL _Py_RefTotal--
-+#  else
-+#    define _Py_DEC_REFTOTAL
-+#  endif
-+#endif
-+
- #if PY_VERSION_HEX >= 0x030800f0
- static inline void
- py3__Py_DECREF(const char *filename, int lineno, PyObject *op)
-@@ -195,6 +205,7 @@ namespace Plugins {
- 				if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll");
- #	endif
- #else
-+				if (!shared_lib_) FindLibrary("python3.9", true);
- 				if (!shared_lib_) FindLibrary("python3.8", true);
- 				if (!shared_lib_) FindLibrary("python3.7", true);
- 				if (!shared_lib_) FindLibrary("python3.6", true);