up to 2024.2

[packages/domoticz.git] / domoticz-tinyxpath.patch

diff --git a/domoticz-tinyxpath.patch b/domoticz-tinyxpath.patch
index f0e94976d93c6c2e146486397df9558af432ccb3..03a4d93c029366ace3d8fc5b96318260bc38998a 100644 (file)
--- a/domoticz-tinyxpath.patch
+++ b/domoticz-tinyxpath.patch
@@ -88,9 +88,36 @@ index bc231d8f6..334f203a6 100644
 +  ENDIF(TinyXML_FOUND)
 +ENDIF(USE_BUILTIN_TINYXPATH)
 +
- IF(EXISTS /sys/class/gpio OR FORCE_WITH_GPIO)
-   message(STATUS "GPIO is available")
-   add_definitions(-DWITH_GPIO)
+ #
+ # OpenZWave
+ # try to find open-zwave, if found, include support
+--- a/hardware/openzwave/control_panel/ozwcp.cpp       2020-03-22 09:16:16.000000000 -0500
++++ b/hardware/openzwave/control_panel/ozwcp.cpp       2020-03-24 10:53:04.968630391 -0500
+@@ -49,7 +49,7 @@
+ #include <sys/stat.h>
+ #include <fstream>
+ #include <iostream>
+-#include "../../../tinyxpath/tinyxml.h"
++#include <tinyxml.h>
+ 
+ //#include "microhttpd.h"
+ #include "ozwcp.h"
+--- a/hardware/plugins/PluginManager.cpp       2020-03-22 09:16:16.000000000 -0500
++++ b/hardware/plugins/PluginManager.cpp       2020-03-24 13:53:05.305852598 -0500
+@@ -21,11 +21,12 @@
+ #include "../../main/Logger.h"
+ #include "../../main/SQLHelper.h"
+ #include "../../main/WebServer.h"
+-#include "../../tinyxpath/tinyxml.h"
+ #ifdef WIN32
++#       include "../../tinyxpath/tinyxml.h"
+ #     include <direct.h>
+ #else
+ #     include <sys/stat.h>
++#       include <tinyxml.h>
+ #endif
+ 
+ #include "DelayedLink.h"
 --- a/hardware/plugins/Plugins.cpp     2020-03-22 09:16:16.000000000 -0500
 +++ b/hardware/plugins/Plugins.cpp     2020-03-24 13:45:46.056965796 -0500
 @@ -16,10 +16,11 @@
@@ -201,19 +228,3 @@ index bc231d8f6..334f203a6 100644
  
  
  #ifdef _DEBUG
---- domoticz-2024.1/hardware/plugins/PluginManager.cpp.orig    2024-01-01 12:59:22.000000000 +0100
-+++ domoticz-2024.1/hardware/plugins/PluginManager.cpp 2024-01-01 15:17:05.057939388 +0100
-@@ -20,12 +20,12 @@
- #include "../../main/Logger.h"
- #include "../../main/SQLHelper.h"
- #include "../../main/WebServer.h"
--#include "../../tinyxpath/tinyxml.h"
- #ifdef WIN32
- #     include <direct.h>
- #else
- #     include <sys/stat.h>
- #endif
-+#include <tinyxml.h>
- 
- #include "DelayedLink.h"
- #include "../../main/EventsPythonModule.h"