From patchwork Mon May 8 07:11:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 49872 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 1940D27BBEA; Mon, 8 May 2023 08:12:17 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 64E1C27BBE9 for ; Mon, 8 May 2023 08:12:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvv2U-0007aW-Bd; Mon, 08 May 2023 03:12:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvv2S-0007aL-1k for guix-patches@gnu.org; Mon, 08 May 2023 03:12:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pvv2R-0002TS-Cc for guix-patches@gnu.org; Mon, 08 May 2023 03:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvv2Q-0007r8-OB for guix-patches@gnu.org; Mon, 08 May 2023 03:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63356] [PATCH] gnu: ftxui: Update to 4.0.0. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 May 2023 07:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63356 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63356@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168352988130147 (code B ref -1); Mon, 08 May 2023 07:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 May 2023 07:11:21 +0000 Received: from localhost ([127.0.0.1]:38995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvv1k-0007qA-Ju for submit@debbugs.gnu.org; Mon, 08 May 2023 03:11:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:53004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvv1j-0007q3-2x for submit@debbugs.gnu.org; Mon, 08 May 2023 03:11:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvv1g-0007Va-GH for guix-patches@gnu.org; Mon, 08 May 2023 03:11:17 -0400 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pvv1e-00022L-1o for guix-patches@gnu.org; Mon, 08 May 2023 03:11:16 -0400 Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2ac806f4fccso47123521fa.1 for ; Mon, 08 May 2023 00:11:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683529871; x=1686121871; h=mime-version:message-id:date:user-agent:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=OHaes509I4nlM4s6Hm8xsnSEGGRPW0wbsictP1FeI34=; b=rPcA6QbIvWMUdyDs7CzegFalNmauNECxcFSOTsdJGLko4Epczc6fOwSMy2CfTC3ult Veqt/SMlAZRVZHVPKN7kuD2WAuVOUzlWE8SLTffLy076HOlSSsu0lIPbCpfQkojjIZW7 eqvZdyhz67gFSETe+6tWvqsX2y1WP+VIDQ92Owc/KZwKs/bjnPifo6adGy1yj5PWlUnV jvFzuVxvBq/TDnM59r8dDLuPNPIKijDX/jAGWaN0VS8SU8uSexYR9DO5WpWyYDp4YIUy LQor7V2WlEVVW+kgauQxnm83+7IbNuhSGeqV6HMc/565U/dQvs498HPiOSaYO2Jk2zm7 jKXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683529871; x=1686121871; h=mime-version:message-id:date:user-agent:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OHaes509I4nlM4s6Hm8xsnSEGGRPW0wbsictP1FeI34=; b=fVArjRjxpSmD2Tr9k57dCeJje1aosr6yRALGcIi4k8H2KQr2gY/h9VnnpW3f4gansF URhhqf88oPmoUW0JyJWIbTsrAp7LsNya4+tFIKoicZVnEaGIYX6nIkkF1agRtGDVglv9 5piy0lnYrsJ6203ZMN6H+sj2kaEn4FfCPbi/D7i1rPOhRzubgBCxgijUDO1IaxQWN1Dt qG37EAQx2VO6lN1dX2V8A9lcJ8bA8iG0gadt3EVytvRxL8II8Z+UaUgAf9ROzy+EVKNB 9UDSxIRTRIV7S9XSr0mrFu6G14ltT/KhYg3pxHabrIxjCv71FtTy+Q4eE4DFq8B/kpC0 OWYA== X-Gm-Message-State: AC+VfDzGa+DxOP8n2gMCBlTsSrndAZX9Yx6qWLmHGoRQKoWNmoDzIGLQ TPZXsX2KmiiScTSux+YFCemZpthhPtk= X-Google-Smtp-Source: ACHHUZ4fEHlHtJb/uCxeDdJUJJLbr0ErS24A8tk0vq5psvxPsJoAMEP+dAU0qx87t8OrcIuja/EsyA== X-Received: by 2002:a2e:9159:0:b0:2ab:6e23:ef71 with SMTP id q25-20020a2e9159000000b002ab6e23ef71mr2745096ljg.37.1683529871479; Mon, 08 May 2023 00:11:11 -0700 (PDT) Received: from elephant ([95.79.66.161]) by smtp.gmail.com with ESMTPSA id d4-20020a2e9284000000b002a8c409f1f5sm1076275ljh.110.2023.05.08.00.11.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 00:11:10 -0700 (PDT) From: "Artyom V. Poptsov" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) Date: Mon, 08 May 2023 10:11:10 +0300 Message-ID: <87a5yf47sh.fsf@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::236; envelope-from=poptsov.artyom@gmail.com; helo=mail-lj1-x236.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello, this patch updates FTXUI[1] to 4.0.0 and fixes its build. - avp References: 1. https://github.com/ArthurSonzogni/FTXUI From 492897d7e9a266fecafa31da2342e63b604364e6 Mon Sep 17 00:00:00 2001 Message-Id: <492897d7e9a266fecafa31da2342e63b604364e6.1683529548.git.poptsov.artyom@gmail.com> From: "Artyom V. Poptsov" Date: Mon, 8 May 2023 10:05:31 +0300 Subject: [PATCH] gnu: ftxui: Update to 4.0.0. * gnu/packages/cpp.scm (ftxui): Update to 4.0.0. [native-inputs]: Add benchmark. [arguments]: Remove phase modifiers. --- gnu/packages/cpp.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 023d1c0337..242ea088bb 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -67,6 +67,7 @@ (define-module (gnu packages cpp) #:use-module (gnu packages) #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) + #:use-module (gnu packages benchmark) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages c) @@ -2433,7 +2434,7 @@ (define-public wdl (define-public ftxui (package (name "ftxui") - (version "3.0.0") + (version "4.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -2441,27 +2442,14 @@ (define-public ftxui (commit (string-append "v" version)))) (sha256 (base32 - "10a4yw2h29kixxyhll6cvrwyscsvz9asxry857a9l8nqvbhs946s")) + "01h59ln8amsj6ymxmsxhmslld2yp003n82fg3mphgkrh6lf22h6y")) (file-name (git-file-name name version)))) (build-system cmake-build-system) - (native-inputs (list googletest)) + (native-inputs (list googletest benchmark)) (arguments (list #:configure-flags #~(list "-DFTXUI_BUILD_TESTS:BOOL=ON" - "-DFTXUI_BUILD_TESTS_FUZZER:BOOL=OFF") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-cmake-tests - (lambda _ - (substitute* "cmake/ftxui_test.cmake" - (("NOT googletest_POPULATED") - "FALSE")) - ;; Disable benchmarks for a while as they require bundled Google - ;; benchmark and when the 'googlebenchmark' is unbundled, there's - ;; a CMake configuration error. - (substitute* "cmake/ftxui_benchmark.cmake" - (("NOT WIN32") - "FALSE")))) ))) + "-DFTXUI_BUILD_TESTS_FUZZER:BOOL=OFF"))) (home-page "https://github.com/ArthurSonzogni/FTXUI") (synopsis "C++ Functional Terminal User Interface") (description base-commit: b7e77446261fdc8dab360d7835a5dec919f6a79f -- 2.34.1