summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-10-10 19:24:40 +0000
committerPeter Volkov <pva@gentoo.org>2009-10-10 19:24:40 +0000
commit4ab272b49265f8f58a4d6cb63f27c7bcb5733a45 (patch)
tree5d83cc4f636e449c5a9d976ccb02c3c317a55130
parentFixed typo: minimum required bzr version is 1.16 and 1.18 is supported too. (diff)
downloadgentoo-2-4ab272b49265f8f58a4d6cb63f27c7bcb5733a45.tar.gz
gentoo-2-4ab272b49265f8f58a4d6cb63f27c7bcb5733a45.tar.bz2
gentoo-2-4ab272b49265f8f58a4d6cb63f27c7bcb5733a45.zip
Version bump and dropped identical freetype-2.3.10-r1.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
-rw-r--r--media-libs/freetype/ChangeLog8
-rw-r--r--media-libs/freetype/files/freetype-2.3.10-nprops-truncation.patch35
-rw-r--r--media-libs/freetype/freetype-2.3.11.ebuild (renamed from media-libs/freetype/freetype-2.3.10-r1.ebuild)3
3 files changed, 8 insertions, 38 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 7a0c1056b481..586a1ef51e7a 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,12 @@
# 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.241 2009/10/10 18:28:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.242 2009/10/10 19:24:40 pva Exp $
+
+*freetype-2.3.11 (10 Oct 2009)
+
+ 10 Oct 2009; Peter Volkov <pva@gentoo.org> -freetype-2.3.10-r1.ebuild,
+ -files/freetype-2.3.10-nprops-truncation.patch, +freetype-2.3.11.ebuild:
+ Version bump and dropped identical freetype-2.3.10-r1.
*freetype-2.3.10-r1 (10 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
deleted file mode 100644
index d239a4a57b94..000000000000
--- a/media-libs/freetype/files/freetype-2.3.10-nprops-truncation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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-r1.ebuild b/media-libs/freetype/freetype-2.3.11.ebuild
index d672f9a51d16..d9f2f93d9336 100644
--- a/media-libs/freetype/freetype-2.3.10-r1.ebuild
+++ b/media-libs/freetype/freetype-2.3.11.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-r1.ebuild,v 1.1 2009/10/10 18:28:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.11.ebuild,v 1.1 2009/10/10 19:24:40 pva Exp $
inherit eutils flag-o-matic libtool
@@ -61,7 +61,6 @@ 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}