From 5bd93ea7e54fe0c99196f44d1b5900502e015ea927e85a2b5e01e4a7e4d54e49 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Mon, 9 Dec 2013 02:46:52 +0000 Subject: [PATCH 1/2] Accepting request 209891 from home:sumski:branches:M17N Update to version 2.5.1 OBS-URL: https://build.opensuse.org/request/show/209891 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=80 --- fix-compile-in-non-debug.patch | 186 +++++++++++++++++++++++++++++++++ freetype-2.5.0.1.tar.bz2 | 3 - freetype-2.5.1.tar.bz2 | 3 + freetype-doc-2.5.0.tar.bz2 | 3 - freetype-doc-2.5.1.tar.bz2 | 3 + freetype2-subpixel.patch | 6 +- freetype2.changes | 58 ++++++++++ freetype2.spec | 8 +- ft2demos-2.5.0.tar.bz2 | 3 - ft2demos-2.5.1.tar.bz2 | 3 + ft2demos.changes | 58 ++++++++++ ft2demos.spec | 12 ++- overflow.patch | 17 +++ 13 files changed, 347 insertions(+), 16 deletions(-) create mode 100644 fix-compile-in-non-debug.patch delete mode 100644 freetype-2.5.0.1.tar.bz2 create mode 100644 freetype-2.5.1.tar.bz2 delete mode 100644 freetype-doc-2.5.0.tar.bz2 create mode 100644 freetype-doc-2.5.1.tar.bz2 delete mode 100644 ft2demos-2.5.0.tar.bz2 create mode 100644 ft2demos-2.5.1.tar.bz2 create mode 100644 overflow.patch diff --git a/fix-compile-in-non-debug.patch b/fix-compile-in-non-debug.patch new file mode 100644 index 0000000..a2fec1d --- /dev/null +++ b/fix-compile-in-non-debug.patch @@ -0,0 +1,186 @@ +From 23d47f17fdb963fb0722a4ad2d9eb8fd150aba5a Mon Sep 17 00:00:00 2001 +From: Werner Lemberg +Date: Wed, 27 Nov 2013 09:23:44 +0000 +Subject: [ftgrid] Fix compilation in non-debug mode. + +* src/ftgrid.c: Guard autofit dump functions with FT_DEBUG_AUTOFIT +clause. +Update prototypes. +(grid_hint_draw_segment): Guard with FT_DEBUG_AUTOFIT clause. +(grid_status_draw_outline): Guard call to `grid_hint_draw_segment' +with FT_DEBUG_AUTOFIT clause. +(Process_Event) <'1'>, <'2'>, <'3'>: Don't mess around with trace +levels, which should always stay internal to the FreeType library. +Update calls to dump functions. +--- +diff --git a/ChangeLog b/ChangeLog +index 2cd9331..676a7db 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,17 @@ ++2013-11-27 Werner Lemberg ++ ++ [ftgrid] Fix compilation in non-debug mode. ++ ++ * src/ftgrid.c: Guard autofit dump functions with FT_DEBUG_AUTOFIT ++ clause. ++ Update prototypes. ++ (grid_hint_draw_segment): Guard with FT_DEBUG_AUTOFIT clause. ++ (grid_status_draw_outline): Guard call to `grid_hint_draw_segment' ++ with FT_DEBUG_AUTOFIT clause. ++ (Process_Event) <'1'>, <'2'>, <'3'>: Don't mess around with trace ++ levels, which should always stay internal to the FreeType library. ++ Update calls to dump functions. ++ + 2013-11-25 Werner Lemberg + + * Version 2.5.1 released. +diff --git a/src/ftgrid.c b/src/ftgrid.c +index e5967e6..37e168f 100644 +--- a/src/ftgrid.c ++++ b/src/ftgrid.c +@@ -47,6 +47,7 @@ + #define N_CFF_HINTING_ENGINES 2 + + ++#ifdef FT_DEBUG_AUTOFIT + /* these variables, structures and declarations are for */ + /* communication with the debugger in the autofit module; */ + /* normal programs don't need this */ +@@ -62,11 +63,14 @@ + extern "C" { + #endif + extern void +- af_glyph_hints_dump_segments( AF_GlyphHints hints ); ++ af_glyph_hints_dump_segments( AF_GlyphHints hints, ++ FT_Bool to_stdout ); + extern void +- af_glyph_hints_dump_points( AF_GlyphHints hints ); ++ af_glyph_hints_dump_points( AF_GlyphHints hints, ++ FT_Bool to_stdout ); + extern void +- af_glyph_hints_dump_edges( AF_GlyphHints hints ); ++ af_glyph_hints_dump_edges( AF_GlyphHints hints, ++ FT_Bool to_stdout ); + extern FT_Error + af_glyph_hints_get_num_segments( AF_GlyphHints hints, + FT_Int dimension, +@@ -80,6 +84,8 @@ + } + #endif + ++#endif /* FT_DEBUG_AUTOFIT */ ++ + typedef struct GridStatusRec_ + { + int width; +@@ -263,6 +269,8 @@ + } + + ++#ifdef FT_DEBUG_AUTOFIT ++ + static void + grid_hint_draw_segment( GridStatus st, + AF_GlyphHints hints ) +@@ -305,6 +313,8 @@ + } + } + ++#endif /* FT_DEBUG_AUTOFIT */ ++ + + static void + ft_bitmap_draw( FT_Bitmap* bitmap, +@@ -491,6 +501,7 @@ + + FTDemo_Get_Size( handle, &size ); + ++#ifdef FT_DEBUG_AUTOFIT + /* Draw segment before drawing glyph. */ + if ( status.do_segment ) + { +@@ -508,6 +519,7 @@ + + _af_debug_disable_horz_hints = !st->do_horz_hints; + _af_debug_disable_vert_hints = !st->do_vert_hints; ++#endif + + if ( FT_Load_Glyph( size->face, st->Num, + handle->load_flags | FT_LOAD_NO_BITMAP ) ) +@@ -849,67 +861,28 @@ + break; + + #ifdef FT_DEBUG_AUTOFIT +- /* we use some internal FreeType functions and variables */ +- /* to manipulate the trace level for the dumping functions */ +- + case grKEY( '1' ): + if ( handle->hinted && handle->autohint ) + { +- if ( FT_Trace_Get_Count() ) +- { +- int old_trace_level = ft_trace_levels[trace_afhints]; +- +- +- ft_trace_levels[trace_afhints] = 7; +- status.header = "dumping glyph edges to stdout"; +- af_glyph_hints_dump_edges( _af_debug_hints ); +- ft_trace_levels[trace_afhints] = old_trace_level; +- } +- else +- status.header = "need FreeType tracing support for dumping"; ++ status.header = "dumping glyph edges to stdout"; ++ af_glyph_hints_dump_edges( _af_debug_hints, 1 ); + } +- else +- status.header = "need autofit mode for edge dumping"; + break; + + case grKEY( '2' ): + if ( handle->hinted && handle->autohint ) + { +- if ( FT_Trace_Get_Count() ) +- { +- int old_trace_level = ft_trace_levels[trace_afhints]; +- +- +- ft_trace_levels[trace_afhints] = 7; +- status.header = "dumping glyph segments to stdout"; +- af_glyph_hints_dump_segments( _af_debug_hints ); +- ft_trace_levels[trace_afhints] = old_trace_level; +- } +- else +- status.header = "need FreeType tracing support for dumping"; ++ status.header = "dumping glyph segments to stdout"; ++ af_glyph_hints_dump_segments( _af_debug_hints, 1 ); + } +- else +- status.header = "need autofit mode for segment dumping"; + break; + + case grKEY( '3' ): + if ( handle->hinted && handle->autohint ) + { +- if ( FT_Trace_Get_Count() ) +- { +- int old_trace_level = ft_trace_levels[trace_afhints]; +- +- +- ft_trace_levels[trace_afhints] = 7; +- status.header = "dumping glyph points to stdout"; +- af_glyph_hints_dump_points( _af_debug_hints ); +- ft_trace_levels[trace_afhints] = old_trace_level; +- } +- else +- status.header = "need FreeType tracing support for dumping"; ++ status.header = "dumping glyph points to stdout"; ++ af_glyph_hints_dump_points( _af_debug_hints, 1 ); + } +- else +- status.header = "need autofit mode for point dumping"; + break; + #endif /* FT_DEBUG_AUTOFIT */ + +-- +cgit v0.9.0.2 diff --git a/freetype-2.5.0.1.tar.bz2 b/freetype-2.5.0.1.tar.bz2 deleted file mode 100644 index a13d30a..0000000 --- a/freetype-2.5.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5 -size 1607037 diff --git a/freetype-2.5.1.tar.bz2 b/freetype-2.5.1.tar.bz2 new file mode 100644 index 0000000..cb602d9 --- /dev/null +++ b/freetype-2.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d715faa92b37980280c857ce9d356fff4361c5a7bd9b5c3f867fc24f598d8f45 +size 1677282 diff --git a/freetype-doc-2.5.0.tar.bz2 b/freetype-doc-2.5.0.tar.bz2 deleted file mode 100644 index bef5c26..0000000 --- a/freetype-doc-2.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c1af657e8845830278abd019c49288e6b0f94409a6d4506c73a29f0fc062a4d -size 106728 diff --git a/freetype-doc-2.5.1.tar.bz2 b/freetype-doc-2.5.1.tar.bz2 new file mode 100644 index 0000000..1c86f70 --- /dev/null +++ b/freetype-doc-2.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57891fa2caf0185bca5d2641ae6715a6e9675fcb83976d4b1838cce02b540f01 +size 109390 diff --git a/freetype2-subpixel.patch b/freetype2-subpixel.patch index 49bdd65..c829946 100644 --- a/freetype2-subpixel.patch +++ b/freetype2-subpixel.patch @@ -1,7 +1,7 @@ -Index: freetype-2.4.11/include/freetype/config/ftoption.h +Index: freetype-2.4.11/include/config/ftoption.h =================================================================== ---- freetype-2.4.11.orig/include/freetype/config/ftoption.h -+++ freetype-2.4.11/include/freetype/config/ftoption.h +--- freetype-2.4.11.orig/include/config/ftoption.h ++++ freetype-2.4.11/include/config/ftoption.h @@ -92,7 +92,7 @@ FT_BEGIN_HEADER /* This is done to allow FreeType clients to run unmodified, forcing */ /* them to display normal gray-level anti-aliased glyphs. */ diff --git a/freetype2.changes b/freetype2.changes index a41ad19..04d51f9 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Wed Nov 27 19:31:42 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to version 2.5.1 + * For some WinFNT files, the last glyph wasn't displayed but + incorrectly marked as invalid. + * The vertical size of glyphs was incorrectly set after a call to + `FT_GlyphSlot_Embolden', resulting in clipped glyphs. + * Many fields of the `PCLT' table in SFNT based fonts (if accessed + with `FT_Get_Sfnt_Table') were computed incorrectly. + * In TrueType fonts, hinting of composite glyphs could sometimes + deliver incorrect positions of components or even distorted + shapes. + * WOFF font format support has been added. + * The auto-hinter now supports Hebrew. Greek and Cyrillic support + has been improved. + * Support for the forthcoming `OS/2' SFNT table version 5, as can + be found e.g. in the `Sitka' font family for Windows 8.1. + * The header file layout has been changed. After installation, + all files are now located in `/include/freetype2'. + Applications that use (a) `freetype-config' or FreeType's + `pkg-config' file to get the include directory for the compiler, + and (b) the documented way for header inclusion like + #include or #include FT_FREETYPE_H + don't need any change to the source code. + * The stem darkening feature of the new CFF engine can now be + fine-tuned with the new `darkening-parameters' property. + * `ftgrid' has been updated to toggle various engines with the `H' + key, similar to `ftview' and `ftdiff'. + * The functionality of `ttdebug' has been greatly enhanced. + . It now displays twilight, storage, and control value data; key + * Better support of ARMv7 and x86_64 processors. + * Apple's `sbix' color bitmap format is now supported. + * Improved auto-hinter rendering for many TrueType fonts, + especially in the range 20-40ppem. + * A new face flag `FT_FACE_FLAG_COLOR' has been added (to be + accessed with the macro `FT_HAS_COLOR'). + * `FT_Gzip_Uncompress' (modeled after zlib's `uncompress' + function) has been added; this is a by-product of the newly + added WOFF support. + * Support for a build with `cmake' has been contributed by John + Cary . + * Support for x64 builds with Visual C++ has been contributed by + Kenneth Miller + * Manual pages for most demo programs have been added. + * The GETINFO bytecode instruction for TrueType fonts was buggy if + used to retrieve subpixel hinting information. It was necessary + to set selector bit 6 to get results for selector bits 7-10, + which is wrong. + * Improved computation of emulated vertical metrics for TrueType + fonts. + * Fixed horizontal start-up position of vertical phantom points in + TrueType bytecode. +- Rebase freetype2-subpixel.patch to current release +- Added fix-compile-in-non-debug.patch, fixes release build of ftdemos +- Added overflow.patch for resolving post-build-check detected error: + I: Statement is overflowing a buffer + ------------------------------------------------------------------- Wed Jul 3 08:31:13 UTC 2013 - idonmez@suse.com diff --git a/freetype2.spec b/freetype2.spec index 8f4576e..f39a26f 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -26,8 +26,8 @@ BuildRequires: zlib-devel Obsoletes: freetype2-64bit %endif # -%define doc_version 2.5.0 -Version: 2.5.0.1 +%define doc_version 2.5.1 +Version: 2.5.1 Release: 0 Summary: A TrueType Font Library License: SUSE-Freetype or GPL-2.0+ @@ -39,6 +39,10 @@ Source3: baselibs.conf Patch1: freetype2-bitmap-foundry.patch Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch +# PATCH-FIX-UPSTREAM fix-compile-in-non-debug.patch +Patch201: fix-compile-in-non-debug.patch +# PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer +Patch202: overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description diff --git a/ft2demos-2.5.0.tar.bz2 b/ft2demos-2.5.0.tar.bz2 deleted file mode 100644 index 6a2eed0..0000000 --- a/ft2demos-2.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:490c3487561119c60b874ae2df5c27fedce320f8ab38b2832d4baf5a28120f34 -size 172671 diff --git a/ft2demos-2.5.1.tar.bz2 b/ft2demos-2.5.1.tar.bz2 new file mode 100644 index 0000000..c356f53 --- /dev/null +++ b/ft2demos-2.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:034543b5d1033fd262326ee58540f2b0744cd0dc34988a8be315fc0260056df0 +size 186036 diff --git a/ft2demos.changes b/ft2demos.changes index cd431f3..a5a73d9 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Wed Nov 27 19:31:42 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to version 2.5.1 + * For some WinFNT files, the last glyph wasn't displayed but + incorrectly marked as invalid. + * The vertical size of glyphs was incorrectly set after a call to + `FT_GlyphSlot_Embolden', resulting in clipped glyphs. + * Many fields of the `PCLT' table in SFNT based fonts (if accessed + with `FT_Get_Sfnt_Table') were computed incorrectly. + * In TrueType fonts, hinting of composite glyphs could sometimes + deliver incorrect positions of components or even distorted + shapes. + * WOFF font format support has been added. + * The auto-hinter now supports Hebrew. Greek and Cyrillic support + has been improved. + * Support for the forthcoming `OS/2' SFNT table version 5, as can + be found e.g. in the `Sitka' font family for Windows 8.1. + * The header file layout has been changed. After installation, + all files are now located in `/include/freetype2'. + Applications that use (a) `freetype-config' or FreeType's + `pkg-config' file to get the include directory for the compiler, + and (b) the documented way for header inclusion like + #include or #include FT_FREETYPE_H + don't need any change to the source code. + * The stem darkening feature of the new CFF engine can now be + fine-tuned with the new `darkening-parameters' property. + * `ftgrid' has been updated to toggle various engines with the `H' + key, similar to `ftview' and `ftdiff'. + * The functionality of `ttdebug' has been greatly enhanced. + . It now displays twilight, storage, and control value data; key + * Better support of ARMv7 and x86_64 processors. + * Apple's `sbix' color bitmap format is now supported. + * Improved auto-hinter rendering for many TrueType fonts, + especially in the range 20-40ppem. + * A new face flag `FT_FACE_FLAG_COLOR' has been added (to be + accessed with the macro `FT_HAS_COLOR'). + * `FT_Gzip_Uncompress' (modeled after zlib's `uncompress' + function) has been added; this is a by-product of the newly + added WOFF support. + * Support for a build with `cmake' has been contributed by John + Cary . + * Support for x64 builds with Visual C++ has been contributed by + Kenneth Miller + * Manual pages for most demo programs have been added. + * The GETINFO bytecode instruction for TrueType fonts was buggy if + used to retrieve subpixel hinting information. It was necessary + to set selector bit 6 to get results for selector bits 7-10, + which is wrong. + * Improved computation of emulated vertical metrics for TrueType + fonts. + * Fixed horizontal start-up position of vertical phantom points in + TrueType bytecode. +- Rebase freetype2-subpixel.patch to current release +- Added fix-compile-in-non-debug.patch, fixes release build of ftdemos +- Added overflow.patch for resolving post-build-check detected error: + I: Statement is overflowing a buffer + ------------------------------------------------------------------- Wed Jul 3 08:33:20 UTC 2013 - idonmez@suse.com diff --git a/ft2demos.spec b/ft2demos.spec index ef5d40c..99f7b7c 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -17,17 +17,21 @@ Name: ft2demos -Version: 2.5.0 +Version: 2.5.1 Release: 0 Summary: Freetype2 Utilities and Demo Programs License: GPL-2.0+ Group: Productivity/Publishing/Other -%define freetype_version 2.5.0.1 +%define freetype_version 2.5.1 Url: http://www.freetype.org Source0: http://savannah.nongnu.org/download/freetype/freetype-%{freetype_version}.tar.bz2 Source1: http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2 Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch +# PATCH-FIX-UPSTREAM fix-compile-in-non-debug.patch +Patch201: fix-compile-in-non-debug.patch +# PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer +Patch202: overflow.patch BuildRequires: libpng-devel BuildRequires: xorg-x11-devel Conflicts: dtc @@ -49,6 +53,10 @@ Freetype2 utilities and demo programs. %if %{enable_subpixel_rendering} %patch200 -p 1 -b .subpixel %endif +pushd ../ft2demos-%{version} +%patch201 -p1 +%patch202 -p1 +popd %build export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" diff --git a/overflow.patch b/overflow.patch new file mode 100644 index 0000000..f8eb972 --- /dev/null +++ b/overflow.patch @@ -0,0 +1,17 @@ +diff -Naur ft2demos-2.5.1/src/ttdebug.c ft2demos-2.5.1.new/src/ttdebug.c +--- ft2demos-2.5.1/src/ttdebug.c 2013-11-05 12:31:57.452397772 +0100 ++++ ft2demos-2.5.1.new/src/ttdebug.c 2013-12-08 23:40:31.756506259 +0100 +@@ -1905,11 +1905,11 @@ + + FT_Library_Version( library, &major, &minor, &patch ); + +- offset = snprintf( version_string, 64 + 1, ++ offset = snprintf( version_string, sizeof(version_string), + "ttdebug (FreeType) %d.%d", + major, minor ); + if ( patch ) +- offset = snprintf( version_string + offset, 64 + 1 - offset, ++ offset = snprintf( version_string + offset, sizeof(version_string) - offset, + ".%d", + patch ); + } From 855baa32a2b3cf1c141a0f8aeefd65284c8c63531a16d8efdc359a86903764bc Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 10 Dec 2013 05:16:18 +0000 Subject: [PATCH 2/2] Accepting request 210107 from home:sumski:branches:M17N Update to version 2.5.2 OBS-URL: https://build.opensuse.org/request/show/210107 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=81 --- fix-compile-in-non-debug.patch | 186 --------------------------------- freetype-2.5.1.tar.bz2 | 3 - freetype-2.5.2.tar.bz2 | 3 + freetype-doc-2.5.1.tar.bz2 | 3 - freetype-doc-2.5.2.tar.bz2 | 3 + freetype2.changes | 15 +++ freetype2.spec | 8 +- ft2demos-2.5.1.tar.bz2 | 3 - ft2demos-2.5.2.tar.bz2 | 3 + ft2demos.changes | 15 +++ ft2demos.spec | 9 +- 11 files changed, 45 insertions(+), 206 deletions(-) delete mode 100644 fix-compile-in-non-debug.patch delete mode 100644 freetype-2.5.1.tar.bz2 create mode 100644 freetype-2.5.2.tar.bz2 delete mode 100644 freetype-doc-2.5.1.tar.bz2 create mode 100644 freetype-doc-2.5.2.tar.bz2 delete mode 100644 ft2demos-2.5.1.tar.bz2 create mode 100644 ft2demos-2.5.2.tar.bz2 diff --git a/fix-compile-in-non-debug.patch b/fix-compile-in-non-debug.patch deleted file mode 100644 index a2fec1d..0000000 --- a/fix-compile-in-non-debug.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 23d47f17fdb963fb0722a4ad2d9eb8fd150aba5a Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Wed, 27 Nov 2013 09:23:44 +0000 -Subject: [ftgrid] Fix compilation in non-debug mode. - -* src/ftgrid.c: Guard autofit dump functions with FT_DEBUG_AUTOFIT -clause. -Update prototypes. -(grid_hint_draw_segment): Guard with FT_DEBUG_AUTOFIT clause. -(grid_status_draw_outline): Guard call to `grid_hint_draw_segment' -with FT_DEBUG_AUTOFIT clause. -(Process_Event) <'1'>, <'2'>, <'3'>: Don't mess around with trace -levels, which should always stay internal to the FreeType library. -Update calls to dump functions. ---- -diff --git a/ChangeLog b/ChangeLog -index 2cd9331..676a7db 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,17 @@ -+2013-11-27 Werner Lemberg -+ -+ [ftgrid] Fix compilation in non-debug mode. -+ -+ * src/ftgrid.c: Guard autofit dump functions with FT_DEBUG_AUTOFIT -+ clause. -+ Update prototypes. -+ (grid_hint_draw_segment): Guard with FT_DEBUG_AUTOFIT clause. -+ (grid_status_draw_outline): Guard call to `grid_hint_draw_segment' -+ with FT_DEBUG_AUTOFIT clause. -+ (Process_Event) <'1'>, <'2'>, <'3'>: Don't mess around with trace -+ levels, which should always stay internal to the FreeType library. -+ Update calls to dump functions. -+ - 2013-11-25 Werner Lemberg - - * Version 2.5.1 released. -diff --git a/src/ftgrid.c b/src/ftgrid.c -index e5967e6..37e168f 100644 ---- a/src/ftgrid.c -+++ b/src/ftgrid.c -@@ -47,6 +47,7 @@ - #define N_CFF_HINTING_ENGINES 2 - - -+#ifdef FT_DEBUG_AUTOFIT - /* these variables, structures and declarations are for */ - /* communication with the debugger in the autofit module; */ - /* normal programs don't need this */ -@@ -62,11 +63,14 @@ - extern "C" { - #endif - extern void -- af_glyph_hints_dump_segments( AF_GlyphHints hints ); -+ af_glyph_hints_dump_segments( AF_GlyphHints hints, -+ FT_Bool to_stdout ); - extern void -- af_glyph_hints_dump_points( AF_GlyphHints hints ); -+ af_glyph_hints_dump_points( AF_GlyphHints hints, -+ FT_Bool to_stdout ); - extern void -- af_glyph_hints_dump_edges( AF_GlyphHints hints ); -+ af_glyph_hints_dump_edges( AF_GlyphHints hints, -+ FT_Bool to_stdout ); - extern FT_Error - af_glyph_hints_get_num_segments( AF_GlyphHints hints, - FT_Int dimension, -@@ -80,6 +84,8 @@ - } - #endif - -+#endif /* FT_DEBUG_AUTOFIT */ -+ - typedef struct GridStatusRec_ - { - int width; -@@ -263,6 +269,8 @@ - } - - -+#ifdef FT_DEBUG_AUTOFIT -+ - static void - grid_hint_draw_segment( GridStatus st, - AF_GlyphHints hints ) -@@ -305,6 +313,8 @@ - } - } - -+#endif /* FT_DEBUG_AUTOFIT */ -+ - - static void - ft_bitmap_draw( FT_Bitmap* bitmap, -@@ -491,6 +501,7 @@ - - FTDemo_Get_Size( handle, &size ); - -+#ifdef FT_DEBUG_AUTOFIT - /* Draw segment before drawing glyph. */ - if ( status.do_segment ) - { -@@ -508,6 +519,7 @@ - - _af_debug_disable_horz_hints = !st->do_horz_hints; - _af_debug_disable_vert_hints = !st->do_vert_hints; -+#endif - - if ( FT_Load_Glyph( size->face, st->Num, - handle->load_flags | FT_LOAD_NO_BITMAP ) ) -@@ -849,67 +861,28 @@ - break; - - #ifdef FT_DEBUG_AUTOFIT -- /* we use some internal FreeType functions and variables */ -- /* to manipulate the trace level for the dumping functions */ -- - case grKEY( '1' ): - if ( handle->hinted && handle->autohint ) - { -- if ( FT_Trace_Get_Count() ) -- { -- int old_trace_level = ft_trace_levels[trace_afhints]; -- -- -- ft_trace_levels[trace_afhints] = 7; -- status.header = "dumping glyph edges to stdout"; -- af_glyph_hints_dump_edges( _af_debug_hints ); -- ft_trace_levels[trace_afhints] = old_trace_level; -- } -- else -- status.header = "need FreeType tracing support for dumping"; -+ status.header = "dumping glyph edges to stdout"; -+ af_glyph_hints_dump_edges( _af_debug_hints, 1 ); - } -- else -- status.header = "need autofit mode for edge dumping"; - break; - - case grKEY( '2' ): - if ( handle->hinted && handle->autohint ) - { -- if ( FT_Trace_Get_Count() ) -- { -- int old_trace_level = ft_trace_levels[trace_afhints]; -- -- -- ft_trace_levels[trace_afhints] = 7; -- status.header = "dumping glyph segments to stdout"; -- af_glyph_hints_dump_segments( _af_debug_hints ); -- ft_trace_levels[trace_afhints] = old_trace_level; -- } -- else -- status.header = "need FreeType tracing support for dumping"; -+ status.header = "dumping glyph segments to stdout"; -+ af_glyph_hints_dump_segments( _af_debug_hints, 1 ); - } -- else -- status.header = "need autofit mode for segment dumping"; - break; - - case grKEY( '3' ): - if ( handle->hinted && handle->autohint ) - { -- if ( FT_Trace_Get_Count() ) -- { -- int old_trace_level = ft_trace_levels[trace_afhints]; -- -- -- ft_trace_levels[trace_afhints] = 7; -- status.header = "dumping glyph points to stdout"; -- af_glyph_hints_dump_points( _af_debug_hints ); -- ft_trace_levels[trace_afhints] = old_trace_level; -- } -- else -- status.header = "need FreeType tracing support for dumping"; -+ status.header = "dumping glyph points to stdout"; -+ af_glyph_hints_dump_points( _af_debug_hints, 1 ); - } -- else -- status.header = "need autofit mode for point dumping"; - break; - #endif /* FT_DEBUG_AUTOFIT */ - --- -cgit v0.9.0.2 diff --git a/freetype-2.5.1.tar.bz2 b/freetype-2.5.1.tar.bz2 deleted file mode 100644 index cb602d9..0000000 --- a/freetype-2.5.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d715faa92b37980280c857ce9d356fff4361c5a7bd9b5c3f867fc24f598d8f45 -size 1677282 diff --git a/freetype-2.5.2.tar.bz2 b/freetype-2.5.2.tar.bz2 new file mode 100644 index 0000000..5c71f59 --- /dev/null +++ b/freetype-2.5.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def +size 1676373 diff --git a/freetype-doc-2.5.1.tar.bz2 b/freetype-doc-2.5.1.tar.bz2 deleted file mode 100644 index 1c86f70..0000000 --- a/freetype-doc-2.5.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57891fa2caf0185bca5d2641ae6715a6e9675fcb83976d4b1838cce02b540f01 -size 109390 diff --git a/freetype-doc-2.5.2.tar.bz2 b/freetype-doc-2.5.2.tar.bz2 new file mode 100644 index 0000000..d7e3a8f --- /dev/null +++ b/freetype-doc-2.5.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47915cdb956a4984e90de81181925386eac1a20a23df1932770de1e6790989ba +size 109440 diff --git a/freetype2.changes b/freetype2.changes index 04d51f9..1c247dd 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Dec 10 03:04:59 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to version 2.5.2 + * Fixed bug that made FreeType crash on some popular (but not + fully conformant) fonts like `ahronbd.ttf' + * Another round of improvements to correct positioning and hinting + of composite glyphs in TrueType fonts + * Fixed bug introduced in version 2.5.1: handling embedded + bitmap strikes of TrueType fonts, caused garbage display + under some circumstances + * Fixed `ftgrid' demo program compilation in non-development + builds +- Droped fix-compile-in-non-debug.patch, included in this release + ------------------------------------------------------------------- Wed Nov 27 19:31:42 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/freetype2.spec b/freetype2.spec index f39a26f..12efce9 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -26,8 +26,8 @@ BuildRequires: zlib-devel Obsoletes: freetype2-64bit %endif # -%define doc_version 2.5.1 -Version: 2.5.1 +%define doc_version 2.5.2 +Version: 2.5.2 Release: 0 Summary: A TrueType Font Library License: SUSE-Freetype or GPL-2.0+ @@ -39,10 +39,8 @@ Source3: baselibs.conf Patch1: freetype2-bitmap-foundry.patch Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch -# PATCH-FIX-UPSTREAM fix-compile-in-non-debug.patch -Patch201: fix-compile-in-non-debug.patch # PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer -Patch202: overflow.patch +Patch201: overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description diff --git a/ft2demos-2.5.1.tar.bz2 b/ft2demos-2.5.1.tar.bz2 deleted file mode 100644 index c356f53..0000000 --- a/ft2demos-2.5.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:034543b5d1033fd262326ee58540f2b0744cd0dc34988a8be315fc0260056df0 -size 186036 diff --git a/ft2demos-2.5.2.tar.bz2 b/ft2demos-2.5.2.tar.bz2 new file mode 100644 index 0000000..2ff71c8 --- /dev/null +++ b/ft2demos-2.5.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3cdf60186caeb68cafc98b6b32c54ae9467a7a844865db161510a17a2d14471 +size 185966 diff --git a/ft2demos.changes b/ft2demos.changes index a5a73d9..22d2b24 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Dec 10 03:04:59 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to version 2.5.2 + * Fixed bug that made FreeType crash on some popular (but not + fully conformant) fonts like `ahronbd.ttf' + * Another round of improvements to correct positioning and hinting + of composite glyphs in TrueType fonts + * Fixed bug introduced in version 2.5.1: handling embedded + bitmap strikes of TrueType fonts, caused garbage display + under some circumstances + * Fixed `ftgrid' demo program compilation in non-development + builds +- Droped fix-compile-in-non-debug.patch, included in this release + ------------------------------------------------------------------- Wed Nov 27 19:31:42 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/ft2demos.spec b/ft2demos.spec index 99f7b7c..c9f6de9 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -17,21 +17,19 @@ Name: ft2demos -Version: 2.5.1 +Version: 2.5.2 Release: 0 Summary: Freetype2 Utilities and Demo Programs License: GPL-2.0+ Group: Productivity/Publishing/Other -%define freetype_version 2.5.1 +%define freetype_version 2.5.2 Url: http://www.freetype.org Source0: http://savannah.nongnu.org/download/freetype/freetype-%{freetype_version}.tar.bz2 Source1: http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2 Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch -# PATCH-FIX-UPSTREAM fix-compile-in-non-debug.patch -Patch201: fix-compile-in-non-debug.patch # PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer -Patch202: overflow.patch +Patch201: overflow.patch BuildRequires: libpng-devel BuildRequires: xorg-x11-devel Conflicts: dtc @@ -55,7 +53,6 @@ Freetype2 utilities and demo programs. %endif pushd ../ft2demos-%{version} %patch201 -p1 -%patch202 -p1 popd %build