From 2e862519671744771f32f0f05569822f1f3e25e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 18 Aug 2025 15:28:32 +0200 Subject: [PATCH] Drop unipi plugin with Qt6 --- debian-qt6/control | 11 ----------- debian-qt6/nymea-plugin-unipi2.install.in | 1 - nymea-plugins-modbus.pro | 14 ++++++++++---- 3 files changed, 10 insertions(+), 16 deletions(-) delete mode 120000 debian-qt6/nymea-plugin-unipi2.install.in diff --git a/debian-qt6/control b/debian-qt6/control index 462922c..6cf2bee 100644 --- a/debian-qt6/control +++ b/debian-qt6/control @@ -257,17 +257,6 @@ Description: nymea integration plugin for SunSpec Modbus devices This package contains the nymea integration plugin for SunSpec compatible solar inverters. -Package: nymea-plugin-unipi2 -Architecture: any -Multi-Arch: same -Section: libs -Depends: ${shlibs:Depends}, - ${misc:Depends}, -Replaces: nymea-plugin-unipi -Description: nymea integration plugin for UniPi devices - This package contains the nymea integration plugin for UniPi devices. - - Package: nymea-plugin-pcelectric Architecture: any Section: libs diff --git a/debian-qt6/nymea-plugin-unipi2.install.in b/debian-qt6/nymea-plugin-unipi2.install.in deleted file mode 120000 index ec9a933..0000000 --- a/debian-qt6/nymea-plugin-unipi2.install.in +++ /dev/null @@ -1 +0,0 @@ -../debian-qt5/nymea-plugin-unipi2.install.in \ No newline at end of file diff --git a/nymea-plugins-modbus.pro b/nymea-plugins-modbus.pro index d75a4ca..a845af8 100644 --- a/nymea-plugins-modbus.pro +++ b/nymea-plugins-modbus.pro @@ -27,20 +27,26 @@ PLUGIN_DIRS = \ stiebeleltron \ sungrow \ sunspec \ - unipi \ vestel \ wattsonic \ webasto \ + +message(============================================) +message("Qt version:" $$[QT_VERSION]) + +!greaterThan(QT_MAJOR_VERSION, 5) { + # We disable unipi for + PLUGIN_DIRS += \ + unipi +} + gcc { COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion") COMPILER_MAJOR_VERSION = $$str_member($$COMPILER_VERSION) greaterThan(COMPILER_MAJOR_VERSION, 7): QMAKE_CXXFLAGS += -Wno-deprecated-copy } -message(============================================) -message("Qt version:" $$[QT_VERSION]) - plugininfo.depends = FORCE for (entry, PLUGIN_DIRS):plugininfo.commands += test -d $${entry} || mkdir -p $${entry}; cd $${entry} && qmake -o Makefile $$PWD/$${entry}/$${entry}.pro && cd ..; for (entry, PLUGIN_DIRS):plugininfo.commands += make -C $${entry} plugininfo.h;