From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUuwD-0007bi-PC for guix-patches@gnu.org; Fri, 29 Dec 2017 08:43:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUuwB-0006uL-67 for guix-patches@gnu.org; Fri, 29 Dec 2017 08:43:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:47243) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUuwB-0006uD-1e for guix-patches@gnu.org; Fri, 29 Dec 2017 08:43:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eUuwA-0003mE-OO for guix-patches@gnu.org; Fri, 29 Dec 2017 08:43:02 -0500 Subject: [bug#29891] [PATCH core-updates] gnu: java-classpathx-servletapi: Update to 3.0-r1244. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUuve-0007Qb-25 for guix-patches@gnu.org; Fri, 29 Dec 2017 08:42:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUuvb-0006bc-G1 for guix-patches@gnu.org; Fri, 29 Dec 2017 08:42:30 -0500 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:42384) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUuvb-0006b3-9o for guix-patches@gnu.org; Fri, 29 Dec 2017 08:42:27 -0500 Received: by mail-wr0-x22c.google.com with SMTP id w107so15863554wrb.9 for ; Fri, 29 Dec 2017 05:42:26 -0800 (PST) From: =?UTF-8?Q?G=C3=A1bor?= Boskovits Date: Fri, 29 Dec 2017 14:41:04 +0100 Message-Id: <20171229134104.6951-1-boskovits@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29891@debbugs.gnu.org Cc: =?UTF-8?Q?G=C3=A1bor?= Boskovits * gnu/packages/java.scm (java-classpathx-servletapi): Update to 3.0-r1244. [source]: Change to svn-fetch from upstream. (This version is only available from there) [arguments]: Switch to a java8 compiler, remove comment about not working with java8, add phase chdir to compensate for the different layout of the upstream repository. This version fixes java8 compilation by fixing a method signature which conflicts with java8. Communication with upstream: 2017-12-18 9:38 GMT+01:00 Chris Burdess : On 17/12/2017 20:53, Gábor Boskovits wrote: Dear classpathx developers, I discovered, that classpathx servletapi 3.0 does not compile with java8. The problem is that java8 added a method to the Map interface: boolean remove(Object,Object), which conflicts with Object remove(Object,Object) method in: source/javax/servlet/jsp/el/ImplicitObjectELResolver.java; ImplicitObjectELResolver::ScopeMap::remove how should we fix this problem? It was a typo in the method signature. I've fixed it now. Thank you very much! --- gnu/packages/java.scm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0be488dec..480d93c55 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2018,28 +2018,26 @@ debugging, etc.") (define-public java-classpathx-servletapi (package (name "java-classpathx-servletapi") - (version "3.0") + (version "3.0-r1244") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/classpathx/servletapi/" - "servletapi-" version ".tar.gz")) + (method svn-fetch) + (uri (svn-reference + (url "svn://svn.savannah.gnu.org/classpathx/trunk") + (revision 1244))) (sha256 (base32 - "0y9489pk4as9q6x300sk3ycc0psqfxcd4b0xvbmf3rhgli8q1kx3")))) + "07ihcwhm5awdr1wj28lqvcxhd6z72w427zbyxrqh42lgga74wsh3")))) (build-system ant-build-system) (arguments `(#:tests? #f ; there is no test target #:build-target "compile" - ;; NOTE: This package does not build with Java 8 because of a type - ;; mismatch in - ;; "source/javax/servlet/jsp/el/ImplicitObjectELResolver.java". It - ;; defines the return value of ScopeMap's "remove" method to be of type - ;; "Object", whereas Map's "remove" method returns boolean. #:make-flags - (list "-Dbuild.compiler=javac1.7" + (list "-Dbuild.compiler=javac1.8" (string-append "-Ddist=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "servletapi") #t)) (replace 'install (lambda* (#:key make-flags #:allow-other-keys) (zero? (apply system* `("ant" "dist" ,@make-flags)))))))) -- 2.15.1