From patchwork Fri Jun 24 15:38:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 13359 Received: (qmail 50382 invoked by uid 89); 24 Jun 2016 15:39:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.5 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPAM_SUBJECT1, SPF_PASS autolearn=no version=3.3.2 spammy=pub X-Spam-Status: No, score=-0.5 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPAM_SUBJECT1, SPF_PASS autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 24 Jun 2016 15:38:56 +0000 Received: from localhost ([::1]:44360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGTC2-00069K-Ea for patchwork@sourceware.org; Fri, 24 Jun 2016 11:38:54 -0400 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 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=enge.fr; s=20140924; h=from:subject:date:message-id:to:mime-version:content-type:in-reply-to: references; bh=ZeS62/DHlCABzEpAECvjY4Dv+CsGUYIepTQapiZ2Qsw=; b=Du1/1qTGpLHPP+WNQuoH5PXLGCxVGwcaFKXr0KozW7WCYxSDy9kCoSGtlLLwyqQlz+DmrMEOEykCZ co9SWwOMpnJ6oTTGKFj30K8Dm5emb8qvXLVdJqWiBdFaUXzLslB2ASwJJJZIrkLWjrx/IMP71O7Und 2oxAfXr3XtMaI3KY= X-HalOne-Cookie: eeb013caceb6b43c3202fe4adb2d745e600ecee7 X-HalOne-ID: b743d78f-3a21-11e6-bffc-b8ca3afa9d73 Received: from solar (unknown [92.89.73.211]) by smtpfilter1.public.one.com (Halon Mail Gateway) with ESMTPSA; Fri, 24 Jun 2016 15:38:36 +0000 (UTC) Date: Fri, 24 Jun 2016 17:38:34 +0200 From: Andreas Enge To: guix-devel@gnu.org Subject: Re: java-swt and tuxguitar Message-ID: <20160624153834.GA2615@solar> References: <20160624150050.GA2414@solar> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160624150050.GA2414@solar> User-Agent: Mutt/1.6.1 (2016-04-27) X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 91.198.169.124 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list 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+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" 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 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