[arch-commits] Commit in lib32-freetype2/trunk (7 files)
Jan Steffens
heftig at gemini.archlinux.org
Sun Dec 5 15:50:58 UTC 2021
Date: Sunday, December 5, 2021 @ 15:50:58
Author: heftig
Revision: 1065183
rebase patches
Modified:
lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch
lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch
lib32-freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch
lib32-freetype2/trunk/0004-Enable-long-PCF-family-names.patch
lib32-freetype2/trunk/PKGBUILD
Deleted:
lib32-freetype2/trunk/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch
lib32-freetype2/trunk/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch
-----------------------------------------------------------+
0001-Enable-table-validation-modules.patch | 2
0002-Enable-subpixel-rendering.patch | 2
0003-Enable-infinality-subpixel-hinting.patch | 2
0004-Enable-long-PCF-family-names.patch | 2
0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch | 35 ----------
0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch | 41 ------------
PKGBUILD | 8 +-
7 files changed, 8 insertions(+), 84 deletions(-)
Modified: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch 2021-12-05 15:46:44 UTC (rev 1065182)
+++ 0001-Enable-table-validation-modules.patch 2021-12-05 15:50:58 UTC (rev 1065183)
@@ -8,7 +8,7 @@
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
Modified: 0002-Enable-subpixel-rendering.patch
===================================================================
--- 0002-Enable-subpixel-rendering.patch 2021-12-05 15:46:44 UTC (rev 1065182)
+++ 0002-Enable-subpixel-rendering.patch 2021-12-05 15:50:58 UTC (rev 1065183)
@@ -8,7 +8,7 @@
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
Modified: 0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- 0003-Enable-infinality-subpixel-hinting.patch 2021-12-05 15:46:44 UTC (rev 1065182)
+++ 0003-Enable-infinality-subpixel-hinting.patch 2021-12-05 15:50:58 UTC (rev 1065183)
@@ -8,7 +8,7 @@
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
Modified: 0004-Enable-long-PCF-family-names.patch
===================================================================
--- 0004-Enable-long-PCF-family-names.patch 2021-12-05 15:46:44 UTC (rev 1065182)
+++ 0004-Enable-long-PCF-family-names.patch 2021-12-05 15:50:58 UTC (rev 1065183)
@@ -8,7 +8,7 @@
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
Deleted: 0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch
===================================================================
--- 0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch 2021-12-05 15:46:44 UTC (rev 1065182)
+++ 0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch 2021-12-05 15:50:58 UTC (rev 1065183)
@@ -1,35 +0,0 @@
-From d7f649f283763af099256eb2d5e326df601c3e76 Mon Sep 17 00:00:00 2001
-From: Anuj Verma <anujv at iitbhilai.ac.in>
-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
-
Deleted: 0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch
===================================================================
--- 0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch 2021-12-05 15:46:44 UTC (rev 1065182)
+++ 0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch 2021-12-05 15:50:58 UTC (rev 1065183)
@@ -1,41 +0,0 @@
-From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001
-From: Alexei Podtelezhnikov <apodtele at gmail.com>
-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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-05 15:46:44 UTC (rev 1065182)
+++ PKGBUILD 2021-12-05 15:50:58 UTC (rev 1065183)
@@ -22,10 +22,10 @@
0004-Enable-long-PCF-family-names.patch)
sha256sums=('3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8'
'SKIP'
- 'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c'
- '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468'
- '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a'
- '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6')
+ '663310ef70f7830de462fb8964ee4fa1d49ad4aeb1a6eae5857707e161039a53'
+ '17cd4bd0c650b9bdd3bc30581ad6457524db14ec34b56f98e243357c3ab4bc05'
+ '0607ac8176d4f08bcfb78d07bdc2c66fcbe7dfde6c82a0e98d6e625597442fd0'
+ '6e5192dc08119e32992eee5a15595e131adcc9d2411066ca8691bfe2af14d97e')
validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl at gnu.org>
prepare() {
More information about the arch-commits
mailing list