All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/simple-mail: bump to 3.0.0, enable for qt6
@ 2024-08-08  5:24 Zoltan Gyarmati
  2024-08-08  5:30 ` Zoltan Gyarmati
  0 siblings, 1 reply; 3+ messages in thread
From: Zoltan Gyarmati @ 2024-08-08  5:24 UTC (permalink / raw)
  To: buildroot; +Cc: Zoltan Gyarmati

Signed-off-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
---
 package/simple-mail/Config.in        |  5 +++--
 package/simple-mail/simple-mail.hash |  2 +-
 package/simple-mail/simple-mail.mk   | 10 ++++++++--
 3 files changed, 12 insertions(+), 5 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.hash b/package/simple-mail/simple-mail.hash
index 67d6caff87..4de1525b53 100644
--- a/package/simple-mail/simple-mail.hash
+++ b/package/simple-mail/simple-mail.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  2026f2017662508b0f25da72694f1dd13ab3ccf82c0454f7c40f8a6cc450c410  simple-mail-2.3.0.tar.gz
+sha256  f93e93843d11da5c4ec44225eba46ccb3e9710fd594a27b966901745429ed4f4  simple-mail-3.0.0.tar.gz
 
 # Hash for license file
 sha256  592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c  LICENSE
diff --git a/package/simple-mail/simple-mail.mk b/package/simple-mail/simple-mail.mk
index 68484f79b0..9f2929345b 100644
--- a/package/simple-mail/simple-mail.mk
+++ b/package/simple-mail/simple-mail.mk
@@ -4,12 +4,18 @@
 #
 ################################################################################
 
-SIMPLE_MAIL_VERSION = 2.3.0
+SIMPLE_MAIL_VERSION = 3.0.0
 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
+endif
+ifeq ($(BR2_PACKAGE_QT6BASE),y)
+SIMPLE_MAIL_DEPENDENCIES += qt6base
+SIMPLE_MAIL_CONF_OPTS += -DQT_VERSION_MAJOR=6
+endif
 
 $(eval $(cmake-package))
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/simple-mail: bump to 3.0.0, enable for qt6
  2024-08-08  5:24 [Buildroot] [PATCH 1/1] package/simple-mail: bump to 3.0.0, enable for qt6 Zoltan Gyarmati
@ 2024-08-08  5:30 ` Zoltan Gyarmati
  2024-08-08  8:35   ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 3+ messages in thread
From: Zoltan Gyarmati @ 2024-08-08  5:30 UTC (permalink / raw)
  To: buildroot


[-- Attachment #1.1: Type: text/plain, Size: 2612 bytes --]



Dear Thomas&All,

please disregard this patch, i've just  read your e-mail about splitting 
my grantlee bump&qt6 patch into 2, gonna do the same with this one...

Thanks,

On 2024-08-08 07:24, Zoltan Gyarmati wrote:

> Signed-off-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
> ---
> package/simple-mail/Config.in        |  5 +++--
> package/simple-mail/simple-mail.hash |  2 +-
> package/simple-mail/simple-mail.mk   | 10 ++++++++--
> 3 files changed, 12 insertions(+), 5 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.hash 
> b/package/simple-mail/simple-mail.hash
> index 67d6caff87..4de1525b53 100644
> --- a/package/simple-mail/simple-mail.hash
> +++ b/package/simple-mail/simple-mail.hash
> @@ -1,5 +1,5 @@
> # Locally calculated
> -sha256  
> 2026f2017662508b0f25da72694f1dd13ab3ccf82c0454f7c40f8a6cc450c410  
> simple-mail-2.3.0.tar.gz
> +sha256  
> f93e93843d11da5c4ec44225eba46ccb3e9710fd594a27b966901745429ed4f4  
> simple-mail-3.0.0.tar.gz
> 
> # Hash for license file
> sha256  
> 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c  
> LICENSE
> diff --git a/package/simple-mail/simple-mail.mk 
> b/package/simple-mail/simple-mail.mk
> index 68484f79b0..9f2929345b 100644
> --- a/package/simple-mail/simple-mail.mk
> +++ b/package/simple-mail/simple-mail.mk
> @@ -4,12 +4,18 @@
> #
> ################################################################################
> 
> -SIMPLE_MAIL_VERSION = 2.3.0
> +SIMPLE_MAIL_VERSION = 3.0.0
> 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
> +endif
> +ifeq ($(BR2_PACKAGE_QT6BASE),y)
> +SIMPLE_MAIL_DEPENDENCIES += qt6base
> +SIMPLE_MAIL_CONF_OPTS += -DQT_VERSION_MAJOR=6
> +endif
> 
> $(eval $(cmake-package))

-- 
https://zgyarmati.de

[-- Attachment #1.2: Type: text/html, Size: 3830 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/simple-mail: bump to 3.0.0, enable for qt6
  2024-08-08  5:30 ` Zoltan Gyarmati
@ 2024-08-08  8:35   ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-08-08  8:35 UTC (permalink / raw)
  To: Zoltan Gyarmati; +Cc: buildroot

Hello Zoltan,

On Thu, 08 Aug 2024 07:30:38 +0200
Zoltan Gyarmati <zgyarmati@zgyarmati.de> wrote:

> please disregard this patch, i've just  read your e-mail about splitting 
> my grantlee bump&qt6 patch into 2, gonna do the same with this one...

Correct. Could you also verify legal-info after this bump, and use:

ifeq ($(BR2_PACKAGE_QT5),y)
...
else ifeq ($(BR2_PACKAGE_QT6),y)
...
endif

in the .mk file? Indeed BR2_PACKAGE_QT5 and BR2_PACKAGE_QT6 are
mutually exclusive.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-08-08  8:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-08  5:24 [Buildroot] [PATCH 1/1] package/simple-mail: bump to 3.0.0, enable for qt6 Zoltan Gyarmati
2024-08-08  5:30 ` Zoltan Gyarmati
2024-08-08  8:35   ` Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.