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

Accepting request 211311 from M17N

Browse Source 
- Added patches:
  * don-t-mark-libpng-as-required-library-in-freetype-co.patch: it's private in pkgconfig file, and causes issues in downstream packages
- As per patch, remove libpng-devel Requires from devel package (forwarded request 211310 from sumski)

OBS-URL: https://build.opensuse.org/request/show/211311
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=59
This commit is contained in:
Stephan Kulow 2013-12-19 11:40:10 +00:00 committed by Git OBS Bridge
commit 95c6ac432e
13 changed files with 261 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
don-t-mark-libpng-as-required-library-in-freetype-co.patch Normal file
View File

@ -0,0 +1,39 @@
From 752bf00d315bee455eab3b31009894141ca8efca Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Thu, 12 Dec 2013 17:41:19 +0100
Subject: [PATCH 1/1] Don't mark libpng as required library in freetype-config
It is private in .pc anyway
---
builds/unix/freetype-config.in | 2 +-
builds/unix/unix-def.in | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
index e4c504d..2fdf39f 100644
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@@ -137,7 +137,7 @@ if test "$echo_cflags" = "yes" ; then
fi
if test "$echo_libs" = "yes" ; then
- libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%"
+ libs="-lfreetype %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%"
if test "${SYSROOT}$libdir" != "/usr/lib" &&
test "${SYSROOT}$libdir" != "/usr/lib64"; then
echo -L${SYSROOT}$libdir $libs
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
index 491e974..ae2e3c5 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -103,7 +103,6 @@ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \
-e 's|%LIBBZ2%|$(LIBBZ2)|' \
-e 's|%LIBZ%|$(LIBZ)|' \
- -e 's|%LIBPNG%|$(LIBPNG)|' \
-e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
-e 's|%exec_prefix%|$(exec_prefix)|' \
-e 's|%ft_version%|$(ft_version)|' \
--
1.8.5

3
freetype-2.5.0.1.tar.bz2
View File

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

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

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

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

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

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

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

6
freetype2-subpixel.patch
View File

@ -1,7 +1,7 @@
Index: freetype-2.4.11/include/freetype/config/ftoption.h
Index: freetype-2.4.11/include/config/ftoption.h
===================================================================
--- freetype-2.4.11.orig/include/freetype/config/ftoption.h
+++ freetype-2.4.11/include/freetype/config/ftoption.h
--- freetype-2.4.11.orig/include/config/ftoption.h
+++ freetype-2.4.11/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. */

88
freetype2.changes
View File

@ -1,3 +1,91 @@
-------------------------------------------------------------------
Thu Dec 12 16:45:13 UTC 2013 - hrvoje.senjan@gmail.com
- Added patches:
* don-t-mark-libpng-as-required-library-in-freetype-co.patch: it's
private in pkgconfig file, and causes issues in downstream
packages
- As per patch, remove libpng-devel Requires from devel package
-------------------------------------------------------------------
Wed Dec 11 07:13:14 UTC 2013 - arvidjaar@gmail.com
- freetype2 pkgconfig now includes -lpng16; make sure freetype2-devel
Requires libpng-devel
-------------------------------------------------------------------
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
- Update to version 2.5.1
* For some WinFNT files, the last glyph wasn't displayed but
incorrectly marked as invalid.
* The vertical size of glyphs was incorrectly set after a call to
`FT_GlyphSlot_Embolden', resulting in clipped glyphs.
* Many fields of the `PCLT' table in SFNT based fonts (if accessed
with `FT_Get_Sfnt_Table') were computed incorrectly.
* In TrueType fonts, hinting of composite glyphs could sometimes
deliver incorrect positions of components or even distorted
shapes.
* WOFF font format support has been added.
* The auto-hinter now supports Hebrew. Greek and Cyrillic support
has been improved.
* Support for the forthcoming `OS/2' SFNT table version 5, as can
be found e.g. in the `Sitka' font family for Windows 8.1.
* The header file layout has been changed. After installation,
all files are now located in `<prefix>/include/freetype2'.
Applications that use (a) `freetype-config' or FreeType's
`pkg-config' file to get the include directory for the compiler,
and (b) the documented way for header inclusion like
#include <ft2build.h> or #include FT_FREETYPE_H
don't need any change to the source code.
* The stem darkening feature of the new CFF engine can now be
fine-tuned with the new `darkening-parameters' property.
* `ftgrid' has been updated to toggle various engines with the `H'
key, similar to `ftview' and `ftdiff'.
* The functionality of `ttdebug' has been greatly enhanced.
. It now displays twilight, storage, and control value data; key
* Better support of ARMv7 and x86_64 processors.
* Apple's `sbix' color bitmap format is now supported.
* Improved auto-hinter rendering for many TrueType fonts,
especially in the range 20-40ppem.
* A new face flag `FT_FACE_FLAG_COLOR' has been added (to be
accessed with the macro `FT_HAS_COLOR').
* `FT_Gzip_Uncompress' (modeled after zlib's `uncompress'
function) has been added; this is a by-product of the newly
added WOFF support.
* Support for a build with `cmake' has been contributed by John
Cary <cary@txcorp.com>.
* Support for x64 builds with Visual C++ has been contributed by
Kenneth Miller <kennethadammiller@yahoo.com>
* Manual pages for most demo programs have been added.
* The GETINFO bytecode instruction for TrueType fonts was buggy if
used to retrieve subpixel hinting information. It was necessary
to set selector bit 6 to get results for selector bits 7-10,
which is wrong.
* Improved computation of emulated vertical metrics for TrueType
fonts.
* Fixed horizontal start-up position of vertical phantom points in
TrueType bytecode.
- Rebase freetype2-subpixel.patch to current release
- Added fix-compile-in-non-debug.patch, fixes release build of ftdemos
- Added overflow.patch for resolving post-build-check detected error:
I: Statement is overflowing a buffer
-------------------------------------------------------------------
Wed Jul 3 08:31:13 UTC 2013 - idonmez@suse.com

9
freetype2.spec
View File

@ -26,8 +26,8 @@ BuildRequires: zlib-devel
Obsoletes: freetype2-64bit
%endif
#
%define doc_version 2.5.0
Version: 2.5.0.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,6 +39,10 @@ Source3: baselibs.conf
Patch1: freetype2-bitmap-foundry.patch
Patch308961: bugzilla-308961-cmex-workaround.patch
Patch200: freetype2-subpixel.patch
# PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer
Patch201: overflow.patch
# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library-in-freetype-co.patch -- it is private in .pc
Patch202: don-t-mark-libpng-as-required-library-in-freetype-co.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -84,6 +88,7 @@ It also contains a small tutorial for using that library.
%if %{enable_subpixel_rendering}
%patch200 -p1
%endif
%patch202 -p1
%build
export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"

3
ft2demos-2.5.0.tar.bz2
View File

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

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

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

88
ft2demos.changes
View File

@ -1,3 +1,91 @@
-------------------------------------------------------------------
Thu Dec 12 16:45:13 UTC 2013 - hrvoje.senjan@gmail.com
- Added patches:
* don-t-mark-libpng-as-required-library-in-freetype-co.patch: it's
private in pkgconfig file, and causes issues in downstream
packages
- As per patch, remove libpng-devel Requires from devel package
-------------------------------------------------------------------
Wed Dec 11 07:13:14 UTC 2013 - arvidjaar@gmail.com
- freetype2 pkgconfig now includes -lpng16; make sure freetype2-devel
Requires libpng-devel
-------------------------------------------------------------------
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
- Update to version 2.5.1
* For some WinFNT files, the last glyph wasn't displayed but
incorrectly marked as invalid.
* The vertical size of glyphs was incorrectly set after a call to
`FT_GlyphSlot_Embolden', resulting in clipped glyphs.
* Many fields of the `PCLT' table in SFNT based fonts (if accessed
with `FT_Get_Sfnt_Table') were computed incorrectly.
* In TrueType fonts, hinting of composite glyphs could sometimes
deliver incorrect positions of components or even distorted
shapes.
* WOFF font format support has been added.
* The auto-hinter now supports Hebrew. Greek and Cyrillic support
has been improved.
* Support for the forthcoming `OS/2' SFNT table version 5, as can
be found e.g. in the `Sitka' font family for Windows 8.1.
* The header file layout has been changed. After installation,
all files are now located in `<prefix>/include/freetype2'.
Applications that use (a) `freetype-config' or FreeType's
`pkg-config' file to get the include directory for the compiler,
and (b) the documented way for header inclusion like
#include <ft2build.h> or #include FT_FREETYPE_H
don't need any change to the source code.
* The stem darkening feature of the new CFF engine can now be
fine-tuned with the new `darkening-parameters' property.
* `ftgrid' has been updated to toggle various engines with the `H'
key, similar to `ftview' and `ftdiff'.
* The functionality of `ttdebug' has been greatly enhanced.
. It now displays twilight, storage, and control value data; key
* Better support of ARMv7 and x86_64 processors.
* Apple's `sbix' color bitmap format is now supported.
* Improved auto-hinter rendering for many TrueType fonts,
especially in the range 20-40ppem.
* A new face flag `FT_FACE_FLAG_COLOR' has been added (to be
accessed with the macro `FT_HAS_COLOR').
* `FT_Gzip_Uncompress' (modeled after zlib's `uncompress'
function) has been added; this is a by-product of the newly
added WOFF support.
* Support for a build with `cmake' has been contributed by John
Cary <cary@txcorp.com>.
* Support for x64 builds with Visual C++ has been contributed by
Kenneth Miller <kennethadammiller@yahoo.com>
* Manual pages for most demo programs have been added.
* The GETINFO bytecode instruction for TrueType fonts was buggy if
used to retrieve subpixel hinting information. It was necessary
to set selector bit 6 to get results for selector bits 7-10,
which is wrong.
* Improved computation of emulated vertical metrics for TrueType
fonts.
* Fixed horizontal start-up position of vertical phantom points in
TrueType bytecode.
- Rebase freetype2-subpixel.patch to current release
- Added fix-compile-in-non-debug.patch, fixes release build of ftdemos
- Added overflow.patch for resolving post-build-check detected error:
I: Statement is overflowing a buffer
-------------------------------------------------------------------
Wed Jul 3 08:33:20 UTC 2013 - idonmez@suse.com

12
ft2demos.spec
View File

@ -17,17 +17,21 @@
Name: ft2demos
Version: 2.5.0
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.0.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 overflow.patch -- I: Statement is overflowing a buffer
Patch201: overflow.patch
# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library-in-freetype-co.patch -- it is private in .pc
Patch202: don-t-mark-libpng-as-required-library-in-freetype-co.patch
BuildRequires: libpng-devel
BuildRequires: xorg-x11-devel
Conflicts: dtc
@ -49,6 +53,10 @@ Freetype2 utilities and demo programs.
%if %{enable_subpixel_rendering}
%patch200 -p 1 -b .subpixel
%endif
pushd ../ft2demos-%{version}
%patch201 -p1
popd
%patch202 -p1
%build
export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"

17
overflow.patch Normal file
View File

@ -0,0 +1,17 @@
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
@@ -1905,11 +1905,11 @@
FT_Library_Version( library, &major, &minor, &patch );
- offset = snprintf( version_string, 64 + 1,
+ 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, sizeof(version_string) - offset,
".%d",
patch );
}