commit 4ff80f89436890d901a404dcfcdae1350e8e6c60
Author: Jan Palus <at...@pld-linux.org>
Date: Fri Jul 21 22:08:31 2023 +0200
up to 2023.2
domoticz-python.patch | 4 +++-
domoticz-tinyxpath.patch | 20 +++++++++++++++-----
domoticz.spec | 6 +++---
3 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/domoticz.spec b/domoticz.spec
index 60b9067..e4b1d6f 100644
--- a/domoticz.spec
+++ b/domoticz.spec
@@ -1,12 +1,12 @@
Summary: Open source Home Automation System
Name: domoticz
-Version: 2023.1
-Release: 2
+Version: 2023.2
+Release: 1
License: GPLv3+ and ASL 2.0 and Boost and BSD and MIT
Group: Base
URL: http://www.domoticz.com
Source0:
https://github.com/domoticz/domoticz/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: fd2d853be241fb13e3582d5499c414ac
+# Source0-md5: ea8089e5b49a33e60ecc2ce0052e32c5
Source1: %{name}.service
Source2: %{name}.conf
# Use system tinyxpath (https://github.com/domoticz/domoticz/pull/1759)
diff --git a/domoticz-python.patch b/domoticz-python.patch
index 5c245c0..1f09cf4 100644
--- a/domoticz-python.patch
+++ b/domoticz-python.patch
@@ -1,9 +1,10 @@
--- domoticz-2021.1/hardware/plugins/DelayedLink.h.orig 2021-04-17
17:50:55.000000000 +0200
+++ domoticz-2021.1/hardware/plugins/DelayedLink.h 2021-04-20
12:36:46.238826640 +0200
-@@ -155,21 +155,9 @@
+@@ -155,23 +155,9 @@
shared_lib_ = nullptr;
if (!shared_lib_) {
#ifdef WIN32
+- if (!shared_lib_) shared_lib_ =
LoadLibrary("python311.dll");
- if (!shared_lib_) shared_lib_ =
LoadLibrary("python310.dll");
- if (!shared_lib_) shared_lib_ =
LoadLibrary("python39.dll");
- if (!shared_lib_) shared_lib_ =
LoadLibrary("python38.dll");
@@ -13,6 +14,7 @@
- if (!shared_lib_) shared_lib_ =
LoadLibrary("python34.dll");
+ if (!shared_lib_) shared_lib_ =
LoadLibrary("python.dll");
#else
+- if (!shared_lib_) FindLibrary("python3.11",
true);
- if (!shared_lib_) FindLibrary("python3.10",
true);
- if (!shared_lib_) FindLibrary("python3.9",
true);
- if (!shared_lib_) FindLibrary("python3.8",
true);
diff --git a/domoticz-tinyxpath.patch b/domoticz-tinyxpath.patch
index ab45407..89ed522 100644
--- a/domoticz-tinyxpath.patch
+++ b/domoticz-tinyxpath.patch
@@ -121,9 +121,9 @@ index bc231d8f6..334f203a6 100644
--- 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 @@
+ #include "../../main/Logger.h"
#include "../../main/SQLHelper.h"
#include "../../main/mainworker.h"
- #include "../../main/localtime_r.h"
-#include "../../tinyxpath/tinyxml.h"
#include "../../notifications/NotificationHelper.h"
@@ -147,8 +147,8 @@ index bc231d8f6..334f203a6 100644
--- a/hardware/EcoDevices.cpp 2020-03-22 09:16:16.000000000 -0500
+++ b/hardware/EcoDevices.cpp 2020-03-24 10:47:20.095926641 -0500
@@ -33,11 +33,11 @@
+ #include "../main/Logger.h"
#include "hardwaretypes.h"
- #include "../main/localtime_r.h"
#include "../httpclient/HTTPClient.h"
-#include "../tinyxpath/tinyxml.h"
-#include "../tinyxpath/xpath_static.h"
@@ -162,12 +162,11 @@ index bc231d8f6..334f203a6 100644
#define MAJOR 1
--- a/hardware/OnkyoAVTCP.cpp 2018-06-23 09:18:06.000000000 -0500
+++ b/hardware/OnkyoAVTCP.cpp 2018-07-08 14:21:06.884163094 -0500
-@@ -3,15 +3,15 @@
+@@ -3,14 +3,14 @@
#include "../main/Logger.h"
#include "../main/Helper.h"
#include "../main/SQLHelper.h"
-#include <iostream>
- #include "../main/localtime_r.h"
#include "../main/mainworker.h"
#include "../hardware/hardwaretypes.h"
-#include <json/json.h>
@@ -201,6 +200,17 @@ index bc231d8f6..334f203a6 100644
#include "../notifications/NotificationHelper.h"
-#include "../tinyxpath/tinyxml.h"
+#include <tinyxml.h>
+ #include "../webserver/Base64.h"
+ #include "hardwaretypes.h"
+ #include <iostream>
+--- domoticz-2023.2/hardware/Enever.cpp.orig 2023-07-21 17:23:44.000000000
+0200
++++ domoticz-2023.2/hardware/Enever.cpp 2023-07-21 20:39:42.240298598
+0200
+@@ -9,7 +9,7 @@
+ #include "../main/RFXtrx.h"
+ #include "../main/SQLHelper.h"
+ #include "../notifications/NotificationHelper.h"
+-#include "../tinyxpath/tinyxml.h"
++#include <tinyxml.h>
+ #include "../webserver/Base64.h"
#include "hardwaretypes.h"
#include <iostream>
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/domoticz.git/commitdiff/4ff80f89436890d901a404dcfcdae1350e8e6c60
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
