unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#29891] [PATCH core-updates] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
@ 2017-12-29 13:41 Gábor Boskovits
  2018-01-07 22:11 ` [bug#29891] [PATCH] " Gábor Boskovits
                   ` (2 more replies)
  0 siblings, 3 replies; 13+ messages in thread
From: Gábor Boskovits @ 2017-12-29 13:41 UTC (permalink / raw)
  To: 29891; +Cc: Gábor 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 <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 | 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

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
  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
  2018-01-07 22:13   ` Gábor Boskovits
  2018-01-09  7:25   ` Chris Marusich
  2018-01-09 10:55 ` Gábor Boskovits
  2018-01-15  8:27 ` [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0.1 Gábor Boskovits
  2 siblings, 2 replies; 13+ messages in thread
From: Gábor Boskovits @ 2018-01-07 22:11 UTC (permalink / raw)
  To: 29891; +Cc: Gábor 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 <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

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
  2018-01-07 22:11 ` [bug#29891] [PATCH] " Gábor Boskovits
@ 2018-01-07 22:13   ` Gábor Boskovits
  2018-01-09  7:25   ` Chris Marusich
  1 sibling, 0 replies; 13+ messages in thread
From: Gábor Boskovits @ 2018-01-07 22:13 UTC (permalink / raw)
  To: 29891

[-- Attachment #1: Type: text/plain, Size: 3435 bytes --]

The second version of this patch provides a good file-name.

2018-01-07 23:11 GMT+01:00 Gábor Boskovits <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
> -                "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 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
>
>

[-- Attachment #2: Type: text/html, Size: 4559 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
  2018-01-07 22:11 ` [bug#29891] [PATCH] " Gábor Boskovits
  2018-01-07 22:13   ` Gábor Boskovits
@ 2018-01-09  7:25   ` Chris Marusich
  2018-01-09  9:59     ` Gábor Boskovits
  1 sibling, 1 reply; 13+ messages in thread
From: Chris Marusich @ 2018-01-09  7:25 UTC (permalink / raw)
  To: Gábor Boskovits; +Cc: 29891

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

Gábor Boskovits <boskovits@gmail.com> writes:

> * gnu/packages/java.scm (java-classpathx-servletapi): Update to 3.0-r1244.

This seems correct to me.  I also verified that this builds
reproducibly.

The commit message is a bit long; we could summarize it with a sentence
instead.

How difficult would it be to have upstream make a new release?  It looks
like we're now using an arbitrary revision of their source code, instead
of a release.  In general, I think it's better to use a release if we
can, since that implies the code has been more thoroughly tested etc.

-- 
Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
  2018-01-09  7:25   ` Chris Marusich
@ 2018-01-09  9:59     ` Gábor Boskovits
  0 siblings, 0 replies; 13+ messages in thread
From: Gábor Boskovits @ 2018-01-09  9:59 UTC (permalink / raw)
  To: Chris Marusich; +Cc: 29891

[-- Attachment #1: Type: text/plain, Size: 865 bytes --]

Actually, I don't know. I've not asked for that. This is the only commit
since years. Maybe they are willing to make a new release.
I will ask them, and cc you.

2018-01-09 8:25 GMT+01:00 Chris Marusich <cmmarusich@gmail.com>:

> Gábor Boskovits <boskovits@gmail.com> writes:
>
> > * gnu/packages/java.scm (java-classpathx-servletapi): Update to
> 3.0-r1244.
>
> This seems correct to me.  I also verified that this builds
> reproducibly.
>
> The commit message is a bit long; we could summarize it with a sentence
> instead.
>
> How difficult would it be to have upstream make a new release?  It looks
> like we're now using an arbitrary revision of their source code, instead
> of a release.  In general, I think it's better to use a release if we
> can, since that implies the code has been more thoroughly tested etc.
>
> --
> Chris
>

[-- Attachment #2: Type: text/html, Size: 1345 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
  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 ` [bug#29891] [PATCH] " Gábor Boskovits
@ 2018-01-09 10:55 ` Gábor Boskovits
  2018-01-09 10:56   ` Gábor Boskovits
  2018-01-15  8:27 ` [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0.1 Gábor Boskovits
  2 siblings, 1 reply; 13+ messages in thread
From: Gábor Boskovits @ 2018-01-09 10:55 UTC (permalink / raw)
  To: 29891; +Cc: Gábor 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

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
  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 15:04     ` Tobias Geerinckx-Rice
  0 siblings, 2 replies; 13+ messages in thread
From: Gábor Boskovits @ 2018-01-09 10:56 UTC (permalink / raw)
  To: 29891

[-- Attachment #1: Type: text/plain, Size: 2854 bytes --]

Reworded commit message.

2018-01-09 11:55 GMT+01:00 Gábor Boskovits <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.
>
> 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 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
>
>

[-- Attachment #2: Type: text/html, Size: 3965 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
  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
  1 sibling, 1 reply; 13+ messages in thread
From: Chris Marusich @ 2018-01-14  2:25 UTC (permalink / raw)
  To: Gábor Boskovits; +Cc: 29891

[-- Attachment #1: Type: text/plain, Size: 659 bytes --]

Gábor Boskovits <boskovits@gmail.com> writes:

> Reworded commit message.
>
> 2018-01-09 11:55 GMT+01:00 Gábor Boskovits <boskovits@gmail.com>:
>
>> * gnu/packages/java.scm (java-classpathx-servletapi): Update to 3.0-r1244.

I wasn't able to apply this patch cleanly.  I tried "git am" and also
the "patch" tool, but they didn't work.  ("git am" did work using your
earlier patches, though.)

By the way, I see that Chris Burdess released a new minor version of
classpathx, which we can get from:

https://ftp.gnu.org/gnu/classpathx/servletapi/servletapi-3.0.1.tar.gz

Could you attach one more patch that uses this release?

-- 
Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
  2018-01-14  2:25     ` Chris Marusich
@ 2018-01-14  9:07       ` Gábor Boskovits
  0 siblings, 0 replies; 13+ messages in thread
From: Gábor Boskovits @ 2018-01-14  9:07 UTC (permalink / raw)
  To: Chris Marusich; +Cc: 29891

[-- Attachment #1: Type: text/plain, Size: 795 bytes --]

Yes, I'm working on it.

2018-01-14 3:25 GMT+01:00 Chris Marusich <cmmarusich@gmail.com>:

> Gábor Boskovits <boskovits@gmail.com> writes:
>
> > Reworded commit message.
> >
> > 2018-01-09 11:55 GMT+01:00 Gábor Boskovits <boskovits@gmail.com>:
> >
> >> * gnu/packages/java.scm (java-classpathx-servletapi): Update to
> 3.0-r1244.
>
> I wasn't able to apply this patch cleanly.  I tried "git am" and also
> the "patch" tool, but they didn't work.  ("git am" did work using your
> earlier patches, though.)
>
> By the way, I see that Chris Burdess released a new minor version of
> classpathx, which we can get from:
>
> https://ftp.gnu.org/gnu/classpathx/servletapi/servletapi-3.0.1.tar.gz
>
> Could you attach one more patch that uses this release?
>
> --
> Chris
>

[-- Attachment #2: Type: text/html, Size: 1490 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
  2018-01-09 10:56   ` Gábor Boskovits
  2018-01-14  2:25     ` Chris Marusich
@ 2018-01-14 15:04     ` Tobias Geerinckx-Rice
  2018-01-14 15:28       ` Gábor Boskovits
  1 sibling, 1 reply; 13+ messages in thread
From: Tobias Geerinckx-Rice @ 2018-01-14 15:04 UTC (permalink / raw)
  To: boskovits, 29891

Gábor,

Gábor Boskovits wrote on 09/01/18 at 11:56:
> Reworded commit message.

Sorry to be a drive-by nit-picker, but this commit message is still much
longer than needed:

> 2018-01-09 11:55 GMT+01:00 Gábor Boskovits <boskovits@gmail.com
> <mailto: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)

That parenthesis should be far more useful to future generations as a
comment in the code.

>     [arguments]: Switch to a java8 compiler, remove comment about not
>     working with java8,

The first half implies the second: I'd not mention the comment.

>     add phase chdir to compensate for the different layout of the
>     upstream repository.

Also very verbose (just “Add ‘chdir’ phase.”?) but OK :-)

Kind regards,

T G-R

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0-r1244.
  2018-01-14 15:04     ` Tobias Geerinckx-Rice
@ 2018-01-14 15:28       ` Gábor Boskovits
  0 siblings, 0 replies; 13+ messages in thread
From: Gábor Boskovits @ 2018-01-14 15:28 UTC (permalink / raw)
  To: Tobias Geerinckx-Rice; +Cc: 29891

[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]

I will send an updated patch soon. Upstream released this fix as 3.0.1, so
it will be just update to 3.0.1.
I would add something like remove obsolate comment, and that will be all.
I'm a bit slow here, I had to run guix gc, so I have a lot to rebuild.
I will send an updated patch asap.

2018-01-14 16:04 GMT+01:00 Tobias Geerinckx-Rice <me@tobias.gr>:

> Gábor,
>
> Gábor Boskovits wrote on 09/01/18 at 11:56:
> > Reworded commit message.
>
> Sorry to be a drive-by nit-picker, but this commit message is still much
> longer than needed:
>
> > 2018-01-09 11:55 GMT+01:00 Gábor Boskovits <boskovits@gmail.com
> > <mailto: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)
>
> That parenthesis should be far more useful to future generations as a
> comment in the code.
>
> >     [arguments]: Switch to a java8 compiler, remove comment about not
> >     working with java8,
>
> The first half implies the second: I'd not mention the comment.
>
> >     add phase chdir to compensate for the different layout of the
> >     upstream repository.
>
> Also very verbose (just “Add ‘chdir’ phase.”?) but OK :-)
>
> Kind regards,
>
> T G-R
>

[-- Attachment #2: Type: text/html, Size: 1989 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#29891] [PATCH] gnu: java-classpathx-servletapi: Update to 3.0.1.
  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 ` [bug#29891] [PATCH] " Gábor Boskovits
  2018-01-09 10:55 ` Gábor Boskovits
@ 2018-01-15  8:27 ` Gábor Boskovits
  2018-01-16  8:03   ` bug#29891: " Chris Marusich
  2 siblings, 1 reply; 13+ messages in thread
From: Gábor Boskovits @ 2018-01-15  8:27 UTC (permalink / raw)
  To: 29891; +Cc: Gábor Boskovits

* gnu/packages/java.scm (java-classpathx-servletapi): Update to 3.0.1.
[arguments]: Switch to a java8 compiler, remove comment about not working with java8.
---
 gnu/packages/java.scm | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c2888b552..8431ed44b 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2019,25 +2019,20 @@ debugging, etc.")
 (define-public java-classpathx-servletapi
   (package
     (name "java-classpathx-servletapi")
-    (version "3.0")
+    (version "3.0.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/classpathx/servletapi/"
                                   "servletapi-" version ".tar.gz"))
               (sha256
                (base32
-                "0y9489pk4as9q6x300sk3ycc0psqfxcd4b0xvbmf3rhgli8q1kx3"))))
+                "07d8h051siga2f33fra72hk12sbq1bxa4jifjg0qj0vfazjjff0x"))))
     (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
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* bug#29891: [PATCH] gnu: java-classpathx-servletapi: Update to 3.0.1.
  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   ` Chris Marusich
  0 siblings, 0 replies; 13+ messages in thread
From: Chris Marusich @ 2018-01-16  8:03 UTC (permalink / raw)
  To: Gábor Boskovits; +Cc: 29891-done

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]

Gábor Boskovits <boskovits@gmail.com> writes:

> * gnu/packages/java.scm (java-classpathx-servletapi): Update to 3.0.1.

Thank you for taking the time to update the patch.  It looks good to me,
and I've committed it as ae307724de2957bbed6b763a1d039dba0876b5a7.

-- 
Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2018-01-16  8:04 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [bug#29891] [PATCH] " Gábor Boskovits
2018-01-07 22:13   ` 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

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).