diff options
| author |   Peter Volkov <pva@gentoo.org> | 2009-10-10 18:28:48 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2009-10-10 18:28:48 +0000 |
| commit | 5bc051203d8da9fe9e5daa360259dd7cfc52d4dc (patch) | |
| tree | 0641f41a57709ef915a7ee29b6b7498ba0e6ab90 /media-libs | |
| parent | Merge from Prefix (diff) | |
| download | gentoo-2-5bc051203d8da9fe9e5daa360259dd7cfc52d4dc.tar.gz gentoo-2-5bc051203d8da9fe9e5daa360259dd7cfc52d4dc.tar.bz2 gentoo-2-5bc051203d8da9fe9e5daa360259dd7cfc52d4dc.zip | |
Fixed PCF fonts regression, bug #288256, thank Martin von Gagern for bisecting and other guys for report.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/freetype/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/freetype/files/freetype-2.3.10-nprops-truncation.patch | 35 | ||||
| -rw-r--r-- | media-libs/freetype/freetype-2.3.10-r1.ebuild (renamed from media-libs/freetype/freetype-2.3.10.ebuild) | 3 |
3 files changed, 46 insertions, 2 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index a5de68525820..7a0c1056b481 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.240 2009/10/08 18:09:54 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.241 2009/10/10 18:28:48 pva Exp $ + +*freetype-2.3.10-r1 (10 Oct 2009) + + 10 Oct 2009; Peter Volkov <pva@gentoo.org> -freetype-2.3.10.ebuild, + +freetype-2.3.10-r1.ebuild, + +files/freetype-2.3.10-nprops-truncation.patch: + Fixed PCF fonts regression, bug #288256, thank Martin von Gagern for + bisecting and other guys for report. *freetype-2.3.10 (08 Oct 2009) diff --git a/media-libs/freetype/files/freetype-2.3.10-nprops-truncation.patch b/media-libs/freetype/files/freetype-2.3.10-nprops-truncation.patch new file mode 100644 index 000000000000..d239a4a57b94 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.3.10-nprops-truncation.patch @@ -0,0 +1,35 @@ +From 008686a12313c89168f5aef5074d46508ef4b774 Mon Sep 17 00:00:00 2001 +From: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> +Date: Sat, 10 Oct 2009 17:07:16 +0000 +Subject: [pcf] Fix a bug in the nprops truncation, Gentoo bug #288357. + +--- +diff --git a/ChangeLog b/ChangeLog +index 3363b90..49f0d97 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,9 @@ ++2009-10-10 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> ++ ++ * src/pcf/pcfread.c (pcf_get_properties): Fix a bug in the nprops ++ truncation. Reported by Martin von Gagern and Peter Volkov. ++ https://bugs.gentoo.org/288357 and https://bugs.gentoo.org/288256 ++ + 2009-10-06 Werner Lemberg <wl@gnu.org> + + * Version 2.3.10 released. +diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c +index a60505b..08becf9 100644 +--- a/src/pcf/pcfread.c ++++ b/src/pcf/pcfread.c +@@ -436,7 +436,7 @@ THE SOFTWARE. + FT_TRACE4(( " nprop = %d (truncate %d props)\n", + (int)nprops, nprops - (int)nprops )); + +- nprops = nprops - (int)nprops; ++ nprops = (int)nprops; + + /* rough estimate */ + if ( nprops > size / PCF_PROPERTY_SIZE ) +-- +cgit v0.8.2.1 diff --git a/media-libs/freetype/freetype-2.3.10.ebuild b/media-libs/freetype/freetype-2.3.10-r1.ebuild index eaccee560a8a..d672f9a51d16 100644 --- a/media-libs/freetype/freetype-2.3.10.ebuild +++ b/media-libs/freetype/freetype-2.3.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.10.ebuild,v 1.1 2009/10/08 18:09:54 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.10-r1.ebuild,v 1.1 2009/10/10 18:28:48 pva Exp $ inherit eutils flag-o-matic libtool @@ -61,6 +61,7 @@ src_unpack() { disable_option FT_CONFIG_OPTION_OLD_INTERNALS epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch + epatch "${FILESDIR}"/${P}-nprops-truncation.patch if use utils; then cd "${WORKDIR}"/ft2demos-${PV} |