From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYrac-0006x9-Ij for guix-patches@gnu.org; Tue, 09 Jan 2018 05:57:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYraY-0007sq-Jc for guix-patches@gnu.org; Tue, 09 Jan 2018 05:57:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33459) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYraY-0007rG-EM for guix-patches@gnu.org; Tue, 09 Jan 2018 05:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eYraX-0002uf-UW for guix-patches@gnu.org; Tue, 09 Jan 2018 05:57:01 -0500 Subject: [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244. References: <20171229134104.6951-1-boskovits@gmail.com> In-Reply-To: <20171229134104.6951-1-boskovits@gmail.com> Resent-Message-ID: From: =?UTF-8?Q?G=C3=A1bor?= Boskovits Date: Tue, 9 Jan 2018 11:55:17 +0100 Message-Id: <20180109105517.29578-1-boskovits@gmail.com> 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. Fixes: Object ImplicitObjectELResolver::ScopeMap::remove(Object,Object) in source/javax/servlet/jsp/el/ImplicitObjectELResolver.java conflicts with boolean remove(Object,Object) of Map in java8. --- gnu/packages/java.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8dd635605..8bd25d361 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2018,28 +2018,27 @@ 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))) + (file-name (string-append name "-" version "-checkout")) (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