From e3503c856e239254db49b46472c596864ea139d2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 3 May 2017 16:11:49 +0300 Subject: liberation-fonts: update to 2.00.1 'fontforge issue' was actually a non-issue; fontforge is required only when building ttf fonts from sfd source. We took prebuilt ttf fonts when using 1.04 version, and can do the same thing with 2.00.1 version, it's just that the tarball name for prebuilt fonts has slightly changed and no one noticed somehow. License has changed from GPLv2 to Open Font License v.1.1 (From OE-Core rev: 9b60def67028df65fa8894c49cf09e601f1670df) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../ttf-fonts/liberation-fonts_1.04.bb | 40 ---------------------- .../ttf-fonts/liberation-fonts_2.00.1.bb | 39 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb create mode 100644 meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb deleted file mode 100644 index 74212e7e5e..0000000000 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Liberation(tm) Fonts" -DESCRIPTION = "The Liberation(tm) Fonts is a font family originally \ -created by Ascender(c) which aims at metric compatibility with \ -Arial, Times New Roman, Courier New." -HOMEPAGE = "https://releases.pagure.org/liberation-fonts/" -BUGTRACKER = "https://bugzilla.redhat.com/" - -RECIPE_NO_UPDATE_REASON = "2.x depends on fontforge package, which is not yet provided in oe-core" - -SECTION = "x11/fonts" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r4" -PE = "1" - -inherit allarch fontcache - -FONT_PACKAGES = "${PN}" - -SRC_URI = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${PV}.tar.gz \ - file://30-liberation-aliases.conf" - -SRC_URI[md5sum] = "4846797ef0fc70b0cbaede2514677c58" -SRC_URI[sha256sum] = "0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1" - -do_install () { - install -d ${D}${datadir}/fonts/ttf/ - for i in *.ttf; do - install -m 0644 $i ${D}${prefix}/share/fonts/ttf/${i} - done - - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ - - install -d ${D}${prefix}/share/doc/${BPN}/ - install -m 0644 License.txt ${D}${datadir}/doc/${BPN}/ -} - -PACKAGES = "${PN}" -FILES_${PN} += "${sysconfdir} ${datadir}" diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb new file mode 100644 index 0000000000..412da48725 --- /dev/null +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "Liberation(tm) Fonts" +DESCRIPTION = "The Liberation(tm) Fonts is a font family originally \ +created by Ascender(c) which aims at metric compatibility with \ +Arial, Times New Roman, Courier New." +HOMEPAGE = "https://releases.pagure.org/liberation-fonts/" +BUGTRACKER = "https://bugzilla.redhat.com/" + +SECTION = "x11/fonts" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f96db970a9a46c5369142b99f530366b" +PE = "1" + +inherit allarch fontcache + +FONT_PACKAGES = "${PN}" + +SRC_URI = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${PV}.tar.gz \ + file://30-liberation-aliases.conf" + +S = "${WORKDIR}/liberation-fonts-ttf-${PV}" + +SRC_URI[md5sum] = "5c781723a0d9ed6188960defba8e91cf" +SRC_URI[sha256sum] = "7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504" + +do_install () { + install -d ${D}${datadir}/fonts/ttf/ + for i in *.ttf; do + install -m 0644 $i ${D}${prefix}/share/fonts/ttf/${i} + done + + install -d ${D}${sysconfdir}/fonts/conf.d/ + install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ + + install -d ${D}${prefix}/share/doc/${BPN}/ + install -m 0644 LICENSE ${D}${datadir}/doc/${BPN}/ +} + +PACKAGES = "${PN}" +FILES_${PN} += "${sysconfdir} ${datadir}" -- cgit v1.2.3-54-g00ecf