diff options
author | 2023-03-09 16:19:44 +0100 | |
---|---|---|
committer | 2023-03-11 00:08:38 +0000 | |
commit | 14b95747cb1d56c731828e06e60b207cdc94ae5e (patch) | |
tree | 2828b501f87e6847534bfc7b4e9040604625056c | |
parent | 3f1a8baa1033a0cc506b078491ae26f199c81fad (diff) | |
download | openembedded-core-14b95747cb1d56c731828e06e60b207cdc94ae5e.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
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-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 @@ -From fa2bbd48a55d54bd2dae30edf7936e3ab7587c96 Mon Sep 17 00:00:00 2001 -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Tue, 17 May 2011 23:03:02 +0000 -Subject: [PATCH] Improve handling of 'all' architecture recipes and their - -Upstream-Status: Inappropriate [configuration] - -XORG_DEFAULT_OPTIONS pulls in the following dependency chains: - -XORG_CWARNFLAGS -> AC_PROG_CC_C99 -XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS -XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host - -each of which triggers the use of the host compiler. As an "all" -architecture package, it shouldn't need a compiler (and doesn't). - -RP 17/5/2011 - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3407c69..9fe1f89 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,12 +27,12 @@ AC_INIT([font-alias], [1.0.4], - [font-alias]) - AM_INIT_AUTOMAKE([foreign dist-bzip2]) - --# Require xorg-macros: XORG_DEFAULT_OPTIONS - m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) - XORG_MACROS_VERSION(1.3) --XORG_DEFAULT_OPTIONS -- -+XORG_RELEASE_VERSION -+XORG_CHANGELOG -+XORG_INSTALL - AC_PROG_INSTALL - - # 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 \ file://misc/fonts.alias;md5=1bdafa7c31aa54f87f3531f2ef8ed5a6 \ file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb \ " - -SRC_URI += "file://nocompiler.patch" +SRC_URI_EXT = "xz" DEPENDS = "util-macros-native font-util-native" RDEPENDS:${PN} = "encodings font-util" @@ -20,4 +19,4 @@ inherit allarch PE = "1" -SRC_URI[sha256sum] = "f3111ae8bf2e980f5f56af400e8eefe5fc9f4207f4a412ea79637fd66c945276" +SRC_URI[sha256sum] = "9f89e217bb73e0e3636a0a493fbf8b7c995156e0c53d9a0476d201b67c2d6b6e" |