From d2f1985994da4dc95a67f1513e9f186324533bc5 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Fri, 9 Aug 2024 13:24:02 +0200 Subject: [PATCH] package/simple-mail: enable for qt6 Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/simple-mail/Config.in | 5 +++-- package/simple-mail/simple-mail.mk | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package/simple-mail/Config.in b/package/simple-mail/Config.in index 681a8410db..fd82a224d3 100644 --- a/package/simple-mail/Config.in +++ b/package/simple-mail/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_SIMPLE_MAIL bool "simple-mail" - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_NETWORK + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT5BASE_NETWORK if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_NETWORK if BR2_PACKAGE_QT6 select BR2_PACKAGE_OPENSSL help An SMTP library written in C++ for Qt. diff --git a/package/simple-mail/simple-mail.mk b/package/simple-mail/simple-mail.mk index 94f2369816..82bea45f21 100644 --- a/package/simple-mail/simple-mail.mk +++ b/package/simple-mail/simple-mail.mk @@ -9,7 +9,12 @@ SIMPLE_MAIL_SITE = $(call github,cutelyst,simple-mail,v$(SIMPLE_MAIL_VERSION)) SIMPLE_MAIL_INSTALL_STAGING = YES SIMPLE_MAIL_LICENSE = LGPL-2.1+ SIMPLE_MAIL_LICENSE_FILES = LICENSE -SIMPLE_MAIL_DEPENDENCIES = qt5base SIMPLE_MAIL_CONF_OPTS = -DBUILD_DEMOS=OFF +ifeq ($(BR2_PACKAGE_QT5BASE),y) +SIMPLE_MAIL_DEPENDENCIES += qt5base +else ifeq ($(BR2_PACKAGE_QT6BASE),y) +SIMPLE_MAIL_DEPENDENCIES += qt6base +SIMPLE_MAIL_CONF_OPTS += -DQT_VERSION_MAJOR=6 +endif $(eval $(cmake-package))