Jelajahi Sumber

package/simple-mail: enable for qt6

Signed-off-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Zoltan Gyarmati 1 tahun lalu
induk
melakukan
d2f1985994
2 mengubah file dengan 9 tambahan dan 3 penghapusan
  1. 3 2
      package/simple-mail/Config.in
  2. 6 1
      package/simple-mail/simple-mail.mk

+ 3 - 2
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.

+ 6 - 1
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))