diff --git a/freetype-2.5.2-more-demos.patch b/freetype-2.5.2-more-demos.patch new file mode 100644 index 0000000..7e58be7 --- /dev/null +++ b/freetype-2.5.2-more-demos.patch @@ -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 diff --git a/freetype.spec b/freetype.spec index 86ae4a7..9a32cbb 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Name: freetype Version: 2.14.3 -Release: 2%{?dist} +Release: 1%{?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 URL: http://www.freetype.org @@ -16,6 +16,8 @@ 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 @@ -77,6 +79,10 @@ FreeType. %patch 0 -p1 -b .enable-spr %patch 1 -p1 -b .enable-valid +pushd ft2demos-%{version} +%patch 2 -p1 -b .more-demos +popd + %patch 3 -p1 -b .libtool %patch 4 -p1 -b .multilib %patch 5 -p1 -b .internal-outline @@ -105,18 +111,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 +142,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 +185,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,20 +227,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog -* Wed Jul 15 2026 Fedora Release Engineering - 2.14.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - * Mon Apr 13 2026 Marek Kasik - 2.14.3-1 - Update to 2.14.3 - Resolves: #2443653 -* Thu Feb 19 2026 Alexei Podtelezhnikov - 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 - 2.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild