mkfontdir utility has been merged into mkfontscale source tree,
so a separate recipe is no longer needed (and clashes on install).

License-Update: additional copyright claims from Red Hat and Open Group
Signed-off-by: Alexander Kanavin <[email protected]>
---
 .../xorg-app/mkfontdir_1.0.7.bb               | 22 -------------------
 ...ontscale_1.1.3.bb => mkfontscale_1.2.1.bb} |  9 +++++---
 2 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
 rename meta/recipes-graphics/xorg-app/{mkfontscale_1.1.3.bb => 
mkfontscale_1.2.1.bb} (65%)

diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb 
b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
deleted file mode 100644
index a453e24876f..00000000000
--- a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require xorg-app-common.inc
-
-SUMMARY = "A program to create an index of X font files in a directory"
-
-DESCRIPTION = "For each directory argument, mkfontdir reads all of the \
-font files in the directory. The font names and related data are written \
-out to the files \"fonts.dir\", \"fonts.scale\", and \"fonts.alias\".  \
-The X server and font server use these files to find the available font \
-files."
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-RDEPENDS_${PN} += "mkfontscale"
-RDEPENDS_${PN}_class-native += "mkfontscale-native"
-
-BBCLASSEXTEND = "native"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=b4fcf2b90cadbfc15009b9e124dc3a3f"
-
-SRC_URI[md5sum] = "18c429148c96c2079edda922a2b67632"
-SRC_URI[sha256sum] = 
"56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530"
diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb 
b/meta/recipes-graphics/xorg-app/mkfontscale_1.2.1.bb
similarity index 65%
rename from meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb
rename to meta/recipes-graphics/xorg-app/mkfontscale_1.2.1.bb
index 2a6bec16491..a767ee847b7 100644
--- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.2.1.bb
@@ -10,9 +10,12 @@ is used by the mkfontdir program."
 
 DEPENDS = "util-macros-native zlib libfontenc freetype xorgproto"
 
+PROVIDES += "mkfontdir"
+RPROVIDES_${PN} += "mkfontdir"
+
 BBCLASSEXTEND = "native"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=99b1e1269aba5179139b9e4380fc0934"
 
-SRC_URI[md5sum] = "987c438e79f5ddb84a9c5726a1610819"
-SRC_URI[sha256sum] = 
"1e98df69ee5f4542d711e140e1d93e2c3f2775407ccbb7849110d52b91782a6a"
+SRC_URI[md5sum] = "215940de158b1a3d8b3f8b442c606e2f"
+SRC_URI[sha256sum] = 
"ca0495eb974a179dd742bfa6199d561bda1c8da4a0c5a667f21fd82aaab6bac7"
-- 
2.17.1

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to