From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYrbc-0007JR-Ku for guix-patches@gnu.org; Tue, 09 Jan 2018 05:58:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYrbW-0000rl-Q5 for guix-patches@gnu.org; Tue, 09 Jan 2018 05:58:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33463) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYrbW-0000rP-Ls for guix-patches@gnu.org; Tue, 09 Jan 2018 05:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eYrbW-0002wE-EA for guix-patches@gnu.org; Tue, 09 Jan 2018 05:58:02 -0500 Subject: [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244. Resent-Message-ID: MIME-Version: 1.0 In-Reply-To: <20180109105517.29578-1-boskovits@gmail.com> References: <20180109105517.29578-1-boskovits@gmail.com> From: =?UTF-8?Q?G=C3=A1bor?= Boskovits Date: Tue, 9 Jan 2018 11:56:58 +0100 Message-ID: Content-Type: multipart/alternative; boundary="001a1144425a1aaeea056255c65a" 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 --001a1144425a1aaeea056255c65a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Reworded commit message. 2018-01-09 11:55 GMT+01:00 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 > - "0y9489pk4as9q6x300sk3ycc0psqfx > cd4b0xvbmf3rhgli8q1kx3")))) > + "07ihcwhm5awdr1wj28lqvcxhd6z72w > 427zbyxrqh42lgga74wsh3")))) > (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 typ= e > - ;; mismatch in > - ;; "source/javax/servlet/jsp/el/ImplicitObjectELResolver.java". > It > - ;; defines the return value of ScopeMap's "remove" method to be o= f > type > - ;; "Object", whereas Map's "remove" method returns boolean. > #:make-flags > - (list "-Dbuild.compiler=3Djavac1.7" > + (list "-Dbuild.compiler=3Djavac1.8" > (string-append "-Ddist=3D" (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 > > --001a1144425a1aaeea056255c65a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Reworded commit message.
<= br>
2018-01-09 11:55 GMT+01:00 G=C3=A1bor Boskovi= ts <boskovits@gmail.com>:
* gnu/packages/java.scm (java-classpathx-servletapi): Up= date 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 w= ith java8,
add phase chdir to compensate for the different layout of the upstream repo= sitory.

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.
---
=C2=A0gnu/packages/java.scm | 21 ++++++++++-----------
=C2=A01 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.")
=C2=A0(define-public java-classpathx-servletapi
=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name "java-classpathx-servletapi")
-=C2=A0 =C2=A0 (version "3.0")
+=C2=A0 =C2=A0 (version "3.0-r1244")
=C2=A0 =C2=A0 =C2=A0(source (origin
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (method url-fetch)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (uri (string-append "= ;mirror://gnu/classpathx/servletapi/"
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "servletapi-" versi= on ".tar.gz"))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (method svn-fetch)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (uri (svn-reference
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (url= "svn://svn.savannah.gnu.org/classpathx/trun= k")
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (rev= ision 1244)))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (file-name (string-append= name "-" version "-checkout"))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sha256
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "0y9489p= k4as9q6x300sk3ycc0psqfxcd4b0xvbmf3rhgli8q1kx3"))))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "07ihcwh= m5awdr1wj28lqvcxhd6z72w427zbyxrqh42lgga74wsh3"))))
=C2=A0 =C2=A0 =C2=A0(build-system ant-build-system)
=C2=A0 =C2=A0 =C2=A0(arguments
=C2=A0 =C2=A0 =C2=A0 `(#:tests? #f ; there is no test target
=C2=A0 =C2=A0 =C2=A0 =C2=A0 #:build-target "compile"
-=C2=A0 =C2=A0 =C2=A0 =C2=A0;; NOTE: This package does not build with Java = 8 because of a type
-=C2=A0 =C2=A0 =C2=A0 =C2=A0;; mismatch in
-=C2=A0 =C2=A0 =C2=A0 =C2=A0;; "source/javax/servlet/jsp/el/Impli= citObjectELResolver.java".=C2=A0 It
-=C2=A0 =C2=A0 =C2=A0 =C2=A0;; defines the return value of ScopeMap's &= quot;remove" method to be of type
-=C2=A0 =C2=A0 =C2=A0 =C2=A0;; "Object", whereas Map's "= remove" method returns boolean.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 #:make-flags
-=C2=A0 =C2=A0 =C2=A0 =C2=A0(list "-Dbuild.compiler=3Djavac1.7" +=C2=A0 =C2=A0 =C2=A0 =C2=A0(list "-Dbuild.compiler=3Djavac1.8" =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (string-append "-Ddis= t=3D" (assoc-ref %outputs "out")))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 #:phases
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (modify-phases %standard-phases
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(add-after 'unpack 'chdir
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(lambda _ (chdir "servletapi= ") #t))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (replace 'install
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (lambda* (#:key make-flags #:allo= w-other-keys)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (zero? (apply system* `(&q= uot;ant" "dist" ,@make-flags))))))))
--
2.15.1


--001a1144425a1aaeea056255c65a--