Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/matplotlib/files: matplotlib-1.1.1-ft-refcount.patch
Date: Wed, 01 Aug 2012 19:17:49
Message-Id: 20120801191740.81F6C2004C@flycatcher.gentoo.org
1 bicatali 12/08/01 19:17:40
2
3 Added: matplotlib-1.1.1-ft-refcount.patch
4 Log:
5 Version bump. Keep bundling of pycxx because it is patched, and some fonts to ease maintenance and portability
6
7 (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch?rev=1.1&content-type=text/plain
14
15 Index: matplotlib-1.1.1-ft-refcount.patch
16 ===================================================================
17 Restoring a fix to an old reference counting bug which was re-included in a recent commit. It fails stix_fonts_demo.py
18 https://github.com/matplotlib/matplotlib/commit/85af0c02bf9a8ecdd0fd18eab8c9662c6b9f4302#src/ft2font.cpp
19
20 bicatali@g.o 08/2012
21 --- src/ft2font.cpp.orig 2012-08-01 17:30:33.000000000 +0100
22 +++ src/ft2font.cpp 2012-08-01 17:30:42.000000000 +0100
23 @@ -870,24 +870,28 @@
24 {
25 std::ostringstream s;
26 s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;
27 + ob_refcnt--;
28 throw Py::RuntimeError(s.str());
29 }
30 else if (error == FT_Err_Cannot_Open_Resource)
31 {
32 std::ostringstream s;
33 s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;
34 + ob_refcnt--;
35 throw Py::RuntimeError(s.str());
36 }
37 else if (error == FT_Err_Invalid_File_Format)
38 {
39 std::ostringstream s;
40 s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;
41 + ob_refcnt--;
42 throw Py::RuntimeError(s.str());
43 }
44 else if (error)
45 {
46 std::ostringstream s;
47 s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;
48 + ob_refcnt--;
49 throw Py::RuntimeError(s.str());
50 }