all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [PATCH] Update IcedTea.
@ 2015-07-22 13:46 Ricardo Wurmus
  2015-07-22 17:33 ` Andreas Enge
  0 siblings, 1 reply; 5+ messages in thread
From: Ricardo Wurmus @ 2015-07-22 13:46 UTC (permalink / raw)
  To: 'Guix-devel'

[-- 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


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

end of thread, other threads:[~2015-09-07  9:39 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-22 13:46 [PATCH] Update IcedTea Ricardo Wurmus
2015-07-22 17:33 ` Andreas Enge
2015-09-07  9:15   ` Andreas Enge
2015-09-07  9:27     ` Ricardo Wurmus
2015-09-07  9:38       ` Andreas Enge

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.