pool/freetype2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 974477 from home:dirkmueller:Factory

Browse Source 
- drop revert-ft212-subpixel-hinting-change.patch: upstream

  - The  meson  build  no  longer enforces  both  static  and  dynamic
    versions of the library by default.
  - The internal  zlib library was  updated to version  1.2.12.  Note,
    however, that  FreeType is *not* affected  by CVE-2018-25032 since
    it only does decompression.

OBS-URL: https://build.opensuse.org/request/show/974477
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=177
This commit is contained in:
Dirk Mueller 2022-05-02 19:39:45 +00:00 committed by Git OBS Bridge
parent a9c7da1e3f
commit 1f6e97ec39
3 changed files with 10 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freetype2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 2 10:12:04 UTC 2022 - Dirk Müller <dmueller@suse.com>
- drop revert-ft212-subpixel-hinting-change.patch: upstream
-------------------------------------------------------------------
Mon May 2 08:59:14 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
@ -9,6 +14,11 @@ Mon May 2 08:59:14 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
hinting was active (bug introduced in version 2.12.0).
- The generation of the pkg-config file `freetype2.pc` was broken if
the build was done with cmake (bug introduced in version 2.12.0).
- The meson build no longer enforces both static and dynamic
versions of the library by default.
- The internal zlib library was updated to version 1.2.12. Note,
however, that FreeType is *not* affected by CVE-2018-25032 since
it only does decompression.
- Drop freetype-2.12.0-cff_slot_load-segfault.patch
- Drop 079a22da037835daf5be2bd9eccf7bc1eaa2e783.patch

1
freetype2.spec
View File

@ -37,7 +37,6 @@ Patch1: don-t-mark-libpng-as-required-library.patch
Patch2: enable-long-family-names-by-default.patch
Patch3: enable-subpixel-rendering.patch
Patch4: enable-infinality-subpixel-hinting.patch
Patch7: revert-ft212-subpixel-hinting-change.patch
BuildRequires: gawk
BuildRequires: libbz2-devel
BuildRequires: libpng-devel

78
revert-ft212-subpixel-hinting-change.patch
View File

@ -1,78 +0,0 @@
temporary revert of
https://gitlab.freedesktop.org/freetype/freetype/-/commit/7809007a5b88b15207d6c6680cd8a979b122eafa.patch
due to https://gitlab.freedesktop.org/freetype/freetype/-/issues/1148
Index: freetype-2.12.1/src/truetype/ttgload.c
===================================================================
--- freetype-2.12.1.orig/src/truetype/ttgload.c
+++ freetype-2.12.1/src/truetype/ttgload.c
@@ -2691,28 +2691,6 @@
exec->ignore_x_mode = FALSE;
#endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
-#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
- /*
- * Toggle backward compatibility according to what font wants, except
- * when
- *
- * 1) we have a `tricky' font that heavily relies on the interpreter to
- * render glyphs correctly, for example DFKai-SB, or
- * 2) FT_RENDER_MODE_MONO (i.e, monochome rendering) is requested.
- *
- * In those cases, backward compatibility needs to be turned off to get
- * correct rendering. The rendering is then completely up to the
- * font's programming.
- *
- */
- if ( driver->interpreter_version == TT_INTERPRETER_VERSION_40 &&
- subpixel_hinting_lean &&
- !FT_IS_TRICKY( glyph->face ) )
- exec->backward_compatibility = !( exec->GS.instruct_control & 4 );
- else
- exec->backward_compatibility = FALSE;
-#endif /* TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL */
-
exec->pedantic_hinting = FT_BOOL( load_flags & FT_LOAD_PEDANTIC );
loader->exec = exec;
loader->instructions = exec->glyphIns;
Index: freetype-2.12.1/src/truetype/ttinterp.c
===================================================================
--- freetype-2.12.1.orig/src/truetype/ttinterp.c
+++ freetype-2.12.1/src/truetype/ttinterp.c
@@ -7762,6 +7762,35 @@
#endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
+ exc->iup_called = FALSE;
+#endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
+
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+ /*
+ * Toggle backward compatibility according to what font wants, except
+ * when
+ *
+ * 1) we have a `tricky' font that heavily relies on the interpreter to
+ * render glyphs correctly, for example DFKai-SB, or
+ * 2) FT_RENDER_MODE_MONO (i.e, monochome rendering) is requested.
+ *
+ * In those cases, backward compatibility needs to be turned off to get
+ * correct rendering. The rendering is then completely up to the
+ * font's programming.
+ *
+ */
+ if ( SUBPIXEL_HINTING_MINIMAL &&
+ exc->subpixel_hinting_lean &&
+ !FT_IS_TRICKY( &exc->face->root ) )
+ exc->backward_compatibility = !( exc->GS.instruct_control & 4 );
+ else
+ exc->backward_compatibility = FALSE;
+
+ exc->iupx_called = FALSE;
+ exc->iupy_called = FALSE;
+#endif
+
/* We restrict the number of twilight points to a reasonable, */
/* heuristic value to avoid slow execution of malformed bytecode. */
num_twilight_points = FT_MAX( 30,