Compare commits
No commits in common. "rawhide" and "f36" have entirely different histories.
6 changed files with 208 additions and 90 deletions
108
.gitignore
vendored
108
.gitignore
vendored
|
|
@ -1,3 +1,105 @@
|
|||
/freetype-*.tar.xz
|
||||
/freetype-doc-*.tar.xz
|
||||
/ft2demos-*.tar.xz
|
||||
ft2demos-2.3.12.tar.bz2
|
||||
freetype-doc-2.3.12.tar.bz2
|
||||
freetype-2.3.12.tar.bz2
|
||||
freetype-2.4.2.tar.bz2
|
||||
freetype-doc-2.4.2.tar.bz2
|
||||
ft2demos-2.4.2.tar.bz2
|
||||
/freetype-2.4.3.tar.bz2
|
||||
/freetype-doc-2.4.3.tar.bz2
|
||||
/ft2demos-2.4.3.tar.bz2
|
||||
/freetype-2.4.4.tar.bz2
|
||||
/freetype-doc-2.4.4.tar.bz2
|
||||
/ft2demos-2.4.4.tar.bz2
|
||||
/freetype-2.4.5.tar.bz2
|
||||
/freetype-doc-2.4.5.tar.bz2
|
||||
/ft2demos-2.4.5.tar.bz2
|
||||
/freetype-2.4.6.tar.bz2
|
||||
/freetype-doc-2.4.6.tar.bz2
|
||||
/ft2demos-2.4.6.tar.bz2
|
||||
/freetype-2.4.7.tar.bz2
|
||||
/freetype-doc-2.4.7.tar.bz2
|
||||
/ft2demos-2.4.7.tar.bz2
|
||||
/freetype-2.4.8.tar.bz2
|
||||
/freetype-doc-2.4.8.tar.bz2
|
||||
/ft2demos-2.4.8.tar.bz2
|
||||
/freetype-2.4.9.tar.bz2
|
||||
/freetype-doc-2.4.9.tar.bz2
|
||||
/ft2demos-2.4.9.tar.bz2
|
||||
/freetype-2.4.10.tar.bz2
|
||||
/freetype-doc-2.4.10.tar.bz2
|
||||
/ft2demos-2.4.10.tar.bz2
|
||||
/freetype-2.4.11.tar.bz2
|
||||
/freetype-doc-2.4.11.tar.bz2
|
||||
/ft2demos-2.4.11.tar.bz2
|
||||
/freetype-2.4.12.tar.bz2
|
||||
/freetype-doc-2.4.12.tar.bz2
|
||||
/ft2demos-2.4.12.tar.bz2
|
||||
/freetype-2.5.0.tar.bz2
|
||||
/freetype-doc-2.5.0.tar.bz2
|
||||
/ft2demos-2.5.0.tar.bz2
|
||||
/freetype-2.5.2.tar.bz2
|
||||
/freetype-doc-2.5.2.tar.bz2
|
||||
/ft2demos-2.5.2.tar.bz2
|
||||
/freetype-2.5.3.tar.bz2
|
||||
/freetype-doc-2.5.3.tar.bz2
|
||||
/ft2demos-2.5.3.tar.bz2
|
||||
/freetype-2.5.4.tar.bz2
|
||||
/freetype-doc-2.5.4.tar.bz2
|
||||
/ft2demos-2.5.4.tar.bz2
|
||||
/freetype-2.5.5.tar.bz2
|
||||
/freetype-doc-2.5.5.tar.bz2
|
||||
/ft2demos-2.5.5.tar.bz2
|
||||
/freetype-2.6.tar.bz2
|
||||
/freetype-doc-2.6.tar.bz2
|
||||
/ft2demos-2.6.tar.bz2
|
||||
/freetype-2.6.1.tar.bz2
|
||||
/freetype-doc-2.6.1.tar.bz2
|
||||
/ft2demos-2.6.1.tar.bz2
|
||||
/freetype-2.6.2.tar.bz2
|
||||
/freetype-doc-2.6.2.tar.bz2
|
||||
/ft2demos-2.6.2.tar.bz2
|
||||
/freetype-2.6.3.tar.bz2
|
||||
/freetype-doc-2.6.3.tar.bz2
|
||||
/ft2demos-2.6.3.tar.bz2
|
||||
/freetype-2.6.5.tar.bz2
|
||||
/freetype-doc-2.6.5.tar.bz2
|
||||
/ft2demos-2.6.5.tar.bz2
|
||||
/freetype-2.7.tar.bz2
|
||||
/freetype-doc-2.7.tar.bz2
|
||||
/ft2demos-2.7.tar.bz2
|
||||
/freetype-2.7.1.tar.bz2
|
||||
/freetype-doc-2.7.1.tar.bz2
|
||||
/ft2demos-2.7.1.tar.bz2
|
||||
/freetype-2.8.tar.bz2
|
||||
/freetype-doc-2.8.tar.bz2
|
||||
/ft2demos-2.8.tar.bz2
|
||||
/freetype-2.9.tar.bz2
|
||||
/freetype-doc-2.9.tar.bz2
|
||||
/ft2demos-2.9.tar.bz2
|
||||
/freetype-2.9.1.tar.bz2
|
||||
/freetype-doc-2.9.1.tar.bz2
|
||||
/ft2demos-2.9.1.tar.bz2
|
||||
/freetype-2.10.0.tar.bz2
|
||||
/freetype-doc-2.10.0.tar.bz2
|
||||
/ft2demos-2.10.0.tar.bz2
|
||||
/freetype-2.10.1.tar.xz
|
||||
/freetype-doc-2.10.1.tar.xz
|
||||
/ft2demos-2.10.1.tar.xz
|
||||
/freetype-2.10.2.tar.xz
|
||||
/freetype-doc-2.10.2.tar.xz
|
||||
/ft2demos-2.10.2.tar.xz
|
||||
/freetype-2.10.4.tar.xz
|
||||
/freetype-doc-2.10.4.tar.xz
|
||||
/ft2demos-2.10.4.tar.xz
|
||||
/freetype-2.11.0.tar.xz
|
||||
/freetype-doc-2.11.0.tar.xz
|
||||
/ft2demos-2.11.0.tar.xz
|
||||
/freetype-2.11.1.tar.xz
|
||||
/freetype-doc-2.11.1.tar.xz
|
||||
/ft2demos-2.11.1.tar.xz
|
||||
/freetype-2.12.0.tar.xz
|
||||
/freetype-doc-2.12.0.tar.xz
|
||||
/ft2demos-2.12.0.tar.xz
|
||||
/freetype-2.12.1.tar.xz
|
||||
/freetype-doc-2.12.1.tar.xz
|
||||
/ft2demos-2.12.1.tar.xz
|
||||
|
|
|
|||
13
freetype-2.10.1-debughook.patch
Normal file
13
freetype-2.10.1-debughook.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/include/freetype/ftmodapi.h b/include/freetype/ftmodapi.h
|
||||
index 8d039c4f3..88488bfe8 100644
|
||||
--- a/include/freetype/ftmodapi.h
|
||||
+++ b/include/freetype/ftmodapi.h
|
||||
@@ -623,7 +623,7 @@ FT_BEGIN_HEADER
|
||||
* it is bytecode interpreter's execution context, `TT_ExecContext`,
|
||||
* which is declared in FreeType's internal header file `tttypes.h`.
|
||||
*/
|
||||
- typedef FT_Error
|
||||
+ typedef void
|
||||
(*FT_DebugHook_Func)( void* arg );
|
||||
|
||||
|
||||
29
freetype-2.12.1-clear-ownership-flags.patch
Normal file
29
freetype-2.12.1-clear-ownership-flags.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From c26872ed59cba3af2f407b5eefc92fcec92aa52b Mon Sep 17 00:00:00 2001
|
||||
From: Ben Wagner <bungeman@chromium.org>
|
||||
Date: Thu, 26 May 2022 20:27:53 -0400
|
||||
Subject: [svg] Clear correct flags for doc ownership
|
||||
|
||||
This issue was discovered with an SVG based font with some documents
|
||||
compressed and other uncompressed. After loading the first compressed
|
||||
document the ownership flag on the glyph slot was set to true but never
|
||||
set to false. As a result after loading a compressed document a glyph
|
||||
from an uncompressed document would load fine, but when this glyph slot
|
||||
was cleared it would try to free its document resulting in a wild free.
|
||||
|
||||
* src/base/ftobjs.c (ft_glyphslot_clear): clear correct flags
|
||||
|
||||
Fixes: #1162
|
||||
|
||||
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
|
||||
index eeda69c3e..f66273f3d 100644
|
||||
--- a/src/base/ftobjs.c
|
||||
+++ b/src/base/ftobjs.c
|
||||
@@ -605,7 +605,7 @@
|
||||
|
||||
|
||||
FT_FREE( doc->svg_document );
|
||||
- slot->internal->load_flags &= ~FT_GLYPH_OWN_GZIP_SVG;
|
||||
+ slot->internal->flags &= ~FT_GLYPH_OWN_GZIP_SVG;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
17
freetype-2.5.2-more-demos.patch
Normal file
17
freetype-2.5.2-more-demos.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
--- ft2demos-2.5.2/Makefile
|
||||
+++ ft2demos-2.5.2/Makefile
|
||||
@@ -296,10 +296,10 @@ else
|
||||
# The following programs are not compiled automatically; either comment
|
||||
# out the affected line or use the program name as a Makefile target.
|
||||
#
|
||||
- # EXES += ftchkwd
|
||||
- # EXES += ftmemchk
|
||||
- # EXES += ftpatchk
|
||||
- # EXES += fttimer
|
||||
+ EXES += ftchkwd
|
||||
+ EXES += ftmemchk
|
||||
+ EXES += ftpatchk
|
||||
+ EXES += fttimer
|
||||
# EXES += testname
|
||||
|
||||
# Not all demo programs have a man page; we thus check for existence in a
|
||||
127
freetype.spec
127
freetype.spec
|
|
@ -1,11 +1,11 @@
|
|||
%{!?with_xfree86:%define with_xfree86 1}
|
||||
%bcond_with bootstrap
|
||||
|
||||
Name: freetype
|
||||
Version: 2.14.3
|
||||
Release: 2%{?dist}
|
||||
Summary: A free and portable font rendering engine
|
||||
License: (FTL OR GPL-2.0-or-later) AND BSD-3-Clause AND MIT AND MIT-Modern-Variant AND LicenseRef-Fedora-Public-Domain AND Zlib
|
||||
Name: freetype
|
||||
Version: 2.12.1
|
||||
Release: 2%{?dist}
|
||||
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
|
||||
URL: http://www.freetype.org
|
||||
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.xz
|
||||
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.xz
|
||||
|
|
@ -16,14 +16,20 @@ Source3: ftconfig.h
|
|||
Patch0: freetype-2.3.0-enable-spr.patch
|
||||
# Enable otvalid and gxvalid modules
|
||||
Patch1: freetype-2.2.1-enable-valid.patch
|
||||
# Enable additional demos
|
||||
Patch2: freetype-2.5.2-more-demos.patch
|
||||
|
||||
Patch3: freetype-2.6.5-libtool.patch
|
||||
|
||||
Patch4: freetype-2.8-multilib.patch
|
||||
|
||||
Patch5: freetype-2.10.0-internal-outline.patch
|
||||
# Revert ABI/API change
|
||||
Patch6: freetype-2.10.1-debughook.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
Patch7: freetype-2.12.1-clear-ownership-flags.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: zlib-devel
|
||||
|
|
@ -74,12 +80,18 @@ FreeType.
|
|||
%prep
|
||||
%setup -q -b 1 -a 2
|
||||
|
||||
%patch 0 -p1 -b .enable-spr
|
||||
%patch 1 -p1 -b .enable-valid
|
||||
%patch0 -p1 -b .enable-spr
|
||||
%patch1 -p1 -b .enable-valid
|
||||
|
||||
%patch 3 -p1 -b .libtool
|
||||
%patch 4 -p1 -b .multilib
|
||||
%patch 5 -p1 -b .internal-outline
|
||||
pushd ft2demos-%{version}
|
||||
%patch2 -p1 -b .more-demos
|
||||
popd
|
||||
|
||||
%patch3 -p1 -b .libtool
|
||||
%patch4 -p1 -b .multilib
|
||||
%patch5 -p1 -b .internal-outline
|
||||
%patch6 -p1 -b .debughook
|
||||
%patch7 -p1 -b .clear-ownership-flags
|
||||
|
||||
%build
|
||||
|
||||
|
|
@ -105,18 +117,30 @@ make TOP_DIR=".."
|
|||
popd
|
||||
%endif
|
||||
|
||||
# Convert FTL.txt and example3.cpp to UTF-8
|
||||
pushd docs
|
||||
iconv -f latin1 -t utf-8 < FTL.TXT > FTL.TXT.tmp && \
|
||||
touch -r FTL.TXT FTL.TXT.tmp && \
|
||||
mv FTL.TXT.tmp FTL.TXT
|
||||
|
||||
iconv -f iso-8859-1 -t utf-8 < "tutorial/example3.cpp" > "tutorial/example3.cpp.utf8"
|
||||
touch -r tutorial/example3.cpp tutorial/example3.cpp.utf8 && \
|
||||
mv tutorial/example3.cpp.utf8 tutorial/example3.cpp
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
|
||||
%make_install gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
|
||||
|
||||
{
|
||||
for ftdemo in ftbench ftdump ftlint ftvalid ttdebug ; do
|
||||
for ftdemo in ftbench ftchkwd ftmemchk ftpatchk fttimer ftdump ftlint ftvalid ; do
|
||||
builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
|
||||
done
|
||||
}
|
||||
%if %{with_xfree86}
|
||||
{
|
||||
for ftdemo in ftdiff ftgamma ftgrid ftmulti ftsdf ftstring ftview ; do
|
||||
for ftdemo in ftdiff ftgamma ftgrid ftmulti ftstring fttimer ftview ; do
|
||||
builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
|
||||
done
|
||||
}
|
||||
|
|
@ -124,13 +148,13 @@ popd
|
|||
|
||||
# man pages for freetype-demos
|
||||
{
|
||||
for ftdemo in ftbench ftdump ftlint ftvalid ttdebug ; do
|
||||
for ftdemo in ftbench ftdump ftlint ftvalid ; do
|
||||
builds/unix/libtool --mode=install install -m 644 ft2demos-%{version}/man/${ftdemo}.1 $RPM_BUILD_ROOT/%{_mandir}/man1
|
||||
done
|
||||
}
|
||||
%if %{with_xfree86}
|
||||
{
|
||||
for ftdemo in ftdiff ftgamma ftgrid ftmulti ftsdf ftstring ftview ; do
|
||||
for ftdemo in ftdiff ftgamma ftgrid ftmulti ftstring ftview ; do
|
||||
builds/unix/libtool --mode=install install -m 644 ft2demos-%{version}/man/${ftdemo}.1 $RPM_BUILD_ROOT/%{_mandir}/man1
|
||||
done
|
||||
}
|
||||
|
|
@ -167,28 +191,28 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
|
|||
|
||||
%files demos
|
||||
%{_bindir}/ftbench
|
||||
%{_bindir}/ftchkwd
|
||||
%{_bindir}/ftmemchk
|
||||
%{_bindir}/ftpatchk
|
||||
%{_bindir}/fttimer
|
||||
%{_bindir}/ftdump
|
||||
%{_bindir}/ftlint
|
||||
%{_bindir}/ftvalid
|
||||
%{_bindir}/ttdebug
|
||||
%{_mandir}/man1/ftbench.1.gz
|
||||
%{_mandir}/man1/ftdump.1.gz
|
||||
%{_mandir}/man1/ftlint.1.gz
|
||||
%{_mandir}/man1/ftvalid.1.gz
|
||||
%{_mandir}/man1/ttdebug.1.gz
|
||||
%if %{with_xfree86}
|
||||
%{_bindir}/ftdiff
|
||||
%{_bindir}/ftgamma
|
||||
%{_bindir}/ftgrid
|
||||
%{_bindir}/ftmulti
|
||||
%{_bindir}/ftsdf
|
||||
%{_bindir}/ftstring
|
||||
%{_bindir}/ftview
|
||||
%{_mandir}/man1/ftdiff.1.gz
|
||||
%{_mandir}/man1/ftgamma.1.gz
|
||||
%{_mandir}/man1/ftgrid.1.gz
|
||||
%{_mandir}/man1/ftmulti.1.gz
|
||||
%{_mandir}/man1/ftsdf.1.gz
|
||||
%{_mandir}/man1/ftstring.1.gz
|
||||
%{_mandir}/man1/ftview.1.gz
|
||||
%endif
|
||||
|
|
@ -209,73 +233,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
|
|||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Mon Apr 13 2026 Marek Kasik <mkasik@redhat.com> - 2.14.3-1
|
||||
- Update to 2.14.3
|
||||
- Resolves: #2443653
|
||||
|
||||
* Thu Feb 19 2026 Alexei Podtelezhnikov <apodtele@gmail.com> - 2.14.1-3
|
||||
- Various spec fixes:
|
||||
- * Remove redundant UTF-8 conversions
|
||||
- * Do not build outdated demos
|
||||
- * Build ftsdf and ttdebug demos
|
||||
- Resolves: #2440529
|
||||
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Wed Oct 15 2025 Marek Kasik <mkasik@redhat.com> - 2.14.1-1
|
||||
- Update to 2.14.1
|
||||
- Resolves: #2393704
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Tue Oct 08 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 2.13.3-1
|
||||
- Update to 2.13.3
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Feb 6 2024 Marek Kasik <mkasik@redhat.com> - 2.13.2-5
|
||||
- Migrated to SPDX license
|
||||
|
||||
* Tue Jan 30 2024 Marek Kasik <mkasik@redhat.com> - 2.13.2-4
|
||||
- Remove a patch which causes FTBFS
|
||||
- Resolves: #2261113
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Tue Jan 16 2024 Marek Kasik <mkasik@redhat.com> - 2.13.2-1
|
||||
- Update to 2.13.2
|
||||
- Resolves: #2217137
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue Jun 27 2023 Marek Kasik <mkasik@redhat.com> - 2.13.1-1
|
||||
- Update to 2.13.1
|
||||
- Resolves: #2217137
|
||||
|
||||
* Sat Feb 25 2023 Marek Kasik <mkasik@redhat.com> - 2.13.0-1
|
||||
- Update to 2.13.0
|
||||
- Resolves: #2168496
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jul 8 2022 Marek Kasik <mkasik@redhat.com> - 2.12.1-2
|
||||
- Clear correct flags for doc ownership
|
||||
- Resolves: #2104570
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (freetype-2.14.3.tar.xz) = 43de86ea70b4b47f6efaae67f3440f65a24ffac29dc6d11203a9764e4f1a749ce1ba7645acd23525220b3ba12ddad8687b962b9f1254e2c0a86070854e85d5a0
|
||||
SHA512 (freetype-doc-2.14.3.tar.xz) = f5d9bdd5119d353533a17366bfbe6d847d079f908137b1353cb9b6ce2e9ae5998dcaf7c888eeceec22b162cdb14256c6e7fefd75057250321fbcd9fcafc068f4
|
||||
SHA512 (ft2demos-2.14.3.tar.xz) = e59c1266010330a8cbfd25dec096a72ce7539b64f9c057de062a281261b3ad658240f58e75b53d7a880d7ad5e020206316a6e9e82b03dec2e4d999f3f56cb39a
|
||||
SHA512 (freetype-2.12.1.tar.xz) = 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
|
||||
SHA512 (freetype-doc-2.12.1.tar.xz) = 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d
|
||||
SHA512 (ft2demos-2.12.1.tar.xz) = cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue