From: Brendan Tildesley <mail@brendan.scot>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: Maxime Devos <maximedevos@telenet.be>, 54337@debbugs.gnu.org
Subject: [bug#54337] [PATCH v3] gnu: Update crfys to 0.11.2
Date: Wed, 16 Mar 2022 04:03:31 +0100 (CET) [thread overview]
Message-ID: <855462635.430174.1647399811692@office.mailbox.org> (raw)
In-Reply-To: <87sfrjocom.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
> On 03/15/2022 9:14 AM Ludovic Courtès <ludo@gnu.org> wrote:
> Since this affect only cryfs, and since it’s just a missing include, I
> wonder if we could instead add “#include <algorithm>” in the cryfs
> source file(s) that include(s) Boost headers? That way, we wouldn’t
> need an extra Boost build.
>
> Thoughts?
>
> Ludo’.
Just this one patch works:
[-- Attachment #2: v3-0001-gnu-cryfs-Update-to-0.11.2.patch --]
[-- Type: text/x-patch, Size: 2454 bytes --]
From a5228fe860659c9bf6c410f8b57a407b30173648 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 10 Mar 2022 20:49:44 +1100
Subject: [PATCH v3] gnu: cryfs: Update to 0.11.2.
* gnu/packages/crypto.scm (cryfs): Update to 0.11.2.
[arguments]: Fix build with boost 1.77
---
gnu/packages/crypto.scm | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index d8e7941903..cf8bc111e1 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1461,7 +1461,7 @@ (define-public transcrypt
(define-public cryfs
(package
(name "cryfs")
- (version "0.11.0")
+ (version "0.11.2")
(source
(origin
(method url-fetch)
@@ -1469,7 +1469,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)
@@ -1485,7 +1485,7 @@ (define-public cryfs
"/cmake-utils/DependenciesFromLocalSystem.cmake"))
#:phases
(modify-phases %standard-phases
- (add-before 'configure 'fix-configure
+ (add-before 'configure 'fix-up
(lambda* (#:key tests? #:allow-other-keys)
;; Remove junk directory that breaks the build
(chdir "..") (delete-file-recursively ".circleci")
@@ -1496,7 +1496,14 @@ (define-public cryfs
(when tests?
(substitute* "CMakeLists.txt"
(("option.BUILD_TESTING .build test cases. OFF.")
- "option(BUILD_TESTING \"build test cases\" ON)")))))
+ "option(BUILD_TESTING \"build test cases\" ON)")))
+ ;; work around a missing import fixed upstream in boost 1.78
+ ;; See https://github.com/boostorg/process/issues/213
+ (substitute* (find-files "." "subprocess.cpp$")
+ (("#include <boost/process.hpp>.*" line)
+ (string-append
+ "#include <algorithm>\n"
+ line)))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
--
2.34.0
next prev parent reply other threads:[~2022-03-16 3:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 6:16 [bug#54337] [PATCHES 0/2] gnu: cryfs: Update to 0.11.2 Brendan Tildesley
2022-03-11 6:19 ` [bug#54337] [PATCH 1/2] gnu: Add boost-1.77/fixed Brendan Tildesley
2022-03-11 6:19 ` [bug#54337] [PATCH 2/2] gnu: cryfs: Update to 0.11.2 Brendan Tildesley
2022-03-11 22:03 ` [bug#54337] [PATCH 1/2] gnu: Add boost-1.77/fixed Maxime Devos
2022-03-14 9:35 ` [bug#54337] [PATCH v2 1/3] gnu: crypto++: Update to 8.6.0 'Brendan Tildesley
2022-03-14 9:35 ` [bug#54337] [PATCH v2 2/3] gnu: Add boost-for-cryfs 'Brendan Tildesley
2022-03-15 8:14 ` Ludovic Courtès
2022-03-15 13:07 ` Brendan Tildesley
2022-03-15 16:35 ` Maxime Devos
2022-03-16 3:03 ` Brendan Tildesley [this message]
2022-03-16 10:40 ` [bug#54337] [PATCH v3] gnu: Update crfys to 0.11.2 Ludovic Courtès
2022-03-14 9:35 ` [bug#54337] [PATCH v2 3/3] gnu: cryfs: Update " 'Brendan Tildesley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=855462635.430174.1647399811692@office.mailbox.org \
--to=mail@brendan.scot \
--cc=54337@debbugs.gnu.org \
--cc=ludo@gnu.org \
--cc=maximedevos@telenet.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.