summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-03-09 16:19:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-11 00:08:40 +0000
commitaae15d436c0308ae75ac518315b088b5b4250583 (patch)
tree9b7f30a8916e84be29752d7c71b6d038c9b0e814 /meta
parent6e7cf978544ada9114e780df3564509095dbe2cc (diff)
downloadpoky-aae15d436c0308ae75ac518315b088b5b4250583.tar.gz
encodings: update 1.0.6 -> 1.0.7
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: 3f1a8baa1033a0cc506b078491ae26f199c81fad) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-font/encodings/nocompiler.patch42
-rw-r--r--meta/recipes-graphics/xorg-font/encodings_1.0.7.bb (renamed from meta/recipes-graphics/xorg-font/encodings_1.0.6.bb)3
2 files changed, 1 insertions, 44 deletions
diff --git a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch
deleted file mode 100644
index 9ee7abe775..0000000000
--- a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 0c0790e90a68bf8290da5c0e57142bf7c620f039 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
6Upstream-Status: Inappropriate [configuration]
7
8XORG_DEFAULT_OPTIONS pulls in the following dependency chains:
9
10XORG_CWARNFLAGS -> AC_PROG_CC_C99
11XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS
12XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host
13
14each of which triggers the use of the host compiler. As an "all"
15architecture package, it shouldn't need a compiler (and doesn't).
16
17RP 17/5/2011
18
19---
20 configure.ac | 6 +++---
21 1 file changed, 3 insertions(+), 3 deletions(-)
22
23diff --git a/configure.ac b/configure.ac
24index b80e3de..80208bb 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.6],
28 [https://gitlab.freedesktop.org/xorg/font/encodings/issues])
29 AM_INIT_AUTOMAKE([foreign dist-xz])
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/encodings_1.0.6.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.7.bb
index be82414eef..5906da416a 100644
--- a/meta/recipes-graphics/xorg-font/encodings_1.0.6.bb
+++ b/meta/recipes-graphics/xorg-font/encodings_1.0.7.bb
@@ -11,8 +11,7 @@ PE = "1"
11DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" 11DEPENDS = "mkfontscale-native mkfontdir-native font-util-native"
12RDEPENDS:${PN} = "" 12RDEPENDS:${PN} = ""
13 13
14SRC_URI += "file://nocompiler.patch" 14SRC_URI[sha256sum] = "3a39a9f43b16521cdbd9f810090952af4f109b44fa7a865cd555f8febcea70a4"
15SRC_URI[sha256sum] = "77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26"
16 15
17SRC_URI_EXT = "xz" 16SRC_URI_EXT = "xz"
18 17