From 40b9be06b52907a8163ae5ffd61c871467a71c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 9 Mar 2021 21:36:58 +0100 Subject: [PATCH] kde-plasma: License change related post fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../tier3/kactivitymanagerd/kactivitymanagerd.bb | 9 ++++++--- recipes-kde/plasma/untier/bluedevil/bluedevil.bb | 10 ++++++++-- .../untier/kdeplasma-addons/kdeplasma-addons.bb | 13 ++++++++++--- recipes-kde/plasma/untier/kgamma5/kgamma5.bb | 4 ++-- recipes-kde/plasma/untier/khotkeys/khotkeys.bb | 8 +++++--- .../kwayland-integration/kwayland-integration.bb | 6 ++++-- .../untier/kwayland-server/kwayland-server.bb | 9 +++++++-- 7 files changed, 42 insertions(+), 17 deletions(-) diff --git a/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb b/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb index 1b3d17e8..26ebedc5 100644 --- a/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb +++ b/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb @@ -1,8 +1,11 @@ SUMMARY = "System service to manage user's activities" -LICENSE = "GPL-2.0 | GPL-3.0" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.1-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ - file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ + file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \ + file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \ + file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \ " inherit kde-plasma gettext diff --git a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb index c5f7a30e..738e0f2e 100644 --- a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb +++ b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb @@ -1,7 +1,13 @@ SUMMARY = "Integrate Bluetooth within KDE workspace and applications" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & GPL-3.0-or-later & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ - file://HACKING;md5=ea929f30c0ac1f4fe1a778821aecc4cd \ + file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ + file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \ + file://LICENSES/GPL-3.0-or-later.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \ + file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \ + file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \ + file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \ " inherit kde-plasma gettext mime diff --git a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb index 6c2c1f79..44f46b26 100644 --- a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb +++ b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb @@ -1,8 +1,15 @@ SUMMARY = "All kind of addons to improve your Plasma experience" -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \ + file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ + file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \ + file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \ + file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \ + file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \ + file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \ " inherit kde-plasma gettext diff --git a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb index 7c4c49f1..3b2c5ca6 100644 --- a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb +++ b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb @@ -1,7 +1,7 @@ SUMMARY = "Adjust your monitor's gamma settings" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ " REQUIRED_DISTRO_FEATURES = "x11" diff --git a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb index 5bea9de0..8132ab83 100644 --- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb +++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb @@ -1,8 +1,10 @@ SUMMARY = "KHOTKEYS" -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-2.0-only & GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ + file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ " REQUIRED_DISTRO_FEATURES = "x11" diff --git a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb index 1847fe9c..f46ec9b9 100644 --- a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb +++ b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb @@ -1,8 +1,10 @@ SUMMARY = "Integration plugins for wayland windowing system" DESCRIPTION = "Provides integration plugins for various KDE frameworks for the wayland windowing system" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \ + file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \ + file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \ " inherit kde-plasma diff --git a/recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb b/recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb index 5d718b6f..1efa2787 100644 --- a/recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb +++ b/recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb @@ -1,7 +1,12 @@ SUMMARY = "Wayland Server Components built on KDE Frameworks" -LICENSE = "LGPL-2.1" +LICENSE = "BSD-3-Clause & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only & MIT & MIT-CMU" LIC_FILES_CHKSUM = " \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \ + file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \ + file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \ + file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \ + file://LICENSES/MIT-CMU.txt;md5=b6936b5be2ab721140d9bf57c37b0b92 \ " inherit kde-plasma