From 73ca8c3e8639929ed78a3c605056f7fd42e500cf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 20 Jul 2022 10:44:04 +0200 Subject: encodings: update 1.0.5 -> 1.0.6 CHanges: gitlab CI: add a basic build test Build xz tarballs instead of bzip2 adjust descriptions for the Unicode mapping to match the Unicode.org data file. add mapping for 0x80-0x9f, as per Unicode.org data files. use descriptions from UnicodeData.txt except for two obsolete or incorrect maps correct a typo (in original), and use appropriate description use Armenian eternity symbol from Unicode 6. whitespace-only changes for consistency, using luit's annotate-enc script add descriptions from UnicodeData.txt, using annotate-enc add descriptions from UnicodeData.txt, using annotate-enc add descriptions from UnicodeData.txt, using annotate-enc add descriptions from UnicodeData.txt, with annotate-enc add descriptions from UnicodeData.txt, with annotate-enc whitespace-only, reformat with annotate-enc Add ability to tweak compressor suffix in filenames, similar to xorg apps and drivers. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit b1fb0fbfbf0bcf50906a26421435d7165be64281) Signed-off-by: Steve Sakoman --- .../xorg-font/encodings/nocompiler.patch | 8 +++---- meta/recipes-graphics/xorg-font/encodings_1.0.5.bb | 25 ---------------------- meta/recipes-graphics/xorg-font/encodings_1.0.6.bb | 25 ++++++++++++++++++++++ .../xorg-font/xorg-font-common.inc | 3 ++- 4 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-font/encodings_1.0.5.bb create mode 100644 meta/recipes-graphics/xorg-font/encodings_1.0.6.bb diff --git a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch index ec7c7d80c1..9ee7abe775 100644 --- a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch +++ b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch @@ -1,4 +1,4 @@ -From b08c43a0842076e0a94e88ad6456a9326cd7ffc9 Mon Sep 17 00:00:00 2001 +From 0c0790e90a68bf8290da5c0e57142bf7c620f039 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 @@ -21,12 +21,12 @@ RP 17/5/2011 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 622c27b..5ee84ed 100644 +index b80e3de..80208bb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.5], +@@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.6], [https://gitlab.freedesktop.org/xorg/font/encodings/issues]) - AM_INIT_AUTOMAKE([foreign dist-bzip2]) + AM_INIT_AUTOMAKE([foreign dist-xz]) -# Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb deleted file mode 100644 index 8ddbaf24dd..0000000000 --- a/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "The Xorg font encoding files" - -DESCRIPTION = "The encodings that map to specific characters for a \ -number of Xorg and common fonts." - -require xorg-font-common.inc -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" -PE = "1" -PR = "r3" - -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" - -# postinst from .inc doesn't apply to this recipe -pkg_postinst:${PN} () { -} diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.6.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.6.bb new file mode 100644 index 0000000000..be82414eef --- /dev/null +++ b/meta/recipes-graphics/xorg-font/encodings_1.0.6.bb @@ -0,0 +1,25 @@ +SUMMARY = "The Xorg font encoding files" + +DESCRIPTION = "The encodings that map to specific characters for a \ +number of Xorg and common fonts." + +require xorg-font-common.inc +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" +PE = "1" + +DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" +RDEPENDS:${PN} = "" + +SRC_URI += "file://nocompiler.patch" +SRC_URI[sha256sum] = "77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26" + +SRC_URI_EXT = "xz" + +inherit allarch + +EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" + +# postinst from .inc doesn't apply to this recipe +pkg_postinst:${PN} () { +} diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc index 2df23efed4..edf7cf7642 100644 --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc @@ -9,7 +9,8 @@ RDEPENDS:${PN} = "encodings font-util font-alias" XORG_PN = "${BPN}" -SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" +SRC_URI_EXT = "bz2" +SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.${SRC_URI_EXT}" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig features_check -- cgit 1.2.3-korg