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

Accepting request 336416 from M17N

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/336416
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=71
This commit is contained in:
Dominique Leuenberger 2015-10-22 10:56:14 +00:00 committed by Git OBS Bridge
commit d8472e30e5
15 changed files with 123 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Dont-use-hmtx-table-for-LSB.patch
View File

@ -1,25 +0,0 @@
From b650dfbb0b0700440cc88da31f97cec45b4140de Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthias.clasen@gmail.com>
Date: Sun, 26 Jul 2015 21:08:34 +0200
Subject: [PATCH] [cff] Don't use `hmtx' table for LSB (#45520).
* src/cff/cffgload.c (cff_slot_load): Use `htmx' table for advance
width only. Bug introduced 2015-04-10.
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 43054f8..a075ddc 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -3064,9 +3064,7 @@
metrics->width = cbox.xMax - cbox.xMin;
metrics->height = cbox.yMax - cbox.yMin;
- if ( !face->horizontal.number_Of_HMetrics )
- metrics->horiBearingX = cbox.xMin;
-
+ metrics->horiBearingX = cbox.xMin;
metrics->horiBearingY = cbox.yMax;
if ( has_vertical_info )
--
2.4.3

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

@ -2,11 +2,11 @@
src/base/ftobjs.c | 5 +++++
1 file changed, 5 insertions(+)
Index: freetype-2.5.4/src/base/ftobjs.c
Index: freetype-2.6.1/src/base/ftobjs.c
===================================================================
--- freetype-2.5.4.orig/src/base/ftobjs.c
+++ freetype-2.5.4/src/base/ftobjs.c
@@ -2254,6 +2254,11 @@
--- freetype-2.6.1.orig/src/base/ftobjs.c
+++ freetype-2.6.1/src/base/ftobjs.c
@@ -2267,6 +2267,11 @@
if ( FT_IS_SCALABLE( face ) )
{

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

@ -1,16 +1,8 @@
From cef195062aa7f509a60b8765661ba4babd85b79c Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Sun, 9 Mar 2014 20:09:12 +0100
Subject: [PATCH 1/1] Don't mark libpng as required library
It is private in .pc anyway
---
diff --git a/builds/unix/configure b/builds/unix/configure
index 4ae00dd..c3101e2 100755
--- a/builds/unix/configure
+++ b/builds/unix/configure
@@ -13691,7 +13691,6 @@ esac
Index: freetype-2.6.1/builds/unix/configure
===================================================================
--- freetype-2.6.1.orig/builds/unix/configure
+++ freetype-2.6.1/builds/unix/configure
@@ -14096,7 +14096,6 @@ esac
# entries in Requires.private are separated by commas;
REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \
@ -18,27 +10,27 @@ index 4ae00dd..c3101e2 100755
$harfbuzz_reqpriv"
# beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
@@ -13705,7 +13704,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
@@ -14110,7 +14109,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
LIBS_PRIVATE="$zlib_libpriv \
$bzip2_libpriv \
- $libpng_libpriv \
$harfbuzz_libpriv \
LIBS_PRIVATE="$zlib_libspriv \
$bzip2_libspriv \
- $libpng_libspriv \
$harfbuzz_libspriv \
$ft2_extra_libs"
# beautify
@@ -13717,7 +13715,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libstaticconf \
$bzip2_libstaticconf \
- $libpng_libstaticconf \
$harfbuzz_libstaticconf \
@@ -14122,7 +14120,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libsstaticconf \
$bzip2_libsstaticconf \
- $libpng_libsstaticconf \
$harfbuzz_libsstaticconf \
$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
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -914,7 +914,6 @@ esac
Index: freetype-2.6.1/builds/unix/configure.raw
===================================================================
--- freetype-2.6.1.orig/builds/unix/configure.raw
+++ freetype-2.6.1/builds/unix/configure.raw
@@ -918,7 +918,6 @@ esac
# entries in Requires.private are separated by commas;
REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \
@ -46,19 +38,19 @@ index dd7e576..bac2645 100644
$harfbuzz_reqpriv"
# beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
@@ -928,7 +927,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
@@ -932,7 +931,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
LIBS_PRIVATE="$zlib_libpriv \
$bzip2_libpriv \
- $libpng_libpriv \
$harfbuzz_libpriv \
LIBS_PRIVATE="$zlib_libspriv \
$bzip2_libspriv \
- $libpng_libspriv \
$harfbuzz_libspriv \
$ft2_extra_libs"
# beautify
@@ -940,7 +938,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libstaticconf \
$bzip2_libstaticconf \
- $libpng_libstaticconf \
$harfbuzz_libstaticconf \
@@ -944,7 +942,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libsstaticconf \
$bzip2_libsstaticconf \
- $libpng_libsstaticconf \
$harfbuzz_libsstaticconf \
$ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later

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

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

3
freetype-2.6.tar.bz2
View File

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

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

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

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

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

8
freetype2-bitmap-foundry.patch
View File

@ -2,11 +2,11 @@
src/pcf/pcfread.c | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
Index: freetype-2.5.4/src/pcf/pcfread.c
Index: freetype-2.6.1/src/pcf/pcfread.c
===================================================================
--- freetype-2.5.4.orig/src/pcf/pcfread.c
+++ freetype-2.5.4/src/pcf/pcfread.c
@@ -1210,8 +1210,34 @@ THE SOFTWARE.
--- 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 )
{

8
freetype2-subpixel.patch
View File

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

59
freetype2.changes
View File

@ -1,3 +1,62 @@
-------------------------------------------------------------------
Sun Oct 4 22:19:32 UTC 2015 - baiduzhyi.devel@gmail.com
- Update to version 2.6.1
* IMPORTANT BUG FIXES
- It turned out that for CFFs only the advance widths should be
taken from the `htmx' table, not the side bearings. This bug,
introduced in version 2.6.0, makes it necessary to upgrade if
you are using CFFs; otherwise, you get cropped glyphs with GUI
interfaces like GTK or Qt.
- Accessing Type 42 fonts returned incorrect results if the glyph
order of the embedded TrueType font differs from the glyph order
of the Type 42 charstrings table.
* IMPORTANT CHANGES
- The header file layout has been changed (again), moving all
header files except `ft2build.h' into a subdirectory tree.
Doing so reduces the possibility of header file name clashes
(e.g., FTGL's `FTGlyph.h' with FreeType's `ftglyph.h') on case
insensitive file systems like Mac OS X or Windows.
Applications that use (a) the `freetype-config' script or
FreeType's `freetype2.pc' file for pkg-config to get the include
directory for the compiler, and (b) the documented way for
header inclusion like
#include <ft2build.h>
#include FT_FREETYPE_H
...
don't need any change to the source code.
- Simple access to named instances in GX variation fonts is now
available (in addition to the previous method via FreeType's MM
interface). In the `FT_Face' structure, bits 16-30 of the
`face_index' field hold the current named instance index for the
given face index, and bits 16-30 of `style_flags' contain the
number of instances for the given face index. `FT_Open_Face'
and friends also understand the extended bits of the face index
parameter.
You need to enable TT_CONFIG_OPTION_GX_VAR_SUPPORT for this new
feature. Otherwise, bits 16-30 of the two fields are zero (or
are ignored).
- Lao script support has been added to the auto-hinter.
* MISCELLANEOUS
- The auto-hinter's Arabic script support has been enhanced.
- Superscript-like and subscript-like glyphs as used by various
phonetic alphabets like the IPA are now better supported by the
auto-hinter.
- The TrueType bytecode interpreter now runs slightly faster.
- Improved support for builds with cmake.
- The function `FT_CeilFix' now always rounds towards plus
infinity.
- The function `FT_FloorFix' now always rounds towards minus
infinity.
- A new load flag `FT_LOAD_COMPUTE_METRICS' has been added; it
makes FreeType ignore pre-computed metrics, as needed by font
validating or font editing programs. Right now, only the
TrueType module supports it to ignore data from the `hdmx'
table.
- Another round of bug fixes to better handle broken fonts, found
by Kostya Serebryany <kcc@google.com>.
- Dropping upstreamed patch Dont-use-hmtx-table-for-LSB.patch.
-------------------------------------------------------------------
Fri Sep 11 04:11:52 UTC 2015 - zaitor@opensuse.org

8
freetype2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package freetype2
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products 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.6
%define doc_version 2.6.1
Name: freetype2
Version: 2.6
Version: 2.6.1
Release: 0
Summary: A TrueType Font Library
License: SUSE-Freetype or GPL-2.0+
@ -29,7 +29,6 @@ Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{ve
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{doc_version}.tar.bz2
Source3: baselibs.conf
Patch1: freetype2-bitmap-foundry.patch
Patch2: Dont-use-hmtx-table-for-LSB.patch
Patch200: freetype2-subpixel.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
@ -85,7 +84,6 @@ It also contains a small tutorial for using that library.
%define enable_subpixel_rendering 0
%setup -q -n freetype-%{version} -a 1
%patch1 -p1
%patch2 -p1
%patch308961 -p 1
%patch202 -p1
%if %{enable_subpixel_rendering}

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

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

3
ft2demos-2.6.tar.bz2
View File

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

5
ft2demos.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Oct 4 22:24:26 UTC 2015 - baiduzhyi.devel@gmail.com
- Update to version 2.6.1.
-------------------------------------------------------------------
Thu Jun 11 08:56:22 UTC 2015 - idonmez@suse.com

6
ft2demos.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ft2demos
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products 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.6
%define freetype_version 2.6.1
Name: ft2demos
Version: 2.6
Version: 2.6.1
Release: 0
Summary: Freetype2 Utilities and Demo Programs
License: GPL-2.0+