summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2019-06-27 16:44:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-28 13:28:37 +0100
commitf08c4285a1f7202811d74f067800b295ad3e261f (patch)
treeb6ca841b8236d87ad3f34ba070c411791ffe2458 /meta
parentadaba4ee4f0997a2827c3d73ed34081c82eb3b4d (diff)
downloadpoky-f08c4285a1f7202811d74f067800b295ad3e261f.tar.gz
encodings: update to 1.0.5
(From OE-Core rev: f65013af8e556b8e56001fae147aac890fb1836c) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-font/encodings/nocompiler.patch23
-rw-r--r--meta/recipes-graphics/xorg-font/encodings_1.0.5.bb (renamed from meta/recipes-graphics/xorg-font/encodings_1.0.4.bb)5
2 files changed, 18 insertions, 10 deletions
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 @@
1From b08c43a0842076e0a94e88ad6456a9326cd7ffc9 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Tue, 17 May 2011 23:03:02 +0000
4Subject: [PATCH] Improve handling of 'all' architecture recipes and their
5
1Upstream-Status: Inappropriate [configuration] 6Upstream-Status: Inappropriate [configuration]
2 7
3XORG_DEFAULT_OPTIONS pulls in the following dependency chains: 8XORG_DEFAULT_OPTIONS pulls in the following dependency chains:
4 9
5XORG_CWARNFLAGS -> AC_PROG_CC_C99 10XORG_CWARNFLAGS -> AC_PROG_CC_C99
6XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS 11XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS
7XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host 12XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host
8 13
9each of which triggers the use of the host compiler. As an "all" 14each of which triggers the use of the host compiler. As an "all"
10architecture package, it shouldn't need a compiler (and doesn't). 15architecture package, it shouldn't need a compiler (and doesn't).
11 16
12RP 17/5/2011 17RP 17/5/2011
13 18
14Index: encodings-1.0.4/configure.ac 19---
15=================================================================== 20 configure.ac | 6 +++---
16--- encodings-1.0.4.orig/configure.ac 2011-05-17 23:36:19.505095876 +0100 21 1 file changed, 3 insertions(+), 3 deletions(-)
17+++ encodings-1.0.4/configure.ac 2011-05-17 23:54:14.935096128 +0100 22
18@@ -4,12 +4,12 @@ 23diff --git a/configure.ac b/configure.ac
24index 622c27b..5ee84ed 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.5],
28 [https://gitlab.freedesktop.org/xorg/font/encodings/issues])
19 AM_INIT_AUTOMAKE([foreign dist-bzip2]) 29 AM_INIT_AUTOMAKE([foreign dist-bzip2])
20 AM_MAINTAINER_MODE
21 30
22-# Require xorg-macros: XORG_DEFAULT_OPTIONS 31-# Require xorg-macros: XORG_DEFAULT_OPTIONS
23 m4_ifndef([XORG_MACROS_VERSION], 32 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
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"
13RDEPENDS_${PN} = "" 13RDEPENDS_${PN} = ""
14 14
15SRC_URI += "file://nocompiler.patch" 15SRC_URI += "file://nocompiler.patch"
16SRC_URI[md5sum] = "bbae4f247b88ccde0e85ed6a403da22a"
17SRC_URI[sha256sum] = "bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31"
16 18
17inherit allarch 19inherit allarch
18 20
19EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" 21EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings"
20
21SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1"
22SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539"