Re: java-swt and tuxguitar

[Andreas Enge <andreas@enge.fr>]

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

Hi again,

I propose the attached two patches to go back and fix the download
location to something that looks permanent. Surprisingly enough,
tuxguitar still does not build for me on x86_64.

After that, we could upgrade to 4.6 or only to 4.5.2.

Andreas


[-- Attachment #2: 0001-Revert-gnu-java-swt-Update-to-4.6.patch --]
[-- Type: text/plain, Size: 1848 bytes --]

From 6b8fe0a0f81cc10b6232b6665d81324e49344a86 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Fri, 24 Jun 2016 17:31:36 +0200
Subject: [PATCH 1/2] Revert "gnu: java-swt: Update to 4.6."

This reverts commit b8a680f778c021c91eaaaab4798bdcc7d417dce2.
---
 gnu/packages/java.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 753fb77..e165193 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -58,15 +58,15 @@
 (define-public java-swt
   (package
     (name "java-swt")
-    (version "4.6")
+    (version "4.5")
     (source
      ;; The types of many variables and procedures differ in the sources
      ;; dependent on whether the target architecture is a 32-bit system or a
      ;; 64-bit system.  Instead of patching the sources on demand in a build
      ;; phase we download either the 32-bit archive (which mostly uses "int"
      ;; types) or the 64-bit archive (which mostly uses "long" types).
-     (let ((hash32 "0jmx1h65wqxsyjzs64i2z6ryiynllxzm13cq90fky2qrzagcw1ir")
-           (hash64 "0wnd01xssdq9pgx5xqh5lfiy3dmk60dzzqdxzdzf883h13692lgy")
+     (let ((hash32 "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q")
+           (hash64 "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff")
            (file32 "x86")
            (file64 "x86_64"))
        (let-values (((hash file)
@@ -78,7 +78,7 @@
            (uri (string-append
                  "http://ftp-stud.fht-esslingen.de/pub/Mirrors/"
                  "eclipse/eclipse/downloads/drops4/R-" version
-                 "-201606061100/swt-" version "-gtk-linux-" file ".zip"))
+                 "-201506032000/swt-" version "-gtk-linux-" file ".zip"))
            (sha256 (base32 hash))))))
     (build-system ant-build-system)
     (arguments
-- 
2.9.0


[-- Attachment #3: 0002-gnu-java-swt-Fix-source-location.patch --]
[-- Type: text/plain, Size: 983 bytes --]

From d850d2007b45aff90cd977c4c4a4c36337fad442 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Fri, 24 Jun 2016 17:33:12 +0200
Subject: [PATCH 2/2] gnu: java-swt: Fix source location.

* gnu/packages/java.scm (java-swt)[source]: Fix URI.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e165193..73cebbe 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -76,8 +76,8 @@
          (origin
            (method url-fetch)
            (uri (string-append
-                 "http://ftp-stud.fht-esslingen.de/pub/Mirrors/"
-                 "eclipse/eclipse/downloads/drops4/R-" version
+                 "http://archive.eclipse.org/eclipse/downloads/drops4/"
+                 "R-" version
                  "-201506032000/swt-" version "-gtk-linux-" file ".zip"))
            (sha256 (base32 hash))))))
     (build-system ant-build-system)
-- 
2.9.0