diff options
| author | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
|---|---|---|
| committer | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
| commit | 5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch) | |
| tree | d0754921833f413b7eb93fb6bb1b1c8a22fb0498 /utils/domoticz | |
| parent | d651082447b4392399a40ea1ae11d0bce4bfe83a (diff) | |
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:
find -L package/feeds/packages/ -name patches | \
sed 's/patches$/refresh/' | sort | xargs make
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'utils/domoticz')
| -rw-r--r-- | utils/domoticz/patches/010-boost-173.patch | 98 | ||||
| -rw-r--r-- | utils/domoticz/patches/011-openzwave-include.patch | 11 | ||||
| -rw-r--r-- | utils/domoticz/patches/012-minizip-overflow.patch | 5 |
3 files changed, 0 insertions, 114 deletions
diff --git a/utils/domoticz/patches/010-boost-173.patch b/utils/domoticz/patches/010-boost-173.patch index b1e0561360..6c98abe00 100644 --- a/utils/domoticz/patches/010-boost-173.patch +++ b/utils/domoticz/patches/010-boost-173.patch @@ -55,8 +55,6 @@ Subject: [PATCH] Avoid deprecated bind placeholders in global namespace webserver/server.cpp | 4 +++- 49 files changed, 107 insertions(+), 32 deletions(-) -diff --git a/hardware/ASyncSerial.cpp b/hardware/ASyncSerial.cpp -index 2c9a5e27e9..36dd402fa7 100644 --- a/hardware/ASyncSerial.cpp +++ b/hardware/ASyncSerial.cpp @@ -34,7 +34,7 @@ @@ -68,8 +66,6 @@ index 2c9a5e27e9..36dd402fa7 100644 #include <boost/function.hpp> #include <boost/thread.hpp> #include <boost/smart_ptr/shared_array.hpp> // for shared_array -diff --git a/hardware/ASyncTCP.cpp b/hardware/ASyncTCP.cpp -index 8990c24300..7f7b1e0f24 100644 --- a/hardware/ASyncTCP.cpp +++ b/hardware/ASyncTCP.cpp @@ -1,10 +1,12 @@ @@ -86,8 +82,6 @@ index 8990c24300..7f7b1e0f24 100644 struct hostent; #ifndef WIN32 -diff --git a/hardware/Comm5Serial.cpp b/hardware/Comm5Serial.cpp -index 9b44496fb5..f1c1f706d2 100644 --- a/hardware/Comm5Serial.cpp +++ b/hardware/Comm5Serial.cpp @@ -5,6 +5,8 @@ @@ -99,8 +93,6 @@ index 9b44496fb5..f1c1f706d2 100644 /* This driver allows Domoticz to control any I/O module from the MA-4xxx Family -diff --git a/hardware/CurrentCostMeterSerial.cpp b/hardware/CurrentCostMeterSerial.cpp -index 05bac73d6a..bf9d35cab7 100644 --- a/hardware/CurrentCostMeterSerial.cpp +++ b/hardware/CurrentCostMeterSerial.cpp @@ -10,10 +10,12 @@ @@ -117,8 +109,6 @@ index 05bac73d6a..bf9d35cab7 100644 // //Class CurrentCostMeterSerial // -diff --git a/hardware/DavisLoggerSerial.cpp b/hardware/DavisLoggerSerial.cpp -index 9c44539beb..44c9dbde5c 100644 --- a/hardware/DavisLoggerSerial.cpp +++ b/hardware/DavisLoggerSerial.cpp @@ -8,13 +8,15 @@ @@ -138,8 +128,6 @@ index 9c44539beb..44c9dbde5c 100644 #ifdef _DEBUG //#define DEBUG_DAVIS #endif -diff --git a/hardware/DenkoviUSBDevices.cpp b/hardware/DenkoviUSBDevices.cpp -index a7977d82c8..53a27e5583 100644 --- a/hardware/DenkoviUSBDevices.cpp +++ b/hardware/DenkoviUSBDevices.cpp @@ -5,6 +5,8 @@ @@ -151,8 +139,6 @@ index a7977d82c8..53a27e5583 100644 #define MAX_POLL_INTERVAL 3600*1000 #define DAE_IO_TYPE_RELAY 2 -diff --git a/hardware/EnOceanESP2.cpp b/hardware/EnOceanESP2.cpp -index f20ff9c0cb..fd08c55f63 100644 --- a/hardware/EnOceanESP2.cpp +++ b/hardware/EnOceanESP2.cpp @@ -8,7 +8,7 @@ @@ -173,8 +159,6 @@ index f20ff9c0cb..fd08c55f63 100644 #define ENOCEAN_RETRY_DELAY 30 #define round(a) ( int ) ( a + .5 ) -diff --git a/hardware/EnOceanESP3.cpp b/hardware/EnOceanESP3.cpp -index 6866eeb0d0..2afa0e1e36 100644 --- a/hardware/EnOceanESP3.cpp +++ b/hardware/EnOceanESP3.cpp @@ -8,7 +8,7 @@ @@ -195,8 +179,6 @@ index 6866eeb0d0..2afa0e1e36 100644 #if _DEBUG #define ENOCEAN_BUTTON_DEBUG #endif -diff --git a/hardware/EvohomeRadio.cpp b/hardware/EvohomeRadio.cpp -index 4da983538b..6ba97158cd 100644 --- a/hardware/EvohomeRadio.cpp +++ b/hardware/EvohomeRadio.cpp @@ -23,6 +23,9 @@ @@ -209,8 +191,6 @@ index 4da983538b..6ba97158cd 100644 extern std::string szUserDataFolder; -diff --git a/hardware/EvohomeSerial.cpp b/hardware/EvohomeSerial.cpp -index 4a54988291..c74cf576cc 100644 --- a/hardware/EvohomeSerial.cpp +++ b/hardware/EvohomeSerial.cpp @@ -7,6 +7,8 @@ @@ -222,8 +202,6 @@ index 4a54988291..c74cf576cc 100644 CEvohomeSerial::CEvohomeSerial(const int ID, const std::string &szSerialPort, const int baudrate, const std::string &UserContID) : CEvohomeRadio(ID, UserContID) { -diff --git a/hardware/KMTronic433.cpp b/hardware/KMTronic433.cpp -index da81b20f9f..f9832a5a74 100644 --- a/hardware/KMTronic433.cpp +++ b/hardware/KMTronic433.cpp @@ -9,11 +9,13 @@ @@ -241,8 +219,6 @@ index da81b20f9f..f9832a5a74 100644 //#define DEBUG_KMTronic #define RETRY_DELAY 30 -diff --git a/hardware/KMTronicBase.cpp b/hardware/KMTronicBase.cpp -index b343108966..d9c45872b5 100644 --- a/hardware/KMTronicBase.cpp +++ b/hardware/KMTronicBase.cpp @@ -10,7 +10,7 @@ @@ -254,8 +230,6 @@ index b343108966..d9c45872b5 100644 #include <ctime> -diff --git a/hardware/KMTronicSerial.cpp b/hardware/KMTronicSerial.cpp -index 4e07f2c37a..6240f941bd 100644 --- a/hardware/KMTronicSerial.cpp +++ b/hardware/KMTronicSerial.cpp @@ -10,12 +10,14 @@ @@ -274,8 +248,6 @@ index 4e07f2c37a..6240f941bd 100644 #define RETRY_DELAY 30 KMTronicSerial::KMTronicSerial(const int ID, const std::string& devname) -diff --git a/hardware/MQTT.cpp b/hardware/MQTT.cpp -index 8de3671853..19750bb75b 100644 --- a/hardware/MQTT.cpp +++ b/hardware/MQTT.cpp @@ -11,6 +11,8 @@ @@ -287,8 +259,6 @@ index 8de3671853..19750bb75b 100644 #define RETRY_DELAY 30 #define CLIENTID "Domoticz" -diff --git a/hardware/Meteostick.cpp b/hardware/Meteostick.cpp -index 9793f4b57b..10da69d6e3 100644 --- a/hardware/Meteostick.cpp +++ b/hardware/Meteostick.cpp @@ -9,12 +9,14 @@ @@ -307,8 +277,6 @@ index 9793f4b57b..10da69d6e3 100644 #define RETRY_DELAY 30 #define round(a) ( int ) ( a + .5 ) -diff --git a/hardware/MySensorsBase.cpp b/hardware/MySensorsBase.cpp -index af976fba95..42bf58fad5 100644 --- a/hardware/MySensorsBase.cpp +++ b/hardware/MySensorsBase.cpp @@ -13,7 +13,7 @@ @@ -320,8 +288,6 @@ index af976fba95..42bf58fad5 100644 #include "../webserver/cWebem.h" #include <json/json.h> -diff --git a/hardware/MySensorsSerial.cpp b/hardware/MySensorsSerial.cpp -index 44f8692d2b..42f3e05409 100644 --- a/hardware/MySensorsSerial.cpp +++ b/hardware/MySensorsSerial.cpp @@ -8,12 +8,14 @@ @@ -340,8 +306,6 @@ index 44f8692d2b..42f3e05409 100644 //#define DEBUG_MYSENSORS #define RETRY_DELAY 30 -diff --git a/hardware/OTGWBase.cpp b/hardware/OTGWBase.cpp -index 322574458b..ded3a31c2c 100644 --- a/hardware/OTGWBase.cpp +++ b/hardware/OTGWBase.cpp @@ -12,7 +12,7 @@ @@ -353,8 +317,6 @@ index 322574458b..ded3a31c2c 100644 #include <json/json.h> #include <ctime> -diff --git a/hardware/OTGWSerial.cpp b/hardware/OTGWSerial.cpp -index 4ade70e063..5a3416548f 100644 --- a/hardware/OTGWSerial.cpp +++ b/hardware/OTGWSerial.cpp @@ -8,12 +8,14 @@ @@ -373,8 +335,6 @@ index 4ade70e063..5a3416548f 100644 #define RETRY_DELAY 30 #define OTGW_READ_INTERVAL 10 -diff --git a/hardware/OpenWebNetUSB.cpp b/hardware/OpenWebNetUSB.cpp -index bf23049844..352a2220e9 100644 --- a/hardware/OpenWebNetUSB.cpp +++ b/hardware/OpenWebNetUSB.cpp @@ -19,11 +19,12 @@ License: Public domain @@ -391,8 +351,6 @@ index bf23049844..352a2220e9 100644 COpenWebNetUSB::COpenWebNetUSB(const int ID, const std::string& devname, unsigned int baud_rate) { -diff --git a/hardware/P1MeterSerial.cpp b/hardware/P1MeterSerial.cpp -index 566b451fa5..7dc3e0782e 100644 --- a/hardware/P1MeterSerial.cpp +++ b/hardware/P1MeterSerial.cpp @@ -14,10 +14,12 @@ @@ -409,8 +367,6 @@ index 566b451fa5..7dc3e0782e 100644 #ifdef _DEBUG //#define DEBUG_P1_R #endif -diff --git a/hardware/Pinger.cpp b/hardware/Pinger.cpp -index d3e2fda942..b6dc78a786 100644 --- a/hardware/Pinger.cpp +++ b/hardware/Pinger.cpp @@ -19,6 +19,8 @@ @@ -422,8 +378,6 @@ index d3e2fda942..b6dc78a786 100644 #if BOOST_VERSION >= 107000 #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) #else -diff --git a/hardware/RAVEn.cpp b/hardware/RAVEn.cpp -index d9efc7480a..b6a4399d04 100644 --- a/hardware/RAVEn.cpp +++ b/hardware/RAVEn.cpp @@ -8,6 +8,8 @@ @@ -435,8 +389,6 @@ index d9efc7480a..b6a4399d04 100644 //Rainforest RAVEn USB ZigBee Smart Meter Adapter //https://rainforestautomation.com/rfa-z106-raven/ -diff --git a/hardware/RFLinkSerial.cpp b/hardware/RFLinkSerial.cpp -index c5cae0f739..4ab07ed88e 100644 --- a/hardware/RFLinkSerial.cpp +++ b/hardware/RFLinkSerial.cpp @@ -5,6 +5,8 @@ @@ -448,8 +400,6 @@ index c5cae0f739..4ab07ed88e 100644 CRFLinkSerial::CRFLinkSerial(const int ID, const std::string& devname) : m_szSerialPort(devname) { -diff --git a/hardware/RFXComSerial.cpp b/hardware/RFXComSerial.cpp -index dc85f4832d..4c39520510 100644 --- a/hardware/RFXComSerial.cpp +++ b/hardware/RFXComSerial.cpp @@ -12,7 +12,7 @@ @@ -470,8 +420,6 @@ index dc85f4832d..4c39520510 100644 #define RETRY_DELAY 30 #define RFX_WRITE_DELAY 300 -diff --git a/hardware/RFXComTCP.cpp b/hardware/RFXComTCP.cpp -index 7c6b3954b8..0e4856fbfb 100644 --- a/hardware/RFXComTCP.cpp +++ b/hardware/RFXComTCP.cpp @@ -1,8 +1,6 @@ @@ -483,8 +431,6 @@ index 7c6b3954b8..0e4856fbfb 100644 #include "../main/Helper.h" #include "../main/localtime_r.h" #include "../main/mainworker.h" -diff --git a/hardware/Rego6XXSerial.cpp b/hardware/Rego6XXSerial.cpp -index b94bd291bc..15d22f869a 100644 --- a/hardware/Rego6XXSerial.cpp +++ b/hardware/Rego6XXSerial.cpp @@ -16,11 +16,13 @@ @@ -502,8 +448,6 @@ index b94bd291bc..15d22f869a 100644 #define Rego6XX_RETRY_DELAY 30 #define Rego6XX_COMMAND_DELAY 5 #define Rego6XX_READ_BUFFER_MASK (Rego6XX_READ_BUFFER_SIZE - 1) -diff --git a/hardware/S0MeterBase.cpp b/hardware/S0MeterBase.cpp -index 9cffa67022..75a06e2cc1 100644 --- a/hardware/S0MeterBase.cpp +++ b/hardware/S0MeterBase.cpp @@ -13,7 +13,7 @@ @@ -515,8 +459,6 @@ index 9cffa67022..75a06e2cc1 100644 #include <ctime> -diff --git a/hardware/S0MeterSerial.cpp b/hardware/S0MeterSerial.cpp -index 1dc16b2b3e..f474d1c766 100644 --- a/hardware/S0MeterSerial.cpp +++ b/hardware/S0MeterSerial.cpp @@ -8,11 +8,13 @@ @@ -534,8 +476,6 @@ index 1dc16b2b3e..f474d1c766 100644 #ifdef _DEBUG //#define DEBUG_S0 #define TOT_DEBUG_LINES 6 -diff --git a/hardware/TCPProxy/tcpproxy_server.cpp b/hardware/TCPProxy/tcpproxy_server.cpp -index 60445d9c28..82ba3559d9 100644 --- a/hardware/TCPProxy/tcpproxy_server.cpp +++ b/hardware/TCPProxy/tcpproxy_server.cpp @@ -15,6 +15,8 @@ @@ -547,8 +487,6 @@ index 60445d9c28..82ba3559d9 100644 #if BOOST_VERSION >= 107000 #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) #else -diff --git a/hardware/TeleinfoSerial.cpp b/hardware/TeleinfoSerial.cpp -index 85f9a6240f..fa794802e9 100644 --- a/hardware/TeleinfoSerial.cpp +++ b/hardware/TeleinfoSerial.cpp @@ -28,9 +28,11 @@ History : @@ -564,8 +502,6 @@ index 85f9a6240f..fa794802e9 100644 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; -diff --git a/hardware/USBtin.cpp b/hardware/USBtin.cpp -index c3e3656319..ce6f542df3 100644 --- a/hardware/USBtin.cpp +++ b/hardware/USBtin.cpp @@ -27,7 +27,7 @@ History : @@ -586,8 +522,6 @@ index c3e3656319..ce6f542df3 100644 #define USBTIN_BAUD_RATE 115200 #define USBTIN_PARITY boost::asio::serial_port_base::parity::none #define USBTIN_CARACTER_SIZE 8 -diff --git a/hardware/XiaomiGateway.cpp b/hardware/XiaomiGateway.cpp -index f4567ec62f..e4998faa6a 100644 --- a/hardware/XiaomiGateway.cpp +++ b/hardware/XiaomiGateway.cpp @@ -12,7 +12,7 @@ @@ -599,8 +533,6 @@ index f4567ec62f..e4998faa6a 100644 #ifndef WIN32 #include <ifaddrs.h> -diff --git a/hardware/Yeelight.h b/hardware/Yeelight.h -index b063f79743..64fd6f5479 100644 --- a/hardware/Yeelight.h +++ b/hardware/Yeelight.h @@ -2,7 +2,6 @@ @@ -611,8 +543,6 @@ index b063f79743..64fd6f5479 100644 class Yeelight : public CDomoticzHardwareBase { -diff --git a/hardware/ZiBlueSerial.cpp b/hardware/ZiBlueSerial.cpp -index 9e9db2aff1..8e896897fc 100644 --- a/hardware/ZiBlueSerial.cpp +++ b/hardware/ZiBlueSerial.cpp @@ -6,6 +6,8 @@ @@ -624,8 +554,6 @@ index 9e9db2aff1..8e896897fc 100644 #define ZiBlue_RETRY_DELAY 30 CZiBlueSerial::CZiBlueSerial(const int ID, const std::string& devname) : -diff --git a/hardware/plugins/PluginTransports.cpp b/hardware/plugins/PluginTransports.cpp -index c7e065529f..7fc1cb953e 100644 --- a/hardware/plugins/PluginTransports.cpp +++ b/hardware/plugins/PluginTransports.cpp @@ -13,6 +13,8 @@ @@ -637,8 +565,6 @@ index c7e065529f..7fc1cb953e 100644 namespace Plugins { void CPluginTransport::handleRead(const boost::system::error_code& e, std::size_t bytes_transferred) -diff --git a/main/WebServer.cpp b/main/WebServer.cpp -index 0a19319669..ed92f06e32 100644 --- a/main/WebServer.cpp +++ b/main/WebServer.cpp @@ -1,7 +1,7 @@ @@ -659,8 +585,6 @@ index 0a19319669..ed92f06e32 100644 #define round(a) ( int ) ( a + .5 ) extern std::string szStartupFolder; -diff --git a/main/mainworker.cpp b/main/mainworker.cpp -index 505f59f49d..5fb2ee9042 100644 --- a/main/mainworker.cpp +++ b/main/mainworker.cpp @@ -174,6 +174,8 @@ @@ -672,8 +596,6 @@ index 505f59f49d..5fb2ee9042 100644 #define round(a) ( int ) ( a + .5 ) extern std::string szStartupFolder; -diff --git a/push/FibaroPush.cpp b/push/FibaroPush.cpp -index 0bc54e6cfd..350a8fa893 100644 --- a/push/FibaroPush.cpp +++ b/push/FibaroPush.cpp @@ -14,6 +14,8 @@ @@ -685,8 +607,6 @@ index 0bc54e6cfd..350a8fa893 100644 CFibaroPush::CFibaroPush() { m_PushType = PushType::PUSHTYPE_FIBARO; -diff --git a/push/GooglePubSubPush.cpp b/push/GooglePubSubPush.cpp -index 6d0fc82d40..a5b720f219 100644 --- a/push/GooglePubSubPush.cpp +++ b/push/GooglePubSubPush.cpp @@ -21,6 +21,8 @@ extern "C" { @@ -698,8 +618,6 @@ index 6d0fc82d40..a5b720f219 100644 extern std::string szUserDataFolder; // this should be filled in by the preprocessor -diff --git a/push/HttpPush.cpp b/push/HttpPush.cpp -index 8132ca2b43..3d1d51d52e 100644 --- a/push/HttpPush.cpp +++ b/push/HttpPush.cpp @@ -15,6 +15,8 @@ @@ -711,8 +629,6 @@ index 8132ca2b43..3d1d51d52e 100644 CHttpPush::CHttpPush() { m_PushType = PushType::PUSHTYPE_HTTP; -diff --git a/push/InfluxPush.cpp b/push/InfluxPush.cpp -index 0a8e99414f..745fdf0496 100644 --- a/push/InfluxPush.cpp +++ b/push/InfluxPush.cpp @@ -15,6 +15,8 @@ @@ -724,8 +640,6 @@ index 0a8e99414f..745fdf0496 100644 CInfluxPush::CInfluxPush() : m_InfluxPort(8086), m_bInfluxDebugActive(false) -diff --git a/push/WebsocketPush.cpp b/push/WebsocketPush.cpp -index 0fb71f96ec..3c2ce7ed54 100644 --- a/push/WebsocketPush.cpp +++ b/push/WebsocketPush.cpp @@ -3,6 +3,8 @@ @@ -737,8 +651,6 @@ index 0fb71f96ec..3c2ce7ed54 100644 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; -diff --git a/tcpserver/TCPServer.cpp b/tcpserver/TCPServer.cpp -index d3b0a94847..3b8d0b9b76 100644 --- a/tcpserver/TCPServer.cpp +++ b/tcpserver/TCPServer.cpp @@ -11,7 +11,7 @@ @@ -750,8 +662,6 @@ index d3b0a94847..3b8d0b9b76 100644 namespace tcp { namespace server { -diff --git a/webserver/cWebem.cpp b/webserver/cWebem.cpp -index f015be097f..63c96f789f 100644 --- a/webserver/cWebem.cpp +++ b/webserver/cWebem.cpp @@ -5,7 +5,7 @@ @@ -763,8 +673,6 @@ index f015be097f..63c96f789f 100644 #include "reply.hpp" #include "request.hpp" #include "mime_types.hpp" -diff --git a/webserver/connection.cpp b/webserver/connection.cpp -index d3485fe923..afe700e5d7 100644 --- a/webserver/connection.cpp +++ b/webserver/connection.cpp @@ -9,7 +9,7 @@ @@ -785,8 +693,6 @@ index d3485fe923..afe700e5d7 100644 namespace http { namespace server { extern std::string convert_to_http_date(time_t time); -diff --git a/webserver/connection_manager.cpp b/webserver/connection_manager.cpp -index b6c20de53f..bf1d9882d0 100644 --- a/webserver/connection_manager.cpp +++ b/webserver/connection_manager.cpp @@ -10,10 +10,12 @@ @@ -803,8 +709,6 @@ index b6c20de53f..bf1d9882d0 100644 namespace http { namespace server { -diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp -index c2bcd3178f..423ee0fb4b 100644 --- a/webserver/proxyclient.cpp +++ b/webserver/proxyclient.cpp @@ -8,6 +8,8 @@ @@ -816,8 +720,6 @@ index c2bcd3178f..423ee0fb4b 100644 // RK: some defines to make mydomoticz also work when openssl not compiled in #ifdef WWW_ENABLE_SSL #define PROXY_PORT 443 -diff --git a/webserver/server.cpp b/webserver/server.cpp -index 1eb2137ef2..6025b1cdb5 100644 --- a/webserver/server.cpp +++ b/webserver/server.cpp @@ -3,7 +3,7 @@ diff --git a/utils/domoticz/patches/011-openzwave-include.patch b/utils/domoticz/patches/011-openzwave-include.patch index ce0af4bfa..1792b5cb6 100644 --- a/utils/domoticz/patches/011-openzwave-include.patch +++ b/utils/domoticz/patches/011-openzwave-include.patch @@ -37,8 +37,6 @@ Tested with both static and dynamic builds of OpenZWave. hardware/openzwave/control_panel/ozwcp.h | 4 ++-- 4 files changed, 15 insertions(+), 18 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fa5b3099d..1f4b6fb57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -694,6 +694,7 @@ endif(WITH_LIBUSB) @@ -69,8 +67,6 @@ index fa5b3099d..1f4b6fb57 100644 endif (OPENZWAVE_INCLUDE_DIRS) add_definitions(-DWITH_OPENZWAVE) ELSE() -diff --git a/hardware/OpenZWave.cpp b/hardware/OpenZWave.cpp -index 272e3d0a7..a226a8924 100644 --- a/hardware/OpenZWave.cpp +++ b/hardware/OpenZWave.cpp @@ -22,10 +22,10 @@ @@ -88,8 +84,6 @@ index 272e3d0a7..a226a8924 100644 #include "ZWaveCommands.h" -diff --git a/hardware/openzwave/control_panel/ozwcp.cpp b/hardware/openzwave/control_panel/ozwcp.cpp -index 0b21a9cf3..5e401b2f1 100644 --- a/hardware/openzwave/control_panel/ozwcp.cpp +++ b/hardware/openzwave/control_panel/ozwcp.cpp @@ -39,11 +39,11 @@ @@ -109,8 +103,6 @@ index 0b21a9cf3..5e401b2f1 100644 #include "../../../main/Logger.h" #include <sys/stat.h> -diff --git a/hardware/openzwave/control_panel/ozwcp.h b/hardware/openzwave/control_panel/ozwcp.h -index ebfef1791..96d14b3bf 100644 --- a/hardware/openzwave/control_panel/ozwcp.h +++ b/hardware/openzwave/control_panel/ozwcp.h @@ -38,8 +38,8 @@ @@ -124,6 +116,3 @@ index ebfef1791..96d14b3bf 100644 #define MAX_NODES 255 --- -2.26.2 - diff --git a/utils/domoticz/patches/012-minizip-overflow.patch b/utils/domoticz/patches/012-minizip-overflow.patch index f5b41e667..8c26ede43 100644 --- a/utils/domoticz/patches/012-minizip-overflow.patch +++ b/utils/domoticz/patches/012-minizip-overflow.patch @@ -28,8 +28,6 @@ Reduce the buffer size to 65535 bytes instead. main/unzip_stream.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/main/unzip_stream.h b/main/unzip_stream.h -index 136fcefd9..813f2489a 100644 --- a/main/unzip_stream.h +++ b/main/unzip_stream.h @@ -135,7 +135,7 @@ namespace clx { @@ -41,6 +39,3 @@ index 136fcefd9..813f2489a 100644 unz_file_info info; unzGetCurrentFileInfo(handler_, &info, path, sizeof(path), NULL, 0, NULL, 0); path_ = path; --- -2.26.2 - |
