font-alias: upgrade 1.0.3 -> 1.0.4

License-Update: editor tags change
(From OE-Core rev: efe4a2cce9144d246c1ae9bd9f2025459d4ce339)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-08-23 22:20:06 +02:00
committed by Richard Purdie
parent 5f3f048162
commit 65085f22e9
2 changed files with 22 additions and 13 deletions

View File

@@ -1,22 +1,32 @@
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] Upstream-Status: Inappropriate [configuration]
XORG_DEFAULT_OPTIONS pulls in the following dependency chains: XORG_DEFAULT_OPTIONS pulls in the following dependency chains:
XORG_CWARNFLAGS -> AC_PROG_CC_C99 XORG_CWARNFLAGS -> AC_PROG_CC_C99
XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS 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" each of which triggers the use of the host compiler. As an "all"
architecture package, it shouldn't need a compiler (and doesn't). architecture package, it shouldn't need a compiler (and doesn't).
RP 17/5/2011 RP 17/5/2011
diff -uNr font-alias-1.0.3.orig//configure.ac font-alias-1.0.3/configure.ac ---
--- font-alias-1.0.3.orig//configure.ac 2011-05-18 21:29:18.378258643 +0200 configure.ac | 6 +++---
+++ font-alias-1.0.3/configure.ac 2011-05-18 21:32:06.865258593 +0200 1 file changed, 3 insertions(+), 3 deletions(-)
@@ -28,12 +28,12 @@
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]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS -# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION], m4_ifndef([XORG_MACROS_VERSION],
@@ -29,4 +39,4 @@ diff -uNr font-alias-1.0.3.orig//configure.ac font-alias-1.0.3/configure.ac
+XORG_INSTALL +XORG_INSTALL
AC_PROG_INSTALL AC_PROG_INSTALL
XORG_FONTROOTDIR # Require X.Org's font util macros 1.2 or later

View File

@@ -4,10 +4,11 @@ require xorg-font-common.inc
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \
file://cyrillic/fonts.alias;md5=f40795b0640d6785826aecd3b16f6124 \ file://cyrillic/fonts.alias;md5=d27bc65a2655cacdbc2644b51c064c20 \
file://75dpi/fonts.alias;md5=6bc48023f2ae7f3bfc105db7b0ee6b49 \ file://75dpi/fonts.alias;md5=6bc48023f2ae7f3bfc105db7b0ee6b49 \
file://misc/fonts.alias;md5=a8ec05d528431d4c9703b55a7efd67a8 \ file://misc/fonts.alias;md5=1bdafa7c31aa54f87f3531f2ef8ed5a6 \
file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb \
"
SRC_URI += "file://nocompiler.patch" SRC_URI += "file://nocompiler.patch"
@@ -18,7 +19,5 @@ RDEPENDS_${PN}_class-native = "font-util-native"
inherit allarch inherit allarch
PE = "1" PE = "1"
PR = "r3"
SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" SRC_URI[sha256sum] = "f3111ae8bf2e980f5f56af400e8eefe5fc9f4207f4a412ea79637fd66c945276"
SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a"