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

Accepting request 264431 from home:sumski:branches:M17N

Browse Source 
Update to version 2.5.4

OBS-URL: https://build.opensuse.org/request/show/264431
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=90
This commit is contained in:
Hrvoje Senjan 2014-12-08 16:14:10 +00:00 committed by Git OBS Bridge
parent 2650963727
commit a143330a32
15 changed files with 162 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bugzilla-308961-cmex-workaround.patch
View File

@ -2,13 +2,11 @@
src/base/ftobjs.c | 5 +++++
1 file changed, 5 insertions(+)
Index: freetype-2.4.11/src/base/ftobjs.c
Index: freetype-2.5.4/src/base/ftobjs.c
===================================================================
--- freetype-2.4.11.orig/src/base/ftobjs.c
+++ freetype-2.4.11/src/base/ftobjs.c
@@ -2187,10 +2187,15 @@
/* some checks */
--- freetype-2.5.4.orig/src/base/ftobjs.c
+++ freetype-2.5.4/src/base/ftobjs.c
@@ -2254,6 +2254,11 @@
if ( FT_IS_SCALABLE( face ) )
{
@ -20,5 +18,3 @@ Index: freetype-2.4.11/src/base/ftobjs.c
if ( face->height < 0 )
face->height = (FT_Short)-face->height;
if ( !FT_HAS_VERTICAL( face ) )
face->max_advance_height = (FT_Short)face->height;

46
don-t-mark-libpng-as-required-library.patch
View File

@ -10,7 +10,7 @@ diff --git a/builds/unix/configure b/builds/unix/configure
index 4ae00dd..c3101e2 100755
--- a/builds/unix/configure
+++ b/builds/unix/configure
@@ -13692,7 +13692,6 @@ esac
@@ -13691,7 +13691,6 @@ esac
# entries in Requires.private are separated by commas;
REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \
@ -18,13 +18,21 @@ index 4ae00dd..c3101e2 100755
$harfbuzz_reqpriv"
# beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
@@ -13718,7 +13717,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBS_CONFIG="-lfreetype \
$ZLIB_LIBS \
$BZIP2_LIBS \
- $LIBPNG_LIBS \
$HARFBUZZ_LIBS \
$ft2_extra_libs"
@@ -13705,7 +13704,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
LIBS_PRIVATE="$zlib_libpriv \
$bzip2_libpriv \
- $libpng_libpriv \
$harfbuzz_libpriv \
$ft2_extra_libs"
# beautify
@@ -13717,7 +13715,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libstaticconf \
$bzip2_libstaticconf \
- $libpng_libstaticconf \
$harfbuzz_libstaticconf \
$ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index dd7e576..bac2645 100644
@ -38,11 +46,19 @@ index dd7e576..bac2645 100644
$harfbuzz_reqpriv"
# beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
@@ -940,7 +939,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBS_CONFIG="-lfreetype \
$ZLIB_LIBS \
$BZIP2_LIBS \
- $LIBPNG_LIBS \
$HARFBUZZ_LIBS \
$ft2_extra_libs"
@@ -928,7 +927,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
LIBS_PRIVATE="$zlib_libpriv \
$bzip2_libpriv \
- $libpng_libpriv \
$harfbuzz_libpriv \
$ft2_extra_libs"
# beautify
@@ -940,7 +938,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libstaticconf \
$bzip2_libstaticconf \
- $libpng_libstaticconf \
$harfbuzz_libstaticconf \
$ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later

3
freetype-2.5.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e
size 1703842

3
freetype-2.5.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b4e2c666b33b32ad29ff0fe5c6538e757d3c73368e5dfa88bd59b4bc95cbabb
size 1726105

3
freetype-doc-2.5.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fd9cbf5f939b9a63fc04ca2b4cef721dd1cd7f047eaac2daec3dc2e1b68ff4a8
size 109607

3
freetype-doc-2.5.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9fa6fb39a324d0b6b744d3745509c51d10a68c7a4f440b23fd00c8b49de6c388
size 109647

12
freetype2-bitmap-foundry.patch
View File

@ -2,13 +2,11 @@
src/pcf/pcfread.c | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
Index: freetype-2.4.11/src/pcf/pcfread.c
Index: freetype-2.5.4/src/pcf/pcfread.c
===================================================================
--- freetype-2.4.11.orig/src/pcf/pcfread.c
+++ freetype-2.4.11/src/pcf/pcfread.c
@@ -1173,12 +1173,38 @@ THE SOFTWARE.
goto Exit;
--- freetype-2.5.4.orig/src/pcf/pcfread.c
+++ freetype-2.5.4/src/pcf/pcfread.c
@@ -1210,8 +1210,34 @@ THE SOFTWARE.
prop = pcf_find_property( face, "FAMILY_NAME" );
if ( prop && prop->isString )
{
@ -45,5 +43,3 @@ Index: freetype-2.4.11/src/pcf/pcfread.c
}
else
root->family_name = NULL;
/*

8
freetype2-subpixel.patch
View File

@ -1,7 +1,7 @@
Index: freetype-2.4.11/include/config/ftoption.h
Index: freetype-2.5.4/include/config/ftoption.h
===================================================================
--- freetype-2.4.11.orig/include/config/ftoption.h
+++ freetype-2.4.11/include/config/ftoption.h
--- freetype-2.5.4.orig/include/config/ftoption.h
+++ freetype-2.5.4/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. */
@ -11,7 +11,7 @@ Index: freetype-2.4.11/include/config/ftoption.h
/*************************************************************************/
@@ -577,7 +577,7 @@ FT_BEGIN_HEADER
@@ -604,7 +604,7 @@ FT_BEGIN_HEADER
/* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
/* defined. */
/* */

51
freetype2.changes
View File

@ -1,3 +1,54 @@
-------------------------------------------------------------------
Mon Dec 8 15:43:58 UTC 2014 - hrvoje.senjan@gmail.com
- Update to version 2.5.4
* IMPORTANT BUG FIXES
- A variant of vulnerability CVE-2014-2240 was identified
(cf. http://savannah.nongnu.org/bugs/?43661) and fixed
in the new CFF driver. All users should upgrade.
- The new auto-hinter code using HarfBuzz crashed for some
invalid fonts.
- Many fixes to better protect against malformed input.
* IMPORTANT CHANGES
- Full auto-hinter support of the Devanagari script.
- Experimental auto-hinter support of the Telugu script.
- CFF stem darkening behaviour can now be controlled at
build time using the eight macros
CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4} .
- Some fields in the `FT_Bitmap' structure have been changed
from signed to unsigned type, which better reflects
the actual usage. It is also an additional means to
protect against malformed input. This change doesn't break
the ABI; however, it might cause compiler warnings.
* MISCELLANEOUS
- Improvements to the auto-hinter's algorithm to recognize
stems and local extrema.
- Function `FT_Get_SubGlyph_Info' always returned an error
even in case of success.
- Version 2.5.1 introduced major bugs in the cjk part of
the auto-hinter, which are now fixed.
- The `FT_Sfnt_Tag' enumeration values have been changed to
uppercase, e.g. `FT_SFNT_HEAD'. The lowercase variants
are deprecated. This is for orthogonality with all other
enumeration (and enumeration-like) values in FreeType.
- `cmake' now supports builds of FreeType as an OS X framework
and for iOS.
- Improved project files for vc2010,
introducing a property file
- The documentation generator for the API reference has been
updated to produce better HTML code (with proper CSS).
At the same time, the documentation got a better structure.
- The FT_LOAD_BITMAP_CROP flag is obsolete; it is not used
by any driver.
- The TrueType DELTAP[123] bytecode instructions now work in
subpixel hinting mode as described in the ClearType
whitepaper (i.e., for touched points in the
non-subpixel direction).
- Many small improvements to the internal arithmetic routines.
- Rebase don-t-mark-libpng-as-required-library.patch,
bugzilla-308961-cmex-workaround.patch, freetype2-subpixel.patch,
freetype2-bitmap-foundry.patch and overflow.patch
-------------------------------------------------------------------
Thu Mar 13 03:14:26 UTC 2014 - hrvoje.senjan@gmail.com

4
freetype2.spec
View File

@ -26,8 +26,8 @@ BuildRequires: zlib-devel
Obsoletes: freetype2-64bit
%endif
#
%define doc_version 2.5.3
Version: 2.5.3
%define doc_version 2.5.4
Version: 2.5.4
Release: 0
Summary: A TrueType Font Library
License: SUSE-Freetype or GPL-2.0+

3
ft2demos-2.5.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e6c9d0b344b88ff5ab25f20640cf78e2ec56bb81a89d1cd1716839357f646c8a
size 186773

3
ft2demos-2.5.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:54621937130926235abe05ba08aeb390a983998d2d1173c5fdc9ccb5bda4d96a
size 187225

51
ft2demos.changes
View File

@ -1,3 +1,54 @@
-------------------------------------------------------------------
Mon Dec 8 15:43:58 UTC 2014 - hrvoje.senjan@gmail.com
- Update to version 2.5.4
* IMPORTANT BUG FIXES
- A variant of vulnerability CVE-2014-2240 was identified
(cf. http://savannah.nongnu.org/bugs/?43661) and fixed
in the new CFF driver. All users should upgrade.
- The new auto-hinter code using HarfBuzz crashed for some
invalid fonts.
- Many fixes to better protect against malformed input.
* IMPORTANT CHANGES
- Full auto-hinter support of the Devanagari script.
- Experimental auto-hinter support of the Telugu script.
- CFF stem darkening behaviour can now be controlled at
build time using the eight macros
CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4} .
- Some fields in the `FT_Bitmap' structure have been changed
from signed to unsigned type, which better reflects
the actual usage. It is also an additional means to
protect against malformed input. This change doesn't break
the ABI; however, it might cause compiler warnings.
* MISCELLANEOUS
- Improvements to the auto-hinter's algorithm to recognize
stems and local extrema.
- Function `FT_Get_SubGlyph_Info' always returned an error
even in case of success.
- Version 2.5.1 introduced major bugs in the cjk part of
the auto-hinter, which are now fixed.
- The `FT_Sfnt_Tag' enumeration values have been changed to
uppercase, e.g. `FT_SFNT_HEAD'. The lowercase variants
are deprecated. This is for orthogonality with all other
enumeration (and enumeration-like) values in FreeType.
- `cmake' now supports builds of FreeType as an OS X framework
and for iOS.
- Improved project files for vc2010,
introducing a property file
- The documentation generator for the API reference has been
updated to produce better HTML code (with proper CSS).
At the same time, the documentation got a better structure.
- The FT_LOAD_BITMAP_CROP flag is obsolete; it is not used
by any driver.
- The TrueType DELTAP[123] bytecode instructions now work in
subpixel hinting mode as described in the ClearType
whitepaper (i.e., for touched points in the
non-subpixel direction).
- Many small improvements to the internal arithmetic routines.
- Rebase don-t-mark-libpng-as-required-library.patch,
bugzilla-308961-cmex-workaround.patch, freetype2-subpixel.patch,
freetype2-bitmap-foundry.patch and overflow.patch
-------------------------------------------------------------------
Thu Mar 13 03:14:26 UTC 2014 - hrvoje.senjan@gmail.com

4
ft2demos.spec
View File

@ -17,12 +17,12 @@
Name: ft2demos
Version: 2.5.3
Version: 2.5.4
Release: 0
Summary: Freetype2 Utilities and Demo Programs
License: GPL-2.0+
Group: Productivity/Publishing/Other
%define freetype_version 2.5.3
%define freetype_version 2.5.4
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

9
overflow.patch
View File

@ -1,16 +1,15 @@
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
--- ft2demos-2.5.4/src/ttdebug.c 2014-05-11 12:50:48.876613439 +0200
+++ ft2demos-2.5.4.new/src/ttdebug.c 2014-12-08 16:39:09.744778704 +0100
@@ -1905,11 +1905,11 @@
FT_Library_Version( library, &major, &minor, &patch );
- offset = snprintf( version_string, 64 + 1,
- offset = snprintf( version_string, 64,
+ 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, 64 - offset,
+ offset = snprintf( version_string + offset, sizeof(version_string) - offset,
".%d",
patch );