From f65013af8e556b8e56001fae147aac890fb1836c Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Thu, 27 Jun 2019 16:44:27 +0200 Subject: [PATCH] encodings: update to 1.0.5 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie --- .../xorg-font/encodings/nocompiler.patch | 23 +++++++++++++------ ...{encodings_1.0.4.bb => encodings_1.0.5.bb} | 5 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) rename meta/recipes-graphics/xorg-font/{encodings_1.0.4.bb => encodings_1.0.5.bb} (77%) diff --git a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch index f330c185af..ec7c7d80c1 100644 --- a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch +++ b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch @@ -1,23 +1,32 @@ +From b08c43a0842076e0a94e88ad6456a9326cd7ffc9 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +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 +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 -Index: encodings-1.0.4/configure.ac -=================================================================== ---- encodings-1.0.4.orig/configure.ac 2011-05-17 23:36:19.505095876 +0100 -+++ encodings-1.0.4/configure.ac 2011-05-17 23:54:14.935096128 +0100 -@@ -4,12 +4,12 @@ +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 622c27b..5ee84ed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.5], + [https://gitlab.freedesktop.org/xorg/font/encodings/issues]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb similarity index 77% rename from meta/recipes-graphics/xorg-font/encodings_1.0.4.bb rename to meta/recipes-graphics/xorg-font/encodings_1.0.5.bb index 36766f2f42..a39609b5da 100644 --- a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb +++ b/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb @@ -13,10 +13,9 @@ DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" RDEPENDS_${PN} = "" SRC_URI += "file://nocompiler.patch" +SRC_URI[md5sum] = "bbae4f247b88ccde0e85ed6a403da22a" +SRC_URI[sha256sum] = "bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31" inherit allarch EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" - -SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" -SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" -- 2.40.1