summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2008-08-17 20:12:30 +0000
committerLuca Barbato <lu_zero@gentoo.org>2008-08-17 20:12:30 +0000
commit556bebf7501eb369c800bfd38957b7e144fcbdf6 (patch)
tree466df7a096eccf26ac2467b11d18031faca0148d /media-gfx
parentstable amd64, bug 234735 (diff)
downloadgentoo-2-556bebf7501eb369c800bfd38957b7e144fcbdf6.tar.gz
gentoo-2-556bebf7501eb369c800bfd38957b7e144fcbdf6.tar.bz2
gentoo-2-556bebf7501eb369c800bfd38957b7e144fcbdf6.zip
Belated fix for Bug #229527
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo ppc, RepoMan options: --force)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/blender/ChangeLog7
-rw-r--r--media-gfx/blender/blender-2.46-r1.ebuild3
-rw-r--r--media-gfx/blender/blender-2.46.ebuild3
-rw-r--r--media-gfx/blender/files/blender-2.46-select_charmap.patch11
4 files changed, 21 insertions, 3 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 3bcc07224041..3fa23c4faed9 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/blender
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.144 2008/07/17 08:02:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.145 2008/08/17 20:12:29 lu_zero Exp $
+
+ 17 Aug 2008; Luca Barbato <lu_zero@gentoo.org>
+ +files/blender-2.46-select_charmap.patch, blender-2.46.ebuild,
+ blender-2.46-r1.ebuild:
+ Belated fix for Bug #229527
17 Jul 2008; Alexis Ballier <aballier@gentoo.org> blender-2.45-r4.ebuild,
blender-2.46.ebuild:
diff --git a/media-gfx/blender/blender-2.46-r1.ebuild b/media-gfx/blender/blender-2.46-r1.ebuild
index 4c25a97c5c03..3e55f3c71224 100644
--- a/media-gfx/blender/blender-2.46-r1.ebuild
+++ b/media-gfx/blender/blender-2.46-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.46-r1.ebuild,v 1.2 2008/05/24 13:30:43 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.46-r1.ebuild,v 1.3 2008/08/17 20:12:29 lu_zero Exp $
inherit multilib flag-o-matic eutils python
@@ -56,6 +56,7 @@ src_unpack() {
epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
epatch "${FILESDIR}"/blender-2.46-ffmpeg.patch
epatch "${FILESDIR}"/blender-2.46-cve-2008-1103-1.patch
+ epatch "${FILESDIR}"/blender-2.46-select_charmap.patch
if use ffmpeg ; then
cd "${S}"/extern
diff --git a/media-gfx/blender/blender-2.46.ebuild b/media-gfx/blender/blender-2.46.ebuild
index 278531210b76..f3cf51f8b891 100644
--- a/media-gfx/blender/blender-2.46.ebuild
+++ b/media-gfx/blender/blender-2.46.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.46.ebuild,v 1.3 2008/07/17 08:02:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.46.ebuild,v 1.4 2008/08/17 20:12:29 lu_zero Exp $
inherit multilib flag-o-matic eutils python
@@ -56,6 +56,7 @@ src_unpack() {
epatch "${FILESDIR}"/blender-2.37-dirs.patch
epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
epatch "${FILESDIR}"/blender-2.46-cve-2008-1103-1.patch
+ epatch "${FILESDIR}"/blender-2.46-select_charmap.patch
if use ffmpeg ; then
cd "${S}"/extern
diff --git a/media-gfx/blender/files/blender-2.46-select_charmap.patch b/media-gfx/blender/files/blender-2.46-select_charmap.patch
new file mode 100644
index 000000000000..6e440434cdcf
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.46-select_charmap.patch
@@ -0,0 +1,11 @@
+--- a/source/blender/blenlib/intern/freetypefont.c
++++ b/source/blender/blenlib/intern/freetypefont.c
+@@ -405,7 +405,7 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile * pf)
+ lcode = charcode;
+ }
+
+- err = FT_Set_Charmap( face, (FT_CharMap) FT_ENCODING_UNICODE );
++ err = FT_Select_Charmap( face, FT_ENCODING_UNICODE );
+
+ return vfd;
+ }