From 1b89803204b8a7a2b55fdb7bd9b8c959938a1c17 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 2 Nov 2021 06:13:27 -0400
Subject: [PATCH] import mkfontscale-1.2.1-3.el9

---
 .gitignore                                    |  1 +
 .mkfontscale.metadata                         |  1 +
 .../mkfontscale-examine-all-encodings.patch   | 13 +++++
 SPECS/mkfontscale.spec                        | 57 +++++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 .mkfontscale.metadata
 create mode 100644 SOURCES/mkfontscale-examine-all-encodings.patch
 create mode 100644 SPECS/mkfontscale.spec

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2362eb4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/mkfontscale-1.2.1.tar.bz2
diff --git a/.mkfontscale.metadata b/.mkfontscale.metadata
new file mode 100644
index 0000000..f2fba78
--- /dev/null
+++ b/.mkfontscale.metadata
@@ -0,0 +1 @@
+fb9d0458a4476a237609b676f9cebcc64b0a8a85 SOURCES/mkfontscale-1.2.1.tar.bz2
diff --git a/SOURCES/mkfontscale-examine-all-encodings.patch b/SOURCES/mkfontscale-examine-all-encodings.patch
new file mode 100644
index 0000000..217f0a4
--- /dev/null
+++ b/SOURCES/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
+@@ -326,7 +326,7 @@ getName(FT_Face face, int nid)
+     unsigned 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/SPECS/mkfontscale.spec b/SPECS/mkfontscale.spec
new file mode 100644
index 0000000..a9adc42
--- /dev/null
+++ b/SPECS/mkfontscale.spec
@@ -0,0 +1,57 @@
+Name:       mkfontscale
+Version:    1.2.1
+Release:    3%{?dist}
+Summary:    Tool to generate legacy X11 font system index files
+
+License:    MIT
+URL:        https://www.x.org
+Source0:    https://www.x.org/pub/individual/app/%{name}-%{version}.tar.bz2
+
+Patch0:     mkfontscale-examine-all-encodings.patch
+
+BuildRequires:  gcc make libtool
+BuildRequires:  pkgconfig(fontenc)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xorg-macros) >= 1.8
+BuildRequires:  zlib-devel
+
+Conflicts:  xorg-x11-font-utils <= 7.5-50
+
+# Used to be a separate upstream repo in xorg-x11-font-utils, now it's part
+# of mkfontscale. Keep the Provides alive though.
+Provides:   mkfontdir = %{version}
+
+%description
+mkfontscale creates the fonts.scale and fonts.dir index files used by the
+legacy X11 font system.  It now includes the mkfontdir script previously
+distributed separately for compatibility with older X11 versions.
+
+%prep
+%autosetup
+
+%build
+%configure --disable-silent-rules
+%make_build
+
+%install
+%make_install
+
+%files
+%license COPYING
+%{_bindir}/mkfontdir
+%{_bindir}/mkfontscale
+%{_mandir}/man1/mkfontdir.1*
+%{_mandir}/man1/mkfontscale.1*
+
+%changelog
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.1-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.1-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Thu Feb 25 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.2.1-1
+- Split mkfontscale/mkfontdir out from xorg-x11-font-utils into its own
+  package (#1932734)