From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 22 Sep 2023 07:24:06 +0000 (+0200)
Subject: font-util: upgrade 1.4.0 -> 1.4.1
X-Git-Tag: yocto-5.2~5065
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de98844d3e574dcbb91eee2f7d9e1dd88bfb21fb;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

font-util: upgrade 1.4.0 -> 1.4.1

License-update: clarify license for unicode items:
https://gitlab.freedesktop.org/xorg/font/util/-/merge_requests/7

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-graphics/xorg-font/font-util_1.4.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.4.1.bb
similarity index 60%
rename from meta/recipes-graphics/xorg-font/font-util_1.4.0.bb
rename to meta/recipes-graphics/xorg-font/font-util_1.4.1.bb
index db82104afe9..0c65927fb4e 100644
--- a/meta/recipes-graphics/xorg-font/font-util_1.4.0.bb
+++ b/meta/recipes-graphics/xorg-font/font-util_1.4.1.bb
@@ -2,12 +2,12 @@ SUMMARY = "X.Org font package creation/installation utilities"
 
 require xorg-font-common.inc
 
-#Unicode is MIT
-LICENSE = "MIT & MIT & BSD-4-Clause & BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5df208ec65eb84ce5bb8d82d8f3b9675 \
+LICENSE = "Unicode-TOU & BSD-4-Clause & BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2a9e705c00e463c8d294f90486852e06 \
                     file://ucs2any.c;endline=28;md5=8357dc567fc628bd12696f15b2a33bcb \
                     file://bdftruncate.c;endline=26;md5=4f82ffc101a1b165eae9c6998abff937 \
-                    file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34"
+                    file://map-ISO8859-1;beginline=1;endline=4;md5=9c9c1d525d29c0e82b5c99edbb8e71c1 \
+                    "
 
 DEPENDS = "encodings util-macros"
 DEPENDS:class-native = "util-macros-native"
@@ -16,7 +16,7 @@ RDEPENDS:${PN}:class-native = ""
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[sha256sum] = "9f724bf940128c7e39f7252bd961cd38cfac2359de2100a8bed696bf40d40f7d"
+SRC_URI[sha256sum] = "5c9f64123c194b150fee89049991687386e6ff36ef2af7b80ba53efaf368cc95"
 
 SYSROOT_DIRS_IGNORE:remove = "${datadir}/fonts"