diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-02-28 08:30:16 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-02-28 08:30:16 +0000 |
| commit | 22a97462331101f4cba530605db5e1db77a2fe30 (patch) | |
| tree | eb4155c1fe12f9c4b003ae7b491cb300a54c219b | |
| parent | Bump, remove old (diff) | |
| download | gentoo-2-22a97462331101f4cba530605db5e1db77a2fe30.tar.gz gentoo-2-22a97462331101f4cba530605db5e1db77a2fe30.tar.bz2 gentoo-2-22a97462331101f4cba530605db5e1db77a2fe30.zip | |
Fix unmappable character for encoding ASCII, bug #399729 by Dennis Schridde; restrict to jdk:1.6, bug #405933
(Portage version: 2.1.10.49/cvs/Linux x86_64)
| -rw-r--r-- | dev-dotnet/ikvm/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-dotnet/ikvm/files/ikvm-0.46.0.2-unmappable-character.patch | 11 | ||||
| -rw-r--r-- | dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild | 7 |
3 files changed, 22 insertions, 3 deletions
diff --git a/dev-dotnet/ikvm/ChangeLog b/dev-dotnet/ikvm/ChangeLog index 83b37a21f50c..48fd80850dff 100644 --- a/dev-dotnet/ikvm/ChangeLog +++ b/dev-dotnet/ikvm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-dotnet/ikvm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.30 2012/01/21 13:49:31 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.31 2012/02/28 08:30:16 pacho Exp $ + + 28 Feb 2012; Pacho Ramos <pacho@gentoo.org> + +files/ikvm-0.46.0.2-unmappable-character.patch, ikvm-0.46.0.2.ebuild: + Fix unmappable character for encoding ASCII, bug #399729 by Dennis Schridde; + restrict to jdk:1.6, bug #405933 *ikvm-0.46.0.2 (21 Jan 2012) diff --git a/dev-dotnet/ikvm/files/ikvm-0.46.0.2-unmappable-character.patch b/dev-dotnet/ikvm/files/ikvm-0.46.0.2-unmappable-character.patch new file mode 100644 index 000000000000..2ed0308af74d --- /dev/null +++ b/dev-dotnet/ikvm/files/ikvm-0.46.0.2-unmappable-character.patch @@ -0,0 +1,11 @@ +--- openjdk/sun/print/Win32PrintService.java.orig 2012-02-26 17:56:16.751000012 +0100 ++++ openjdk/sun/print/Win32PrintService.java 2012-02-26 17:56:37.182000012 +0100 +@@ -119,7 +119,7 @@ + Chromaticity.class
+ };
+
+- // conversion from 1/100 Inch (.NET) to µm (Java)
++ // conversion from 1/100 Inch (.NET) to m (Java)
+ private static final int INCH100_TO_MYM = 254;
+ private static final int MATCH_DIFF = 500; // 0.5 mm
+
diff --git a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild b/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild index 231d63827d3a..c05ec1094118 100644 --- a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild +++ b/dev-dotnet/ikvm/ikvm-0.46.0.2.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-dotnet/ikvm/ikvm-0.46.0.2.ebuild,v 1.1 2012/01/21 13:49:31 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild,v 1.2 2012/02/28 08:30:16 pacho Exp $ EAPI="4" @@ -21,12 +21,15 @@ RDEPEND=">=dev-lang/mono-2 DEPEND="${RDEPEND} !dev-dotnet/ikvm-bin >=dev-dotnet/nant-0.85 - >=virtual/jdk-1.6 + >=virtual/jdk-1.6:1.6 app-arch/unzip dev-util/pkgconfig app-arch/sharutils" src_prepare() { + # Fix unmappable character for encoding ASCII, bug #399729 + epatch "${FILESDIR}"/${PN}-0.46.0.2-unmappable-character.patch + # We cannot rely on Mono Crypto Service Provider as it doesn't work inside # sandbox, we simply hard-code the path to a bundled key like Debian does. epatch "${FILESDIR}"/${PN}-0.46.0.1-key.patch |