diff --git a/0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch b/0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch deleted file mode 100644 index 24059e8..0000000 --- a/0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1cc96f25aff9898a93f2a575d9f6c57574da042f Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Thu, 23 Oct 2014 12:57:43 +0200 -Subject: [PATCH font/encodings] jisx0201.1976-0.enc: Add undefined mapping for - 0x7f - 0xa0 range - -The jisx0201 encoding has a hole in it in the 0x7f - 0xa0 range, see: -http://en.wikipedia.org/wiki/JIS_X_0201 - -The document for the format of the encoding files says: -"Codes not listed are assumed to map through the identity (i.e. to the same - numerical value). In order to override this default mapping, you may specify - a range of codes to be undefined by using an `UNDEFINE' line" - -jisx0201.1976-0.enc was not doing this, causing all the codes on the range -to be mapped 1:1. This specifically is causing problems for ttmkfdir, which -checks that a font covers (most of) an encoding before adding a line for that -encoding to fonts.scale, and the hole not properly being undefined causes -this check to fail for atleast the Sazanami fonts. - -Cc: Akira TAGOH -BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1009350 -Signed-off-by: Hans de Goede ---- - large/jisx0201.1976-0.enc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/large/jisx0201.1976-0.enc b/large/jisx0201.1976-0.enc -index 915d50c..328bc7a 100644 ---- a/large/jisx0201.1976-0.enc -+++ b/large/jisx0201.1976-0.enc -@@ -68,6 +68,7 @@ ENDMAPPING - STARTMAPPING unicode - 0x5C 0x00A5 # YEN SIGN - 0x7E 0x203E # OVERLINE -+UNDEFINE 0x7F 0xA0 - 0x00A1 0x00DF 0xFF61 - ENDMAPPING - STARTMAPPING cmap 1 1 --- -2.1.0 - diff --git a/encodings-1.0.4.tar.bz2 b/encodings-1.0.4.tar.bz2 deleted file mode 100644 index ba7d2cb..0000000 Binary files a/encodings-1.0.4.tar.bz2 and /dev/null differ diff --git a/encodings-1.0.5.tar.bz2 b/encodings-1.0.5.tar.bz2 new file mode 100644 index 0000000..86b735a Binary files /dev/null and b/encodings-1.0.5.tar.bz2 differ diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index 399ac7d..8f8798f 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -4,13 +4,13 @@ Summary: X.Org X11 fonts Name: xorg-x11-fonts Version: 7.5 -Release: 21 +Release: 22 License: MIT and Lucida and Public Domain URL: http://www.x.org BuildArch: noarch -Source0: http://www.x.org/pub/individual/font/encodings-1.0.4.tar.bz2 +Source0: http://www.x.org/pub/individual/font/encodings-1.0.5.tar.bz2 Source1: http://www.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2 Source2: http://www.x.org/pub/individual/font/font-adobe-75dpi-1.0.3.tar.bz2 Source3: http://www.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2 @@ -43,8 +43,6 @@ Source29: http://www.x.org/pub/individual/font/font-sun-misc-1.0.3.tar.bz2 Source30: http://www.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 Source31: http://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz2 -Patch1: 0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch - BuildRequires: bdftopcf font-util >= 1.1.0 pkgconfig(xorg-macros) >= 1.3 ucs2any Requires(post): fontconfig mkfontdir @@ -121,9 +119,6 @@ Contains a set of Cyrillic fonts. %prep %setup -q -c xorg-x11-fonts-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31 -pushd encodings-* -%patch1 -p1 -popd %build { @@ -546,5 +541,11 @@ done %{_x11fontdir}/75dpi/lut[BR]S??-ISO8859-15.pcf* %changelog +* Thu Jan 09 2020 openEuler Buildteam - 7.5-22 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:update encodings version to 1.0.5 + * Thu Sep 12 2019 openEuler Buildteam - 7.5-21 - Package init