Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni via buildroot <buildroot@buildroot.org>
To: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/grantlee: bump to 5.3.1 and enable for Qt6
Date: Wed, 7 Aug 2024 22:59:05 +0200	[thread overview]
Message-ID: <20240807225905.63f4c0b2@windsurf> (raw)
In-Reply-To: <20240807145517.3019024-1-zgyarmati@zgyarmati.de>

Hello Zoltan,

I have applied, but after doing some changes, see below.

On Wed,  7 Aug 2024 16:55:17 +0200
Zoltan Gyarmati <zgyarmati@zgyarmati.de> wrote:

> Signed-off-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
> ---
>  package/grantlee/Config.in     |  8 +++++---
>  package/grantlee/grantlee.hash |  2 +-
>  package/grantlee/grantlee.mk   | 11 +++++++++--
>  3 files changed, 15 insertions(+), 6 deletions(-)

First of all, I've split into two commits: one doing the bump, one
enabling on Qt6.

> diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in
> index 779306bc2e..a64f8a589b 100644
> --- a/package/grantlee/Config.in
> +++ b/package/grantlee/Config.in
> @@ -1,8 +1,10 @@
>  config BR2_PACKAGE_GRANTLEE
>  	bool "grantlee"
> -	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5
> -	select BR2_PACKAGE_QT5SCRIPT
> -	select BR2_PACKAGE_QT5BASE_GUI
> +	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6

I've added parenthesis around (BR2_PACKAGE_QT5_JSCORE_AVAILABLE &&
BR2_PACKAGE_QT5) to clarify the priority of the operators.

> diff --git a/package/grantlee/grantlee.hash b/package/grantlee/grantlee.hash
> index 6508aa70cc..57061fb03f 100644
> --- a/package/grantlee/grantlee.hash
> +++ b/package/grantlee/grantlee.hash
> @@ -1,5 +1,5 @@
>  # Locally calculated
> -sha256  139acee5746b957bdf1327ec0d97c604d4c0b9be42aec5d584297cb5ed6a990a  grantlee-5.2.0.tar.gz
> +sha256  ba288ae9ed37ec0c3622ceb40ae1f7e1e6b2ea89216ad8587f0863d64be24f06  grantlee-5.3.1.tar.gz
>  
>  # Hash for license file
>  sha256  a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING.LIB

The hash of the license file had changed, perhaps you forgot to check
"make legal-info"? So I fixed that up and explained the license change
in the commit log.

Applied with those changes. 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

      reply	other threads:[~2024-08-07 20:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-07 14:55 [Buildroot] [PATCH 1/1] package/grantlee: bump to 5.3.1 and enable for Qt6 Zoltan Gyarmati
2024-08-07 20:59 ` Thomas Petazzoni via buildroot [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240807225905.63f4c0b2@windsurf \
    --to=buildroot@buildroot.org \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=zgyarmati@zgyarmati.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox