summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-05-03 16:11:49 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-16 14:08:30 +0100
commite3503c856e239254db49b46472c596864ea139d2 (patch)
tree1980fd69832125b394b5857603155ca3cca2b889 /meta
parent85267a103496fc294c8bf25c1b2f2242ca8d99ed (diff)
downloadpoky-e3503c856e239254db49b46472c596864ea139d2.tar.gz
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 <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/default-versions.inc3
-rw-r--r--meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb (renamed from meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb)17
2 files changed, 8 insertions, 12 deletions
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 @@
2# Default preferred versions 2# Default preferred versions
3# 3#
4 4
5# Force the older version of liberation-fonts until we fix the fontforge issue
6PREFERRED_VERSION_liberation-fonts ?= "1.04"
7
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
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."
5HOMEPAGE = "https://releases.pagure.org/liberation-fonts/" 5HOMEPAGE = "https://releases.pagure.org/liberation-fonts/"
6BUGTRACKER = "https://bugzilla.redhat.com/" 6BUGTRACKER = "https://bugzilla.redhat.com/"
7 7
8RECIPE_NO_UPDATE_REASON = "2.x depends on fontforge package, which is not yet provided in oe-core"
9
10SECTION = "x11/fonts" 8SECTION = "x11/fonts"
11LICENSE = "GPLv2" 9LICENSE = "OFL-1.1"
12LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=f96db970a9a46c5369142b99f530366b"
13PR = "r4"
14PE = "1" 11PE = "1"
15 12
16inherit allarch fontcache 13inherit allarch fontcache
17 14
18FONT_PACKAGES = "${PN}" 15FONT_PACKAGES = "${PN}"
19 16
20SRC_URI = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${PV}.tar.gz \ 17SRC_URI = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${PV}.tar.gz \
21 file://30-liberation-aliases.conf" 18 file://30-liberation-aliases.conf"
22 19
23SRC_URI[md5sum] = "4846797ef0fc70b0cbaede2514677c58" 20S = "${WORKDIR}/liberation-fonts-ttf-${PV}"
24SRC_URI[sha256sum] = "0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1" 21
22SRC_URI[md5sum] = "5c781723a0d9ed6188960defba8e91cf"
23SRC_URI[sha256sum] = "7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504"
25 24
26do_install () { 25do_install () {
27 install -d ${D}${datadir}/fonts/ttf/ 26 install -d ${D}${datadir}/fonts/ttf/
@@ -33,7 +32,7 @@ do_install () {
33 install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ 32 install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
34 33
35 install -d ${D}${prefix}/share/doc/${BPN}/ 34 install -d ${D}${prefix}/share/doc/${BPN}/
36 install -m 0644 License.txt ${D}${datadir}/doc/${BPN}/ 35 install -m 0644 LICENSE ${D}${datadir}/doc/${BPN}/
37} 36}
38 37
39PACKAGES = "${PN}" 38PACKAGES = "${PN}"