From dd8205a888ff5f5c3b3a52ca34e9d40cdb42db5f Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Mon, 8 Apr 2019 16:52:36 +0200 Subject: [PATCH 01/44] Remove freetype-2.9-ftsmooth.patch --- freetype-2.9-ftsmooth.patch | 101 ------------------------------------ freetype.spec | 8 +-- 2 files changed, 4 insertions(+), 105 deletions(-) delete mode 100644 freetype-2.9-ftsmooth.patch diff --git a/freetype-2.9-ftsmooth.patch b/freetype-2.9-ftsmooth.patch deleted file mode 100644 index 2735bd5..0000000 --- a/freetype-2.9-ftsmooth.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- a/src/smooth/ftsmooth.c -+++ b/src/smooth/ftsmooth.c -@@ -232,39 +232,13 @@ - FT_UInt i, j; - - unsigned int height = bitmap->rows; -- unsigned int width = bitmap->width; -+ unsigned int width = bitmap->width / 3; - int pitch = bitmap->pitch; - -- -- /* Render 3 separate monochrome bitmaps, shifting the outline */ -- /* by 1/3 pixel. */ -- width /= 3; -- -- bitmap->buffer += width; -- -- error = render->raster_render( render->raster, ¶ms ); -- if ( error ) -- goto Exit; -- -- FT_Outline_Translate( outline, -21, 0 ); -- x_shift -= 21; -- bitmap->buffer += width; -- - error = render->raster_render( render->raster, ¶ms ); - if ( error ) - goto Exit; - -- FT_Outline_Translate( outline, 42, 0 ); -- x_shift += 42; -- bitmap->buffer -= 2 * width; -- -- error = render->raster_render( render->raster, ¶ms ); -- if ( error ) -- goto Exit; -- -- /* XXX: Rearrange the bytes according to FT_PIXEL_MODE_LCD. */ -- /* XXX: It is more efficient to render every third byte above. */ -- - if ( FT_ALLOC( temp, (FT_ULong)pitch ) ) - goto Exit; - -@@ -272,11 +246,7 @@ - { - line = bitmap->buffer + i * (FT_ULong)pitch; - for ( j = 0; j < width; j++ ) -- { -- temp[3 * j ] = line[j]; -- temp[3 * j + 1] = line[j + width]; -- temp[3 * j + 2] = line[j + width + width]; -- } -+ temp[3 * j] = temp[3 * j + 1] = temp[3 * j + 2] = line[j]; - FT_MEM_COPY( line, temp, pitch ); - } - -@@ -284,35 +254,23 @@ - } - else if ( vmul ) /* lcd_v */ - { -- int pitch = bitmap->pitch; -- -+ FT_Byte* line; -+ FT_UInt i; -+ int original_pitch = bitmap->pitch; - -- /* Render 3 separate monochrome bitmaps, shifting the outline */ -- /* by 1/3 pixel. Triple the pitch to render on each third row. */ - bitmap->pitch *= 3; - bitmap->rows /= 3; - -- bitmap->buffer += pitch; -- -- error = render->raster_render( render->raster, ¶ms ); -- if ( error ) -- goto Exit; -- -- FT_Outline_Translate( outline, 0, 21 ); -- y_shift += 21; -- bitmap->buffer += pitch; -- - error = render->raster_render( render->raster, ¶ms ); - if ( error ) - goto Exit; - -- FT_Outline_Translate( outline, 0, -42 ); -- y_shift -= 42; -- bitmap->buffer -= 2 * pitch; -- -- error = render->raster_render( render->raster, ¶ms ); -- if ( error ) -- goto Exit; -+ for ( i = 0; i < bitmap->rows; i++ ) -+ { -+ line = bitmap->buffer + i * bitmap->pitch; -+ FT_MEM_COPY( line + original_pitch, line, bitmap->width ); -+ FT_MEM_COPY( line + 2 * original_pitch, line, bitmap->width ); -+ } - - bitmap->pitch /= 3; - bitmap->rows *= 3; diff --git a/freetype.spec b/freetype.spec index 49cb8e8..0aa90c0 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.9.1 -Release: 7%{?dist} +Release: 8%{?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.bz2 @@ -22,8 +22,6 @@ Patch3: freetype-2.6.5-libtool.patch Patch4: freetype-2.8-multilib.patch -Patch5: freetype-2.9-ftsmooth.patch - BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -79,7 +77,6 @@ popd %patch3 -p1 -b .libtool %patch4 -p1 -b .multilib -%patch5 -p1 -b .ftsmooth %build @@ -192,6 +189,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Mon Apr 8 2019 Marek Kasik - 2.9.1-8 +- Remove freetype-2.9-ftsmooth.patch + * Thu Jan 31 2019 Fedora Release Engineering - 2.9.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 055610bb614eb824c4389d59522d0f792609dcca Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Mon, 8 Apr 2019 16:53:05 +0200 Subject: [PATCH 02/44] Remove freetype-2.9-ftsmooth.patch --- freetype-2.9-ftsmooth.patch | 101 ------------------------------------ freetype.spec | 8 +-- 2 files changed, 4 insertions(+), 105 deletions(-) delete mode 100644 freetype-2.9-ftsmooth.patch diff --git a/freetype-2.9-ftsmooth.patch b/freetype-2.9-ftsmooth.patch deleted file mode 100644 index 2735bd5..0000000 --- a/freetype-2.9-ftsmooth.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- a/src/smooth/ftsmooth.c -+++ b/src/smooth/ftsmooth.c -@@ -232,39 +232,13 @@ - FT_UInt i, j; - - unsigned int height = bitmap->rows; -- unsigned int width = bitmap->width; -+ unsigned int width = bitmap->width / 3; - int pitch = bitmap->pitch; - -- -- /* Render 3 separate monochrome bitmaps, shifting the outline */ -- /* by 1/3 pixel. */ -- width /= 3; -- -- bitmap->buffer += width; -- -- error = render->raster_render( render->raster, ¶ms ); -- if ( error ) -- goto Exit; -- -- FT_Outline_Translate( outline, -21, 0 ); -- x_shift -= 21; -- bitmap->buffer += width; -- - error = render->raster_render( render->raster, ¶ms ); - if ( error ) - goto Exit; - -- FT_Outline_Translate( outline, 42, 0 ); -- x_shift += 42; -- bitmap->buffer -= 2 * width; -- -- error = render->raster_render( render->raster, ¶ms ); -- if ( error ) -- goto Exit; -- -- /* XXX: Rearrange the bytes according to FT_PIXEL_MODE_LCD. */ -- /* XXX: It is more efficient to render every third byte above. */ -- - if ( FT_ALLOC( temp, (FT_ULong)pitch ) ) - goto Exit; - -@@ -272,11 +246,7 @@ - { - line = bitmap->buffer + i * (FT_ULong)pitch; - for ( j = 0; j < width; j++ ) -- { -- temp[3 * j ] = line[j]; -- temp[3 * j + 1] = line[j + width]; -- temp[3 * j + 2] = line[j + width + width]; -- } -+ temp[3 * j] = temp[3 * j + 1] = temp[3 * j + 2] = line[j]; - FT_MEM_COPY( line, temp, pitch ); - } - -@@ -284,35 +254,23 @@ - } - else if ( vmul ) /* lcd_v */ - { -- int pitch = bitmap->pitch; -- -+ FT_Byte* line; -+ FT_UInt i; -+ int original_pitch = bitmap->pitch; - -- /* Render 3 separate monochrome bitmaps, shifting the outline */ -- /* by 1/3 pixel. Triple the pitch to render on each third row. */ - bitmap->pitch *= 3; - bitmap->rows /= 3; - -- bitmap->buffer += pitch; -- -- error = render->raster_render( render->raster, ¶ms ); -- if ( error ) -- goto Exit; -- -- FT_Outline_Translate( outline, 0, 21 ); -- y_shift += 21; -- bitmap->buffer += pitch; -- - error = render->raster_render( render->raster, ¶ms ); - if ( error ) - goto Exit; - -- FT_Outline_Translate( outline, 0, -42 ); -- y_shift -= 42; -- bitmap->buffer -= 2 * pitch; -- -- error = render->raster_render( render->raster, ¶ms ); -- if ( error ) -- goto Exit; -+ for ( i = 0; i < bitmap->rows; i++ ) -+ { -+ line = bitmap->buffer + i * bitmap->pitch; -+ FT_MEM_COPY( line + original_pitch, line, bitmap->width ); -+ FT_MEM_COPY( line + 2 * original_pitch, line, bitmap->width ); -+ } - - bitmap->pitch /= 3; - bitmap->rows *= 3; diff --git a/freetype.spec b/freetype.spec index 49cb8e8..0aa90c0 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.9.1 -Release: 7%{?dist} +Release: 8%{?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.bz2 @@ -22,8 +22,6 @@ Patch3: freetype-2.6.5-libtool.patch Patch4: freetype-2.8-multilib.patch -Patch5: freetype-2.9-ftsmooth.patch - BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -79,7 +77,6 @@ popd %patch3 -p1 -b .libtool %patch4 -p1 -b .multilib -%patch5 -p1 -b .ftsmooth %build @@ -192,6 +189,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Mon Apr 8 2019 Marek Kasik - 2.9.1-8 +- Remove freetype-2.9-ftsmooth.patch + * Thu Jan 31 2019 Fedora Release Engineering - 2.9.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2e6bf149908d61c2b2121dad36f2caef260a2053 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 28 May 2019 14:56:55 +0200 Subject: [PATCH 03/44] Update to 2.10.0 Keep FT_Outline_New_Internal() and FT_Outline_Done_Internal() for ABI compatibility but make them just throw Unimplemented_Feature error. Remove them once soname has been bumped! Resolves: #1689117 --- freetype-2.10.0-internal-outline.patch | 72 ++++++++++++++++++++++++++ freetype-2.2.1-enable-valid.patch | 4 +- freetype-2.3.0-enable-spr.patch | 8 +-- freetype.spec | 15 +++++- 4 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 freetype-2.10.0-internal-outline.patch diff --git a/freetype-2.10.0-internal-outline.patch b/freetype-2.10.0-internal-outline.patch new file mode 100644 index 0000000..0f69ff9 --- /dev/null +++ b/freetype-2.10.0-internal-outline.patch @@ -0,0 +1,72 @@ +--- freetype-2.10.0/include/freetype/ftoutln.h ++++ freetype-2.10.0/include/freetype/ftoutln.h +@@ -165,6 +165,15 @@ FT_BEGIN_HEADER + FT_Int numContours, + FT_Outline *anoutline ); + ++ /* ++ * Kept downstream for ABI compatibility only. ++ * It just throws error now. Remove once soname has been bumped. ++ */ ++ FT_EXPORT( FT_Error ) ++ FT_Outline_New_Internal( FT_Memory memory, ++ FT_UInt numPoints, ++ FT_Int numContours, ++ FT_Outline *anoutline ); + + /************************************************************************** + * +@@ -192,6 +201,13 @@ FT_BEGIN_HEADER + FT_Outline_Done( FT_Library library, + FT_Outline* outline ); + ++ /* ++ * Kept downstream for ABI compatibility only. ++ * It just throws error now. Remove once soname has been bumped. ++ */ ++ FT_EXPORT( FT_Error ) ++ FT_Outline_Done_Internal( FT_Memory memory, ++ FT_Outline* outline ); + + /************************************************************************** + * +--- freetype-2.10.0/src/base/ftoutln.c ++++ freetype-2.10.0/src/base/ftoutln.c +@@ -291,6 +291,19 @@ + + /* documentation is in ftoutln.h */ + ++ /* ++ * Kept downstream for ABI compatibility only. ++ * It just throws error now. Remove once soname has been bumped. ++ */ ++ FT_EXPORT_DEF( FT_Error ) ++ FT_Outline_New_Internal( FT_Memory memory, ++ FT_UInt numPoints, ++ FT_Int numContours, ++ FT_Outline *anoutline ) ++ { ++ return FT_THROW( Unimplemented_Feature ); ++ } ++ + FT_EXPORT_DEF( FT_Error ) + FT_Outline_New( FT_Library library, + FT_UInt numPoints, +@@ -423,6 +436,17 @@ + + /* documentation is in ftoutln.h */ + ++ /* ++ * Kept downstream for ABI compatibility only. ++ * It just throws error now. Remove once soname has been bumped. ++ */ ++ FT_EXPORT_DEF( FT_Error ) ++ FT_Outline_Done_Internal( FT_Memory memory, ++ FT_Outline* outline ) ++ { ++ return FT_THROW( Unimplemented_Feature ); ++ } ++ + FT_EXPORT_DEF( FT_Error ) + FT_Outline_Done( FT_Library library, + FT_Outline* outline ) diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch index d924705..e1615aa 100644 --- a/freetype-2.2.1-enable-valid.patch +++ b/freetype-2.2.1-enable-valid.patch @@ -1,18 +1,18 @@ --- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 +++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 @@ -110,7 +110,7 @@ + # TrueType GX/AAT table validation. Needs `ftgxval.c' below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += gxvalid +AUX_MODULES += gxvalid # Support for streams compressed with gzip (files with suffix .gz). # @@ -124,7 +124,7 @@ + # OpenType table validation. Needs `ftotval.c' below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += otvalid +AUX_MODULES += otvalid diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch index d551000..a234782 100644 --- a/freetype-2.3.0-enable-spr.patch +++ b/freetype-2.3.0-enable-spr.patch @@ -1,11 +1,11 @@ --- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 +++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 @@ -92,7 +92,7 @@ - /* rendering technology that produces excellent output without LCD */ - /* filtering. */ - /* */ + * macro is not defined, FreeType offers alternative LCD rendering + * technology that produces excellent output without LCD filtering. + */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - /*************************************************************************/ + /************************************************************************** diff --git a/freetype.spec b/freetype.spec index 0aa90c0..392caab 100644 --- a/freetype.spec +++ b/freetype.spec @@ -2,8 +2,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.9.1 -Release: 8%{?dist} +Version: 2.10.0 +Release: 1%{?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.bz2 @@ -22,6 +22,8 @@ Patch3: freetype-2.6.5-libtool.patch Patch4: freetype-2.8-multilib.patch +Patch5: freetype-2.10.0-internal-outline.patch + BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -77,6 +79,7 @@ popd %patch3 -p1 -b .libtool %patch4 -p1 -b .multilib +%patch5 -p1 -b .internal-outline %build @@ -189,6 +192,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue May 28 2019 Marek Kasik - 2.10.0-1 +- Update to 2.10.0 +- Keep FT_Outline_New_Internal() and FT_Outline_Done_Internal() +- for ABI compatibility but make them just throw +- Unimplemented_Feature error. +- Remove them once soname has been bumped! +- Resolves: #1689117 + * Mon Apr 8 2019 Marek Kasik - 2.9.1-8 - Remove freetype-2.9-ftsmooth.patch From 83a0c1f2517c5964e28985a5443e62686a18f0d9 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 28 May 2019 15:03:26 +0200 Subject: [PATCH 04/44] Update sources file --- .gitignore | 3 +++ sources | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1467bcf..b540077 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,6 @@ ft2demos-2.4.2.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 diff --git a/sources b/sources index 231fa83..4d912dd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.9.1.tar.bz2) = 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708 -SHA512 (freetype-doc-2.9.1.tar.bz2) = 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4 -SHA512 (ft2demos-2.9.1.tar.bz2) = 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46 +SHA512 (freetype-2.10.0.tar.bz2) = dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e +SHA512 (freetype-doc-2.10.0.tar.bz2) = e0902983030b7b67443ca88f29a8bb72662de706ddff81309c66b6738b26c5d11dbd00eb75795851ddcd9f93ce05981623884afad096c0defd08bd544f5266d6 +SHA512 (ft2demos-2.10.0.tar.bz2) = d48cbabd5cc673e0af2e0c4056dba95cee8e08092f881958c6908ea2d4da7104ca81b701d47a17640ac36cbdfd8aa274cc26353bb43f026f55c00d565f2ad641 From 8c479430c9096984745b11916c383b79177605ad Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 11 Jun 2019 09:44:50 +0200 Subject: [PATCH 05/44] Fix handling of undefined glyph [pcf] Signed-off-by: Igor Gnatenko --- ...ix-handling-of-undefined-glyph-56067.patch | 324 ++++++++++++++++++ freetype.spec | 11 +- 2 files changed, 334 insertions(+), 1 deletion(-) create mode 100644 0001-pcf-Fix-handling-of-undefined-glyph-56067.patch diff --git a/0001-pcf-Fix-handling-of-undefined-glyph-56067.patch b/0001-pcf-Fix-handling-of-undefined-glyph-56067.patch new file mode 100644 index 0000000..1c3f224 --- /dev/null +++ b/0001-pcf-Fix-handling-of-undefined-glyph-56067.patch @@ -0,0 +1,324 @@ +From c149f7397e484c97f45fb75fa1c7fdda2fc646cd Mon Sep 17 00:00:00 2001 +From: Werner Lemberg +Date: Wed, 17 Apr 2019 07:49:17 +0200 +Subject: [PATCH] [pcf] Fix handling of undefined glyph (#56067). + +This commit fixes the changes from 2018-07-21, which broke charmap +iteration. We now add the default character as a new glyph with +index 0, thus increasing the number of glyphs by one (as before). + +* src/pcf/pcfread.c (pcf_get_metrics): Adjust to new artificial +glyph with index 0. +Limit number of elements to 65534. +(pcf_get_bitmaps): Ditto. +Unify two loops into one; this avoids allocation of an intermediate +array. +(pcf_get_encodings): Don't flip indices but copy glyph metrics of +default character to index 0. +Also handle invalid default character. + +* docs/CHANGES: Updated. +--- + src/pcf/pcf.h | 3 +- + src/pcf/pcfdrivr.c | 12 ++-- + src/pcf/pcfread.c | 161 ++++++++++++++++++++++++--------------------- + 3 files changed, 93 insertions(+), 83 deletions(-) + +diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h +index 529dd3adf..33be4bcd8 100644 +--- a/src/pcf/pcf.h ++++ b/src/pcf/pcf.h +@@ -99,7 +99,8 @@ FT_BEGIN_HEADER + FT_Short ascent; + FT_Short descent; + FT_Short attributes; +- FT_ULong bits; ++ ++ FT_ULong bits; /* offset into the PCF_BITMAPS table */ + + } PCF_MetricRec, *PCF_Metric; + +diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c +index 54bbb9d11..b39592c79 100644 +--- a/src/pcf/pcfdrivr.c ++++ b/src/pcf/pcfdrivr.c +@@ -122,9 +122,9 @@ THE SOFTWARE. + charcodeCol > enc->lastCol ) + return 0; + +- return (FT_UInt)enc->offset[ ( charcodeRow - enc->firstRow ) * +- ( enc->lastCol - enc->firstCol + 1 ) + +- charcodeCol - enc->firstCol ]; ++ return (FT_UInt)enc->offset[( charcodeRow - enc->firstRow ) * ++ ( enc->lastCol - enc->firstCol + 1 ) + ++ charcodeCol - enc->firstCol]; + } + + +@@ -160,9 +160,9 @@ THE SOFTWARE. + + charcode = (FT_UInt32)( charcodeRow * 256 + charcodeCol ); + +- result = (FT_UInt)enc->offset[ ( charcodeRow - enc->firstRow ) * +- ( enc->lastCol - enc->firstCol + 1 ) + +- charcodeCol - enc->firstCol ]; ++ result = (FT_UInt)enc->offset[( charcodeRow - enc->firstRow ) * ++ ( enc->lastCol - enc->firstCol + 1 ) + ++ charcodeCol - enc->firstCol]; + if ( result != 0xFFFFU ) + break; + } +diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c +index 71143ecfb..3692eeff1 100644 +--- a/src/pcf/pcfread.c ++++ b/src/pcf/pcfread.c +@@ -743,33 +743,39 @@ THE SOFTWARE. + if ( !orig_nmetrics ) + return FT_THROW( Invalid_Table ); + +- /* PCF is a format from ancient times; Unicode was in its */ +- /* infancy, and widely used two-byte character sets for CJK */ +- /* scripts (Big 5, GB 2312, JIS X 0208, etc.) did have at most */ +- /* 15000 characters. Even the more exotic CNS 11643 and CCCII */ +- /* standards, which were essentially three-byte character sets, */ +- /* provided less then 65536 assigned characters. */ +- /* */ +- /* While technically possible to have a larger number of glyphs */ +- /* in PCF files, we thus limit the number to 65536. */ +- if ( orig_nmetrics > 65536 ) ++ /* ++ * PCF is a format from ancient times; Unicode was in its infancy, and ++ * widely used two-byte character sets for CJK scripts (Big 5, GB 2312, ++ * JIS X 0208, etc.) did have at most 15000 characters. Even the more ++ * exotic CNS 11643 and CCCII standards, which were essentially ++ * three-byte character sets, provided less then 65536 assigned ++ * characters. ++ * ++ * While technically possible to have a larger number of glyphs in PCF ++ * files, we thus limit the number to 65535, taking into account that we ++ * synthesize the metrics of glyph 0 to be a copy of the `default ++ * character', and that 0xFFFF in the encodings array indicates a ++ * missing glyph. ++ */ ++ if ( orig_nmetrics > 65534 ) + { + FT_TRACE0(( "pcf_get_metrics:" +- " only loading first 65536 metrics\n" )); +- nmetrics = 65536; ++ " only loading first 65534 metrics\n" )); ++ nmetrics = 65534; + } + else + nmetrics = orig_nmetrics; + +- face->nmetrics = nmetrics; ++ face->nmetrics = nmetrics + 1; + +- if ( FT_NEW_ARRAY( face->metrics, nmetrics ) ) ++ if ( FT_NEW_ARRAY( face->metrics, face->nmetrics ) ) + return error; + +- metrics = face->metrics; ++ /* we handle glyph index 0 later on */ ++ metrics = face->metrics + 1; + + FT_TRACE4(( "\n" )); +- for ( i = 0; i < nmetrics; i++, metrics++ ) ++ for ( i = 1; i < face->nmetrics; i++, metrics++ ) + { + FT_TRACE5(( " idx %ld:", i )); + error = pcf_get_metric( stream, format, metrics ); +@@ -808,12 +814,10 @@ THE SOFTWARE. + pcf_get_bitmaps( FT_Stream stream, + PCF_Face face ) + { +- FT_Error error; +- FT_Memory memory = FT_FACE( face )->memory; +- FT_ULong* offsets = NULL; +- FT_ULong bitmapSizes[GLYPHPADOPTIONS]; +- FT_ULong format, size; +- FT_ULong nbitmaps, orig_nbitmaps, i, sizebitmaps = 0; ++ FT_Error error; ++ FT_ULong bitmapSizes[GLYPHPADOPTIONS]; ++ FT_ULong format, size, pos; ++ FT_ULong nbitmaps, orig_nbitmaps, i, sizebitmaps = 0; + + + error = pcf_seek_to_table_type( stream, +@@ -859,31 +863,46 @@ THE SOFTWARE. + FT_TRACE4(( " number of bitmaps: %ld\n", orig_nbitmaps )); + + /* see comment in `pcf_get_metrics' */ +- if ( orig_nbitmaps > 65536 ) ++ if ( orig_nbitmaps > 65534 ) + { + FT_TRACE0(( "pcf_get_bitmaps:" +- " only loading first 65536 bitmaps\n" )); +- nbitmaps = 65536; ++ " only loading first 65534 bitmaps\n" )); ++ nbitmaps = 65534; + } + else + nbitmaps = orig_nbitmaps; + +- if ( nbitmaps != face->nmetrics ) ++ /* no extra bitmap for glyph 0 */ ++ if ( nbitmaps != face->nmetrics - 1 ) + return FT_THROW( Invalid_File_Format ); + +- if ( FT_NEW_ARRAY( offsets, nbitmaps ) ) +- return error; ++ /* start position of bitmap data */ ++ pos = stream->pos + nbitmaps * 4 + 4 * 4; + + FT_TRACE5(( "\n" )); +- for ( i = 0; i < nbitmaps; i++ ) ++ for ( i = 1; i <= nbitmaps; i++ ) + { ++ FT_ULong offset; ++ ++ + if ( PCF_BYTE_ORDER( format ) == MSBFirst ) +- (void)FT_READ_ULONG( offsets[i] ); ++ (void)FT_READ_ULONG( offset ); + else +- (void)FT_READ_ULONG_LE( offsets[i] ); ++ (void)FT_READ_ULONG_LE( offset ); + + FT_TRACE5(( " bitmap %lu: offset %lu (0x%lX)\n", +- i, offsets[i], offsets[i] )); ++ i, offset, offset )); ++ ++ /* right now, we only check the offset with a rough estimate; */ ++ /* actual bitmaps are only loaded on demand */ ++ if ( offset > size ) ++ { ++ FT_TRACE0(( "pcf_get_bitmaps:" ++ " invalid offset to bitmap data of glyph %lu\n", i )); ++ face->metrics[i].bits = pos; ++ } ++ else ++ face->metrics[i].bits = pos + offset; + } + if ( error ) + goto Bail; +@@ -910,24 +929,9 @@ THE SOFTWARE. + + FT_UNUSED( sizebitmaps ); /* only used for debugging */ + +- /* right now, we only check the bitmap offsets; */ +- /* actual bitmaps are only loaded on demand */ +- for ( i = 0; i < nbitmaps; i++ ) +- { +- /* rough estimate */ +- if ( offsets[i] > size ) +- { +- FT_TRACE0(( "pcf_get_bitmaps:" +- " invalid offset to bitmap data of glyph %lu\n", i )); +- } +- else +- face->metrics[i].bits = stream->pos + offsets[i]; +- } +- + face->bitmapsFormat = format; + + Bail: +- FT_FREE( offsets ); + return error; + } + +@@ -1062,41 +1066,52 @@ THE SOFTWARE. + defaultCharCol = enc->firstCol; + } + +- /* FreeType mandates that glyph index 0 is the `undefined glyph', */ +- /* which PCF calls the `default character'. For this reason, we */ +- /* swap the positions of glyph index 0 and the index corresponding */ +- /* to `defaultChar' in case they are different. */ +- +- /* `stream->cursor' still points at the beginning of the frame; */ +- /* we can thus easily get the offset to the default character */ ++ /* ++ * FreeType mandates that glyph index 0 is the `undefined glyph', which ++ * PCF calls the `default character'. However, FreeType needs glyph ++ * index 0 to be used for the undefined glyph only, which is is not the ++ * case for PCF. For this reason, we add one slot for glyph index 0 and ++ * simply copy the default character to it. ++ * ++ * `stream->cursor' still points to the beginning of the frame; we can ++ * thus easily get the offset to the default character. ++ */ + pos = stream->cursor + + 2 * ( ( defaultCharRow - enc->firstRow ) * +- ( enc->lastCol - enc->firstCol + 1 ) + +- defaultCharCol - enc->firstCol ); ++ ( enc->lastCol - enc->firstCol + 1 ) + ++ defaultCharCol - enc->firstCol ); + + if ( PCF_BYTE_ORDER( format ) == MSBFirst ) + defaultCharEncodingOffset = FT_PEEK_USHORT( pos ); + else + defaultCharEncodingOffset = FT_PEEK_USHORT_LE( pos ); + +- if ( defaultCharEncodingOffset >= face->nmetrics ) ++ if ( defaultCharEncodingOffset == 0xFFFF ) + { + FT_TRACE0(( "pcf_get_encodings:" +- " Invalid glyph index for default character," +- " setting to zero\n" )); +- defaultCharEncodingOffset = 0; ++ " No glyph for default character,\n" ++ " " ++ " setting it to the first glyph of the font\n" )); ++ defaultCharEncodingOffset = 1; + } +- +- if ( defaultCharEncodingOffset ) ++ else + { +- /* do the swapping */ +- PCF_MetricRec tmp = face->metrics[defaultCharEncodingOffset]; +- ++ defaultCharEncodingOffset++; + +- face->metrics[defaultCharEncodingOffset] = face->metrics[0]; +- face->metrics[0] = tmp; ++ if ( defaultCharEncodingOffset >= face->nmetrics ) ++ { ++ FT_TRACE0(( "pcf_get_encodings:" ++ " Invalid glyph index for default character,\n" ++ " " ++ " setting it to the first glyph of the font\n" )); ++ defaultCharEncodingOffset = 1; ++ } + } + ++ /* copy metrics of default character to index 0 */ ++ face->metrics[0] = face->metrics[defaultCharEncodingOffset]; ++ ++ /* now loop over all values */ + offset = enc->offset; + for ( i = enc->firstRow; i <= enc->lastRow; i++ ) + { +@@ -1111,15 +1126,9 @@ THE SOFTWARE. + else + encodingOffset = FT_GET_USHORT_LE(); + +- if ( encodingOffset != 0xFFFFU ) +- { +- if ( encodingOffset == defaultCharEncodingOffset ) +- encodingOffset = 0; +- else if ( encodingOffset == 0 ) +- encodingOffset = defaultCharEncodingOffset; +- } +- +- *offset++ = encodingOffset; ++ /* everything is off by 1 due to the artificial glyph 0 */ ++ *offset++ = encodingOffset == 0xFFFF ? 0xFFFF ++ : encodingOffset + 1; + } + } + FT_Stream_ExitFrame( stream ); +-- +2.22.0 + diff --git a/freetype.spec b/freetype.spec index 392caab..2ee2da7 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.10.0 -Release: 1%{?dist} +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.bz2 @@ -24,6 +24,10 @@ Patch4: freetype-2.8-multilib.patch Patch5: freetype-2.10.0-internal-outline.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1719132 +# https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=c149f7397e484c97f45fb75fa1c7fdda2fc646cd +Patch6: 0001-pcf-Fix-handling-of-undefined-glyph-56067.patch + BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -81,6 +85,8 @@ popd %patch4 -p1 -b .multilib %patch5 -p1 -b .internal-outline +%patch6 -p1 -b .undefined-pcf-glyph + %build %configure --disable-static \ @@ -192,6 +198,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue Jun 11 09:42:57 CEST 2019 Igor Gnatenko - 2.10.0-2 +- Fix handling of undefined glyph [pcf] + * Tue May 28 2019 Marek Kasik - 2.10.0-1 - Update to 2.10.0 - Keep FT_Outline_New_Internal() and FT_Outline_Done_Internal() From c37eacefc5fdc5b4b0662e58414d6197d2086cc0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 01:03:12 +0000 Subject: [PATCH 06/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 2ee2da7..771754d 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.10.0 -Release: 2%{?dist} +Release: 3%{?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.bz2 @@ -198,6 +198,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 11 09:42:57 CEST 2019 Igor Gnatenko - 2.10.0-2 - Fix handling of undefined glyph [pcf] From 095c0c5a53e6ba0d4791f84355565097e8042028 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Sat, 12 Oct 2019 22:55:01 +0200 Subject: [PATCH 07/44] Update to 2.10.1 --- .gitignore | 3 + ...ix-handling-of-undefined-glyph-56067.patch | 324 ------------------ freetype.spec | 19 +- sources | 6 +- 4 files changed, 14 insertions(+), 338 deletions(-) delete mode 100644 0001-pcf-Fix-handling-of-undefined-glyph-56067.patch diff --git a/.gitignore b/.gitignore index b540077..a52aae7 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,6 @@ ft2demos-2.4.2.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 diff --git a/0001-pcf-Fix-handling-of-undefined-glyph-56067.patch b/0001-pcf-Fix-handling-of-undefined-glyph-56067.patch deleted file mode 100644 index 1c3f224..0000000 --- a/0001-pcf-Fix-handling-of-undefined-glyph-56067.patch +++ /dev/null @@ -1,324 +0,0 @@ -From c149f7397e484c97f45fb75fa1c7fdda2fc646cd Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Wed, 17 Apr 2019 07:49:17 +0200 -Subject: [PATCH] [pcf] Fix handling of undefined glyph (#56067). - -This commit fixes the changes from 2018-07-21, which broke charmap -iteration. We now add the default character as a new glyph with -index 0, thus increasing the number of glyphs by one (as before). - -* src/pcf/pcfread.c (pcf_get_metrics): Adjust to new artificial -glyph with index 0. -Limit number of elements to 65534. -(pcf_get_bitmaps): Ditto. -Unify two loops into one; this avoids allocation of an intermediate -array. -(pcf_get_encodings): Don't flip indices but copy glyph metrics of -default character to index 0. -Also handle invalid default character. - -* docs/CHANGES: Updated. ---- - src/pcf/pcf.h | 3 +- - src/pcf/pcfdrivr.c | 12 ++-- - src/pcf/pcfread.c | 161 ++++++++++++++++++++++++--------------------- - 3 files changed, 93 insertions(+), 83 deletions(-) - -diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h -index 529dd3adf..33be4bcd8 100644 ---- a/src/pcf/pcf.h -+++ b/src/pcf/pcf.h -@@ -99,7 +99,8 @@ FT_BEGIN_HEADER - FT_Short ascent; - FT_Short descent; - FT_Short attributes; -- FT_ULong bits; -+ -+ FT_ULong bits; /* offset into the PCF_BITMAPS table */ - - } PCF_MetricRec, *PCF_Metric; - -diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c -index 54bbb9d11..b39592c79 100644 ---- a/src/pcf/pcfdrivr.c -+++ b/src/pcf/pcfdrivr.c -@@ -122,9 +122,9 @@ THE SOFTWARE. - charcodeCol > enc->lastCol ) - return 0; - -- return (FT_UInt)enc->offset[ ( charcodeRow - enc->firstRow ) * -- ( enc->lastCol - enc->firstCol + 1 ) + -- charcodeCol - enc->firstCol ]; -+ return (FT_UInt)enc->offset[( charcodeRow - enc->firstRow ) * -+ ( enc->lastCol - enc->firstCol + 1 ) + -+ charcodeCol - enc->firstCol]; - } - - -@@ -160,9 +160,9 @@ THE SOFTWARE. - - charcode = (FT_UInt32)( charcodeRow * 256 + charcodeCol ); - -- result = (FT_UInt)enc->offset[ ( charcodeRow - enc->firstRow ) * -- ( enc->lastCol - enc->firstCol + 1 ) + -- charcodeCol - enc->firstCol ]; -+ result = (FT_UInt)enc->offset[( charcodeRow - enc->firstRow ) * -+ ( enc->lastCol - enc->firstCol + 1 ) + -+ charcodeCol - enc->firstCol]; - if ( result != 0xFFFFU ) - break; - } -diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c -index 71143ecfb..3692eeff1 100644 ---- a/src/pcf/pcfread.c -+++ b/src/pcf/pcfread.c -@@ -743,33 +743,39 @@ THE SOFTWARE. - if ( !orig_nmetrics ) - return FT_THROW( Invalid_Table ); - -- /* PCF is a format from ancient times; Unicode was in its */ -- /* infancy, and widely used two-byte character sets for CJK */ -- /* scripts (Big 5, GB 2312, JIS X 0208, etc.) did have at most */ -- /* 15000 characters. Even the more exotic CNS 11643 and CCCII */ -- /* standards, which were essentially three-byte character sets, */ -- /* provided less then 65536 assigned characters. */ -- /* */ -- /* While technically possible to have a larger number of glyphs */ -- /* in PCF files, we thus limit the number to 65536. */ -- if ( orig_nmetrics > 65536 ) -+ /* -+ * PCF is a format from ancient times; Unicode was in its infancy, and -+ * widely used two-byte character sets for CJK scripts (Big 5, GB 2312, -+ * JIS X 0208, etc.) did have at most 15000 characters. Even the more -+ * exotic CNS 11643 and CCCII standards, which were essentially -+ * three-byte character sets, provided less then 65536 assigned -+ * characters. -+ * -+ * While technically possible to have a larger number of glyphs in PCF -+ * files, we thus limit the number to 65535, taking into account that we -+ * synthesize the metrics of glyph 0 to be a copy of the `default -+ * character', and that 0xFFFF in the encodings array indicates a -+ * missing glyph. -+ */ -+ if ( orig_nmetrics > 65534 ) - { - FT_TRACE0(( "pcf_get_metrics:" -- " only loading first 65536 metrics\n" )); -- nmetrics = 65536; -+ " only loading first 65534 metrics\n" )); -+ nmetrics = 65534; - } - else - nmetrics = orig_nmetrics; - -- face->nmetrics = nmetrics; -+ face->nmetrics = nmetrics + 1; - -- if ( FT_NEW_ARRAY( face->metrics, nmetrics ) ) -+ if ( FT_NEW_ARRAY( face->metrics, face->nmetrics ) ) - return error; - -- metrics = face->metrics; -+ /* we handle glyph index 0 later on */ -+ metrics = face->metrics + 1; - - FT_TRACE4(( "\n" )); -- for ( i = 0; i < nmetrics; i++, metrics++ ) -+ for ( i = 1; i < face->nmetrics; i++, metrics++ ) - { - FT_TRACE5(( " idx %ld:", i )); - error = pcf_get_metric( stream, format, metrics ); -@@ -808,12 +814,10 @@ THE SOFTWARE. - pcf_get_bitmaps( FT_Stream stream, - PCF_Face face ) - { -- FT_Error error; -- FT_Memory memory = FT_FACE( face )->memory; -- FT_ULong* offsets = NULL; -- FT_ULong bitmapSizes[GLYPHPADOPTIONS]; -- FT_ULong format, size; -- FT_ULong nbitmaps, orig_nbitmaps, i, sizebitmaps = 0; -+ FT_Error error; -+ FT_ULong bitmapSizes[GLYPHPADOPTIONS]; -+ FT_ULong format, size, pos; -+ FT_ULong nbitmaps, orig_nbitmaps, i, sizebitmaps = 0; - - - error = pcf_seek_to_table_type( stream, -@@ -859,31 +863,46 @@ THE SOFTWARE. - FT_TRACE4(( " number of bitmaps: %ld\n", orig_nbitmaps )); - - /* see comment in `pcf_get_metrics' */ -- if ( orig_nbitmaps > 65536 ) -+ if ( orig_nbitmaps > 65534 ) - { - FT_TRACE0(( "pcf_get_bitmaps:" -- " only loading first 65536 bitmaps\n" )); -- nbitmaps = 65536; -+ " only loading first 65534 bitmaps\n" )); -+ nbitmaps = 65534; - } - else - nbitmaps = orig_nbitmaps; - -- if ( nbitmaps != face->nmetrics ) -+ /* no extra bitmap for glyph 0 */ -+ if ( nbitmaps != face->nmetrics - 1 ) - return FT_THROW( Invalid_File_Format ); - -- if ( FT_NEW_ARRAY( offsets, nbitmaps ) ) -- return error; -+ /* start position of bitmap data */ -+ pos = stream->pos + nbitmaps * 4 + 4 * 4; - - FT_TRACE5(( "\n" )); -- for ( i = 0; i < nbitmaps; i++ ) -+ for ( i = 1; i <= nbitmaps; i++ ) - { -+ FT_ULong offset; -+ -+ - if ( PCF_BYTE_ORDER( format ) == MSBFirst ) -- (void)FT_READ_ULONG( offsets[i] ); -+ (void)FT_READ_ULONG( offset ); - else -- (void)FT_READ_ULONG_LE( offsets[i] ); -+ (void)FT_READ_ULONG_LE( offset ); - - FT_TRACE5(( " bitmap %lu: offset %lu (0x%lX)\n", -- i, offsets[i], offsets[i] )); -+ i, offset, offset )); -+ -+ /* right now, we only check the offset with a rough estimate; */ -+ /* actual bitmaps are only loaded on demand */ -+ if ( offset > size ) -+ { -+ FT_TRACE0(( "pcf_get_bitmaps:" -+ " invalid offset to bitmap data of glyph %lu\n", i )); -+ face->metrics[i].bits = pos; -+ } -+ else -+ face->metrics[i].bits = pos + offset; - } - if ( error ) - goto Bail; -@@ -910,24 +929,9 @@ THE SOFTWARE. - - FT_UNUSED( sizebitmaps ); /* only used for debugging */ - -- /* right now, we only check the bitmap offsets; */ -- /* actual bitmaps are only loaded on demand */ -- for ( i = 0; i < nbitmaps; i++ ) -- { -- /* rough estimate */ -- if ( offsets[i] > size ) -- { -- FT_TRACE0(( "pcf_get_bitmaps:" -- " invalid offset to bitmap data of glyph %lu\n", i )); -- } -- else -- face->metrics[i].bits = stream->pos + offsets[i]; -- } -- - face->bitmapsFormat = format; - - Bail: -- FT_FREE( offsets ); - return error; - } - -@@ -1062,41 +1066,52 @@ THE SOFTWARE. - defaultCharCol = enc->firstCol; - } - -- /* FreeType mandates that glyph index 0 is the `undefined glyph', */ -- /* which PCF calls the `default character'. For this reason, we */ -- /* swap the positions of glyph index 0 and the index corresponding */ -- /* to `defaultChar' in case they are different. */ -- -- /* `stream->cursor' still points at the beginning of the frame; */ -- /* we can thus easily get the offset to the default character */ -+ /* -+ * FreeType mandates that glyph index 0 is the `undefined glyph', which -+ * PCF calls the `default character'. However, FreeType needs glyph -+ * index 0 to be used for the undefined glyph only, which is is not the -+ * case for PCF. For this reason, we add one slot for glyph index 0 and -+ * simply copy the default character to it. -+ * -+ * `stream->cursor' still points to the beginning of the frame; we can -+ * thus easily get the offset to the default character. -+ */ - pos = stream->cursor + - 2 * ( ( defaultCharRow - enc->firstRow ) * -- ( enc->lastCol - enc->firstCol + 1 ) + -- defaultCharCol - enc->firstCol ); -+ ( enc->lastCol - enc->firstCol + 1 ) + -+ defaultCharCol - enc->firstCol ); - - if ( PCF_BYTE_ORDER( format ) == MSBFirst ) - defaultCharEncodingOffset = FT_PEEK_USHORT( pos ); - else - defaultCharEncodingOffset = FT_PEEK_USHORT_LE( pos ); - -- if ( defaultCharEncodingOffset >= face->nmetrics ) -+ if ( defaultCharEncodingOffset == 0xFFFF ) - { - FT_TRACE0(( "pcf_get_encodings:" -- " Invalid glyph index for default character," -- " setting to zero\n" )); -- defaultCharEncodingOffset = 0; -+ " No glyph for default character,\n" -+ " " -+ " setting it to the first glyph of the font\n" )); -+ defaultCharEncodingOffset = 1; - } -- -- if ( defaultCharEncodingOffset ) -+ else - { -- /* do the swapping */ -- PCF_MetricRec tmp = face->metrics[defaultCharEncodingOffset]; -- -+ defaultCharEncodingOffset++; - -- face->metrics[defaultCharEncodingOffset] = face->metrics[0]; -- face->metrics[0] = tmp; -+ if ( defaultCharEncodingOffset >= face->nmetrics ) -+ { -+ FT_TRACE0(( "pcf_get_encodings:" -+ " Invalid glyph index for default character,\n" -+ " " -+ " setting it to the first glyph of the font\n" )); -+ defaultCharEncodingOffset = 1; -+ } - } - -+ /* copy metrics of default character to index 0 */ -+ face->metrics[0] = face->metrics[defaultCharEncodingOffset]; -+ -+ /* now loop over all values */ - offset = enc->offset; - for ( i = enc->firstRow; i <= enc->lastRow; i++ ) - { -@@ -1111,15 +1126,9 @@ THE SOFTWARE. - else - encodingOffset = FT_GET_USHORT_LE(); - -- if ( encodingOffset != 0xFFFFU ) -- { -- if ( encodingOffset == defaultCharEncodingOffset ) -- encodingOffset = 0; -- else if ( encodingOffset == 0 ) -- encodingOffset = defaultCharEncodingOffset; -- } -- -- *offset++ = encodingOffset; -+ /* everything is off by 1 due to the artificial glyph 0 */ -+ *offset++ = encodingOffset == 0xFFFF ? 0xFFFF -+ : encodingOffset + 1; - } - } - FT_Stream_ExitFrame( stream ); --- -2.22.0 - diff --git a/freetype.spec b/freetype.spec index 771754d..9568871 100644 --- a/freetype.spec +++ b/freetype.spec @@ -2,13 +2,13 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.10.0 -Release: 3%{?dist} +Version: 2.10.1 +Release: 1%{?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.bz2 -Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2 -Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2 +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 +Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.xz Source3: ftconfig.h # Enable subpixel rendering (ClearType) @@ -24,10 +24,6 @@ Patch4: freetype-2.8-multilib.patch Patch5: freetype-2.10.0-internal-outline.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1719132 -# https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=c149f7397e484c97f45fb75fa1c7fdda2fc646cd -Patch6: 0001-pcf-Fix-handling-of-undefined-glyph-56067.patch - BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -85,8 +81,6 @@ popd %patch4 -p1 -b .multilib %patch5 -p1 -b .internal-outline -%patch6 -p1 -b .undefined-pcf-glyph - %build %configure --disable-static \ @@ -198,6 +192,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Sat Oct 12 2019 Michael Kuhn - 2.10.1-1 +- Update to 2.10.1 + * Thu Jul 25 2019 Fedora Release Engineering - 2.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 4d912dd..a343c4c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.10.0.tar.bz2) = dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e -SHA512 (freetype-doc-2.10.0.tar.bz2) = e0902983030b7b67443ca88f29a8bb72662de706ddff81309c66b6738b26c5d11dbd00eb75795851ddcd9f93ce05981623884afad096c0defd08bd544f5266d6 -SHA512 (ft2demos-2.10.0.tar.bz2) = d48cbabd5cc673e0af2e0c4056dba95cee8e08092f881958c6908ea2d4da7104ca81b701d47a17640ac36cbdfd8aa274cc26353bb43f026f55c00d565f2ad641 +SHA512 (freetype-2.10.1.tar.xz) = c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650 +SHA512 (freetype-doc-2.10.1.tar.xz) = 7260d0d6b1bd04f9940b456b20d8d8157fc528f5b6a5c2028fe57008bee3e8d0434bdf89589e2e521b04e3e2c43627155549091d3aaf06384b654f795458991e +SHA512 (ft2demos-2.10.1.tar.xz) = f1c06fae3d5653d6d8f8d630e531d47b7be4429b122dc826c80791953e61df7374dfc151f90519fe110f78fcbf592d9dbd9e96c83200730a6f04e42760cc3142 From ac07a003d7f75321346188eb9618d418d2b2decb Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 17 Oct 2019 21:06:50 +0200 Subject: [PATCH 08/44] Revert FT_DebugHook_Func ABI/API changes --- freetype-2.10.1-debughook.patch | 13 +++++++++++++ freetype.spec | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 freetype-2.10.1-debughook.patch diff --git a/freetype-2.10.1-debughook.patch b/freetype-2.10.1-debughook.patch new file mode 100644 index 0000000..4421401 --- /dev/null +++ b/freetype-2.10.1-debughook.patch @@ -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 ); + + diff --git a/freetype.spec b/freetype.spec index 9568871..b2c7801 100644 --- a/freetype.spec +++ b/freetype.spec @@ -23,6 +23,8 @@ 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 BuildRequires: libX11-devel @@ -80,6 +82,7 @@ popd %patch3 -p1 -b .libtool %patch4 -p1 -b .multilib %patch5 -p1 -b .internal-outline +%patch6 -p1 -b .debughook %build @@ -194,6 +197,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %changelog * Sat Oct 12 2019 Michael Kuhn - 2.10.1-1 - Update to 2.10.1 +- Revert FT_DebugHook_Func ABI/API changes * Thu Jul 25 2019 Fedora Release Engineering - 2.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 8f8172bb6967da594ead0b416fd9c8b8d78a500f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 19:01:09 +0000 Subject: [PATCH 09/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index b2c7801..c5670f9 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.10.1 -Release: 1%{?dist} +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 @@ -195,6 +195,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Oct 12 2019 Michael Kuhn - 2.10.1-1 - Update to 2.10.1 - Revert FT_DebugHook_Func ABI/API changes From 036e86865718598dd576b1067dce912cd413cd38 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Wed, 15 Jul 2020 13:07:20 +0200 Subject: [PATCH 10/44] Update to 2.10.2 Enable support for WOFF2 streams Resolves: #1725983 --- .gitignore | 3 +++ freetype.spec | 13 ++++++++++--- sources | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a52aae7..f7a0a5a 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,6 @@ ft2demos-2.4.2.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 diff --git a/freetype.spec b/freetype.spec index c5670f9..a281638 100644 --- a/freetype.spec +++ b/freetype.spec @@ -2,8 +2,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.10.1 -Release: 2%{?dist} +Version: 2.10.2 +Release: 1%{?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 @@ -31,6 +31,7 @@ BuildRequires: libX11-devel BuildRequires: libpng-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel +BuildRequires: brotli-devel Provides: %{name}-bytecode Provides: %{name}-subpixel @@ -91,7 +92,8 @@ popd --with-bzip2=yes \ --with-png=yes \ --enable-freetype-config \ - --with-harfbuzz=no + --with-harfbuzz=no \ + --with-brotli=yes sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool make %{?_smp_mflags} @@ -195,6 +197,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Wed Jul 15 2020 Marek Kasik - 2.10.2-1 +- Update to 2.10.2 +- Enable support for WOFF2 streams +- Resolves: #1725983 + * Tue Jan 28 2020 Fedora Release Engineering - 2.10.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index a343c4c..5a56659 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.10.1.tar.xz) = c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650 -SHA512 (freetype-doc-2.10.1.tar.xz) = 7260d0d6b1bd04f9940b456b20d8d8157fc528f5b6a5c2028fe57008bee3e8d0434bdf89589e2e521b04e3e2c43627155549091d3aaf06384b654f795458991e -SHA512 (ft2demos-2.10.1.tar.xz) = f1c06fae3d5653d6d8f8d630e531d47b7be4429b122dc826c80791953e61df7374dfc151f90519fe110f78fcbf592d9dbd9e96c83200730a6f04e42760cc3142 +SHA512 (freetype-2.10.2.tar.xz) = cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa +SHA512 (freetype-doc-2.10.2.tar.xz) = c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67 +SHA512 (ft2demos-2.10.2.tar.xz) = 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438 From b7670a0f74cb9f620a71e347a11978d0ae2d1301 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 21 Jul 2020 22:00:54 +0000 Subject: [PATCH 11/44] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- freetype.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/freetype.spec b/freetype.spec index a281638..3fb6a07 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.10.2 -Release: 1%{?dist} +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 @@ -96,7 +96,7 @@ popd --with-brotli=yes sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool -make %{?_smp_mflags} +%make_build %if %{with_xfree86} # Build demos @@ -197,6 +197,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue Jul 21 2020 Tom Stellard - 2.10.2-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Wed Jul 15 2020 Marek Kasik - 2.10.2-1 - Update to 2.10.2 - Enable support for WOFF2 streams From 7ebf3fc38d7377189bc64237fa9f9ad9fbf85fda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 17:50:52 +0000 Subject: [PATCH 12/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 3fb6a07..8ceffad 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.10.2 -Release: 2%{?dist} +Release: 3%{?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 @@ -197,6 +197,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.10.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 21 2020 Tom Stellard - 2.10.2-2 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From b6c7e8f031239f07fce64f6031f08a950b3dcb90 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 23 Oct 2020 13:10:17 +0200 Subject: [PATCH 13/44] Update to 2.10.4 Test bitmap size earlier for PNGs Fix memory leak in pngshim.c Enable man pages for demos Resolves: #1887084, #1890211 --- .gitignore | 3 ++ freetype-2.10.4-png-memory-leak.patch | 43 +++++++++++++++++++++++++++ freetype-2.3.0-enable-spr.patch | 4 +-- freetype.spec | 40 +++++++++++++++++++++++-- sources | 6 ++-- 5 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 freetype-2.10.4-png-memory-leak.patch diff --git a/.gitignore b/.gitignore index f7a0a5a..8bd6c86 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,6 @@ ft2demos-2.4.2.tar.bz2 /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 diff --git a/freetype-2.10.4-png-memory-leak.patch b/freetype-2.10.4-png-memory-leak.patch new file mode 100644 index 0000000..52df99a --- /dev/null +++ b/freetype-2.10.4-png-memory-leak.patch @@ -0,0 +1,43 @@ +From 007c109b4594c5e63948bd08b4d5011ad76ffb10 Mon Sep 17 00:00:00 2001 +From: Ben Wagner +Date: Fri, 23 Oct 2020 08:29:14 +0200 +Subject: [PATCH] * src/sfnt/pngshim.c (Load_SBit_Png): Fix memory leak + (#59322). + +The issue is that `rows` is allocated but will not be freed in the +event that the call to `png_read_image` fails and calls `longjmp`. +--- + ChangeLog | 7 +++++++ + src/sfnt/pngshim.c | 1 + + 2 files changed, 8 insertions(+) + +diff --git a/ChangeLog b/ChangeLog +index 42f7c34ba..ff048b8ab 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,10 @@ ++2020-10-23 Ben Wagner ++ ++ * src/sfnt/pngshim.c (Load_SBit_Png): Fix memory leak (#59322). ++ ++ The issue is that `rows` is allocated but will not be freed in the ++ event that the call to `png_read_image` fails and calls `longjmp`. ++ + 2020-10-20 Werner Lemberg + + * Version 2.10.4 released. +diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c +index f55016122..d4e43a9f4 100644 +--- a/src/sfnt/pngshim.c ++++ b/src/sfnt/pngshim.c +@@ -443,6 +443,7 @@ + png_read_end( png, info ); + + DestroyExit: ++ FT_FREE( rows ); + png_destroy_read_struct( &png, &info, NULL ); + FT_Stream_Close( &stream ); + +-- +2.26.2 + diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch index a234782..2c812cd 100644 --- a/freetype-2.3.0-enable-spr.patch +++ b/freetype-2.3.0-enable-spr.patch @@ -1,8 +1,8 @@ --- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 +++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 @@ -92,7 +92,7 @@ - * macro is not defined, FreeType offers alternative LCD rendering - * technology that produces excellent output without LCD filtering. + * When this macro is not defined, FreeType offers alternative LCD + * rendering technology that produces excellent output. */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING diff --git a/freetype.spec b/freetype.spec index 8ceffad..596793c 100644 --- a/freetype.spec +++ b/freetype.spec @@ -2,8 +2,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.10.2 -Release: 3%{?dist} +Version: 2.10.4 +Release: 1%{?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 @@ -26,6 +26,8 @@ Patch5: freetype-2.10.0-internal-outline.patch # Revert ABI/API change Patch6: freetype-2.10.1-debughook.patch +Patch7: freetype-2.10.4-png-memory-leak.patch + BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -84,6 +86,7 @@ popd %patch4 -p1 -b .multilib %patch5 -p1 -b .internal-outline %patch6 -p1 -b .debughook +%patch7 -p1 -b .png-memory-leak %build @@ -122,7 +125,7 @@ popd %make_install gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale { - for ftdemo in ftbench ftchkwd ftmemchk ftpatchk fttimer ftdump ftlint ftmemchk ftvalid ; 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 } @@ -134,6 +137,20 @@ popd } %endif +# man pages for freetype-demos +{ + 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 ftstring ftview ; do + builds/unix/libtool --mode=install install -m 644 ft2demos-%{version}/man/${ftdemo}.1 $RPM_BUILD_ROOT/%{_mandir}/man1 + done +} +%endif + # fix multilib issues %define wordsize %{__isa_bits} @@ -172,6 +189,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_bindir}/ftdump %{_bindir}/ftlint %{_bindir}/ftvalid +%{_mandir}/man1/ftbench.1.gz +%{_mandir}/man1/ftdump.1.gz +%{_mandir}/man1/ftlint.1.gz +%{_mandir}/man1/ftvalid.1.gz %if %{with_xfree86} %{_bindir}/ftdiff %{_bindir}/ftgamma @@ -179,6 +200,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_bindir}/ftmulti %{_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/ftstring.1.gz +%{_mandir}/man1/ftview.1.gz %endif %doc ChangeLog README @@ -197,6 +224,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Fri Oct 23 2020 Marek Kasik - 2.10.4-1 +- Update to 2.10.4 +- Test bitmap size earlier for PNGs +- Fix memory leak in pngshim.c +- Enable man pages for demos +- Resolves: #1887084, #1890211 + * Mon Jul 27 2020 Fedora Release Engineering - 2.10.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 5a56659..a9ea804 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.10.2.tar.xz) = cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa -SHA512 (freetype-doc-2.10.2.tar.xz) = c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67 -SHA512 (ft2demos-2.10.2.tar.xz) = 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438 +SHA512 (freetype-2.10.4.tar.xz) = 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f +SHA512 (freetype-doc-2.10.4.tar.xz) = 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8 +SHA512 (ft2demos-2.10.4.tar.xz) = d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8 From 78900600f105d42ec42389ac9848ae39c4736bcb Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 18 Dec 2020 22:53:42 +0000 Subject: [PATCH 14/44] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- freetype.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/freetype.spec b/freetype.spec index 596793c..d64c8c7 100644 --- a/freetype.spec +++ b/freetype.spec @@ -34,6 +34,7 @@ BuildRequires: libpng-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: brotli-devel +BuildRequires: make Provides: %{name}-bytecode Provides: %{name}-subpixel From 19cee984ff6907bf27b0dcd0a661a60fd6ccc0c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 05:56:36 +0000 Subject: [PATCH 15/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index d64c8c7..82fe43a 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.10.4 -Release: 1%{?dist} +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 @@ -225,6 +225,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.10.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Oct 23 2020 Marek Kasik - 2.10.4-1 - Update to 2.10.4 - Test bitmap size earlier for PNGs From 0e52f0de2b054a6fdd107d77dd5141d7bc6a04c7 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 5 Feb 2021 11:25:46 +0100 Subject: [PATCH 16/44] Enable HarfBuzz support Add bootstrap without HarfBuzz Resolves: #1853937 Resolves: #1906714 --- freetype.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/freetype.spec b/freetype.spec index 82fe43a..ec11e00 100644 --- a/freetype.spec +++ b/freetype.spec @@ -1,9 +1,10 @@ %{!?with_xfree86:%define with_xfree86 1} +%bcond_without bootstrap Summary: A free and portable font rendering engine Name: freetype Version: 2.10.4 -Release: 2%{?dist} +Release: 3%{?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 @@ -35,6 +36,9 @@ BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: brotli-devel BuildRequires: make +%if %{without bootstrap} +BuildRequires: harfbuzz-devel +%endif Provides: %{name}-bytecode Provides: %{name}-subpixel @@ -96,7 +100,11 @@ popd --with-bzip2=yes \ --with-png=yes \ --enable-freetype-config \ +%if %{without bootstrap} + --with-harfbuzz=yes \ +%else --with-harfbuzz=no \ +%endif --with-brotli=yes sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool @@ -225,10 +233,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Fri Feb 5 2021 Akira TAGOH - 2.10.4-3 +- Enable HarfBuzz support +- Add bootstrap without HarfBuzz +- Resolves: #1853937 +- Resolves: #1906714 + * Tue Jan 26 2021 Fedora Release Engineering - 2.10.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Fri Oct 23 2020 Marek Kasik - 2.10.4-1 +* Fri Oct 23 2020 Marek Kasik - 2.10.4-1 - Update to 2.10.4 - Test bitmap size earlier for PNGs - Fix memory leak in pngshim.c From a8d7bc9dd80538548eb3bcc0b0930917def2b8a8 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 5 Feb 2021 12:25:53 +0100 Subject: [PATCH 17/44] Disable bootstrap for final build --- freetype.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index ec11e00..4e925cc 100644 --- a/freetype.spec +++ b/freetype.spec @@ -1,5 +1,5 @@ %{!?with_xfree86:%define with_xfree86 1} -%bcond_without bootstrap +%bcond_with bootstrap Summary: A free and portable font rendering engine Name: freetype From 2a1385237b7ccfee8c36cf6a05e292b87840f74b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 23:22:58 +0000 Subject: [PATCH 18/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 4e925cc..0724d69 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,7 +4,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.10.4 -Release: 3%{?dist} +Release: 4%{?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 @@ -233,6 +233,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.10.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Feb 5 2021 Akira TAGOH - 2.10.4-3 - Enable HarfBuzz support - Add bootstrap without HarfBuzz From d6214db5e7e63c0bc908422df30885a4e43b7cdf Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 22 Jul 2021 19:10:45 +0200 Subject: [PATCH 19/44] Update to 2.11.0 --- .gitignore | 3 ++ freetype-2.10.4-png-memory-leak.patch | 43 --------------------------- freetype-2.5.2-more-demos.patch | 2 +- freetype.spec | 12 ++++---- sources | 6 ++-- 5 files changed, 13 insertions(+), 53 deletions(-) delete mode 100644 freetype-2.10.4-png-memory-leak.patch diff --git a/.gitignore b/.gitignore index 8bd6c86..bbcf9f8 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,6 @@ ft2demos-2.4.2.tar.bz2 /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 diff --git a/freetype-2.10.4-png-memory-leak.patch b/freetype-2.10.4-png-memory-leak.patch deleted file mode 100644 index 52df99a..0000000 --- a/freetype-2.10.4-png-memory-leak.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 007c109b4594c5e63948bd08b4d5011ad76ffb10 Mon Sep 17 00:00:00 2001 -From: Ben Wagner -Date: Fri, 23 Oct 2020 08:29:14 +0200 -Subject: [PATCH] * src/sfnt/pngshim.c (Load_SBit_Png): Fix memory leak - (#59322). - -The issue is that `rows` is allocated but will not be freed in the -event that the call to `png_read_image` fails and calls `longjmp`. ---- - ChangeLog | 7 +++++++ - src/sfnt/pngshim.c | 1 + - 2 files changed, 8 insertions(+) - -diff --git a/ChangeLog b/ChangeLog -index 42f7c34ba..ff048b8ab 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,10 @@ -+2020-10-23 Ben Wagner -+ -+ * src/sfnt/pngshim.c (Load_SBit_Png): Fix memory leak (#59322). -+ -+ The issue is that `rows` is allocated but will not be freed in the -+ event that the call to `png_read_image` fails and calls `longjmp`. -+ - 2020-10-20 Werner Lemberg - - * Version 2.10.4 released. -diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c -index f55016122..d4e43a9f4 100644 ---- a/src/sfnt/pngshim.c -+++ b/src/sfnt/pngshim.c -@@ -443,6 +443,7 @@ - png_read_end( png, info ); - - DestroyExit: -+ FT_FREE( rows ); - png_destroy_read_struct( &png, &info, NULL ); - FT_Stream_Close( &stream ); - --- -2.26.2 - diff --git a/freetype-2.5.2-more-demos.patch b/freetype-2.5.2-more-demos.patch index e737cb7..7e58be7 100644 --- a/freetype-2.5.2-more-demos.patch +++ b/freetype-2.5.2-more-demos.patch @@ -14,4 +14,4 @@ + EXES += fttimer # EXES += testname - exes: $(EXES:%=$(BIN_DIR_2)/%$E) + # Not all demo programs have a man page; we thus check for existence in a diff --git a/freetype.spec b/freetype.spec index 0724d69..74c1069 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,8 +3,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.10.4 -Release: 4%{?dist} +Version: 2.11.0 +Release: 1%{?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 @@ -27,8 +27,6 @@ Patch5: freetype-2.10.0-internal-outline.patch # Revert ABI/API change Patch6: freetype-2.10.1-debughook.patch -Patch7: freetype-2.10.4-png-memory-leak.patch - BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -91,7 +89,6 @@ popd %patch4 -p1 -b .multilib %patch5 -p1 -b .internal-outline %patch6 -p1 -b .debughook -%patch7 -p1 -b .png-memory-leak %build @@ -185,7 +182,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %files %{!?_licensedir:%global license %%doc} -%license docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT +%license LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT %{_libdir}/libfreetype.so.* %doc README @@ -233,6 +230,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Thu Jul 22 2021 Marek Kasik - 2.11.0-1 +- Update to 2.11.0 + * Wed Jul 21 2021 Fedora Release Engineering - 2.10.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index a9ea804..bcff9d2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.10.4.tar.xz) = 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f -SHA512 (freetype-doc-2.10.4.tar.xz) = 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8 -SHA512 (ft2demos-2.10.4.tar.xz) = d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8 +SHA512 (freetype-2.11.0.tar.xz) = bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d +SHA512 (freetype-doc-2.11.0.tar.xz) = 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301 +SHA512 (ft2demos-2.11.0.tar.xz) = 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531 From edee3a64e954b9637e23026a2713152dd9e5b36c Mon Sep 17 00:00:00 2001 From: Diego Herrera Date: Sat, 4 Dec 2021 03:48:47 -0300 Subject: [PATCH 20/44] Update to 2.11.1 --- .gitignore | 3 +++ freetype.spec | 5 ++++- sources | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bbcf9f8..73beede 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,6 @@ ft2demos-2.4.2.tar.bz2 /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 diff --git a/freetype.spec b/freetype.spec index 74c1069..6971f49 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.11.0 +Version: 2.11.1 Release: 1%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement URL: http://www.freetype.org @@ -230,6 +230,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Sat Dec 4 2021 Diego Herrera - 2.11.1-1 +- Update to 2.11.1 + * Thu Jul 22 2021 Marek Kasik - 2.11.0-1 - Update to 2.11.0 diff --git a/sources b/sources index bcff9d2..b5cad55 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.11.0.tar.xz) = bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d -SHA512 (freetype-doc-2.11.0.tar.xz) = 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301 -SHA512 (ft2demos-2.11.0.tar.xz) = 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531 +SHA512 (freetype-2.11.1.tar.xz) = 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 +SHA512 (freetype-doc-2.11.1.tar.xz) = c5e19d98425491682edc58230c48390925cc4b466169f655cf3b8575ba787a70feecdeb7a16224b132dcc32f17b041483d84056cda8e3132d98b531e46a26c36 +SHA512 (ft2demos-2.11.1.tar.xz) = 93d68daefa8a49b4fc987a7356133299fe2a8e012415ea09ad7616ececcfd978fdf9fc7a2d855f7488f51a497d019acb89ef5774484babae66357b3083a883c5 From b76102fcdadff9b77d404e1f212e1580b5bd1644 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 03:26:43 +0000 Subject: [PATCH 21/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 6971f49..45b767c 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,7 +4,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.11.1 -Release: 1%{?dist} +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 @@ -230,6 +230,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Dec 4 2021 Diego Herrera - 2.11.1-1 - Update to 2.11.1 From d4e28cf46bb1f2f2bbd95160dd9d75c86c0f100a Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Mon, 25 Apr 2022 11:33:51 +0200 Subject: [PATCH 22/44] Update to 2.12.0 Resolves: #2070686 --- .gitignore | 3 +++ freetype.spec | 8 ++++++-- sources | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 73beede..d5db5dd 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,6 @@ ft2demos-2.4.2.tar.bz2 /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 diff --git a/freetype.spec b/freetype.spec index 45b767c..067e455 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,8 +3,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.11.1 -Release: 2%{?dist} +Version: 2.12.0 +Release: 1%{?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 @@ -230,6 +230,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Mon Apr 25 2022 Marek Kasik - 2.12.0-1 +- Update to 2.12.0 +- Resolves: #2070686 + * Thu Jan 20 2022 Fedora Release Engineering - 2.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index b5cad55..4a48631 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.11.1.tar.xz) = 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 -SHA512 (freetype-doc-2.11.1.tar.xz) = c5e19d98425491682edc58230c48390925cc4b466169f655cf3b8575ba787a70feecdeb7a16224b132dcc32f17b041483d84056cda8e3132d98b531e46a26c36 -SHA512 (ft2demos-2.11.1.tar.xz) = 93d68daefa8a49b4fc987a7356133299fe2a8e012415ea09ad7616ececcfd978fdf9fc7a2d855f7488f51a497d019acb89ef5774484babae66357b3083a883c5 +SHA512 (freetype-2.12.0.tar.xz) = d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54 +SHA512 (freetype-doc-2.12.0.tar.xz) = 49d2ab0f39bafefe18da5bdc28aa11103caa2c130767179945e10183b7efe79b1ee6319e101dd86b7aacd2975d4b206edaf42129dd2516c2424a1d9954c946c6 +SHA512 (ft2demos-2.12.0.tar.xz) = 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2 From 16b1c26a1cd7ef619c7222189eee61bdc10c8f75 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Mon, 2 May 2022 12:51:29 +0200 Subject: [PATCH 23/44] Update to 2.12.1 Resolves: #2080714 --- .gitignore | 3 +++ freetype.spec | 6 +++++- sources | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d5db5dd..4643dfa 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,6 @@ ft2demos-2.4.2.tar.bz2 /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 diff --git a/freetype.spec b/freetype.spec index 067e455..563b053 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.12.0 +Version: 2.12.1 Release: 1%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement URL: http://www.freetype.org @@ -230,6 +230,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Mon May 2 2022 Marek Kasik - 2.12.1-1 +- Update to 2.12.1 +- Resolves: #2080714 + * Mon Apr 25 2022 Marek Kasik - 2.12.0-1 - Update to 2.12.0 - Resolves: #2070686 diff --git a/sources b/sources index 4a48631..e0b6848 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.12.0.tar.xz) = d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54 -SHA512 (freetype-doc-2.12.0.tar.xz) = 49d2ab0f39bafefe18da5bdc28aa11103caa2c130767179945e10183b7efe79b1ee6319e101dd86b7aacd2975d4b206edaf42129dd2516c2424a1d9954c946c6 -SHA512 (ft2demos-2.12.0.tar.xz) = 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2 +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 From 209614c14c404ac11fad39066157dcdf2fae2020 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 8 Jul 2022 14:20:01 +0200 Subject: [PATCH 24/44] Clear correct flags for doc ownership Resolves: #2104570 --- freetype-2.12.1-clear-ownership-flags.patch | 29 +++++++++++++++++++++ freetype.spec | 9 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 freetype-2.12.1-clear-ownership-flags.patch diff --git a/freetype-2.12.1-clear-ownership-flags.patch b/freetype-2.12.1-clear-ownership-flags.patch new file mode 100644 index 0000000..2598188 --- /dev/null +++ b/freetype-2.12.1-clear-ownership-flags.patch @@ -0,0 +1,29 @@ +From c26872ed59cba3af2f407b5eefc92fcec92aa52b Mon Sep 17 00:00:00 2001 +From: Ben Wagner +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 diff --git a/freetype.spec b/freetype.spec index 563b053..4c6bb76 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,7 +4,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.12.1 -Release: 1%{?dist} +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 @@ -27,6 +27,8 @@ Patch5: freetype-2.10.0-internal-outline.patch # Revert ABI/API change Patch6: freetype-2.10.1-debughook.patch +Patch7: freetype-2.12.1-clear-ownership-flags.patch + BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -89,6 +91,7 @@ popd %patch4 -p1 -b .multilib %patch5 -p1 -b .internal-outline %patch6 -p1 -b .debughook +%patch7 -p1 -b .clear-ownership-flags %build @@ -230,6 +233,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Fri Jul 8 2022 Marek Kasik - 2.12.1-2 +- Clear correct flags for doc ownership +- Resolves: #2104570 + * Mon May 2 2022 Marek Kasik - 2.12.1-1 - Update to 2.12.1 - Resolves: #2080714 From 23c0e450f2b748b399c67925f6e9afd23d735515 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 03:38:53 +0000 Subject: [PATCH 25/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 4c6bb76..c22e8b2 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,7 +4,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.12.1 -Release: 2%{?dist} +Release: 3%{?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 @@ -233,6 +233,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 8 2022 Marek Kasik - 2.12.1-2 - Clear correct flags for doc ownership - Resolves: #2104570 From b3936322ad99016e75495fbbe12747f180a50a21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:55:02 +0000 Subject: [PATCH 26/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index c22e8b2..27f3561 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,7 +4,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.12.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -233,6 +233,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.12.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 2.12.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1df760fa781e5c81edc89314a96a25237cb50a69 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Sat, 25 Feb 2023 13:16:06 +0100 Subject: [PATCH 27/44] Update to 2.13.0 Resolves: #2168496 --- .gitignore | 3 +++ freetype-2.12.1-clear-ownership-flags.patch | 29 --------------------- freetype.spec | 11 ++++---- sources | 6 ++--- 4 files changed, 12 insertions(+), 37 deletions(-) delete mode 100644 freetype-2.12.1-clear-ownership-flags.patch diff --git a/.gitignore b/.gitignore index 4643dfa..3dd701c 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,6 @@ ft2demos-2.4.2.tar.bz2 /freetype-2.12.1.tar.xz /freetype-doc-2.12.1.tar.xz /ft2demos-2.12.1.tar.xz +/freetype-2.13.0.tar.xz +/freetype-doc-2.13.0.tar.xz +/ft2demos-2.13.0.tar.xz diff --git a/freetype-2.12.1-clear-ownership-flags.patch b/freetype-2.12.1-clear-ownership-flags.patch deleted file mode 100644 index 2598188..0000000 --- a/freetype-2.12.1-clear-ownership-flags.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c26872ed59cba3af2f407b5eefc92fcec92aa52b Mon Sep 17 00:00:00 2001 -From: Ben Wagner -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 diff --git a/freetype.spec b/freetype.spec index 27f3561..10c4454 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,8 +3,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.12.1 -Release: 4%{?dist} +Version: 2.13.0 +Release: 1%{?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 @@ -27,8 +27,6 @@ Patch5: freetype-2.10.0-internal-outline.patch # Revert ABI/API change Patch6: freetype-2.10.1-debughook.patch -Patch7: freetype-2.12.1-clear-ownership-flags.patch - BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -91,7 +89,6 @@ popd %patch4 -p1 -b .multilib %patch5 -p1 -b .internal-outline %patch6 -p1 -b .debughook -%patch7 -p1 -b .clear-ownership-flags %build @@ -233,6 +230,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Sat Feb 25 2023 Marek Kasik - 2.13.0-1 +- Update to 2.13.0 +- Resolves: #2168496 + * Thu Jan 19 2023 Fedora Release Engineering - 2.12.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index e0b6848..ad51d1b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -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 +SHA512 (freetype-2.13.0.tar.xz) = b93a69a92b99f54c4fc4a276066bc7a87597df132e42ef93f6d973f1425e64bebcc568defa511d39fb04ab4d3a2090a6db1e54cf992a80ff57d658fee28a9110 +SHA512 (freetype-doc-2.13.0.tar.xz) = d4367513e1ca48691aa6d64c36bf53603f67a67214378a2ae3810b2227084647743ee0d7137453f31c966ccb9ce19c2a72b3b5445d4accbce9a63d71f6b6800e +SHA512 (ft2demos-2.13.0.tar.xz) = 7d686e9febdda587b74647cc38fa22f0722d0306ecb05430e319e05b6132c999d20728bcd7a6506b8d8ad45a6859443e2b69d766802497357a8f0ba3352404ba From faa706b7e90603645d77e7060aeed1b418252ac3 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 27 Jun 2023 18:07:38 +0200 Subject: [PATCH 28/44] Update to 2.13.1 Resolves: #2217137 --- .gitignore | 3 +++ freetype.spec | 20 ++++++++++++-------- sources | 6 +++--- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 3dd701c..4fc5bc4 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,6 @@ ft2demos-2.4.2.tar.bz2 /freetype-2.13.0.tar.xz /freetype-doc-2.13.0.tar.xz /ft2demos-2.13.0.tar.xz +/freetype-2.13.1.tar.xz +/freetype-doc-2.13.1.tar.xz +/ft2demos-2.13.1.tar.xz diff --git a/freetype.spec b/freetype.spec index 10c4454..090d130 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.13.0 +Version: 2.13.1 Release: 1%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement URL: http://www.freetype.org @@ -78,17 +78,17 @@ FreeType. %prep %setup -q -b 1 -a 2 -%patch0 -p1 -b .enable-spr -%patch1 -p1 -b .enable-valid +%patch 0 -p1 -b .enable-spr +%patch 1 -p1 -b .enable-valid pushd ft2demos-%{version} -%patch2 -p1 -b .more-demos +%patch 2 -p1 -b .more-demos popd -%patch3 -p1 -b .libtool -%patch4 -p1 -b .multilib -%patch5 -p1 -b .internal-outline -%patch6 -p1 -b .debughook +%patch 3 -p1 -b .libtool +%patch 4 -p1 -b .multilib +%patch 5 -p1 -b .internal-outline +%patch 6 -p1 -b .debughook %build @@ -230,6 +230,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue Jun 27 2023 Marek Kasik - 2.13.1-1 +- Update to 2.13.1 +- Resolves: #2217137 + * Sat Feb 25 2023 Marek Kasik - 2.13.0-1 - Update to 2.13.0 - Resolves: #2168496 diff --git a/sources b/sources index ad51d1b..7096a1e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.13.0.tar.xz) = b93a69a92b99f54c4fc4a276066bc7a87597df132e42ef93f6d973f1425e64bebcc568defa511d39fb04ab4d3a2090a6db1e54cf992a80ff57d658fee28a9110 -SHA512 (freetype-doc-2.13.0.tar.xz) = d4367513e1ca48691aa6d64c36bf53603f67a67214378a2ae3810b2227084647743ee0d7137453f31c966ccb9ce19c2a72b3b5445d4accbce9a63d71f6b6800e -SHA512 (ft2demos-2.13.0.tar.xz) = 7d686e9febdda587b74647cc38fa22f0722d0306ecb05430e319e05b6132c999d20728bcd7a6506b8d8ad45a6859443e2b69d766802497357a8f0ba3352404ba +SHA512 (freetype-2.13.1.tar.xz) = 045c43f9a3ca33e7d6a98c286895b94ea6ccfbb83851270d1b1861b31ef3ee5a574d8e49c6414c4e14bdfb9276dc49a0677b3be3e4f40ef279dcda99b769b962 +SHA512 (freetype-doc-2.13.1.tar.xz) = e18f0851c52689628fb7fa520c6165895650412bfe1ebab8417bf5738d5cc7d1877e78e4afbede0996938f33554f53a0ea7b837fe81497a12b10daae5b8829ed +SHA512 (ft2demos-2.13.1.tar.xz) = c03205266a420c589eec2a95ca082ab1c5606215a477500fe1a2f31c2f30c327a61e1fececec4ca3268f1a8b92a0bc8310bacf26f276ec09062fa5c5b0878511 From 447e16d9e901f213da1bcedca5cd6a344a4e2369 Mon Sep 17 00:00:00 2001 From: FAS Marie Loise Nolden Date: Sat, 8 Jul 2023 07:46:49 +0000 Subject: [PATCH 29/44] fix patching to fix build errors on rhel --- freetype.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/freetype.spec b/freetype.spec index 090d130..76a998c 100644 --- a/freetype.spec +++ b/freetype.spec @@ -78,17 +78,17 @@ 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 pushd ft2demos-%{version} -%patch 2 -p1 -b .more-demos +%patch2 -p1 -b .more-demos popd -%patch 3 -p1 -b .libtool -%patch 4 -p1 -b .multilib -%patch 5 -p1 -b .internal-outline -%patch 6 -p1 -b .debughook +%patch3 -p1 -b .libtool +%patch4 -p1 -b .multilib +%patch5 -p1 -b .internal-outline +%patch6 -p1 -b .debughook %build From 593e22a6af6c01aea24907a7fa403a74c629b420 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:16:20 +0000 Subject: [PATCH 30/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 76a998c..4e0f7c7 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,7 +4,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.13.1 -Release: 1%{?dist} +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 @@ -230,6 +230,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 27 2023 Marek Kasik - 2.13.1-1 - Update to 2.13.1 - Resolves: #2217137 From 8a56b77dd82faf018a5013d75019b824e7f3cb2e Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 16 Jan 2024 18:46:49 +0100 Subject: [PATCH 31/44] Update to 2.13.2 Resolves: #2217137 --- .gitignore | 3 +++ freetype.spec | 22 +++++++++++++--------- sources | 6 +++--- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 4fc5bc4..65d442c 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,6 @@ ft2demos-2.4.2.tar.bz2 /freetype-2.13.1.tar.xz /freetype-doc-2.13.1.tar.xz /ft2demos-2.13.1.tar.xz +/freetype-2.13.2.tar.xz +/freetype-doc-2.13.2.tar.xz +/ft2demos-2.13.2.tar.xz diff --git a/freetype.spec b/freetype.spec index 4e0f7c7..6925ef2 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,8 +3,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.13.1 -Release: 2%{?dist} +Version: 2.13.2 +Release: 1%{?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 @@ -78,17 +78,17 @@ FreeType. %prep %setup -q -b 1 -a 2 -%patch0 -p1 -b .enable-spr -%patch1 -p1 -b .enable-valid +%patch 0 -p1 -b .enable-spr +%patch 1 -p1 -b .enable-valid pushd ft2demos-%{version} -%patch2 -p1 -b .more-demos +%patch 2 -p1 -b .more-demos popd -%patch3 -p1 -b .libtool -%patch4 -p1 -b .multilib -%patch5 -p1 -b .internal-outline -%patch6 -p1 -b .debughook +%patch 3 -p1 -b .libtool +%patch 4 -p1 -b .multilib +%patch 5 -p1 -b .internal-outline +%patch 6 -p1 -b .debughook %build @@ -230,6 +230,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue Jan 16 2024 Marek Kasik - 2.13.2-1 +- Update to 2.13.2 +- Resolves: #2217137 + * Wed Jul 19 2023 Fedora Release Engineering - 2.13.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 7096a1e..ab35474 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.13.1.tar.xz) = 045c43f9a3ca33e7d6a98c286895b94ea6ccfbb83851270d1b1861b31ef3ee5a574d8e49c6414c4e14bdfb9276dc49a0677b3be3e4f40ef279dcda99b769b962 -SHA512 (freetype-doc-2.13.1.tar.xz) = e18f0851c52689628fb7fa520c6165895650412bfe1ebab8417bf5738d5cc7d1877e78e4afbede0996938f33554f53a0ea7b837fe81497a12b10daae5b8829ed -SHA512 (ft2demos-2.13.1.tar.xz) = c03205266a420c589eec2a95ca082ab1c5606215a477500fe1a2f31c2f30c327a61e1fececec4ca3268f1a8b92a0bc8310bacf26f276ec09062fa5c5b0878511 +SHA512 (freetype-2.13.2.tar.xz) = a5917edaa45cb9f75786f8a4f9d12fdf07529247e09dfdb6c0cf7feb08f7588bb24f7b5b11425fb47f8fd62fcb426e731c944658f6d5a59ce4458ad5b0a50194 +SHA512 (freetype-doc-2.13.2.tar.xz) = ca3438dcf6f995af556d8db3cb3cfdcabb81ab5a7dd88464ff757e3e418b3219b0011857cde8a338372e30d8375486ac8e50914da2ea948dc874f70010bce60c +SHA512 (ft2demos-2.13.2.tar.xz) = aa83ba4212ff7c4453b72f036136cb9b04cacf7d196388a3e4752613e000b3bb45a4dcf63d3d1d5b3d6ada10720304b532fb6e33ed6a5b399dcce45c27af9ade From 9dc61ee31bcfde5edd8cfb81f4791c9dfa694cf2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:48:35 +0000 Subject: [PATCH 32/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 6925ef2..53ed7b4 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,7 +4,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.13.2 -Release: 1%{?dist} +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 @@ -230,6 +230,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.13.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 16 2024 Marek Kasik - 2.13.2-1 - Update to 2.13.2 - Resolves: #2217137 From d45c69f8da3cb3ea7aaee592d2ab21e86a9804dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:03:36 +0000 Subject: [PATCH 33/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 53ed7b4..cc1c05b 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,7 +4,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.13.2 -Release: 2%{?dist} +Release: 3%{?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 @@ -230,6 +230,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.13.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.13.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 639d392930b1db0fd978ded555e592b846094952 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 30 Jan 2024 11:53:29 +0100 Subject: [PATCH 34/44] Remove a patch which causes FTBFS Resolves: #2261113 --- freetype-2.10.1-debughook.patch | 13 ------------- freetype.spec | 9 +++++---- 2 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 freetype-2.10.1-debughook.patch diff --git a/freetype-2.10.1-debughook.patch b/freetype-2.10.1-debughook.patch deleted file mode 100644 index 4421401..0000000 --- a/freetype-2.10.1-debughook.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 ); - - diff --git a/freetype.spec b/freetype.spec index cc1c05b..c07f098 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,7 +4,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.13.2 -Release: 3%{?dist} +Release: 4%{?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 @@ -24,8 +24,6 @@ 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 BuildRequires: libX11-devel @@ -88,7 +86,6 @@ popd %patch 3 -p1 -b .libtool %patch 4 -p1 -b .multilib %patch 5 -p1 -b .internal-outline -%patch 6 -p1 -b .debughook %build @@ -230,6 +227,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue Jan 30 2024 Marek Kasik - 2.13.2-4 +- Remove a patch which causes FTBFS +- Resolves: #2261113 + * Wed Jan 24 2024 Fedora Release Engineering - 2.13.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From dd29b9e704a121bb077eea1594e0989cd27b3e6e Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 6 Feb 2024 17:12:02 +0100 Subject: [PATCH 35/44] Migrated to SPDX license --- freetype.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/freetype.spec b/freetype.spec index c07f098..8598fda 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,8 +4,8 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.13.2 -Release: 4%{?dist} -License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement +Release: 5%{?dist} +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 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 @@ -227,6 +227,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue Feb 6 2024 Marek Kasik - 2.13.2-5 +- Migrated to SPDX license + * Tue Jan 30 2024 Marek Kasik - 2.13.2-4 - Remove a patch which causes FTBFS - Resolves: #2261113 From 0b515d81e573dfb578f53a9d1652995bdfdd8c70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:39:45 +0000 Subject: [PATCH 36/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 8598fda..9e962b0 100644 --- a/freetype.spec +++ b/freetype.spec @@ -4,7 +4,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.13.2 -Release: 5%{?dist} +Release: 6%{?dist} 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 Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.xz @@ -227,6 +227,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.13.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 6 2024 Marek Kasik - 2.13.2-5 - Migrated to SPDX license From 78c69e7828a8b91a426d954b5a03b29ee2339de7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 9 Oct 2024 10:37:13 +0100 Subject: [PATCH 37/44] Update to 2.13.3, minor cleanups --- .gitignore | 117 ++------------------------------------------------ freetype.spec | 11 +++-- sources | 6 +-- 3 files changed, 13 insertions(+), 121 deletions(-) diff --git a/.gitignore b/.gitignore index 65d442c..8a17b3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,114 +1,3 @@ -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 -/freetype-2.13.0.tar.xz -/freetype-doc-2.13.0.tar.xz -/ft2demos-2.13.0.tar.xz -/freetype-2.13.1.tar.xz -/freetype-doc-2.13.1.tar.xz -/ft2demos-2.13.1.tar.xz -/freetype-2.13.2.tar.xz -/freetype-doc-2.13.2.tar.xz -/ft2demos-2.13.2.tar.xz +/freetype-*.tar.xz +/freetype-doc-*.tar.xz +/ft2demos-*.tar.xz diff --git a/freetype.spec b/freetype.spec index 9e962b0..98250e3 100644 --- a/freetype.spec +++ b/freetype.spec @@ -1,10 +1,10 @@ %{!?with_xfree86:%define with_xfree86 1} %bcond_with bootstrap -Summary: A free and portable font rendering engine Name: freetype -Version: 2.13.2 -Release: 6%{?dist} +Version: 2.13.3 +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 Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.xz @@ -25,7 +25,7 @@ Patch4: freetype-2.8-multilib.patch Patch5: freetype-2.10.0-internal-outline.patch -BuildRequires: gcc +BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libpng-devel BuildRequires: zlib-devel @@ -227,6 +227,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Tue Oct 08 2024 Peter Robinson - 2.13.3-1 +- Update to 2.13.3 + * Wed Jul 17 2024 Fedora Release Engineering - 2.13.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index ab35474..6845c87 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.13.2.tar.xz) = a5917edaa45cb9f75786f8a4f9d12fdf07529247e09dfdb6c0cf7feb08f7588bb24f7b5b11425fb47f8fd62fcb426e731c944658f6d5a59ce4458ad5b0a50194 -SHA512 (freetype-doc-2.13.2.tar.xz) = ca3438dcf6f995af556d8db3cb3cfdcabb81ab5a7dd88464ff757e3e418b3219b0011857cde8a338372e30d8375486ac8e50914da2ea948dc874f70010bce60c -SHA512 (ft2demos-2.13.2.tar.xz) = aa83ba4212ff7c4453b72f036136cb9b04cacf7d196388a3e4752613e000b3bb45a4dcf63d3d1d5b3d6ada10720304b532fb6e33ed6a5b399dcce45c27af9ade +SHA512 (freetype-2.13.3.tar.xz) = 600828d7756c8cfa974448ef34ee0db573fb8cfdb2dc1e0358b63c44a03bfd7e3d4384424b9cc5e4749034f60231a550c4b7fcb46694fcacea218787ce305504 +SHA512 (freetype-doc-2.13.3.tar.xz) = 54ef9e3a4f0c298893268ed409f59aa1620a60c656ee3f8bdddbb91ffb2e70eea2f016a85c0a02eef699de362abee4aabae4482f0fa1cbf42967b5873fc84f2d +SHA512 (ft2demos-2.13.3.tar.xz) = e662a20ad2ff80534e8ea0df2f299e8f61350f13d279f80f8257b18352e863dd2c266791b85d3410b0c83966cb12e3ff49cf398b83a651dc73772df9fcf5936c From ef8fdcba42979f703ed294d7a55c93906e800280 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:51:21 +0000 Subject: [PATCH 38/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 98250e3..86e46e2 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Name: freetype Version: 2.13.3 -Release: 1%{?dist} +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 URL: http://www.freetype.org @@ -227,6 +227,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.13.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Oct 08 2024 Peter Robinson - 2.13.3-1 - Update to 2.13.3 From 9b53f3cfe7696987005a8a2cb1915b240cd63b12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:48:39 +0000 Subject: [PATCH 39/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 86e46e2..5a6a09b 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Name: freetype Version: 2.13.3 -Release: 2%{?dist} +Release: 3%{?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 @@ -227,6 +227,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.13.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 2.13.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e6cc53fb5f04e16f208ec3b9ae9ee802d2157699 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Wed, 15 Oct 2025 17:01:39 +0200 Subject: [PATCH 40/44] Update to 2.14.1 Resolves: #2393704 --- freetype.spec | 8 ++++++-- sources | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/freetype.spec b/freetype.spec index 5a6a09b..1411d61 100644 --- a/freetype.spec +++ b/freetype.spec @@ -2,8 +2,8 @@ %bcond_with bootstrap Name: freetype -Version: 2.13.3 -Release: 3%{?dist} +Version: 2.14.1 +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 @@ -227,6 +227,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Wed Oct 15 2025 Marek Kasik - 2.14.1-1 +- Update to 2.14.1 +- Resolves: #2393704 + * Wed Jul 23 2025 Fedora Release Engineering - 2.13.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 6845c87..cf8c5e8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.13.3.tar.xz) = 600828d7756c8cfa974448ef34ee0db573fb8cfdb2dc1e0358b63c44a03bfd7e3d4384424b9cc5e4749034f60231a550c4b7fcb46694fcacea218787ce305504 -SHA512 (freetype-doc-2.13.3.tar.xz) = 54ef9e3a4f0c298893268ed409f59aa1620a60c656ee3f8bdddbb91ffb2e70eea2f016a85c0a02eef699de362abee4aabae4482f0fa1cbf42967b5873fc84f2d -SHA512 (ft2demos-2.13.3.tar.xz) = e662a20ad2ff80534e8ea0df2f299e8f61350f13d279f80f8257b18352e863dd2c266791b85d3410b0c83966cb12e3ff49cf398b83a651dc73772df9fcf5936c +SHA512 (freetype-2.14.1.tar.xz) = 28284da99be52e90c7883fd668131cd44227ce68b98a57767fc33b2fe73e4baa5425cba4144bf3094192946d2abec03cec7afefe6300c0cda6787fae91966bad +SHA512 (freetype-doc-2.14.1.tar.xz) = a2e0901863d59c59ff4d1ded1c2000ddaa5cf21c3ea5fdf74e8bfecee56f8cf954628d0abd7440e9c1a3ebe23801138737e297809f403574304c41231f0fb962 +SHA512 (ft2demos-2.14.1.tar.xz) = a6240e888807c6171f8ee5d14578f83902cb495e6e911e5fd7c17628025310a60b0dfe5cd6c6e8803d3460eacd534d7f21c6c598081934d609575e182a312877 From 3fe096ec99d7e8ac0061e7d6bb5d546275187d08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 11:35:52 +0000 Subject: [PATCH 41/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 1411d61..bd74d93 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Name: freetype Version: 2.14.1 -Release: 1%{?dist} +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 URL: http://www.freetype.org @@ -227,6 +227,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Oct 15 2025 Marek Kasik - 2.14.1-1 - Update to 2.14.1 - Resolves: #2393704 From 5be258a11d160e8ab50bb19cf7a6058872bc1078 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 19 Feb 2026 18:20:18 +0100 Subject: [PATCH 42/44] Various spec fixes Remove redundant UTF-8 conversions Do not build outdated demos Build ftsdf and ttdebug demos Resolves: #2440529 --- freetype-2.5.2-more-demos.patch | 17 ------------- freetype.spec | 43 ++++++++++++--------------------- 2 files changed, 16 insertions(+), 44 deletions(-) delete mode 100644 freetype-2.5.2-more-demos.patch diff --git a/freetype-2.5.2-more-demos.patch b/freetype-2.5.2-more-demos.patch deleted file mode 100644 index 7e58be7..0000000 --- a/freetype-2.5.2-more-demos.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 bd74d93..78750f2 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Name: freetype Version: 2.14.1 -Release: 2%{?dist} +Release: 3%{?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,8 +16,6 @@ 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 @@ -79,10 +77,6 @@ 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 @@ -111,30 +105,18 @@ 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 ftchkwd ftmemchk ftpatchk fttimer ftdump ftlint ftvalid ; do + for ftdemo in ftbench ftdump ftlint ftvalid ttdebug ; 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 ftstring fttimer ftview ; do + for ftdemo in ftdiff ftgamma ftgrid ftmulti ftsdf ftstring ftview ; do builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir} done } @@ -142,13 +124,13 @@ popd # man pages for freetype-demos { - for ftdemo in ftbench ftdump ftlint ftvalid ; do + for ftdemo in ftbench ftdump ftlint ftvalid ttdebug ; 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 ftstring ftview ; do + for ftdemo in ftdiff ftgamma ftgrid ftmulti ftsdf ftstring ftview ; do builds/unix/libtool --mode=install install -m 644 ft2demos-%{version}/man/${ftdemo}.1 $RPM_BUILD_ROOT/%{_mandir}/man1 done } @@ -185,28 +167,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 @@ -227,6 +209,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* 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 From b5e46c9c4043de59f55c98c23bc3faa47a076521 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Mon, 13 Apr 2026 15:58:52 +0200 Subject: [PATCH 43/44] Update to 2.14.3 Resolves: #2443653 --- freetype.spec | 8 ++++++-- sources | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/freetype.spec b/freetype.spec index 78750f2..0f9d800 100644 --- a/freetype.spec +++ b/freetype.spec @@ -2,8 +2,8 @@ %bcond_with bootstrap Name: freetype -Version: 2.14.1 -Release: 3%{?dist} +Version: 2.14.3 +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 @@ -209,6 +209,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* 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 diff --git a/sources b/sources index cf8c5e8..76fb292 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.14.1.tar.xz) = 28284da99be52e90c7883fd668131cd44227ce68b98a57767fc33b2fe73e4baa5425cba4144bf3094192946d2abec03cec7afefe6300c0cda6787fae91966bad -SHA512 (freetype-doc-2.14.1.tar.xz) = a2e0901863d59c59ff4d1ded1c2000ddaa5cf21c3ea5fdf74e8bfecee56f8cf954628d0abd7440e9c1a3ebe23801138737e297809f403574304c41231f0fb962 -SHA512 (ft2demos-2.14.1.tar.xz) = a6240e888807c6171f8ee5d14578f83902cb495e6e911e5fd7c17628025310a60b0dfe5cd6c6e8803d3460eacd534d7f21c6c598081934d609575e182a312877 +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 From d6facd5816a4796f8eee47558239a02291221f3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 15 Jul 2026 23:28:20 +0000 Subject: [PATCH 44/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- freetype.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/freetype.spec b/freetype.spec index 0f9d800..86ae4a7 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,7 +3,7 @@ Name: freetype Version: 2.14.3 -Release: 1%{?dist} +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 URL: http://www.freetype.org @@ -209,6 +209,9 @@ 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