Skip to contentSkip to conversation

qt5: fix legal info

PATCH New Fatih Aşıcı 2 participants 2 messages Jun 13, 2014 – Jun 14, 2014

lore
Share & tools
lore

Fatih Aşıcı

author
#0 lore raw

PATCH 1/1 qt5: fix legal info

Signed-off-by Fatih A??c? <[email protected]>
---
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 +---
 package/qt5/qt5multimedia/qt5multimedia.mk             | 4 +---
 package/qt5/qt5svg/qt5svg.mk                           | 3 +--
 package/qt5/qt5webkit/qt5webkit.mk                     | 8 +++-----
 4 files changed, 6 insertions(+), 13 deletions(-)
package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +1 -3
index 036cf21..2c3f66a 100644
@@ -12,9 +12,7 @@ QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5GRAPHICALEFFECTS_LICENSE = LGPLv2.1 or GPLv3.0
-# Here we would like to get license files from qt5base, but qt5base
-# may not be extracted at the time we get the legal-info for
-# qt5script.
+QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
 QT5GRAPHICALEFFECTS_LICENSE = Commercial license
 QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO
package/qt5/qt5multimedia/qt5multimedia.mk +1 -3
index e7ac562..5eef543 100644
@@ -12,9 +12,7 @@ QT5MULTIMEDIA_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5MULTIMEDIA_LICENSE = LGPLv2.1 or GPLv3.0
-# Here we would like to get license files from qt5base, but qt5base
-# may not be extracted at the time we get the legal-info for
-# qt5script.
+QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
 QT5MULTIMEDIA_LICENSE = Commercial license
 QT5MULTIMEDIA_REDISTRIBUTE = NO
package/qt5/qt5svg/qt5svg.mk +1 -2
index da981f4..a768acb 100644
@@ -12,8 +12,7 @@ QT5SVG_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5SVG_LICENSE = LGPLv2.1 or GPLv3.0
-# Here we would like to get license files from qt5base, but qt5base
-# may not be extracted at the time we get the legal-info for qt5svg.
+QT5SVG_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
 QT5SVG_LICENSE = Commercial license
 QT5SVG_REDISTRIBUTE = NO
package/qt5/qt5webkit/qt5webkit.mk +3 -5
index 33b775d..08c30be 100644
@@ -11,14 +11,12 @@ QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison host-fle
 QT5WEBKIT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBKIT_LICENSE = LGPLv2.1 or GPLv3.0
-# Here we would like to get license files from qt5base, but qt5base
-# may not be extracted at the time we get the legal-info for
-# qt5script.
+QT5WEBKIT_LICENSE = LGPLv2+, MIT
 else
-QT5WEBKIT_LICENSE = Commercial license
+QT5WEBKIT_LICENSE = LGPLv2+, MIT, Commercial license
 QT5WEBKIT_REDISTRIBUTE = NO
 endif
+QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 Source/WebKit/LICENSE
 
 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
 QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
Signature · 1 line
1.9.1
Applied
#1 lore raw

PATCH 1/1 qt5: fix legal info

Dear Fatih A??c?,

Quoted 7 lines · Fatih A??c?
Signed-off-by Fatih A??c? <[email protected]>
---
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 +---
 package/qt5/qt5multimedia/qt5multimedia.mk             | 4 +---
 package/qt5/qt5svg/qt5svg.mk                           | 3 +--
 package/qt5/qt5webkit/qt5webkit.mk                     | 8 +++-----
 4 files changed, 6 insertions(+), 13 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com