From 99472122cb579a6c1806762b3d3ad5f3aaac55cdcdb64e893582747181db74dc Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 1 Jan 2017 14:34:47 +0000 Subject: [PATCH] Accepting request 448387 from home:namtrac:branches:M17N - Update to version 2.7.1: * IMPORTANT CHANGES + Support for the new CFF2 font format as introduced with OpenType 1.8 has been contributed by Dave Arnolds from Adobe. + Preliminary support for variation fonts as specified in OpenType 1.8 (in addition to the already existing support for Adobe's MM and Apple's GX formats). Dave Arnolds contributed handling of advance width change variation; more will come in the next version. * IMPORTANT BUG FIXES + Handling of raw CID fonts was partially broken (bug introduced in 2.6.4). * MISCELLANEOUS + Some limits for TrueType bytecode execution have been tightened to speed up FreeType's handling of malformed fonts, in particular to quickly abort endless loops. + The number of twilight points can no longer be set to an arbitrarily large value. + The total number of jump opcode instructions (like JMPR) with negative arguments is dynamically restricted; the same holds for the total number of iterations in LOOPCALL opcodes. + The dynamic limits are based on the number of points in a glyph and the number of CVT entries. Please report if you encounter a font where the selected values are not adequate. + PCF family names are made more `colourful'; they now include the foundry and information whether they contain wide characters. For example, you no longer get `Fixed' but rather `Sony Fixed' or `Misc Fixed Wide'. + A new function `FT_Get_Var_Blend_Coordinates' (with its alias name `FT_Get_MM_Blend_Coordinates') to retrieve the normalized OBS-URL: https://build.opensuse.org/request/show/448387 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=123 --- freetype-2.7.1.tar.bz2 | 3 +++ freetype-2.7.tar.bz2 | 3 --- freetype-doc-2.7.1.tar.bz2 | 3 +++ freetype-doc-2.7.tar.bz2 | 3 --- freetype2-bitmap-foundry.patch | 45 ------------------------------- freetype2.changes | 48 +++++++++++++++++++++++++++++++++- freetype2.spec | 8 +++--- ft2demos-2.7.1.tar.bz2 | 3 +++ ft2demos-2.7.tar.bz2 | 3 --- ft2demos.changes | 11 ++++++++ ft2demos.spec | 9 +++---- ftinspect-library.patch | 13 --------- 12 files changed, 73 insertions(+), 79 deletions(-) create mode 100644 freetype-2.7.1.tar.bz2 delete mode 100644 freetype-2.7.tar.bz2 create mode 100644 freetype-doc-2.7.1.tar.bz2 delete mode 100644 freetype-doc-2.7.tar.bz2 delete mode 100644 freetype2-bitmap-foundry.patch create mode 100644 ft2demos-2.7.1.tar.bz2 delete mode 100644 ft2demos-2.7.tar.bz2 delete mode 100644 ftinspect-library.patch diff --git a/freetype-2.7.1.tar.bz2 b/freetype-2.7.1.tar.bz2 new file mode 100644 index 0000000..1803eaa --- /dev/null +++ b/freetype-2.7.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88 +size 1825107 diff --git a/freetype-2.7.tar.bz2 b/freetype-2.7.tar.bz2 deleted file mode 100644 index 94fcf48..0000000 --- a/freetype-2.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48 -size 1789896 diff --git a/freetype-doc-2.7.1.tar.bz2 b/freetype-doc-2.7.1.tar.bz2 new file mode 100644 index 0000000..ab444c7 --- /dev/null +++ b/freetype-doc-2.7.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e09cf22d1c98006fe3af160b7c3b7c847e4a3743963d6d89314d350b859dfb0 +size 2127460 diff --git a/freetype-doc-2.7.tar.bz2 b/freetype-doc-2.7.tar.bz2 deleted file mode 100644 index 89f7372..0000000 --- a/freetype-doc-2.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8440b7e576ccbe840051c162419a39083627a4de0c7d15fd20220736c03aac66 -size 1935798 diff --git a/freetype2-bitmap-foundry.patch b/freetype2-bitmap-foundry.patch deleted file mode 100644 index ddfb6c6..0000000 --- a/freetype2-bitmap-foundry.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- - src/pcf/pcfread.c | 30 ++++++++++++++++++++++++++++-- - 1 file changed, 28 insertions(+), 2 deletions(-) - -Index: freetype-2.6.1/src/pcf/pcfread.c -=================================================================== ---- freetype-2.6.1.orig/src/pcf/pcfread.c -+++ freetype-2.6.1/src/pcf/pcfread.c -@@ -1246,8 +1246,34 @@ THE SOFTWARE. - prop = pcf_find_property( face, "FAMILY_NAME" ); - if ( prop && prop->isString ) - { -- if ( FT_STRDUP( root->family_name, prop->value.atom ) ) -- goto Exit; -+ int l = ft_strlen( prop->value.atom ) + 1; -+ int wide = 0; -+ PCF_Property foundry_prop = pcf_find_property( face, "FOUNDRY" ); -+ PCF_Property point_size_prop = pcf_find_property( face, "POINT_SIZE" ); -+ PCF_Property average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" ); -+ if ( point_size_prop != NULL && average_width_prop != NULL) { -+ if ( average_width_prop->value.l >= point_size_prop->value.l ) { -+ /* This font is at least square shaped or even wider */ -+ wide = 1; -+ l += ft_strlen( " Wide"); -+ } -+ } -+ if ( foundry_prop != NULL && foundry_prop->isString) { -+ l += ft_strlen( foundry_prop->value.atom ) + 1; -+ if ( FT_NEW_ARRAY( root->family_name, l ) ) -+ goto Exit; -+ ft_strcpy( root->family_name, foundry_prop->value.atom ); -+ strcat( root->family_name, " "); -+ strcat( root->family_name, prop->value.atom ); -+ } -+ else { -+ if ( FT_NEW_ARRAY( root->family_name, l ) ) -+ goto Exit; -+ ft_strcpy( root->family_name, prop->value.atom ); -+ } -+ if ( wide != 0) { -+ strcat( root->family_name, " Wide"); -+ } - } - else - root->family_name = NULL; diff --git a/freetype2.changes b/freetype2.changes index 7a49487..9e98b14 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Sun Jan 1 11:58:27 UTC 2017 - idonmez@suse.com + +- Update to version 2.7.1: + * IMPORTANT CHANGES + + Support for the new CFF2 font format as introduced with + OpenType 1.8 has been contributed by Dave Arnolds from Adobe. + + Preliminary support for variation fonts as specified in + OpenType 1.8 (in addition to the already existing support for + Adobe's MM and Apple's GX formats). Dave Arnolds contributed + handling of advance width change variation; more will come in + the next version. + * IMPORTANT BUG FIXES + + Handling of raw CID fonts was partially broken (bug introduced + in 2.6.4). + * MISCELLANEOUS + + Some limits for TrueType bytecode execution have been tightened + to speed up FreeType's handling of malformed fonts, in + particular to quickly abort endless loops. + + The number of twilight points can no longer be set to an + arbitrarily large value. + + The total number of jump opcode instructions (like JMPR) with + negative arguments is dynamically restricted; the same holds + for the total number of iterations in LOOPCALL opcodes. + + The dynamic limits are based on the number of points in a glyph + and the number of CVT entries. Please report if you encounter a + font where the selected values are not adequate. + + PCF family names are made more `colourful'; they now include the + foundry and information whether they contain wide characters. + For example, you no longer get `Fixed' but rather `Sony Fixed' + or `Misc Fixed Wide'. + + A new function `FT_Get_Var_Blend_Coordinates' (with its alias + name `FT_Get_MM_Blend_Coordinates') to retrieve the normalized + blend coordinates of the currently selected variation instance + has been added to the Multiple Masters interface. + + A new function `FT_Get_Var_Design_Coordinates' to retrieve the + design coordinates of the currently selected variation instance + has been added to the Multiple Masters interface. + + A new load flag `FT_LOAD_BITMAP_METRICS_ONLY' to retrieve bitmap + information without loading the (embedded) bitmap itself. + + Retrieving advance widths from bitmap strikes (using + `FT_Get_Advance' and `FT_Get_Advances') have been sped up. + + The usual round of fuzzer fixes to better reject malformed + fonts. +- Drop freetype2-bitmap-foundry.patch, merged upstream. + ------------------------------------------------------------------- Fri Sep 9 16:10:39 UTC 2016 - develop7@develop7.info @@ -12,7 +58,7 @@ Fri Sep 9 16:10:39 UTC 2016 - develop7@develop7.info `FREETYPE_PROPERTIES' environment variable). See the corresponding entry below for version 2.6.4, which gives more information. - - A new option `FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES' has been + + A new option `FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES' has been introduced. If set (which is the default), an environment variable `FREETYPE_PROPERTIES' can be used to control driver properties. Example: diff --git a/freetype2.spec b/freetype2.spec index 2d343e2..20bb4bd 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -1,7 +1,7 @@ # # spec file for package freetype2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ # -%define doc_version 2.7 +%define doc_version 2.7.1 Name: freetype2 -Version: 2.7 +Version: 2.7.1 Release: 0 Summary: A TrueType Font Library License: SUSE-Freetype or GPL-2.0+ @@ -28,7 +28,6 @@ Url: http://www.freetype.org Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2 Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{doc_version}.tar.bz2 Source3: baselibs.conf -Patch1: freetype2-bitmap-foundry.patch # PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc Patch202: don-t-mark-libpng-as-required-library.patch Patch308961: bugzilla-308961-cmex-workaround.patch @@ -81,7 +80,6 @@ It also contains a small tutorial for using that library. %prep %setup -q -n freetype-%{version} -a 1 -%patch1 -p1 %patch308961 -p 1 %patch202 -p1 diff --git a/ft2demos-2.7.1.tar.bz2 b/ft2demos-2.7.1.tar.bz2 new file mode 100644 index 0000000..984fffa --- /dev/null +++ b/ft2demos-2.7.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3f8a0d5a3f0d58701133458a8c1d3f97f658869f3c904b1fda447ed3b290ecd +size 222288 diff --git a/ft2demos-2.7.tar.bz2 b/ft2demos-2.7.tar.bz2 deleted file mode 100644 index d378b8f..0000000 --- a/ft2demos-2.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0865b71dd379605bc19396b8f9a4ee8bab436f44ea55299784a20ef0ff95d9c8 -size 218381 diff --git a/ft2demos.changes b/ft2demos.changes index 3a3ba4d..c48bf04 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Jan 1 12:04:31 UTC 2017 - idonmez@suse.com + +- Update to version 2.7.1 + + The `ftmulti' demo program can now switch engines with key `H'. + + The `ftstring' demo program can now show some built-in, + non-latin sample strings (to be selected with the TAB key). + + The `ftview' demo program can now switch between a font's + charmaps using the TAB key. +- Remove ftinspect-library.patch, merged upstream. + ------------------------------------------------------------------- Tue Sep 20 11:58:32 UTC 2016 - idonmez@suse.com diff --git a/ft2demos.spec b/ft2demos.spec index 4c9a650..a3be32c 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -1,7 +1,7 @@ # # spec file for package ft2demos # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define freetype_version 2.7 +%define freetype_version 2.7.1 Name: ft2demos -Version: 2.7 +Version: 2.7.1 Release: 0 Summary: Freetype2 Utilities and Demo Programs License: GPL-2.0+ @@ -35,8 +35,6 @@ Source1016: bug-647375_tt2.ttf Patch201: overflow.patch # PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc Patch202: don-t-mark-libpng-as-required-library.patch -# PATCH-FIX-UPSTREAM -- Fix patch to static freetype library -Patch203: ftinspect-library.patch Patch308961: bugzilla-308961-cmex-workaround.patch BuildRequires: libpng-devel BuildRequires: xorg-x11-devel @@ -58,7 +56,6 @@ Freetype2 utilities and demo programs. %patch308961 -p 1 pushd ../ft2demos-%{version} %patch201 -p1 -%patch203 -p1 popd %patch202 -p1 diff --git a/ftinspect-library.patch b/ftinspect-library.patch deleted file mode 100644 index 746a59f..0000000 --- a/ftinspect-library.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ft2demos-2.7/src/ftinspect.pro -=================================================================== ---- ft2demos-2.7.orig/src/ftinspect.pro -+++ ft2demos-2.7/src/ftinspect.pro -@@ -5,7 +5,7 @@ INCLUDEPATH += ../../freetype2/include - # - # You should adapt this to your setup. - unix|macx { -- LIBS += ../../freetype2/objs/libfreetype.a -+ LIBS += ../../freetype2/objs/.libs/libfreetype.a - - CONFIG += link_pkgconfig - PKGCONFIG += libpng harfbuzz zlib bzip2