rpms/xorg-x11-font-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c10s
Branches Tags
rpms:c8s
rpms:c10s
rpms:c9s
rpms:c8
rpms:c8-beta
rpms:imports/c10s/xorg-x11-font-utils-7.5-61.el10
rpms:imports/c10s/xorg-x11-font-utils-7.5-60.el10
rpms:imports/c8/xorg-x11-font-utils-7.5-41.el8
rpms:imports/c8-beta/xorg-x11-font-utils-7.5-41.el8
rpms:imports/c8-beta/xorg-x11-font-utils-7.5-40.el8
rpms:imports/c8/xorg-x11-font-utils-7.5-40.el8
rpms:imports/c8s/xorg-x11-font-utils-7.5-41.el8
...
pull from: rpms:c8s
Branches Tags
rpms:c10s
rpms:c8s
rpms:c9s
rpms:c8
rpms:c8-beta
rpms:imports/c10s/xorg-x11-font-utils-7.5-61.el10
rpms:imports/c10s/xorg-x11-font-utils-7.5-60.el10
rpms:imports/c8/xorg-x11-font-utils-7.5-41.el8
rpms:imports/c8-beta/xorg-x11-font-utils-7.5-41.el8
rpms:imports/c8-beta/xorg-x11-font-utils-7.5-40.el8
rpms:imports/c8/xorg-x11-font-utils-7.5-40.el8
rpms:imports/c8s/xorg-x11-font-utils-7.5-41.el8

No commits in common. "c10s" and "c8s" have entirely different histories.
c10s ... c8s

5 changed files with 96 additions and 90 deletions
Show Stats Expand all files Collapse all files

7
.gitignore vendored
View File

@ -1 +1,6 @@
font-util-*.tar.xz
fonttosfnt-.*.tar.bz2
bdftopcf-.*.tar.bz2
mkfontscale-.*.tar.bz2
mkfontdir-.*.tar.bz2
font-util-.*.tar.bz2
/fonttosfnt-1.2.1.tar.bz2

2
gating.yaml
View File

@ -1,6 +1,6 @@
--- !Policy
product_versions:
- rhel-10
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

13
mkfontscale-examine-all-encodings.patch Normal file
View File

@ -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);

6
sources
View File

@ -1 +1,5 @@
SHA512 (font-util-1.4.1.tar.xz) = cec7fc38ba64ca9c81c59a8395da94d71c75e14f19faf6457da0a1a8c3c1cf51bcaab227834f6f5a6d274ba2557555e542dbe2bd88e527c45ea196318bbc38d0
SHA512 (bdftopcf-1.1.tar.bz2) = 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
SHA512 (font-util-1.3.1.tar.bz2) = 9fd6dd4c0a01ede5f0b09ec0f9d316267ca086e2ee9526a43a4e4d6ce3cd67c977293bd3cf440328ca417292fcae1579888b24b7259eaf012230890210d74889
SHA512 (mkfontdir-1.0.7.tar.bz2) = 96d1920565514f90621e18a87fb5a2db9e052d1bffc6552d9659e065a21e252ab98b4e62013755032b98ed6d8c3381eb75c3c8e02651766ee4791ca622dcef1f
SHA512 (mkfontscale-1.1.3.tar.bz2) = 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62
SHA512 (fonttosfnt-1.2.1.tar.bz2) = 3d4ece61e31d4a5ed56923ecc1883e80a9308d2062d37345cb5be081bc2b004aadebf99a989601749a63e03eb641e0522d07773a57bca0b4710ed453e4f20742

158
xorg-x11-font-utils.spec
View File

@ -1,4 +1,8 @@
%global font_util 1.4.1
%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
@ -7,41 +11,81 @@ Summary: X.Org X11 font utilities
Name: xorg-x11-font-utils
Epoch: 1
Version: 7.5
Release: 61%{?dist}
License: MIT AND BSD-2-Clause AND MIT-open-group AND Unicode-3.0
Release: 41%{?dist}
License: MIT
URL: http://www.x.org
Source0: http://www.x.org/pub/individual/font/font-util-%{font_util}.tar.xz
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
BuildRequires: gcc make libtool
BuildRequires: pkgconfig(xorg-macros) >= 1.8
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}
Obsoletes: bdftopcf < 1.1-1
Obsoletes: fonttosfnt < 1.2.1-1
Obsoletes: mkfontdir < 1.2.1-1
Obsoletes: mkfontscale < 1.2.1-1
%description
X.Org X11 font utilities required for font installation, conversion, and
generation.
%prep
%autosetup -n font-util-%{font_util}
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
pushd mkfontscale-*
%patch0 -p1 -b .all-encodings
popd
%build
%configure --with-fontrootdir=%{_x11fontdir}
%make_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
%make_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
@ -51,12 +95,19 @@ install -m 744 -p -D %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/xorg-x11-fonts-up
find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f
%files
%doc README.md
%license COPYING
%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}
@ -64,78 +115,11 @@ find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f
%{_x11fontdir}/util/map-*
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:7.5-61
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:7.5-60
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-59
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 03 2024 Peter Hutterer <peter.hutterer@redhat.com> - 7.5-58
- font-utils 1.4.1 with sources this time
* Wed Jan 03 2024 Peter Hutterer <peter.hutterer@redhat.com> - 7.5-57
- font-utils 1.4.1
- SPDX migration: update to SPDX-compatible license terms
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-56
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-55
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-54
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-53
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-52
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Feb 25 2021 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-51
- Drop bdftopcf, mkfontscale and fonttosfnt, they are in separate packages
now (#1932731)
* Tue Feb 23 2021 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-50
- Update to mkfontscale 1.2.1 which obsoletes the separate mkfontdir.
* Sun Feb 21 2021 Neal Gompa <ngompa13@gmail.com> - 1:7.5-49
- Add OrderWithRequires for freetype to ensure freetype is installed first
- Move license files to license tag on file list
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-48
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Dec 16 2020 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-47
- fonttosfnt 1.2.1
* Thu Nov 5 10:26:37 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 1:7.5-46
- Add BuildRequires for make
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 06 2020 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-43
- fonttosfnt 1.1.0
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon May 24 2021 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-41
- fonttosfnt 1.2.1 (#1831118)
* Wed Aug 01 2018 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-40
- fonttosfnt 1.0.5
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
- fonttosfnt 1.0.5 (#1607031)
* Thu May 17 2018 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-38
- mkfontscale 1.1.3