commit cd9dc7eee16343242b3ae2f657d58c272b1c93dc
Author: Jan Palus <[email protected]>
Date: Mon Jan 31 21:51:02 2022 +0100
up to 2022.1
domoticz-gpio.patch | 16 ----------------
domoticz-tinyxpath.patch | 6 +++---
domoticz.spec | 13 ++++++-------
strstr.patch | 24 ++++++++++++++++++++++++
4 files changed, 33 insertions(+), 26 deletions(-)
---
diff --git a/domoticz.spec b/domoticz.spec
index 1de1f59..87d1f5f 100644
--- a/domoticz.spec
+++ b/domoticz.spec
@@ -1,12 +1,12 @@
Summary: Open source Home Automation System
Name: domoticz
-Version: 2021.1
-Release: 7
+Version: 2022.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: 28349806fc3ddb0514ea7d9255ceecd0
+# Source0-md5: 03ebcd9af34fbd2737725303a50ad9fd
Source1: %{name}.service
Source2: %{name}.conf
# Use system tinyxpath (https://github.com/domoticz/domoticz/pull/1759)
@@ -14,14 +14,13 @@ Patch0: %{name}-tinyxpath.patch
# Fix python detection (https://github.com/domoticz/domoticz/pull/1749)
Patch1: %{name}-python.patch
Patch2: no-git.patch
-Patch3: %{name}-gpio.patch
-Patch4: %{name}-no_updates.patch
+Patch3: %{name}-no_updates.patch
+Patch4: strstr.patch
BuildRequires: boost-devel >= 1.66.0
BuildRequires: cereal-devel
BuildRequires: cmake >= 3.16.0
BuildRequires: curl-devel
BuildRequires: jsoncpp-devel
-BuildRequires: libfmt-devel
BuildRequires: libmosquitto-devel
BuildRequires: libopenzwave-devel >= 1.5.0
BuildRequires: libstdc++-devel >= 6:4.9
@@ -77,7 +76,6 @@ install -d build && cd build
export CXXFLAGS="%{rpmcxxflags} -DPYTHON_LIBDIR=\\\"%{_libdir}\\\""
%cmake \
-DUSE_BUILTIN_JSONCPP=NO \
- -DUSE_BUILTIN_LIBFMT=NO \
-DUSE_BUILTIN_MINIZIP=NO \
-DUSE_BUILTIN_MQTT=NO \
-DUSE_BUILTIN_SQLITE=NO \
@@ -87,6 +85,7 @@ export CXXFLAGS="%{rpmcxxflags}
-DPYTHON_LIBDIR=\\\"%{_libdir}\\\""
-DUSE_STATIC_BOOST=NO \
-DUSE_STATIC_LIBSTDCXX=NO \
-DUSE_STATIC_OPENZWAVE=NO \
+ -DFORCE_WITH_GPIO:BOOL=TRUE \
-DCMAKE_INSTALL_PREFIX=%{_datadir}/%{name} \
..
diff --git a/domoticz-gpio.patch b/domoticz-gpio.patch
deleted file mode 100644
index 4dbe8cb..0000000
--- a/domoticz-gpio.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- domoticz-2020.2/CMakeLists.txt.orig 2021-04-08 21:42:12.847131340
+0200
-+++ domoticz-2020.2/CMakeLists.txt 2021-04-08 21:52:40.727278201 +0200
-@@ -718,12 +718,7 @@
- MESSAGE(STATUS "==== OpenZWave not found, support disabled!")
- ENDIF(OpenZWave)
-
--IF(EXISTS /sys/class/gpio)
-- message(STATUS "GPIO is available")
-- add_definitions(-DWITH_GPIO)
--ELSE()
-- message(STATUS "GPIO is not available")
--ENDIF()
-+add_definitions(-DWITH_GPIO)
-
- find_path(TELLDUSCORE_INCLUDE NAMES telldus-core.h)
- IF(TELLDUSCORE_INCLUDE)
diff --git a/domoticz-tinyxpath.patch b/domoticz-tinyxpath.patch
index 26f6d20..5ca63d9 100644
--- a/domoticz-tinyxpath.patch
+++ b/domoticz-tinyxpath.patch
@@ -130,9 +130,9 @@ index bc231d8f6..334f203a6 100644
+#include <tinyxml.h>
+
- #define ADD_STRING_TO_DICT(pPlugin, pDict, key, value)
\
- {
\
- PyNewRef pObj = Py_BuildValue("s", value.c_str());
\
+ #define ADD_STRING_TO_DICT(pPlugin, pDict, key, value)
\
+ {
\
+ PyNewRef pObj = Py_BuildValue("s", value.c_str());
\
--- 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 @@
diff --git a/strstr.patch b/strstr.patch
new file mode 100644
index 0000000..15321f2
--- /dev/null
+++ b/strstr.patch
@@ -0,0 +1,24 @@
+From 3b96ccfcd61ef4e30d4fa246dcd1724c0712bbe9 Mon Sep 17 00:00:00 2001
+From: Jan Palus <[email protected]>
+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/3a1bb43e8d6669b83edc0b3b0f6e7e37872502c2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
