diff --git a/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch b/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch index 67dea6e4..5adeb212 100644 --- a/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch +++ b/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Enable table validation modules 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.cfg b/modules.cfg -index 30f7fac45a..a9a4703989 100644 +index 30f7fac45abd..a9a4703989b9 100644 --- a/modules.cfg +++ b/modules.cfg @@ -114,26 +114,26 @@ AUX_MODULES += cache diff --git a/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch b/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch index 8a1cddb9..03f911a2 100644 --- a/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch +++ b/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Enable subpixel rendering 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 4227fd376e..32da3fa039 100644 +index 4227fd376e41..32da3fa03903 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -123,7 +123,7 @@ FT_BEGIN_HEADER diff --git a/freetype2/mingw-w64-bootstrap/0003-Enable-infinality-subpixel-hinting.patch b/freetype2/mingw-w64-bootstrap/0003-Enable-infinality-subpixel-hinting.patch index cc1aa73d..dc0adb23 100644 --- a/freetype2/mingw-w64-bootstrap/0003-Enable-infinality-subpixel-hinting.patch +++ b/freetype2/mingw-w64-bootstrap/0003-Enable-infinality-subpixel-hinting.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Enable infinality subpixel hinting 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 32da3fa039..0dd4021e24 100644 +index 32da3fa03903..0dd4021e2433 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -688,8 +688,8 @@ FT_BEGIN_HEADER diff --git a/freetype2/mingw-w64-bootstrap/0004-Enable-long-PCF-family-names.patch b/freetype2/mingw-w64-bootstrap/0004-Enable-long-PCF-family-names.patch index 1c082b79..2c932957 100644 --- a/freetype2/mingw-w64-bootstrap/0004-Enable-long-PCF-family-names.patch +++ b/freetype2/mingw-w64-bootstrap/0004-Enable-long-PCF-family-names.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Enable long PCF family names 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 0dd4021e24..8da3073b6d 100644 +index 0dd4021e2433..8da3073b6d71 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -877,7 +877,7 @@ FT_BEGIN_HEADER diff --git a/freetype2/mingw-w64-bootstrap/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch b/freetype2/mingw-w64-bootstrap/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch deleted file mode 100644 index 5e1d8dc5..00000000 --- a/freetype2/mingw-w64-bootstrap/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d7f649f283763af099256eb2d5e326df601c3e76 Mon Sep 17 00:00:00 2001 -From: Anuj Verma -Date: Mon, 16 Aug 2021 07:48:09 +0530 -Subject: [PATCH] [sdf] Return `FT_Err_Ok` while trying to render bitmap. - - * src/sdf/ftsdfrend.c (ft_bsdf_render): Return OK if the slot is - a bitmap and the render mode is anything other than `FT_RENDER_MODE_SDF`. - This is for compatibility reasons. - - Fixes issue #1076 ---- - src/sdf/ftsdfrend.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/sdf/ftsdfrend.c b/src/sdf/ftsdfrend.c -index 30f2e62a4..5686c0bf5 100644 ---- a/src/sdf/ftsdfrend.c -+++ b/src/sdf/ftsdfrend.c -@@ -502,8 +502,11 @@ - /* check whether render mode is correct */ - if ( mode != FT_RENDER_MODE_SDF ) - { -- error = FT_THROW( Cannot_Render_Glyph ); -- goto Exit; -+ FT_TRACE0(( "ft_bsdf_render: trying to render bitmap\n" )); -+ -+ /* return OK since the slot is already a bitmap */ -+ error = FT_Err_Ok; -+ return error; - } - - if ( origin ) --- -GitLab - diff --git a/freetype2/mingw-w64-bootstrap/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch b/freetype2/mingw-w64-bootstrap/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch deleted file mode 100644 index 46206465..00000000 --- a/freetype2/mingw-w64-bootstrap/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001 -From: Alexei Podtelezhnikov -Date: Fri, 20 Aug 2021 16:01:32 -0400 -Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs. - -Fixes #1076. - -* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when -rendering a bitmap glyph. ---- - src/base/ftobjs.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c -index 342ac4a27..7b40c6421 100644 ---- a/src/base/ftobjs.c -+++ b/src/base/ftobjs.c -@@ -4703,7 +4703,7 @@ - else - renderer = FT_Lookup_Renderer( library, slot->format, &node ); - -- error = FT_ERR( Unimplemented_Feature ); -+ error = FT_ERR( Cannot_Render_Glyph ); - while ( renderer ) - { - error = renderer->render( renderer, slot, render_mode, NULL ); -@@ -4719,6 +4719,11 @@ - /* format. */ - renderer = FT_Lookup_Renderer( library, slot->format, &node ); - } -+ -+ /* it is not an error if we cannot render a bitmat glyph */ -+ if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) && -+ slot->format == FT_GLYPH_FORMAT_BITMAP ) -+ error = FT_Err_Ok; - } - } - --- -GitLab - diff --git a/freetype2/mingw-w64-bootstrap/PKGBUILD b/freetype2/mingw-w64-bootstrap/PKGBUILD index 3b406af7..a1974e54 100644 --- a/freetype2/mingw-w64-bootstrap/PKGBUILD +++ b/freetype2/mingw-w64-bootstrap/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-freetype2-bootstrap -pkgver=2.11.0 +pkgver=2.11.1 pkgrel=1 pkgdesc='Font rasterization library (mingw-w64)' arch=('any') @@ -20,17 +20,13 @@ source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkg 0001-Enable-table-validation-modules.patch 0002-Enable-subpixel-rendering.patch 0003-Enable-infinality-subpixel-hinting.patch - 0004-Enable-long-PCF-family-names.patch - 0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch - 0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch) -sha256sums=('8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7' + 0004-Enable-long-PCF-family-names.patch) +sha256sums=('3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8' 'SKIP' - 'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c' - '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468' - '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a' - '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6' - '2b13b8cc9acc3e56be6b0f8102d648864227bf93637bc956d5052c77c8509782' - '21a2d243bc6b44d1cdb88ef29af2bd5ceda8d0faaf928bdc2c078a474ddc61f1') + '663310ef70f7830de462fb8964ee4fa1d49ad4aeb1a6eae5857707e161039a53' + '17cd4bd0c650b9bdd3bc30581ad6457524db14ec34b56f98e243357c3ab4bc05' + '0607ac8176d4f08bcfb78d07bdc2c66fcbe7dfde6c82a0e98d6e625597442fd0' + '6e5192dc08119e32992eee5a15595e131adcc9d2411066ca8691bfe2af14d97e') validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then @@ -54,9 +50,6 @@ prepare() { patch -Np1 -i ../0002-Enable-subpixel-rendering.patch patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch - # https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076 - patch -Np1 -i ../0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch - patch -Np1 -i ../0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch } build() { diff --git a/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch b/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch index 67dea6e4..5adeb212 100644 --- a/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch +++ b/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Enable table validation modules 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.cfg b/modules.cfg -index 30f7fac45a..a9a4703989 100644 +index 30f7fac45abd..a9a4703989b9 100644 --- a/modules.cfg +++ b/modules.cfg @@ -114,26 +114,26 @@ AUX_MODULES += cache diff --git a/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch b/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch index 8a1cddb9..03f911a2 100644 --- a/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch +++ b/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Enable subpixel rendering 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 4227fd376e..32da3fa039 100644 +index 4227fd376e41..32da3fa03903 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -123,7 +123,7 @@ FT_BEGIN_HEADER diff --git a/freetype2/mingw-w64/0003-Enable-infinality-subpixel-hinting.patch b/freetype2/mingw-w64/0003-Enable-infinality-subpixel-hinting.patch index cc1aa73d..dc0adb23 100644 --- a/freetype2/mingw-w64/0003-Enable-infinality-subpixel-hinting.patch +++ b/freetype2/mingw-w64/0003-Enable-infinality-subpixel-hinting.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Enable infinality subpixel hinting 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 32da3fa039..0dd4021e24 100644 +index 32da3fa03903..0dd4021e2433 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -688,8 +688,8 @@ FT_BEGIN_HEADER diff --git a/freetype2/mingw-w64/0004-Enable-long-PCF-family-names.patch b/freetype2/mingw-w64/0004-Enable-long-PCF-family-names.patch index 1c082b79..2c932957 100644 --- a/freetype2/mingw-w64/0004-Enable-long-PCF-family-names.patch +++ b/freetype2/mingw-w64/0004-Enable-long-PCF-family-names.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Enable long PCF family names 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 0dd4021e24..8da3073b6d 100644 +index 0dd4021e2433..8da3073b6d71 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -877,7 +877,7 @@ FT_BEGIN_HEADER diff --git a/freetype2/mingw-w64/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch b/freetype2/mingw-w64/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch deleted file mode 100644 index 5e1d8dc5..00000000 --- a/freetype2/mingw-w64/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d7f649f283763af099256eb2d5e326df601c3e76 Mon Sep 17 00:00:00 2001 -From: Anuj Verma -Date: Mon, 16 Aug 2021 07:48:09 +0530 -Subject: [PATCH] [sdf] Return `FT_Err_Ok` while trying to render bitmap. - - * src/sdf/ftsdfrend.c (ft_bsdf_render): Return OK if the slot is - a bitmap and the render mode is anything other than `FT_RENDER_MODE_SDF`. - This is for compatibility reasons. - - Fixes issue #1076 ---- - src/sdf/ftsdfrend.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/sdf/ftsdfrend.c b/src/sdf/ftsdfrend.c -index 30f2e62a4..5686c0bf5 100644 ---- a/src/sdf/ftsdfrend.c -+++ b/src/sdf/ftsdfrend.c -@@ -502,8 +502,11 @@ - /* check whether render mode is correct */ - if ( mode != FT_RENDER_MODE_SDF ) - { -- error = FT_THROW( Cannot_Render_Glyph ); -- goto Exit; -+ FT_TRACE0(( "ft_bsdf_render: trying to render bitmap\n" )); -+ -+ /* return OK since the slot is already a bitmap */ -+ error = FT_Err_Ok; -+ return error; - } - - if ( origin ) --- -GitLab - diff --git a/freetype2/mingw-w64/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch b/freetype2/mingw-w64/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch deleted file mode 100644 index 46206465..00000000 --- a/freetype2/mingw-w64/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001 -From: Alexei Podtelezhnikov -Date: Fri, 20 Aug 2021 16:01:32 -0400 -Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs. - -Fixes #1076. - -* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when -rendering a bitmap glyph. ---- - src/base/ftobjs.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c -index 342ac4a27..7b40c6421 100644 ---- a/src/base/ftobjs.c -+++ b/src/base/ftobjs.c -@@ -4703,7 +4703,7 @@ - else - renderer = FT_Lookup_Renderer( library, slot->format, &node ); - -- error = FT_ERR( Unimplemented_Feature ); -+ error = FT_ERR( Cannot_Render_Glyph ); - while ( renderer ) - { - error = renderer->render( renderer, slot, render_mode, NULL ); -@@ -4719,6 +4719,11 @@ - /* format. */ - renderer = FT_Lookup_Renderer( library, slot->format, &node ); - } -+ -+ /* it is not an error if we cannot render a bitmat glyph */ -+ if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) && -+ slot->format == FT_GLYPH_FORMAT_BITMAP ) -+ error = FT_Err_Ok; - } - } - --- -GitLab - diff --git a/freetype2/mingw-w64/PKGBUILD b/freetype2/mingw-w64/PKGBUILD index 5c17a197..479cc72b 100644 --- a/freetype2/mingw-w64/PKGBUILD +++ b/freetype2/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-freetype2 -pkgver=2.11.0 +pkgver=2.11.1 pkgrel=1 pkgdesc='Font rasterization library (mingw-w64)' arch=('any') @@ -20,17 +20,13 @@ source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkg 0001-Enable-table-validation-modules.patch 0002-Enable-subpixel-rendering.patch 0003-Enable-infinality-subpixel-hinting.patch - 0004-Enable-long-PCF-family-names.patch - 0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch - 0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch) -sha256sums=('8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7' + 0004-Enable-long-PCF-family-names.patch) +sha256sums=('3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8' 'SKIP' - 'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c' - '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468' - '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a' - '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6' - '2b13b8cc9acc3e56be6b0f8102d648864227bf93637bc956d5052c77c8509782' - '21a2d243bc6b44d1cdb88ef29af2bd5ceda8d0faaf928bdc2c078a474ddc61f1') + '663310ef70f7830de462fb8964ee4fa1d49ad4aeb1a6eae5857707e161039a53' + '17cd4bd0c650b9bdd3bc30581ad6457524db14ec34b56f98e243357c3ab4bc05' + '0607ac8176d4f08bcfb78d07bdc2c66fcbe7dfde6c82a0e98d6e625597442fd0' + '6e5192dc08119e32992eee5a15595e131adcc9d2411066ca8691bfe2af14d97e') validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then @@ -54,9 +50,6 @@ prepare() { patch -Np1 -i ../0002-Enable-subpixel-rendering.patch patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch - # https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076 - patch -Np1 -i ../0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch - patch -Np1 -i ../0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch } build() {