From 7a08c5775826c6c2d6364ae2867949a2fa6c5399 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 13:30:26 +0200 Subject: [PATCH] qtdeclarative: Update LICENSE info * 5.0.2 and git recipes have the same LICENSE as qtbase (defined in qt5-${PV}.inc) (From meta-qt5 rev: a0099515d277936814e5ed687dd5e3f4da552d29) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-qt5/recipes-qt/qt5/qtdeclarative.inc | 4 ---- meta-qt5/recipes-qt/qt5/qtdeclarative_5.0.0.bb | 6 ++++++ meta-qt5/recipes-qt/qt5/qtdeclarative_5.0.1.bb | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/meta-qt5/recipes-qt/qt5/qtdeclarative.inc b/meta-qt5/recipes-qt/qt5/qtdeclarative.inc index 3a27788..d77c484 100644 --- a/meta-qt5/recipes-qt/qt5/qtdeclarative.inc +++ b/meta-qt5/recipes-qt/qt5/qtdeclarative.inc @@ -1,9 +1,5 @@ require qt5.inc -# FIXME!!! -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" - DEPENDS = "qtbase qtjsbackend" INC_PR = "r0" diff --git a/meta-qt5/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/meta-qt5/recipes-qt/qt5/qtdeclarative_5.0.0.bb index fb37cb8..996792c 100644 --- a/meta-qt5/recipes-qt/qt5/qtdeclarative_5.0.0.bb +++ b/meta-qt5/recipes-qt/qt5/qtdeclarative_5.0.0.bb @@ -1,6 +1,12 @@ require ${PN}.inc require qt5-${PV}.inc +# LICENSE files are missing in 5.0.0 and 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + PR = "${INC_PR}.0" SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832" diff --git a/meta-qt5/recipes-qt/qt5/qtdeclarative_5.0.1.bb b/meta-qt5/recipes-qt/qt5/qtdeclarative_5.0.1.bb index 9947168..1c33ea5 100644 --- a/meta-qt5/recipes-qt/qt5/qtdeclarative_5.0.1.bb +++ b/meta-qt5/recipes-qt/qt5/qtdeclarative_5.0.1.bb @@ -1,6 +1,12 @@ require ${PN}.inc require qt5-${PV}.inc +# LICENSE files are missing in 5.0.0 and 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + PR = "${INC_PR}.0" SRC_URI[md5sum] = "91bb22db9501847e7549e8a431d81b78" -- 2.7.4