diff --git a/0001-mkfontscale-examine-all-encodings.patch b/0001-mkfontscale-examine-all-encodings.patch new file mode 100644 index 0000000000000000000000000000000000000000..1913915ca2c3ff0fba71cf3f66dc810357c0f5fd --- /dev/null +++ b/0001-mkfontscale-examine-all-encodings.patch @@ -0,0 +1,13 @@ +diff --git a/mkfontscale.c b/mkfontscale.c +index a67f283..96e19a3 100644 +--- a/mkfontscale.c ++++ b/mkfontscale.c +@@ -317,7 +317,7 @@ getName(FT_Face face, int nid) + int i; + + if(getNameHelper(face, nid, +- TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) || ++ TT_PLATFORM_MICROSOFT, -1, &name) || + getNameHelper(face, nid, + TT_PLATFORM_APPLE_UNICODE, -1, &name)) { + string = malloc(name.string_len / 2 + 1); diff --git a/font-util-1.3.1.tar.bz2 b/font-util-1.3.1.tar.bz2 deleted file mode 100644 index f8d893a77153b7bf4b1ffeeedbbd552f825d7d33..0000000000000000000000000000000000000000 Binary files a/font-util-1.3.1.tar.bz2 and /dev/null differ diff --git a/font-util-1.3.2.tar.bz2 b/font-util-1.3.2.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..c0f46288ec445426f96d784a518a5128c2be6062 Binary files /dev/null and b/font-util-1.3.2.tar.bz2 differ diff --git a/fonttosfnt-1.0.5.tar.bz2 b/fonttosfnt-1.0.5.tar.bz2 deleted file mode 100644 index 1878183d0d8b9abcc4dc59cfc475c5ff0ce0c18a..0000000000000000000000000000000000000000 Binary files a/fonttosfnt-1.0.5.tar.bz2 and /dev/null differ diff --git a/fonttosfnt-1.1.0.tar.bz2 b/fonttosfnt-1.1.0.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..65a72fd7d2d32b11ff18d0d0c6cc371bee02b752 Binary files /dev/null and b/fonttosfnt-1.1.0.tar.bz2 differ diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec index 7effa3d4f07e1fcf90e497d436b5ac24df7422ab..23f5a190d05db3be2c42637be72d072fe210f86f 100644 --- a/xorg-x11-font-utils.spec +++ b/xorg-x11-font-utils.spec @@ -4,27 +4,38 @@ Summary: X.Org X11 font utilities Name: xorg-x11-font-utils Epoch: 1 Version: 7.5 -Release: 42 +Release: 43 License: MIT URL: http://www.x.org Source0: http://www.x.org/pub/individual/app/bdftopcf-1.1.tar.bz2 -Source1: http://www.x.org/pub/individual/app/fonttosfnt-1.0.5.tar.bz2 +Source1: http://www.x.org/pub/individual/app/fonttosfnt-1.1.0.tar.bz2 Source2: http://www.x.org/pub/individual/app/mkfontdir-1.0.7.tar.bz2 Source3: http://www.x.org/pub/individual/app/mkfontscale-1.1.3.tar.bz2 -Source4: http://www.x.org/pub/individual/font/font-util-1.3.1.tar.bz2 +Source4: http://www.x.org/pub/individual/font/font-util-1.3.2.tar.bz2 Source5: xorg-x11-fonts-update-dirs Source6: xorg-x11-fonts-update-dirs.1 -BuildRequires: libtool pkgconfig(fontenc) pkgconfig(freetype2) pkgconfig(x11) pkgconfig(xorg-macros) >= 1.8 zlib-devel +Patch0: 0001-mkfontscale-examine-all-encodings.patch + +BuildRequires: libtool pkgconfig(fontenc) pkgconfig(freetype2) +BuildRequires: pkgconfig(x11) pkgconfig(xorg-macros) >= 1.8 zlib-devel Provides: bdftopcf = 1.1 -Provides: fonttosfnt = 1.0.5 +Obsoletes: bdftopcf < 1.1 +Provides: fonttosfnt = 1.1.0 +Obsoletes: fonttosfnt < 1.1.0 Provides: mkfontdir = 1.0.7 +Obsoletes: mkfontdir < 1.0.7 Provides: mkfontscale = 1.1.3 -Provides: font-util = 1.3.1 +Obsoletes: mkfontscale < 1.1.3 +Provides: font-util = 1.3.2 +Obsoletes: font-util < 1.3.2 Provides: font-utils = %{epoch}:%{version}-%{release} +Obsoletes: font-utils < %{epoch}:%{version}-%{release} Provides: ucs2any = 1.3.1 +Obsoletes: ucs2any < 1.3.1 + %description X.Org X11 font utilities required for font installation, conversion, and generation. @@ -33,6 +44,9 @@ X.Org X11 font utilities required for font installation, conversion, and generat %prep %setup -q -c xorg-x11-font-utils-%{version} -a1 -a2 -a3 -a4 +pushd mkfontscale-* +%patch0 -p1 -b .all-encodings +popd %build { @@ -97,6 +111,12 @@ find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f %{_mandir}/man1/xorg-x11-fonts-update-dirs.1* %changelog +* Fri Jul 24 2020 chengguipeng - 7.5-43 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:Upgrade to 7.5-43 + * Thu Jan 09 2020 openEuler Buildteam - 7.5-42 - Type:enhancement - Id:NA