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

Accepting request 448411 from M17N

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/448411
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=77
This commit is contained in:
Dominique Leuenberger 2017-01-19 09:32:57 +00:00 committed by Git OBS Bridge
commit 9630dd4ef6
11 changed files with 90 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
freetype-2.7.tar.bz2
View File

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

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

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

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

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

45
freetype2-bitmap-foundry.patch
View File

@ -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;

48
freetype2.changes
View File

@ -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:

8
freetype2.spec
View File

@ -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

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

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

3
ft2demos-2.7.tar.bz2
View File

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

16
ft2demos.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
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
- Also build ftinspect
-------------------------------------------------------------------
Fri Sep 9 16:14:34 UTC 2016 - develop7@develop7.info

19
ft2demos.spec
View File

@ -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+
@ -38,6 +38,9 @@ Patch202: don-t-mark-libpng-as-required-library.patch
Patch308961: bugzilla-308961-cmex-workaround.patch
BuildRequires: libpng-devel
BuildRequires: xorg-x11-devel
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(harfbuzz)
Supplements: fonts-config
Conflicts: dtc < 1.4.0
# silence our clamav check
@ -58,18 +61,26 @@ popd
%build
export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
%configure --without-bzip2
%configure \
--enable-static \
--without-bzip2
make %{?_smp_mflags}
pushd ..
ln -s freetype-%{freetype_version} freetype2
cd ft2demos-%{version}
make %{?_smp_mflags}
cd src
qmake-qt5 ftinspect.pro
make
popd
%install
mkdir -p %{buildroot}%{_bindir}
pushd ../ft2demos-%{version}/bin/.libs
install -m 755 ft* %{buildroot}%{_bindir}
install -m 755 ../../src/ftinspect %{buildroot}%{_bindir}
popd
%check