From patchwork Thu Nov 7 18:19:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 16000 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C2407176EA; Thu, 7 Nov 2019 18:21:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4A5A41765A for ; Thu, 7 Nov 2019 18:21:20 +0000 (GMT) Received: from localhost ([::1]:47014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSmPH-00013l-Li for patchwork@mira.cbaines.net; Thu, 07 Nov 2019 13:21:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33219) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSmP3-00011r-Tv for guix-patches@gnu.org; Thu, 07 Nov 2019 13:21:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iSmP1-0003Hw-8A for guix-patches@gnu.org; Thu, 07 Nov 2019 13:21:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35069) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iSmP0-0003HJ-E8 for guix-patches@gnu.org; Thu, 07 Nov 2019 13:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iSmP0-0004zr-9Z for guix-patches@gnu.org; Thu, 07 Nov 2019 13:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Nov 2019 18:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38106@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157315085919176 (code B ref -1); Thu, 07 Nov 2019 18:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Nov 2019 18:20:59 +0000 Received: from localhost ([127.0.0.1]:43890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iSmOu-0004zB-Ty for submit@debbugs.gnu.org; Thu, 07 Nov 2019 13:20:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:48403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iSmOr-0004z2-3E for submit@debbugs.gnu.org; Thu, 07 Nov 2019 13:20:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33075) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSmOp-0000pv-Kz for guix-patches@gnu.org; Thu, 07 Nov 2019 13:20:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iSmOl-00034L-Vv for guix-patches@gnu.org; Thu, 07 Nov 2019 13:20:51 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:32772) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iSmOk-00032p-Rk for guix-patches@gnu.org; Thu, 07 Nov 2019 13:20:47 -0500 Received: from localhost.localdomain (178.113.183.24.wireless.dyn.drei.com [178.113.183.24]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 0F89233601B1; Thu, 7 Nov 2019 19:20:42 +0100 (CET) From: Danny Milosavljevic Date: Thu, 7 Nov 2019 19:19:49 +0100 Message-Id: <20191107181949.24679-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Tags: patch X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/rust.scm (mrustc): Update to 0.8.1. [source](patches): Remove it. --- gnu/local.mk | 1 - ....0-fix-variable-length-integer-receiving.patch | 15 --------------- gnu/packages/rust.scm | 6 ++---- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2513b4003c..5f52372875 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1140,7 +1140,6 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-tracelogger.patch \ %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ - %D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ %D%/packages/patches/mumble-1.2.19-abs.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ diff --git a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch b/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch deleted file mode 100644 index 9e76653a07..0000000000 --- a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/thepowersgang/mrustc/issues/109 -From: Danny Milosavljevic -Date: Fri, 3 Jan 2019 13:00:00 +0100 - ---- mrustc/src/expand/proc_macro.cpp.orig 2019-02-01 14:16:54.208486062 +0100 -+++ mrustc/src/expand/proc_macro.cpp 2019-02-01 14:17:14.350925705 +0100 -@@ -977,7 +977,7 @@ - for(;;) - { - auto b = recv_u8(); -- v |= static_cast(b) << ofs; -+ v |= static_cast(b & 0x7F) << ofs; - if( (b & 0x80) == 0 ) - break; - ofs += 7; diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index f3fee4c126..eefdec8e0d 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -91,7 +91,7 @@ (let ((rustc-version "1.19.0")) (package (name "mrustc") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -100,9 +100,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")) - (patches - (search-patches "mrustc-0.8.0-fix-variable-length-integer-receiving.patch")))) + "00800zckq009kf9v3hb8kp1svryvq3jpg4439ksm3wcidjvszdzc")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs