[PATCH] Update IcedTea.

[PATCH] Update IcedTea.

[Ricardo Wurmus]

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

Attached is a patch to move our ‘icedtea7’ package to the 2.6.x series
(the 2.5.x series will only get one more release).

I would also like to suggest changing the names ‘icedtea6’ and
‘icedtea7’ to just ‘icedtea’.  They cannot be installed into the same
profile anyway and users will most likely want the latest version by
default.

What do you think?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-icedtea7-Update-to-2.6.1.patch --]
[-- Type: text/x-patch, Size: 3635 bytes --]

From 010ce39a913594b9c5a06ac06dff11906002a548 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Wed, 22 Jul 2015 15:40:58 +0200
Subject: [PATCH] gnu: icedtea7: Update to 2.6.1.

* gnu/packages/java.scm (icedtea7): Update to 2.6.1.
---
 gnu/packages/java.scm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index aa8cd2c..0ff70c8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -588,7 +588,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
     (license license:gpl2+)))
 
 (define-public icedtea7
-  (let* ((version "2.5.5")
+  (let* ((version "2.6.1")
          (drop (lambda (name hash)
                  (origin
                    (method url-fetch)
@@ -606,7 +606,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
                       version ".tar.xz"))
                 (sha256
                  (base32
-                  "1irxk2ndwsfk4c1zbzb5h3rpwv2bc9bhfjvz6p4dws5476vsxrq9"))
+                  "0s107vi1530a5dyxacysc4m64zshgg2d3xpndsc0ws99wz0zmr6c"))
                 (modules '((guix build utils)))
                 (snippet
                  '(substitute* "Makefile.in"
@@ -630,7 +630,11 @@ build process and its dependencies, whereas Make uses Makefile format.")
          #:locale "C"
          ,@(substitute-keyword-arguments (package-arguments icedtea6)
              ((#:configure-flags flags)
-              `(delete "--with-openjdk-src-dir=./openjdk" ,flags))
+              `(delete "--with-openjdk-src-dir=./openjdk"
+                       ;; TODO: package pcsc and sctp, and add to inputs
+                       (append '("--disable-system-pcsc"
+                                 "--disable-system-sctp")
+                               ,flags)))
              ((#:phases phases)
               `(modify-phases ,phases
                  (replace
@@ -737,24 +741,24 @@ build process and its dependencies, whereas Make uses Makefile format.")
        `(("ant" ,ant)
          ("openjdk-drop"
           ,(drop "openjdk"
-                 "03gxqn17cxwl1nspnwigacaqd28p02d45f396j5f4kkbzfnbl0ak"))
+                 "0gs6vbj5c09516r460r68i7vm652sb25h973kq9hfx749qbs0s01"))
          ("corba-drop"
           ,(drop "corba"
-                 "0ldcckknn2f92jv1144cnn0z3wmvxln28wc00rc6xxblnjcnamzh"))
+                 "1y7nf6hqry1az28i3b6ln5cs82cww1jj4r61jk54ab8s2xydj0yd"))
          ("jaxp-drop"
           ,(drop "jaxp"
-                 "0mnjdziffcnyqlyvf8dw1hrl4kiiwmh8ia0ym417wgvnjpaihci9"))
+                 "1szs2w0p496k1qi3yl1fymj0g10lgq31am35zlalcz7pi4l4q360"))
          ("jaxws-drop"
           ,(drop "jaxws"
-                 "1gkmypnhygx2mxhca3ngy620k993wi2cc1wysc0np06y1rkx1mkn"))
+                 "17xfy9q2zdpap7m2prbf937x55jm3pwrqpp1fdlridraqrfzjprd"))
          ("jdk-drop"
           ,(drop "jdk"
-                 "10x43mqjfn43jlckic0nyf7apyyjyr910cdmmvy41kvw8ljhvg61"))
+                 "0qskhwr4nml49zhbppnq8ldj0x001bl37mrcpxslbnsdw5skw258"))
          ("langtools-drop"
           ,(drop "langtools"
-                 "0q5nqc14r6vmhxgikw3wgdcc0r9symp830v13isnv8qdjgm6kcki"))
+                 "0hyxrrb0zrx1pq1s90bmim94hwfligr0ajzs1874da4gclbbvfbd"))
          ("hotspot-drop"
           ,(drop "hotspot"
-                 "1yqxfd2jwbm5y41wscyfx8h0fr3h8ny2g2mda5iwd8sikxsaj96p"))
+                 "1cv8df2s89mnjzg4rja4i89d4fr8n0c3v5y2cqbww1ma1463n100"))
          ,@(fold alist-delete (package-native-inputs icedtea6)
                  '("openjdk6-src" "ant-bootstrap")))))))
-- 
2.1.0

Re: [PATCH] Update IcedTea.

[Andreas Enge]

On Wed, Jul 22, 2015 at 03:46:38PM +0200, Ricardo Wurmus wrote:
> Attached is a patch to move our ‘icedtea7’ package to the 2.6.x series
> (the 2.5.x series will only get one more release).

The patch looks good to me.

> I would also like to suggest changing the names ‘icedtea6’ and
> ‘icedtea7’ to just ‘icedtea’.  They cannot be installed into the same
> profile anyway and users will most likely want the latest version by
> default.

These version numbers are anyway a bit confusing...

Is there a reason to keep icedtea6 around at all? If not, you might drop it
and rename icedtea7 as icedtea.

Andreas

Re: [PATCH] Update IcedTea.

[Andreas Enge]

Hi Ricardo,

do you have an answer to the question below?

On Wed, Jul 22, 2015 at 07:33:56PM +0200, Andreas Enge wrote:
> > I would also like to suggest changing the names ‘icedtea6’ and
> > ‘icedtea7’ to just ‘icedtea’.  They cannot be installed into the same
> > profile anyway and users will most likely want the latest version by
> > default.
> 
> These version numbers are anyway a bit confusing...
> 
> Is there a reason to keep icedtea6 around at all? If not, you might drop it
> and rename icedtea7 as icedtea.

Andreas

Re: [PATCH] Update IcedTea.

[Ricardo Wurmus]

Andreas Enge <andreas@enge.fr> writes:

> On Wed, Jul 22, 2015 at 07:33:56PM +0200, Andreas Enge wrote:
>> > I would also like to suggest changing the names ‘icedtea6’ and
>> > ‘icedtea7’ to just ‘icedtea’.  They cannot be installed into the same
>> > profile anyway and users will most likely want the latest version by
>> > default.
>> 
>> These version numbers are anyway a bit confusing...
>> 
>> Is there a reason to keep icedtea6 around at all? If not, you might drop it
>> and rename icedtea7 as icedtea.

The only reason why I added icedtea7 and kept icedtea6 was that I
previously did not know that icedtea7 could be bootstrapped with GCJ.
In the first attempt to get icedtea7 to compile I used icedtea6 to build
it.  Now that this is no longer required, I think there is no good
reason not to rename “icedtea7” to “icedtea” and drop icedtea6.

It should be noted, though, that “icedtea7” inherits from “icedtea6” and
dropping “icedtea6” would either require a rewrite of the package
definition for “icedtea7” or force us to retain the “icedtea6”
definition (making it private).

~~ Ricardo

Re: [PATCH] Update IcedTea.

[Andreas Enge]

On Mon, Sep 07, 2015 at 11:27:26AM +0200, Ricardo Wurmus wrote:
> The only reason why I added icedtea7 and kept icedtea6 was that I
> previously did not know that icedtea7 could be bootstrapped with GCJ.
> In the first attempt to get icedtea7 to compile I used icedtea6 to build
> it.  Now that this is no longer required, I think there is no good
> reason not to rename “icedtea7” to “icedtea” and drop icedtea6.

Great!

> It should be noted, though, that “icedtea7” inherits from “icedtea6” and
> dropping “icedtea6” would either require a rewrite of the package
> definition for “icedtea7” or force us to retain the “icedtea6”
> definition (making it private).

Rewriting the icedtea(7) definition sounds like the proper solution to me.

Thanks!

Andreas