From patchwork Fri Mar 11 06:19:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37749 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 D1FAC27BBEA; Fri, 11 Mar 2022 07:02:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 87B9E27BBE9 for ; Fri, 11 Mar 2022 07:02:31 +0000 (GMT) Received: from localhost ([::1]:55906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSZIE-0001Nj-Mh for patchwork@mira.cbaines.net; Fri, 11 Mar 2022 02:02:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSYd9-0001KA-IC for guix-patches@gnu.org; Fri, 11 Mar 2022 01:20:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSYd9-0005jW-3Z for guix-patches@gnu.org; Fri, 11 Mar 2022 01:20:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSYd8-00070u-Tx for guix-patches@gnu.org; Fri, 11 Mar 2022 01:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54337] [PATCH 1/2] gnu: Add boost-1.77/fixed. References: <1232237267.49384.1646979368358@office.mailbox.org> In-Reply-To: <1232237267.49384.1646979368358@office.mailbox.org> Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Mar 2022 06:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54337@debbugs.gnu.org Received: via spool by 54337-submit@debbugs.gnu.org id=B54337.164697959226929 (code B ref 54337); Fri, 11 Mar 2022 06:20:02 +0000 Received: (at 54337) by debbugs.gnu.org; 11 Mar 2022 06:19:52 +0000 Received: from localhost ([127.0.0.1]:36299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSYct-00070C-1P for submit@debbugs.gnu.org; Fri, 11 Mar 2022 01:19:51 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:36616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSYcr-0006zh-2p for 54337@debbugs.gnu.org; Fri, 11 Mar 2022 01:19:45 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4KFG4B0df1z9scX for <54337@debbugs.gnu.org>; Fri, 11 Mar 2022 07:19:38 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646979575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b4ZUGYaINEflw0ItpaMqezeFgt4KISmP66ilDZnqJlk=; b=bCpBC8rZc3tQwPXjY70peNnmsFt812ZNlw6cSGfmqfTHuj7R10Q8v/9ZNv61FY4LNJ2HRE aoz/0AHr+33e3pda+M7wkGDfwT1MQmcOFpsH8gFTAnFXmO09JTjYqk3y6wvhkGfZ119Q4z d96fDE69fo+x8eL+MIacF3p6HDeELDrHQB/1SCZmMBRhFYoT/oVwwjSGhFHb4QAncL1KVO Jn/4dLPTFz3KFnFIkSkbGJpcOcrxqe8hAEsAchKQsZ/HQgliEPQ/bagI4Iv7X59vpHXBHM 2I5UrGETBuaeQ3e+dBu2aVvyy9q8brmn0x5tl7Q3h7lrkjuVPjkczjEWaStkSw== Date: Fri, 11 Mar 2022 17:19:24 +1100 Message-Id: <20220311061925.11865-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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/boost.scm (boost-1.77/fixed): New variable. Since updating boost would resulting in building 1000s of rebuilds, add a temporary variant to fixing a missing import resulting in "error: 'transform' is not a member of 'std'" when building cryfs. See: https://github.com/boostorg/process/commit/e08374ed95ac33865bda40602c94909e7cd9607f * gnu/packages/patches/boost-wchar-include-algorithm.patch: New file. * gnu/local.mk: Reference patch. --- gnu/local.mk | 1 + gnu/packages/boost.scm | 11 +++++++++++ .../patches/boost-wchar-include-algorithm.patch | 11 +++++++++++ 3 files changed, 23 insertions(+) create mode 100644 gnu/packages/patches/boost-wchar-include-algorithm.patch diff --git a/gnu/local.mk b/gnu/local.mk index 60ee713508..ce3f529a7a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -915,6 +915,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-CVE-2021-45078.patch \ %D%/packages/patches/bloomberg-bde-cmake-module-path.patch \ %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \ + %D%/packages/patches/boost-wchar-include-algorithm.patch \ %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index b53b1f4257..d49449a72a 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Franck Pérignon ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2021 Aleksandr Vityazev +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,6 +69,7 @@ (define (boost-patch name version hash) (define-public boost (package (name "boost") + ;; Note: consider removing boost-1.77/fixed when updating boost to 1.78 or newer. (version "1.77.0") (source (origin (method url-fetch) @@ -193,6 +195,15 @@ (define-public boost (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt" "Some components have other similar licences.")))) +(define-public boost-1.77/fixed + ;; This patch applies for boost 1.77. Should not be needed in later releases. + ;; See: https://github.com/boostorg/process/commit/e08374ed95ac33865bda40602c94909e7cd9607f + (package/inherit boost + (name "boost-fixed") + (source (origin + (inherit (package-source boost)) + (patches (search-patches "boost-wchar-include-algorithm.patch")))))) + ;; Sadly, this is needed for irods. It won't link with 1.69 or later. (define-public boost-for-irods (package diff --git a/gnu/packages/patches/boost-wchar-include-algorithm.patch b/gnu/packages/patches/boost-wchar-include-algorithm.patch new file mode 100644 index 0000000000..c174dc5cd2 --- /dev/null +++ b/gnu/packages/patches/boost-wchar-include-algorithm.patch @@ -0,0 +1,11 @@ +--- a/boost/process/detail/traits/wchar_t.hpp ++++ b/boost/process/detail/traits/wchar_t.hpp +@@ -12,6 +12,8 @@ + #include + #include + ++#include ++ + namespace boost { namespace process { namespace detail { + + //template From patchwork Fri Mar 11 06:19:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37748 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 8022D27BBE9; Fri, 11 Mar 2022 07:02:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4C5C427BBE9 for ; Fri, 11 Mar 2022 07:02:25 +0000 (GMT) Received: from localhost ([::1]:55678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSZI8-0001CU-3x for patchwork@mira.cbaines.net; Fri, 11 Mar 2022 02:02:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSYd9-0001KD-IY for guix-patches@gnu.org; Fri, 11 Mar 2022 01:20:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSYd8-0005j6-Ld for guix-patches@gnu.org; Fri, 11 Mar 2022 01:20:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSYd8-00070n-Fq for guix-patches@gnu.org; Fri, 11 Mar 2022 01:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54337] [PATCH 2/2] gnu: cryfs: Update to 0.11.2. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Mar 2022 06:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54337@debbugs.gnu.org Received: via spool by 54337-submit@debbugs.gnu.org id=B54337.164697958526910 (code B ref 54337); Fri, 11 Mar 2022 06:20:02 +0000 Received: (at 54337) by debbugs.gnu.org; 11 Mar 2022 06:19:45 +0000 Received: from localhost ([127.0.0.1]:36296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSYcq-0006zy-QM for submit@debbugs.gnu.org; Fri, 11 Mar 2022 01:19:45 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:56492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSYcp-0006zf-5Y for 54337@debbugs.gnu.org; Fri, 11 Mar 2022 01:19:43 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4KFG485Q8rz9sbF for <54337@debbugs.gnu.org>; Fri, 11 Mar 2022 07:19:36 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646979574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b1WPQIc66PTVllJUcYzA4nDMoAGVOjLZzVDG3OeAVX0=; b=RmSFIcUNBd7cRogzpPNbF0mO8WA0Furns3mnxvUBORLnqr/mud8SpT+LqSnKGAb4cVCDpZ a1er9xP0YDOEtCn/6hl9Nj+nnpBabDXfwGWGy46St2VakXIEfZdmQheyCF0ceLI5Wc1nHk vckSOWeMOfgrTpAeZoDfjW5okjllWACb2WLbdLrY33yveXGEcPDSqtP3yoQxMByDoPy0xc keVObz91cJN+2l5ZQsGIGimMFImtvhrxBvH4m+Eov8IK9LBcis+IpDr4I3Deytq3c70bop Mg+wWIk+C51PWqslMgglTufkuePYDiB4GOZFKh1M7GELD7CDIW+dfXngp7w6Qw== Date: Fri, 11 Mar 2022 17:19:25 +1100 Message-Id: <20220311061925.11865-2-mail@brendan.scot> In-Reply-To: <20220311061925.11865-1-mail@brendan.scot> References: <20220311061925.11865-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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/crypto.scm (cryfs): Update to 0.11.2. [inputs]: Use boost-1.77/fixed to fix build. --- gnu/packages/crypto.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 007119c6de..e971d4c304 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1459,7 +1459,7 @@ (define-public transcrypt (define-public cryfs (package (name "cryfs") - (version "0.11.0") + (version "0.11.2") (source (origin (method url-fetch) @@ -1467,7 +1467,7 @@ (define-public cryfs "https://github.com/cryfs/cryfs/releases/download/" version "/cryfs-" version ".tar.xz")) (sha256 - (base32 "0dxphbj5sssm82rkkdb71algrcki16qlpzlvrjyvvm6b7x7zi0sm")))) + (base32 "1ggizlacm4fccsw9syy2763ihxnby6cdh3mhhraxy8bmsdjza7lm")))) (build-system cmake-build-system) (arguments '(#:modules ((guix build cmake-build-system) @@ -1514,7 +1514,7 @@ (define-public cryfs `(("python" ,python-wrapper) ("pkg-config" ,pkg-config))) (inputs - (list boost curl fuse range-v3 spdlog)) + (list boost-1.77/fixed curl fuse range-v3 spdlog)) (home-page "https://www.cryfs.org/") (synopsis "Encrypted FUSE filesystem for the cloud") (description "CryFS encrypts your files, so you can safely store them anywhere.