Belated fix for Bug #229527

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo ppc
RepoMan-Options: --force

5 files changed, 25 insertions, 16 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/Manifest b/media-gfx/blender/Manifest
index 53489cb96688..fb8684dd6bd5 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX blender-2.37-dirs.patch 725 RMD160 3496386616f3066e1a237921f8ecc695a21b142e SHA1 905181caae8193d212a783e4c4c938e87e136752 SHA256 18ed351fd88c1bf952c86425dc769143cda6c5cd25e948ec1e1c0a1b911d44f7
 AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108879999 SHA1 50143946828d3f2b2568e71fae5ed28f6adf7449 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4
 AUX blender-2.44-swscale.patch 4054 RMD160 8e0f31402682e01763ccd8ad529fb57db064c423 SHA1 2e8a322644d4cfafc59f6fa33b34e46851a03836 SHA256 c74007ad24989a215b04dd275c8dee33960a05297901daf3c457e4c42de51c35
@@ -11,6 +8,7 @@ AUX blender-2.45-ffmpeg.patch 2807 RMD160 748fec0b51ee35b0524d678facecfaf91204dd
 AUX blender-2.45-missing_includes.patch 2314 RMD160 7f9b7205569dccb357fc82754cbe1100ca946574 SHA1 4bfdde220c3e3508e6987f0bdff654a8ed54c8e3 SHA256 f3deb71358d7b5163a5d0ea52b7891a622d0419d06fa7c33d4c3d256d512ad7d
 AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ace4a1bd6628 SHA1 979fa1c2f0836b46dfd26c197798625a72e0a28b SHA256 a0dd64fb749a9577d84e22896872dc2956a8530700308d0aadad588191356b96
 AUX blender-2.46-ffmpeg.patch 3823 RMD160 33f41651b1a6bc6d497ba01ab710ca3d7a1559c0 SHA1 82ce585db15a3c88625b0c04e649bd08b3c35b41 SHA256 ad75babcc08ae41f2a7c71bc457bd56a0ef39b5ae1e92ede2cdb0a34d7cbcc85
+AUX blender-2.46-select_charmap.patch 349 RMD160 a5387d5cf59d1e7c3aa6154faf6c83136338b5ea SHA1 bfeb5c0a126b6b83c0b52b40429e10670d90e8ac SHA256 6e858aef912d6fd2b41e2ef4a1b806ab080a76586ba3888d6bf84ee46667e9b5
 AUX blender.desktop 194 RMD160 5b154d86d52f46a3f1fcd29da90322e1727f1107 SHA1 a1b70789388f72f2a292939588365a0b845b83b7 SHA256 9d21fe8823f249f0720895107817854dd8ce64afe6586317af08805b94fe0fab
 AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad
 DIST blender-2.43.tar.gz 13806334 RMD160 a43babbc816194ba3e4cfed3bd250d20406e2479 SHA1 de9ba15fb40d962e56deebdea13a3a68b3ae6532 SHA256 a48213b61302d03eb8db0cf42712b142d280d16ad111f6411cd8e43403e5e61b
@@ -20,14 +18,7 @@ DIST ffmpeg-0.4.9-p20070330.tar.bz2 2192476 RMD160 e52bf6abbf7c630aa3e76243987fb
 EBUILD blender-2.43-r2.ebuild 3842 RMD160 d8f01d4265173a61388c66c62bb7e882469a26e8 SHA1 d80a1d14bebc4742ffee4ff5d03ba59fbba0e0b1 SHA256 a7350b4b9790f0f3cbe7850c2ad35d0e8ea492c4fac64ed14295814d91276811
 EBUILD blender-2.45-r3.ebuild 3630 RMD160 227ddf68702a6da91e53f51696264882e4922e37 SHA1 fd6566b569a3dcee49a69f40dc46b84ea3c336ce SHA256 fce484f3d84b1faf87d1af33cca1c3df1247a859d3b7501cf0e8b029528135fa
 EBUILD blender-2.45-r4.ebuild 3615 RMD160 ac1f9b3019b4df0b096bad978c28ab5f548b1185 SHA1 0e035f0a53a24cb3df933baab85b8fbb2799a744 SHA256 6a4ef47a1744e4af6b479d24e10dbf1686cafaebc8bb97734e8d034208a0b5a9
-EBUILD blender-2.46-r1.ebuild 3574 RMD160 96e10ca94ed19434d850d943e57d9187f445ea23 SHA1 f83903eb21566b45d1b66669bddccc9753483c77 SHA256 8ec27cf235472c8c5d823b95f8f06ecb196f23e5df2a0c80bff84f9db2814fc4
-EBUILD blender-2.46.ebuild 3547 RMD160 0e0efa4e6c37897b7d8195f31a57f593e7d4ee12 SHA1 90b016c7e11dd4998ae21eb70ee23399ed5c3ddd SHA256 7fc4e4fa38224aa0eda191687476005003ee2c4dcd726c361ff42de0d2f1b758
-MISC ChangeLog 21262 RMD160 b10f95ea34dbecec8c63e05c55e77c28b983a9f8 SHA1 ae253fd977e5f550ebb78a941753d40baecf5056 SHA256 e71d906cdf611c49b781e305c89242add39e757ad6528e4761bb85f44ce09b0b
+EBUILD blender-2.46-r1.ebuild 3630 RMD160 f2a4f3bbdfbc0b30f4284694e6ec263b6e7e66c2 SHA1 54c7eabaf40b17820115d615b21742a5b3e2351c SHA256 bc482c0874bbf57dbfb9770a80041401f7a27c53f65a11260c1785c19e762701
+EBUILD blender-2.46.ebuild 3602 RMD160 86e8526c456b78f44bcd8cc05c1df320d76903f0 SHA1 5c1ab9951e4256ce75f47c9623755cd90e52f2e8 SHA256 d36260c6399766db15b38c79a01216be23dd982113a34e3e83927ed6ecfac52a
+MISC ChangeLog 21432 RMD160 40888076f1e4ecb6428d6f29c5b0eb58dba5608e SHA1 2a926ebadf3713d9129033bab9d25b5cd8ad78ce SHA256 a00401b0aa4ea50d4c83bda71e24144f1e991123ef7be0120ed442bce80b275b
 MISC metadata.xml 492 RMD160 c477917476fbde6356586768276eda1ea31ae3ea SHA1 4a109fbded83a3f6c403ab5f3ec20e7113c1a26c SHA256 0ef00c095e68d12b312f8558b8909b4ae633717cf12932d7a4e479faf7fb9e18
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkh+/JoACgkQvFcC4BYPU0pPggCgyI9KlLLxbOQ4mDIfHHCtAXFW
-sukAn0Id468sc44pTuweaxgzRbGyOfH0
-=B6OM
------END PGP SIGNATURE-----
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;	
+ }