From 855baa32a2b3cf1c141a0f8aeefd65284c8c63531a16d8efdc359a86903764bc Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 10 Dec 2013 05:16:18 +0000 Subject: [PATCH] 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