From 1cebb8e27851fcf1e91fc746251783f41a489bd3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 6 Jul 2021 19:39:33 -0700 Subject: [PATCH] telldus-core: fix compilation with GCC11 Signed-off-by: Rosen Penev --- utils/telldus-core/Makefile | 2 +- utils/telldus-core/patches/970-gcc11.patch | 33 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 utils/telldus-core/patches/970-gcc11.patch diff --git a/utils/telldus-core/Makefile b/utils/telldus-core/Makefile index 96d7dfc64e..70374ce1a0 100644 --- a/utils/telldus-core/Makefile +++ b/utils/telldus-core/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=telldus-core PKG_VERSION:=2.1.2 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.telldus.com/TellStick/Software/telldus-core/ diff --git a/utils/telldus-core/patches/970-gcc11.patch b/utils/telldus-core/patches/970-gcc11.patch new file mode 100644 index 0000000000..a575647d7b --- /dev/null +++ b/utils/telldus-core/patches/970-gcc11.patch @@ -0,0 +1,33 @@ +--- a/service/SettingsConfuse.cpp ++++ b/service/SettingsConfuse.cpp +@@ -42,10 +42,10 @@ Settings::Settings(void) { + */ + Settings::~Settings(void) { + TelldusCore::MutexLocker locker(&mutex); +- if (d->cfg > 0) { ++ if (d->cfg) { + cfg_free(d->cfg); + } +- if (d->var_cfg > 0) { ++ if (d->var_cfg) { + cfg_free(d->var_cfg); + } + delete d; +@@ -56,7 +56,7 @@ Settings::~Settings(void) { + */ + std::wstring Settings::getSetting(const std::wstring &strName) const { + TelldusCore::MutexLocker locker(&mutex); +- if (d->cfg > 0) { ++ if (d->cfg) { + std::string setting(cfg_getstr(d->cfg, TelldusCore::wideToString(strName).c_str())); + return TelldusCore::charToWstring(setting.c_str()); + } +@@ -68,7 +68,7 @@ std::wstring Settings::getSetting(const + */ + int Settings::getNumberOfNodes(Node node) const { + TelldusCore::MutexLocker locker(&mutex); +- if (d->cfg > 0) { ++ if (d->cfg) { + if (node == Device) { + return cfg_size(d->cfg, "device"); + } else if (node == Controller) {