From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Enge Subject: Re: java-swt and tuxguitar Date: Fri, 24 Jun 2016 17:38:34 +0200 Message-ID: <20160624153834.GA2615@solar> References: <20160624150050.GA2414@solar> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="+QahgC5+KEYLbs62" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGTBt-00066U-EP for guix-devel@gnu.org; Fri, 24 Jun 2016 11:38:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bGTBo-0001XX-3C for guix-devel@gnu.org; Fri, 24 Jun 2016 11:38:44 -0400 Received: from mailrelay1.public.one.com ([91.198.169.124]:45305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGTBn-0001XB-Kq for guix-devel@gnu.org; Fri, 24 Jun 2016 11:38:40 -0400 Content-Disposition: inline In-Reply-To: <20160624150050.GA2414@solar> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --+QahgC5+KEYLbs62 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --+QahgC5+KEYLbs62 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-Revert-gnu-java-swt-Update-to-4.6.patch" >From 6b8fe0a0f81cc10b6232b6665d81324e49344a86 Mon Sep 17 00:00:00 2001 From: Andreas Enge 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 --+QahgC5+KEYLbs62 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-java-swt-Fix-source-location.patch" >From d850d2007b45aff90cd977c4c4a4c36337fad442 Mon Sep 17 00:00:00 2001 From: Andreas Enge 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 --+QahgC5+KEYLbs62--