From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7FD741388C3 for ; Thu, 7 Jan 2016 15:36:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48FC1E0864; Thu, 7 Jan 2016 15:36:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D981EE0864 for ; Thu, 7 Jan 2016 15:36:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 697F43408F9 for ; Thu, 7 Jan 2016 15:36:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59807CFB for ; Thu, 7 Jan 2016 15:36:37 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1452180990.dbb4430a5a7e54165041053fc5817aeafce7e6d4.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/, dev-java/icedtea/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/icedtea/files/icedtea-bug-2781.patch dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild X-VCS-Directories: dev-java/icedtea/ dev-java/icedtea/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: dbb4430a5a7e54165041053fc5817aeafce7e6d4 X-VCS-Branch: master Date: Thu, 7 Jan 2016 15:36:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 62a4cecc-ea30-455f-8390-3aa3d036a325 X-Archives-Hash: 5bb02767164bf080bcfec13ff98b06c5 commit: dbb4430a5a7e54165041053fc5817aeafce7e6d4 Author: James Le Cuirot gentoo org> AuthorDate: Thu Jan 7 15:36:14 2016 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Jan 7 15:36:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb4430a dev-java/icedtea: Patch against icedtea bug #2781 CACAO have now fixed this upstream and it will hopefully make it into the next icedtea release. Package-Manager: portage-2.2.26 dev-java/icedtea/files/icedtea-bug-2781.patch | 42 ++++++++++++++++++++++ ...7.2.6.3-r3.ebuild => icedtea-7.2.6.3-r4.ebuild} | 5 +-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dev-java/icedtea/files/icedtea-bug-2781.patch b/dev-java/icedtea/files/icedtea-bug-2781.patch new file mode 100644 index 0000000..5cc32c3 --- /dev/null +++ b/dev-java/icedtea/files/icedtea-bug-2781.patch @@ -0,0 +1,42 @@ +# HG changeset patch +# User Stefan Ring +# Date 1452083014 -3600 +# Node ID 9295d3c06eb706407b5af1412674c8f0a0ce9fdf +# Parent 468081e3e037df27b6427aa298dfaaa20f4ba4bf +Fix some oversights during a large macro cleanup in 1e9787c3484e + +diff --git cacao/cacao/src/vm/jit/verify/typecheck-common.cpp cacao/cacao/src/vm/jit/verify/typecheck-common.cpp +--- cacao/cacao/src/vm/jit/verify/typecheck-common.cpp ++++ cacao/cacao/src/vm/jit/verify/typecheck-common.cpp +@@ -281,7 +281,7 @@ + + dv->type = sv->type; + if (dv->type == TYPE_ADR) { +- dv->typeinfo = sv->typeinfo; ++ typeinfo_t::clone(sv->typeinfo, dv->typeinfo); + } + } + return true; +diff --git cacao/cacao/src/vm/jit/verify/typeinfo.cpp cacao/cacao/src/vm/jit/verify/typeinfo.cpp +--- cacao/cacao/src/vm/jit/verify/typeinfo.cpp ++++ cacao/cacao/src/vm/jit/verify/typeinfo.cpp +@@ -1674,6 +1674,7 @@ + classref_or_classinfo common; + classref_or_classinfo elementclass; + int dimension; ++ ArrayType elementtype; + bool changed; + typecheck_result r; + +diff --git cacao/cacao/src/vm/resolve.cpp cacao/cacao/src/vm/resolve.cpp +--- cacao/cacao/src/vm/resolve.cpp ++++ cacao/cacao/src/vm/resolve.cpp +@@ -703,7 +703,7 @@ + + /* uninitialized objects are illegal here */ + +- if (subtinfo->is_primitive()) { ++ if (subtinfo->is_newobject()) { + exceptions_throw_verifyerror(refmethod, + "Invalid use of uninitialized object"); + return resolveFailed; diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild b/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild similarity index 98% rename from dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild rename to dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild index bd433a4..7621ae1 100644 --- a/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild @@ -266,8 +266,9 @@ src_configure() { cacao_config="--enable-cacao" # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612 - export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch" - ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 + export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch icedtea-bug-2781.patch" + ln -snf "${FILESDIR}"/{${SLOT}-cacao-pr-157,icedtea-bug-2781}.patch . || die fi # Turn on Zero if needed (non-HS/CACAO archs) or requested