From: "Gábor Boskovits" <boskovits@gmail.com>
To: 29891@debbugs.gnu.org
Cc: "Gábor Boskovits" <boskovits@gmail.com>
Subject: [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
Date: Sun, 7 Jan 2018 23:11:42 +0100 [thread overview]
Message-ID: <20180107221142.17118-1-boskovits@gmail.com> (raw)
In-Reply-To: <20171229134104.6951-1-boskovits@gmail.com>
* 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 <dog@gnu.org>:
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 | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0be488dec..b2b4c254f 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
next prev parent reply other threads:[~2018-01-07 22:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-29 13:41 [bug#29891] [PATCH core-updates] gnu: java-classpathx-servletapi: Update to 3.0-r1244 Gábor Boskovits
2018-01-07 22:11 ` Gábor Boskovits [this message]
2018-01-07 22:13 ` [bug#29891] [PATCH] " Gábor Boskovits
2018-01-09 7:25 ` Chris Marusich
2018-01-09 9:59 ` Gábor Boskovits
2018-01-09 10:55 ` Gábor Boskovits
2018-01-09 10:56 ` Gábor Boskovits
2018-01-14 2:25 ` Chris Marusich
2018-01-14 9:07 ` Gábor Boskovits
2018-01-14 15:04 ` Tobias Geerinckx-Rice
2018-01-14 15:28 ` Gábor Boskovits
2018-01-15 8:27 ` [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0.1 Gábor Boskovits
2018-01-16 8:03 ` bug#29891: " Chris Marusich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180107221142.17118-1-boskovits@gmail.com \
--to=boskovits@gmail.com \
--cc=29891@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.