[packages/domoticz] up to 2025.1

[atler]

commit 81fa35a3b26e07c6c40ca349a9c29012a6117fde
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed May 7 00:57:58 2025 +0200

    up to 2025.1

 domoticz-python.patch | 54 +++++++++++++++++++++++----------------------------
 domoticz.spec         |  8 +++++---
 2 files changed, 29 insertions(+), 33 deletions(-)
---
diff --git a/domoticz.spec b/domoticz.spec
index 2eb6810..5bfad3e 100644
--- a/domoticz.spec
+++ b/domoticz.spec
@@ -1,12 +1,12 @@
 Summary:	Open source Home Automation System
 Name:		domoticz
-Version:	2024.7
-Release:	2
+Version:	2025.1
+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:	d4456862e27178cccfab82e43516a2e8
+# Source0-md5:	b6ad2eb81df4319498c348cf339f3764
 Source1:	%{name}.service
 Source2:	%{name}.conf
 # Use system tinyxpath (https://github.com/domoticz/domoticz/pull/1759)
@@ -20,6 +20,7 @@ BuildRequires:	boost-devel >= 1.66.0
 BuildRequires:	cmake >= 3.16.0
 BuildRequires:	curl-devel
 BuildRequires:	jsoncpp-devel
+BuildRequires:	jwt-cpp-devel
 BuildRequires:	libmosquitto-devel
 BuildRequires:	libopenzwave-devel >= 1.5.0
 BuildRequires:	libstdc++-devel >= 6:8
@@ -79,6 +80,7 @@ export CXXFLAGS="%{rpmcxxflags} -DPYTHON_LIBDIR=\\\"%{_libdir}\\\""
 	-DUSE_BUILTIN_MQTT=NO \
 	-DUSE_BUILTIN_SQLITE=NO \
 	-DUSE_BUILTIN_TINYXPATH=NO \
+	-DUSE_BUILTIN_JWTCPP=NO \
 	-DUSE_LUA_STATIC=NO \
 	-DUSE_OPENSSL_STATIC=NO \
 	-DUSE_STATIC_BOOST=NO \
diff --git a/domoticz-python.patch b/domoticz-python.patch
index 6047ea1..6f93b9c 100644
--- a/domoticz-python.patch
+++ b/domoticz-python.patch
@@ -1,34 +1,28 @@
---- 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,25 +155,9 @@
- 			shared_lib_ = nullptr;
- 			if (!shared_lib_) {
- #ifdef WIN32
--				if (!shared_lib_) shared_lib_ = LoadLibrary("python312.dll");
--				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");
--				if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll");
--				if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll");
--				if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll");
--				if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll");
-+				if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll");
+--- domoticz-2025.1/hardware/plugins/DelayedLink.h.orig	2025-05-05 09:02:49.000000000 +0200
++++ domoticz-2025.1/hardware/plugins/DelayedLink.h	2025-05-07 00:27:10.339387997 +0200
+@@ -161,10 +161,8 @@
+             shared_lib_ = nullptr;
+ 
+             // Define the base Python versions in descending order (latest to oldest)
+-			constexpr std::array<const char*, 11> python_versions = {
+-				"python3.14", "python3.13", "python3.12", "python3.11", "python3.10",
+-                "python3.9", "python3.8", "python3.7", "python3.6",
+-                "python3.5", "python3.4"
++			constexpr std::array<const char*, 1> python_versions = {
++				PYTHON_LIBDIR
+             };
+             // Platform-specific suffixes
+ 			std::string extension;
+@@ -182,7 +180,7 @@
+ 				shared_lib_ = LoadLibrary(lib_name.c_str());
  #else
--				if (!shared_lib_) FindLibrary("python3.12", true);
--				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);
--				if (!shared_lib_) FindLibrary("python3.7", true);
--				if (!shared_lib_) FindLibrary("python3.6", true);
--				if (!shared_lib_) FindLibrary("python3.5", true);
--				if (!shared_lib_) FindLibrary("python3.4", true);
-+				if (!shared_lib_) FindLibrary(PYTHON_LIBDIR, false);
- #ifdef __FreeBSD__
- 				if (!shared_lib_) FindLibrary("python3.12m", true);
- 				if (!shared_lib_) FindLibrary("python3.11m", true);
-@@ -355,34 +327,20 @@
+ 				lib_name += extension;
+-				FindLibrary(lib_name.c_str(), true);
++				FindLibrary(lib_name.c_str(), false);
+ #endif
+ 				if (shared_lib_)
+ 				{
+@@ -370,34 +368,20 @@
  				else
  				{
  					std::vector<std::string> entries;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/domoticz.git/commitdiff/81fa35a3b26e07c6c40ca349a9c29012a6117fde