* [Buildroot] [PATCH 1/1] qt5quickcontrols: update license file names
@ 2018-08-29 6:18 Laurent Hartanerot
2018-08-29 8:23 ` Thomas Petazzoni
2018-08-29 11:05 ` [Buildroot] [PATCH v2 " Laurent Hartanerot
0 siblings, 2 replies; 4+ messages in thread
From: Laurent Hartanerot @ 2018-08-29 6:18 UTC (permalink / raw)
To: buildroot
From: Laurent Hartanerot <laurent.hartanerot@atos.net>
For the 2018.05.x branch:
Update license file name for qt5quickcontrols-5.6.3
(Last version on the 2018.05.x branch)
Signed-off-by: Laurent Hartanerot <laurent.hartanerot@atos.net>
---
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 5517cc1537..4afcf5953b 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -11,7 +11,7 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS_INSTALL_STAGING = YES
QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
-QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL
+QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.FDL LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
define QT5QUICKCONTROLS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] qt5quickcontrols: update license file names
2018-08-29 6:18 [Buildroot] [PATCH 1/1] qt5quickcontrols: update license file names Laurent Hartanerot
@ 2018-08-29 8:23 ` Thomas Petazzoni
2018-08-29 11:05 ` [Buildroot] [PATCH v2 " Laurent Hartanerot
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2018-08-29 8:23 UTC (permalink / raw)
To: buildroot
Hello Laurent,
Thanks for this contribution!
On Wed, 29 Aug 2018 08:18:13 +0200, Laurent Hartanerot wrote:
> From: Laurent Hartanerot <laurent.hartanerot@atos.net>
>
> For the 2018.05.x branch:
Why only for the 2018.05.x branch? The master branch seems to be
affected as well.
> Update license file name for qt5quickcontrols-5.6.3
> (Last version on the 2018.05.x branch)
>
> Signed-off-by: Laurent Hartanerot <laurent.hartanerot@atos.net>
> ---
> package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
> index 5517cc1537..4afcf5953b 100644
> --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
> +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
> @@ -11,7 +11,7 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
> QT5QUICKCONTROLS_INSTALL_STAGING = YES
>
> QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
> -QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL
> +QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.FDL LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
Is this working for both Qt 5.6 and Qt 5.11 ? Or do we need a
conditional on the Qt version, like we have in qt5serialport.mk for
example ?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2 1/1] qt5quickcontrols: update license file names
2018-08-29 6:18 [Buildroot] [PATCH 1/1] qt5quickcontrols: update license file names Laurent Hartanerot
2018-08-29 8:23 ` Thomas Petazzoni
@ 2018-08-29 11:05 ` Laurent Hartanerot
2018-08-29 20:50 ` Thomas Petazzoni
1 sibling, 1 reply; 4+ messages in thread
From: Laurent Hartanerot @ 2018-08-29 11:05 UTC (permalink / raw)
To: buildroot
From: Laurent Hartanerot <laurent.hartanerot@atos.net>
Update license file name for qt5quickcontrols-5.6
Signed-off-by: Laurent Hartanerot <laurent.hartanerot@atos.net>
---
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 6e551d5a27..318b015739 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -10,8 +10,13 @@ QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUIC
QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS_INSTALL_STAGING = YES
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL
+else
+QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
+QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.FDL LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
+endif
define QT5QUICKCONTROLS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2 1/1] qt5quickcontrols: update license file names
2018-08-29 11:05 ` [Buildroot] [PATCH v2 " Laurent Hartanerot
@ 2018-08-29 20:50 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2018-08-29 20:50 UTC (permalink / raw)
To: buildroot
Hello Laurent,
On Wed, 29 Aug 2018 13:05:17 +0200, Laurent Hartanerot wrote:
> From: Laurent Hartanerot <laurent.hartanerot@atos.net>
>
> Update license file name for qt5quickcontrols-5.6
>
> Signed-off-by: Laurent Hartanerot <laurent.hartanerot@atos.net>
I have applied your patch to the master branch, after doing two
additional tweaks, see below.
> +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
> QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
> QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL
> +else
> +QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
The LICENSE variable was the same in both cases, so I moved it outside
of the version condition.
> +QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.FDL LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
I moved LICENSE.FDL to the end of the list, so that the license files
are in the same order in both versions. It doesn't change anything
functionally speaking, but is a bit more consistent.
Thanks!
Thomas Petazzoni
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-08-29 20:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-29 6:18 [Buildroot] [PATCH 1/1] qt5quickcontrols: update license file names Laurent Hartanerot
2018-08-29 8:23 ` Thomas Petazzoni
2018-08-29 11:05 ` [Buildroot] [PATCH v2 " Laurent Hartanerot
2018-08-29 20:50 ` Thomas Petazzoni
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.