commit 9dcba8be6a6cb89b8f70b157ab3391b50c5a9680 Author: CentOS Sources Date: Tue May 25 04:14:02 2021 +0000 import xorg-x11-font-utils-7.5-41.el8 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5291799 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +SOURCES/bdftopcf-1.1.tar.bz2 +SOURCES/font-util-1.3.1.tar.bz2 +SOURCES/fonttosfnt-1.2.1.tar.bz2 +SOURCES/mkfontdir-1.0.7.tar.bz2 +SOURCES/mkfontscale-1.1.3.tar.bz2 diff --git a/.xorg-x11-font-utils.metadata b/.xorg-x11-font-utils.metadata new file mode 100644 index 0000000..97b6942 --- /dev/null +++ b/.xorg-x11-font-utils.metadata @@ -0,0 +1,5 @@ +48a783337a5aa49ebc102c9788ff0f43ea35c5c4 SOURCES/bdftopcf-1.1.tar.bz2 +0b16add3637c64b0bbaf1dd223b71b0421100c20 SOURCES/font-util-1.3.1.tar.bz2 +954cf0fee50325f999e0fecd824172989f822148 SOURCES/fonttosfnt-1.2.1.tar.bz2 +3c06dad8a5fbf7362b51fb7d6b1ab805eba40336 SOURCES/mkfontdir-1.0.7.tar.bz2 +2fdbd7c6cc5b0678f2c5d10d2350a809d576e9e5 SOURCES/mkfontscale-1.1.3.tar.bz2 diff --git a/SOURCES/mkfontscale-examine-all-encodings.patch b/SOURCES/mkfontscale-examine-all-encodings.patch new file mode 100644 index 0000000..1913915 --- /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 +@@ -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/SOURCES/xorg-x11-fonts-update-dirs b/SOURCES/xorg-x11-fonts-update-dirs new file mode 100755 index 0000000..6d5fb2e --- /dev/null +++ b/SOURCES/xorg-x11-fonts-update-dirs @@ -0,0 +1,61 @@ +#!/bin/sh +# This script is used by the xorg-x11-fonts package in the %post stage for +# some fonts to generate the right encodings. + +fontdir="" +encodingsdir="@DATADIR@/X11/fonts/encodings" + +# some fonts need to skip mkfontscale, set to "yes" to skip +skip_fontscale="" +# some fonts need to run ttmkfdir, set to "yes" to run +need_ttmkfdir="" + +if [ $# -lt 1 ]; then + echo "Need at least one parameter for font dir." + exit 1 +fi + +while [ $# != 0 ]; do + case $1 in + --skip-fontscale) + skip_fontscale="yes" + ;; + --need-ttmkfdir) + need_ttmkfdir="yes" + ;; + --encodingsdir) + shift + encodingsdir="$1" + ;; + *) + fontdir="$1" + + if [ $# != 1 ]; then + echo "Too many parameters." + exit 1 + fi + ;; + esac + shift +done + +if [ "$skip_fontscale" != "yes" ]; then + mkfontscale $fontdir +fi +if [ "$need_ttmkfdir" = "yes" ]; then + ttmkfdir -d $fontdir -o "$fontdir/fonts.scale" +fi + +mkfontdir $fontdir +fc-cache $fontdir + +if ! [ -z "$encodingsdir" ]; then + [ -d "$encodingsdir" ] || mkdir -p "$encodingsdir" + [ -d "$encodingsdir/large" ] || mkdir -p "$encodingsdir/large" + oldpwd=$(pwd) + cd "$encodingsdir" + mkfontscale -n -e "$encodingsdir" -e "$encodingsdir/large" + cd ${oldpwd} +fi + + diff --git a/SOURCES/xorg-x11-fonts-update-dirs.1 b/SOURCES/xorg-x11-fonts-update-dirs.1 new file mode 100644 index 0000000..847f824 --- /dev/null +++ b/SOURCES/xorg-x11-fonts-update-dirs.1 @@ -0,0 +1,23 @@ +.TH XORG-X11-FONTS-UPDATE-DIRS 1 "25 July 2014" +.SH NAME +xorg-x11-fonts-update-dirs \- update X11 font directories +.SH SYNOPSIS +.B xorg-x11-fonts-update-dirs [--skip-fontscale] [--need-ttmkfdir] path +.SH DESCRIPTION +.PP +The +.B xorg-x11-fonts-* +rpm packages call +.I xorg-x11-fonts-update-dirs +during %post and %postun to update the X11 font indices. +This script may change in incompatible ways without notice and +you should not run this script manually or rely on it otherwise. +To manually update the font indices invoke +.B mkfontscale +and +.B ttmkfdir +directly as required. +.PP +.SH "SEE ALSO" +mkfontscale(1) +ttmkfdir(1) diff --git a/SPECS/xorg-x11-font-utils.spec b/SPECS/xorg-x11-font-utils.spec new file mode 100644 index 0000000..1287a3e --- /dev/null +++ b/SPECS/xorg-x11-font-utils.spec @@ -0,0 +1,170 @@ +%global bdftopcf 1.1 +%global fonttosfnt 1.2.1 +%global mkfontdir 1.0.7 +%global mkfontscale 1.1.3 +%global font_util 1.3.1 + +# Must be kept in sync with xorg-x11-fonts! +%global _x11fontdir %{_datadir}/X11/fonts + +Summary: X.Org X11 font utilities +Name: xorg-x11-font-utils +Epoch: 1 +Version: 7.5 +Release: 41%{?dist} +License: MIT +URL: http://www.x.org + +Source0: http://www.x.org/pub/individual/app/bdftopcf-%{bdftopcf}.tar.bz2 +Source1: http://www.x.org/pub/individual/app/fonttosfnt-%{fonttosfnt}.tar.bz2 +Source2: http://www.x.org/pub/individual/app/mkfontdir-%{mkfontdir}.tar.bz2 +Source3: http://www.x.org/pub/individual/app/mkfontscale-%{mkfontscale}.tar.bz2 +Source4: http://www.x.org/pub/individual/font/font-util-%{font_util}.tar.bz2 +# helper script used in post for xorg-x11-fonts +Source5: xorg-x11-fonts-update-dirs +Source6: xorg-x11-fonts-update-dirs.1 + +Patch0: mkfontscale-examine-all-encodings.patch + +BuildRequires: libtool +BuildRequires: pkgconfig(fontenc) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: zlib-devel + +Provides: bdftopcf = %{bdftopcf} +Provides: fonttosfnt = %{fonttosfnt} +Provides: mkfontdir = %{mkfontdir} +Provides: mkfontscale = %{mkfontscale} +Provides: font-util = %{font_util} + +Provides: font-utils = %{epoch}:%{version}-%{release} +Provides: ucs2any = %{font_util} + +%description +X.Org X11 font utilities required for font installation, conversion, and +generation. + +%prep +%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 +pushd mkfontscale-* +%patch0 -p1 -b .all-encodings +popd + +%build +# Build all apps +{ +for app in * ; do + pushd $app + autoreconf -vif + case $app in + font-util-*) + %configure --with-fontrootdir=%{_x11fontdir} + ;; + *) + %configure + ;; + esac + make %{?_smp_mflags} + popd +done +} + +%install +# Install all apps +{ + for app in * ; do + pushd $app + %make_install + popd + done + for i in */README ; do + [ -s $i ] && cp $i README-$(echo $i | sed 's/-[0-9].*//') + done + for i in */COPYING ; do + grep -q stub $i || cp $i COPYING-$(echo $i | sed 's/-[0-9].*//') + done +} + +install -m 744 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/xorg-x11-fonts-update-dirs +sed -i "s:@DATADIR@:%{_datadir}:" $RPM_BUILD_ROOT%{_bindir}/xorg-x11-fonts-update-dirs + +install -m 744 -p -D %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/xorg-x11-fonts-update-dirs.1 + +find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f + +%files +%doc README-* COPYING-bdftopcf COPYING-[c-z]* +%{_bindir}/bdftopcf +%{_bindir}/fonttosfnt +%{_bindir}/mkfontdir +%{_bindir}/mkfontscale +%{_bindir}/ucs2any +%{_bindir}/xorg-x11-fonts-update-dirs +%{_datadir}/aclocal/fontutil.m4 +%{_libdir}/pkgconfig/fontutil.pc +%{_mandir}/man1/bdftopcf.1* +%{_mandir}/man1/fonttosfnt.1* +%{_mandir}/man1/mkfontdir.1* +%{_mandir}/man1/mkfontscale.1* +%{_mandir}/man1/ucs2any.1* +%{_mandir}/man1/xorg-x11-fonts-update-dirs.1* +%dir %{_x11fontdir} +%dir %{_x11fontdir}/util +%{_x11fontdir}/util/map-* + +%changelog +* Mon May 24 2021 Peter Hutterer 1:7.5-41 +- fonttosfnt 1.2.1 (#1831118) + +* Wed Aug 01 2018 Peter Hutterer 1:7.5-40 +- fonttosfnt 1.0.5 (#1607031) + +* Thu May 17 2018 Peter Hutterer 1:7.5-38 +- mkfontscale 1.1.3 + +* Fri Feb 09 2018 Fedora Release Engineering - 1:7.5-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 25 2018 Adam Jackson - 7.5-36 +- bdftopcf 1.1 + +* Thu Aug 03 2017 Fedora Release Engineering - 1:7.5-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1:7.5-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1:7.5-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Sep 28 2016 Hans de Goede - 1:7.5-32 +- bdftopcf 1.0.5 + +* Fri Feb 05 2016 Fedora Release Engineering - 1:7.5-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jan 20 2016 Peter Hutterer +- s/define/global/ + +* Thu Oct 15 2015 Adam Jackson 7.5-30 +- Drop bdftruncate utility, nothing in the OS uses it and we don't ship BDF + fonts in any case. + +* Fri Jun 19 2015 Fedora Release Engineering - 1:7.5-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri May 01 2015 Simone Caronni - 1:7.5-28 +- font-util 1.3.1 + +* Sat Feb 21 2015 Till Maas - 1:7.5-27 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Sat Jan 17 2015 Simone Caronni - 1:7.5-26 +- Update mkfontscale to 1.1.2. + +* Mon Nov 10 2014 Simone Caronni - 1:7.5-25 +- Restore font-utils provider, required by some packages for building. + examine all platform=3 encodings (fixes #578460)