From efe4a2cce9144d246c1ae9bd9f2025459d4ce339 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 23 Aug 2020 22:20:06 +0200 Subject: font-alias: upgrade 1.0.3 -> 1.0.4 License-Update: editor tags change Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../xorg-font/font-alias-1.0.3/nocompiler.patch | 32 ----------------- .../xorg-font/font-alias-1.0.4/nocompiler.patch | 42 ++++++++++++++++++++++ .../recipes-graphics/xorg-font/font-alias_1.0.3.bb | 24 ------------- .../recipes-graphics/xorg-font/font-alias_1.0.4.bb | 23 ++++++++++++ 4 files changed, 65 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch create mode 100644 meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch delete mode 100644 meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb create mode 100644 meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch b/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch deleted file mode 100644 index 0b9fb8ccc0..0000000000 --- a/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 - -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 -+++ font-alias-1.0.3/configure.ac 2011-05-18 21:32:06.865258593 +0200 -@@ -28,12 +28,12 @@ - AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# 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 - - XORG_FONTROOTDIR 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 new file mode 100644 index 0000000000..e54eee4ea9 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/font-alias-1.0.4/nocompiler.patch @@ -0,0 +1,42 @@ +From fa2bbd48a55d54bd2dae30edf7936e3ab7587c96 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 + +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.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb deleted file mode 100644 index c5990a9e44..0000000000 --- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "X font aliases" - -require xorg-font-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ - file://cyrillic/fonts.alias;md5=f40795b0640d6785826aecd3b16f6124 \ - file://75dpi/fonts.alias;md5=6bc48023f2ae7f3bfc105db7b0ee6b49 \ - file://misc/fonts.alias;md5=a8ec05d528431d4c9703b55a7efd67a8 \ - file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" - -SRC_URI += "file://nocompiler.patch" - -DEPENDS = "util-macros-native font-util-native" -RDEPENDS_${PN} = "encodings font-util" -RDEPENDS_${PN}_class-native = "font-util-native" - -inherit allarch - -PE = "1" -PR = "r3" - -SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" -SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb new file mode 100644 index 0000000000..e4b70c69dc --- /dev/null +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb @@ -0,0 +1,23 @@ +SUMMARY = "X font aliases" + +require xorg-font-common.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ + file://cyrillic/fonts.alias;md5=d27bc65a2655cacdbc2644b51c064c20 \ + file://75dpi/fonts.alias;md5=6bc48023f2ae7f3bfc105db7b0ee6b49 \ + file://misc/fonts.alias;md5=1bdafa7c31aa54f87f3531f2ef8ed5a6 \ + file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb \ + " + +SRC_URI += "file://nocompiler.patch" + +DEPENDS = "util-macros-native font-util-native" +RDEPENDS_${PN} = "encodings font-util" +RDEPENDS_${PN}_class-native = "font-util-native" + +inherit allarch + +PE = "1" + +SRC_URI[sha256sum] = "f3111ae8bf2e980f5f56af400e8eefe5fc9f4207f4a412ea79637fd66c945276" -- cgit 1.2.3-korg