diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-03-09 16:19:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-11 00:08:40 +0000 |
commit | bef022f9db66490b658d6e2ac950b2df53cc05bd (patch) | |
tree | df25670f1c869c64f43c63b8233dd10d2891cebb | |
parent | aae15d436c0308ae75ac518315b088b5b4250583 (diff) | |
download | poky-bef022f9db66490b658d6e2ac950b2df53cc05bd.tar.gz |
font-alias: update 1.0.4 -> 1.0.5
Drop nocompiler.patch as upstream is now using a macro specifically for data-only items:
https://www.spinics.net/lists/xorg/msg60817.html
(From OE-Core rev: 14b95747cb1d56c731828e06e60b207cdc94ae5e)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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 | 42 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-font/font-alias_1.0.5.bb (renamed from meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb) | 5 |
2 files changed, 2 insertions, 45 deletions
diff --git a/meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch b/meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch deleted file mode 100644 index e54eee4ea9..0000000000 --- a/meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
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 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | XORG_DEFAULT_OPTIONS pulls in the following dependency chains: | ||
9 | |||
10 | XORG_CWARNFLAGS -> AC_PROG_CC_C99 | ||
11 | XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS | ||
12 | XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host | ||
13 | |||
14 | each of which triggers the use of the host compiler. As an "all" | ||
15 | architecture package, it shouldn't need a compiler (and doesn't). | ||
16 | |||
17 | RP 17/5/2011 | ||
18 | |||
19 | --- | ||
20 | configure.ac | 6 +++--- | ||
21 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
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]) | ||
29 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | ||
30 | |||
31 | -# Require xorg-macros: XORG_DEFAULT_OPTIONS | ||
32 | m4_ifndef([XORG_MACROS_VERSION], | ||
33 | [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) | ||
34 | XORG_MACROS_VERSION(1.3) | ||
35 | -XORG_DEFAULT_OPTIONS | ||
36 | - | ||
37 | +XORG_RELEASE_VERSION | ||
38 | +XORG_CHANGELOG | ||
39 | +XORG_INSTALL | ||
40 | AC_PROG_INSTALL | ||
41 | |||
42 | # Require X.Org's font util macros 1.2 or later | ||
diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.5.bb index d80ecbeb8f..03c39a4334 100644 --- a/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.5.bb | |||
@@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ | |||
9 | file://misc/fonts.alias;md5=1bdafa7c31aa54f87f3531f2ef8ed5a6 \ | 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_EXT = "xz" | |
13 | SRC_URI += "file://nocompiler.patch" | ||
14 | 13 | ||
15 | DEPENDS = "util-macros-native font-util-native" | 14 | DEPENDS = "util-macros-native font-util-native" |
16 | RDEPENDS:${PN} = "encodings font-util" | 15 | RDEPENDS:${PN} = "encodings font-util" |
@@ -20,4 +19,4 @@ inherit allarch | |||
20 | 19 | ||
21 | PE = "1" | 20 | PE = "1" |
22 | 21 | ||
23 | SRC_URI[sha256sum] = "f3111ae8bf2e980f5f56af400e8eefe5fc9f4207f4a412ea79637fd66c945276" | 22 | SRC_URI[sha256sum] = "9f89e217bb73e0e3636a0a493fbf8b7c995156e0c53d9a0476d201b67c2d6b6e" |