domoticz-python.patch

   1 diff -urN domoticz-4.10717.orig/hardware/plugins/DelayedLink.h domoticz-4.10717/hardware/plugins/DelayedLink.h
   2 --- domoticz-4.10717.orig/hardware/plugins/DelayedLink.h        2019-05-10 11:37:55.000000000 +0200
   3 +++ domoticz-4.10717/hardware/plugins/DelayedLink.h     2019-10-05 19:05:40.930495976 +0200
   4 @@ -145,18 +145,10 @@
   5                                 if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll");
   6                                 if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll");
   7  #      else
   8 -                               if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll");
   9 -                               if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll");
  10 -                               if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll");
  11 -                               if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll");
  12 -                               if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll");
  13 +                               if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll");
  14  #      endif
  15  #else
  16 -                               if (!shared_lib_) FindLibrary("python3.8", true);
  17 -                               if (!shared_lib_) FindLibrary("python3.7", true);
  18 -                               if (!shared_lib_) FindLibrary("python3.6", true);
  19 -                               if (!shared_lib_) FindLibrary("python3.5", true);
  20 -                               if (!shared_lib_) FindLibrary("python3.4", true);
  21 +                               if (!shared_lib_) FindLibrary("python3", true);
  22  #endif
  23                                 if (shared_lib_)
  24                                 {
  25 @@ -271,24 +263,12 @@
  26                                                 library = "lib" + sLibrary + ".so";
  27                                                 shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
  28                                         }
  29 -                                       // look in directories covered by ldconfig but 'm' variant
  30 -                                       if (!shared_lib_)
  31 -                                       {
  32 -                                               library = "lib" + sLibrary + "m.so";
  33 -                                               shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
  34 -                                       }
  35                                         // look in /usr/lib directories
  36                                         if (!shared_lib_)
  37                                         {
  38                                                 library = "/usr/lib/" + sLibrary + "/";
  39                                                 FindLibrary(library, false);
  40                                         }
  41 -                                       // look in /usr/lib directories but 'm' variant
  42 -                                       if (!shared_lib_)
  43 -                                       {
  44 -                                               library = "/usr/lib/" + sLibrary + "m/";
  45 -                                               FindLibrary(library, false);
  46 -                                       }
  47                                         // look in /usr/local/lib directory (handles build from source)
  48                                         if (!shared_lib_)
  49                                         {
  50 @@ -296,12 +276,6 @@
  51                                                 shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
  52
  53                                         }
  54 -                                       // look in /usr/local/lib directory (handles build from source) but 'm' variant
  55 -                                       if (!shared_lib_)
  56 -                                       {
  57 -                                               library = "/usr/local/lib/lib" + sLibrary + "m.so";
  58 -                                               shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
  59 -                                       }
  60                                         // MacOS
  61                                         // look for .dylib in /usr/local/lib
  62                                         if (!shared_lib_)