diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-08-23 22:20:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-25 16:00:10 +0100 |
commit | 65085f22e921f0ab9cd40aa7b192a22bdb7f31d0 (patch) | |
tree | 9d94479d860a6ed81ffe2b4b22d69cdb786ca813 | |
parent | 5f3f04816221ff5fd20a044cbfd0ad8dbef8ecc7 (diff) | |
download | poky-65085f22e921f0ab9cd40aa7b192a22bdb7f31d0.tar.gz |
font-alias: upgrade 1.0.3 -> 1.0.4
License-Update: editor tags change
(From OE-Core rev: efe4a2cce9144d246c1ae9bd9f2025459d4ce339)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch (renamed from meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch) | 24 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb (renamed from meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb) | 11 |
2 files changed, 22 insertions, 13 deletions
diff --git a/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch b/meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch index 0b9fb8ccc0..e54eee4ea9 100644 --- a/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch +++ b/meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch | |||
@@ -1,22 +1,32 @@ | |||
1 | From fa2bbd48a55d54bd2dae30edf7936e3ab7587c96 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Tue, 17 May 2011 23:03:02 +0000 | ||
4 | Subject: [PATCH] Improve handling of 'all' architecture recipes and their | ||
5 | |||
1 | Upstream-Status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
2 | 7 | ||
3 | XORG_DEFAULT_OPTIONS pulls in the following dependency chains: | 8 | XORG_DEFAULT_OPTIONS pulls in the following dependency chains: |
4 | 9 | ||
5 | XORG_CWARNFLAGS -> AC_PROG_CC_C99 | 10 | XORG_CWARNFLAGS -> AC_PROG_CC_C99 |
6 | XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS | 11 | XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS |
7 | XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host | 12 | XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host |
8 | 13 | ||
9 | each of which triggers the use of the host compiler. As an "all" | 14 | each of which triggers the use of the host compiler. As an "all" |
10 | architecture package, it shouldn't need a compiler (and doesn't). | 15 | architecture package, it shouldn't need a compiler (and doesn't). |
11 | 16 | ||
12 | RP 17/5/2011 | 17 | RP 17/5/2011 |
13 | 18 | ||
14 | diff -uNr font-alias-1.0.3.orig//configure.ac font-alias-1.0.3/configure.ac | 19 | --- |
15 | --- font-alias-1.0.3.orig//configure.ac 2011-05-18 21:29:18.378258643 +0200 | 20 | configure.ac | 6 +++--- |
16 | +++ font-alias-1.0.3/configure.ac 2011-05-18 21:32:06.865258593 +0200 | 21 | 1 file changed, 3 insertions(+), 3 deletions(-) |
17 | @@ -28,12 +28,12 @@ | 22 | |
23 | diff --git a/configure.ac b/configure.ac | ||
24 | index 3407c69..9fe1f89 100644 | ||
25 | --- a/configure.ac | ||
26 | +++ b/configure.ac | ||
27 | @@ -27,12 +27,12 @@ AC_INIT([font-alias], [1.0.4], | ||
28 | [font-alias]) | ||
18 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | 29 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) |
19 | AM_MAINTAINER_MODE | ||
20 | 30 | ||
21 | -# Require xorg-macros: XORG_DEFAULT_OPTIONS | 31 | -# Require xorg-macros: XORG_DEFAULT_OPTIONS |
22 | m4_ifndef([XORG_MACROS_VERSION], | 32 | m4_ifndef([XORG_MACROS_VERSION], |
@@ -29,4 +39,4 @@ diff -uNr font-alias-1.0.3.orig//configure.ac font-alias-1.0.3/configure.ac | |||
29 | +XORG_INSTALL | 39 | +XORG_INSTALL |
30 | AC_PROG_INSTALL | 40 | AC_PROG_INSTALL |
31 | 41 | ||
32 | XORG_FONTROOTDIR | 42 | # Require X.Org's font util macros 1.2 or later |
diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb index c5990a9e44..e4b70c69dc 100644 --- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb | |||
@@ -4,10 +4,11 @@ require xorg-font-common.inc | |||
4 | 4 | ||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ |
7 | file://cyrillic/fonts.alias;md5=f40795b0640d6785826aecd3b16f6124 \ | 7 | file://cyrillic/fonts.alias;md5=d27bc65a2655cacdbc2644b51c064c20 \ |
8 | file://75dpi/fonts.alias;md5=6bc48023f2ae7f3bfc105db7b0ee6b49 \ | 8 | file://75dpi/fonts.alias;md5=6bc48023f2ae7f3bfc105db7b0ee6b49 \ |
9 | file://misc/fonts.alias;md5=a8ec05d528431d4c9703b55a7efd67a8 \ | 9 | file://misc/fonts.alias;md5=1bdafa7c31aa54f87f3531f2ef8ed5a6 \ |
10 | file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" | 10 | file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb \ |
11 | " | ||
11 | 12 | ||
12 | SRC_URI += "file://nocompiler.patch" | 13 | SRC_URI += "file://nocompiler.patch" |
13 | 14 | ||
@@ -18,7 +19,5 @@ RDEPENDS_${PN}_class-native = "font-util-native" | |||
18 | inherit allarch | 19 | inherit allarch |
19 | 20 | ||
20 | PE = "1" | 21 | PE = "1" |
21 | PR = "r3" | ||
22 | 22 | ||
23 | SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" | 23 | SRC_URI[sha256sum] = "f3111ae8bf2e980f5f56af400e8eefe5fc9f4207f4a412ea79637fd66c945276" |
24 | SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" | ||