[packages/domoticz] up to 2022.2
atler
atler at pld-linux.org
Sat Nov 5 13:33:15 CET 2022
commit fbf2e31490ced5b01baeb95788bacdd58371b725
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Nov 5 13:32:46 2022 +0100
up to 2022.2
domoticz-no_updates.patch | 2 +-
domoticz-python.patch | 11 ++++++-----
domoticz-tinyxpath.patch | 6 +++---
domoticz.spec | 12 ++++--------
gcc12.patch | 31 -------------------------------
strstr.patch | 24 ------------------------
6 files changed, 14 insertions(+), 72 deletions(-)
---
diff --git a/domoticz.spec b/domoticz.spec
index d1c67b0..1503252 100644
--- a/domoticz.spec
+++ b/domoticz.spec
@@ -1,12 +1,12 @@
Summary: Open source Home Automation System
Name: domoticz
-Version: 2022.1
-Release: 3
+Version: 2022.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: 03ebcd9af34fbd2737725303a50ad9fd
+# Source0-md5: f9ac0ba4828dc40a19c1f24f8b2d9614
Source1: %{name}.service
Source2: %{name}.conf
# Use system tinyxpath (https://github.com/domoticz/domoticz/pull/1759)
@@ -15,9 +15,7 @@ Patch0: %{name}-tinyxpath.patch
Patch1: %{name}-python.patch
Patch2: no-git.patch
Patch3: %{name}-no_updates.patch
-Patch4: strstr.patch
-Patch5: config.patch
-Patch6: gcc12.patch
+Patch4: config.patch
BuildRequires: boost-devel >= 1.66.0
BuildRequires: cereal-devel
BuildRequires: cmake >= 3.16.0
@@ -64,8 +62,6 @@ and much more. Notifications/Alerts can be sent to any mobile device
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
APPVERSION="%{version}"
echo "#define APPVERSION ${APPVERSION##*.}" > appversion.h
diff --git a/domoticz-no_updates.patch b/domoticz-no_updates.patch
index 17e0bed..47f2515 100644
--- a/domoticz-no_updates.patch
+++ b/domoticz-no_updates.patch
@@ -1,8 +1,8 @@
--- domoticz-2020.2/main/domoticz.cpp.orig 2020-04-26 15:49:25.000000000 +0200
+++ domoticz-2020.2/main/domoticz.cpp 2021-04-10 16:50:37.189198278 +0200
@@ -152,7 +152,7 @@
+ bool g_bUseSyslog = false;
bool g_bRunAsDaemon = false;
- bool g_bDontCacheWWW = false;
http::server::_eWebCompressionMode g_wwwCompressMode = http::server::WWW_USE_GZIP;
-bool g_bUseUpdater = true;
+bool g_bUseUpdater = false;
diff --git a/domoticz-python.patch b/domoticz-python.patch
index a5244d9..5c245c0 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,20 +155,10 @@
- if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll");
- if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll");
- # else
+@@ -155,21 +155,9 @@
+ shared_lib_ = nullptr;
+ if (!shared_lib_) {
+ #ifdef WIN32
+- 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");
@@ -11,8 +12,8 @@
- if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll");
- if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll");
+ if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll");
- # endif
#else
+- 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);
diff --git a/domoticz-tinyxpath.patch b/domoticz-tinyxpath.patch
index 5ca63d9..1711735 100644
--- a/domoticz-tinyxpath.patch
+++ b/domoticz-tinyxpath.patch
@@ -132,7 +132,7 @@ index bc231d8f6..334f203a6 100644
+
#define ADD_STRING_TO_DICT(pPlugin, pDict, key, value) \
{ \
- PyNewRef pObj = Py_BuildValue("s", value.c_str()); \
+ PyNewRef pStr(value); \
--- a/hardware/AnnaThermostat.cpp 2020-03-22 09:16:16.000000000 -0500
+++ b/hardware/AnnaThermostat.cpp 2020-03-24 10:41:00.530030798 -0500
@@ -9,7 +9,7 @@
@@ -158,8 +158,8 @@ index bc231d8f6..334f203a6 100644
+#include <tinyxml.h>
+#include <xpath_static.h>
- #ifdef _DEBUG
- #define DEBUG_EcoDevices
+ // Minimum EcoDevises firmware required
+ #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 @@
diff --git a/gcc12.patch b/gcc12.patch
deleted file mode 100644
index 6f7dc14..0000000
--- a/gcc12.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2975b1113d9540f39b6bade3b6d459b61c2e5007 Mon Sep 17 00:00:00 2001
-From: Arjen de Korte <build+github at de-korte.org>
-Date: Sun, 15 May 2022 19:00:02 +0200
-Subject: [PATCH] Fix compilation with GCC12
-
-Building domoticz fails under GCC12 with the following error:
-
-In file included from /usr/include/c++/12/utility:68,
- from /home/abuild/rpmbuild/BUILD/domoticz-2022.1/main/LuaTable.cpp:10:
-/usr/include/c++/12/bits/stl_relops.h:86:5: error: template with C linkage
- 86 | template <class _Tp>
- | ^~~~~~~~
----
- main/LuaTable.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main/LuaTable.cpp b/main/LuaTable.cpp
-index 6475fac6bd..eca7489a42 100644
---- a/main/LuaTable.cpp
-+++ b/main/LuaTable.cpp
-@@ -6,9 +6,9 @@ extern "C" {
- #include <lua.h>
- #include <lualib.h>
- #include <lauxlib.h>
-+}
-
- #include <utility>
--}
-
- CLuaTable::CLuaTable(lua_State *lua_state, const std::string &Name)
- {
diff --git a/strstr.patch b/strstr.patch
deleted file mode 100644
index 15321f2..0000000
--- a/strstr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3b96ccfcd61ef4e30d4fa246dcd1724c0712bbe9 Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus at fastmail.com>
-Date: Mon, 31 Jan 2022 12:15:41 +0100
-Subject: [PATCH] add header for strstr
-
----
- hardware/EnOceanRawValue.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hardware/EnOceanRawValue.cpp b/hardware/EnOceanRawValue.cpp
-index 1a6769118..14de21632 100644
---- a/hardware/EnOceanRawValue.cpp
-+++ b/hardware/EnOceanRawValue.cpp
-@@ -1,6 +1,7 @@
- #include "stdafx.h"
- #include "EnOceanRawValue.h"
- #include <string>
-+#include <string.h>
-
-
-
---
-2.35.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/domoticz.git/commitdiff/fbf2e31490ced5b01baeb95788bacdd58371b725
More information about the pld-cvs-commit
mailing list