diff options
Diffstat (limited to 'dev-java/jython')
| -rw-r--r-- | dev-java/jython/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-java/jython/files/jython-2.5.2-sax-parser-class-not-found.patch | 39 | ||||
| -rw-r--r-- | dev-java/jython/jython-2.5.2-r2.ebuild (renamed from dev-java/jython/jython-2.5.2-r1.ebuild) | 5 |
3 files changed, 51 insertions, 2 deletions
diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog index 67300eb06eeb..2a68a28bf96a 100644 --- a/dev-java/jython/ChangeLog +++ b/dev-java/jython/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/jython # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.79 2012/08/26 13:43:40 thev00d00 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.80 2012/08/26 16:16:22 thev00d00 Exp $ + +*jython-2.5.2-r2 (26 Aug 2012) + + 26 Aug 2012; Ian Whyman <thev00d00@gentoo.org> -jython-2.5.2-r1.ebuild, + +jython-2.5.2-r2.ebuild, + +files/jython-2.5.2-sax-parser-class-not-found.patch: + Add patch to fix SAXParser ClassNotFoundException #431754 *jython-2.5.3-r1 (26 Aug 2012) diff --git a/dev-java/jython/files/jython-2.5.2-sax-parser-class-not-found.patch b/dev-java/jython/files/jython-2.5.2-sax-parser-class-not-found.patch new file mode 100644 index 000000000000..7e9273c68cb4 --- /dev/null +++ b/dev-java/jython/files/jython-2.5.2-sax-parser-class-not-found.patch @@ -0,0 +1,39 @@ +# HG changeset patch +# User Alan Kennedy <alan@xhaus.com> +# Date 1333300584 -3600 +# Node ID a972112ac1b155ef41b3f8ce195251bc6cc3ebce +# Parent 920a60f5d5b5fdf46f4f26c75cab42e2a671be2f +#1537: Fix for classloading issues with MATLAB/OpenJDK + +diff --git a/Lib/xml/parsers/expat.py b/Lib/xml/parsers/expat.py +--- a/Lib/xml/parsers/expat.py ++++ b/Lib/xml/parsers/expat.py +@@ -47,12 +47,8 @@ from org.xml.sax.helpers import XMLReade + from org.xml.sax.ext import DefaultHandler2 + + # Xerces +-try: +- # Name mangled by jarjar? +- import org.python.apache.xerces.parsers.SAXParser +- _xerces_parser = "org.python.apache.xerces.parsers.SAXParser" +-except ImportError: +- _xerces_parser = "org.apache.xerces.parsers.SAXParser" ++_mangled_xerces_parser_name = "org.python.apache.xerces.parsers.SAXParser" ++_xerces_parser_name = "org.apache.xerces.parsers.SAXParser" + + + # @expat args registry +@@ -88,7 +84,11 @@ class XMLParser(object): + "not %s" % type(namespace_separator).__name__) + raise TypeError(error) + +- self._reader = XMLReaderFactory.createXMLReader(_xerces_parser) ++ # See http://bugs.jython.org/issue1537 ++ try: ++ self._reader = XMLReaderFactory.createXMLReader(_mangled_xerces_parser_name) ++ except: ++ self._reader = XMLReaderFactory.createXMLReader(_xerces_parser_name) + + if self.namespace_separator is None: + try: + diff --git a/dev-java/jython/jython-2.5.2-r1.ebuild b/dev-java/jython/jython-2.5.2-r2.ebuild index 049be7621d38..85c5f21abe5f 100644 --- a/dev-java/jython/jython-2.5.2-r1.ebuild +++ b/dev-java/jython/jython-2.5.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.2-r1.ebuild,v 1.2 2012/08/20 02:44:35 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.2-r2.ebuild,v 1.1 2012/08/26 16:16:22 thev00d00 Exp $ EAPI="4" @@ -60,6 +60,9 @@ java_prepare() { epatch "${FILESDIR}/${P}-sax-parser-fix.patch" + # 431754 + epatch "${FILESDIR}/${P}-sax-parser-class-not-found.patch" + epatch "${FILESDIR}/${P}-distutils_byte_compilation.patch" epatch "${FILESDIR}/${P}-distutils_scripts_location.patch" epatch "${FILESDIR}/${P}-respect_PYTHONPATH.patch" |