From: "Ian Delaney (idella4)" <idella4@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/matplotlib/files: matplotlib-1.1.1-ft-refcount.patch
Date: Mon, 26 Nov 2012 06:21:02 +0000 (UTC) [thread overview]
Message-ID: <20121126062102.3A34420C9F@flycatcher.gentoo.org> (raw)
idella4 12/11/26 06:21:02
Modified: matplotlib-1.1.1-ft-refcount.patch
Log:
Appended missing hunk to -ft-refcount.patch, reported by, and thanks to, Carl Michal in Bug #442298
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path
1.2 dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch?r1=1.1&r2=1.2
Index: matplotlib-1.1.1-ft-refcount.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- matplotlib-1.1.1-ft-refcount.patch 1 Aug 2012 19:17:40 -0000 1.1
+++ matplotlib-1.1.1-ft-refcount.patch 26 Nov 2012 06:21:02 -0000 1.2
@@ -1,5 +1,10 @@
-Restoring a fix to an old reference counting bug which was re-included in a recent commit. It fails stix_fonts_demo.py
-https://github.com/matplotlib/matplotlib/commit/85af0c02bf9a8ecdd0fd18eab8c9662c6b9f4302#src/ft2font.cpp
+#Restoring a fix to an old reference counting bug which was re-included in a recent commit. It fails stix_fonts_demo.py
+# https://github.com/matplotlib/matplotlib/commit/85af0c02bf9a8ecdd0fd18eab8c9662c6b9f4302#src/ft2font.cpp (Keep just in case)
+
+Reinstate the manual reference counting as discovered in #1054
+commit ca678a49f37411b1b0e72d7d0dfa88c124b0e34b
+wrt Bug #442298 by Carl Michal, "the patch in the tree is missing the fifth insertion', i.e. the 2nd. hunk
+appending the 2nd hunk to bicatelli's prepared patch
bicatali@gentoo.org 08/2012
--- src/ft2font.cpp.orig 2012-08-01 17:30:33.000000000 +0100
@@ -33,3 +38,11 @@
throw Py::RuntimeError(s.str());
}
+@@ -904,6 +908,7 @@ inline double conv(int v)
+ {
+ std::ostringstream s;
+ s << "Could not set the fontsize for facefile " << facefile << std::endl;
++ ob_refcnt--;
+ throw Py::RuntimeError(s.str());
+ }
+
next reply other threads:[~2012-11-26 6:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-26 6:21 Ian Delaney (idella4) [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-08-01 19:17 [gentoo-commits] gentoo-x86 commit in dev-python/matplotlib/files: matplotlib-1.1.1-ft-refcount.patch Sebastien Fabbro (bicatali)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121126062102.3A34420C9F@flycatcher.gentoo.org \
--to=idella4@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox