up to 2024.1

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

diff --git a/domoticz-python.patch b/domoticz-python.patch
index 1f09cf4a9d3b0ef7c1fd88e7df44ecef07fbe390..6047ea155102a15d551946b0b12c3944ada6a51f 100644 (file)
--- 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,23 +155,9 @@
+@@ -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");
@@ -14,6 +15,7 @@
 -                              if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll");
 +                              if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll");
  #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);
@@ -24,8 +26,8 @@
 -                              if (!shared_lib_) FindLibrary("python3.4", true);
 +                              if (!shared_lib_) FindLibrary(PYTHON_LIBDIR, false);
  #ifdef __FreeBSD__
-                               if (!shared_lib_) FindLibrary("python3.7m", true);
-                               if (!shared_lib_) FindLibrary("python3.6m", true);
+                               if (!shared_lib_) FindLibrary("python3.12m", true);
+                               if (!shared_lib_) FindLibrary("python3.11m", true);
 @@ -355,34 +327,20 @@
                                else
                                {