From 9b60def67028df65fa8894c49cf09e601f1670df Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 3 May 2017 16:11:49 +0300 Subject: [PATCH] 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 Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/conf/distro/include/default-versions.inc | 3 --- ...fonts_1.04.bb => liberation-fonts_2.00.1.bb} | 17 ++++++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) rename meta/recipes-graphics/ttf-fonts/{liberation-fonts_1.04.bb => liberation-fonts_2.00.1.bb} (67%) diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index d976508ff5..a6f331350e 100644 --- a/meta/conf/distro/include/default-versions.inc +++ b/meta/conf/distro/include/default-versions.inc @@ -2,6 +2,3 @@ # Default preferred versions # -# Force the older version of liberation-fonts until we fix the fontforge issue -PREFERRED_VERSION_liberation-fonts ?= "1.04" - diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb similarity index 67% rename from meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb rename to meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb index 74212e7e5e..412da48725 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb @@ -5,23 +5,22 @@ 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" +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-${PV}.tar.gz \ +SRC_URI = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${PV}.tar.gz \ file://30-liberation-aliases.conf" -SRC_URI[md5sum] = "4846797ef0fc70b0cbaede2514677c58" -SRC_URI[sha256sum] = "0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1" +S = "${WORKDIR}/liberation-fonts-ttf-${PV}" + +SRC_URI[md5sum] = "5c781723a0d9ed6188960defba8e91cf" +SRC_URI[sha256sum] = "7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504" do_install () { install -d ${D}${datadir}/fonts/ttf/ @@ -33,7 +32,7 @@ do_install () { 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}/ + install -m 0644 LICENSE ${D}${datadir}/doc/${BPN}/ } PACKAGES = "${PN}" -- 2.40.1