From patchwork Sat Apr 6 00:47:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62757 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 9D1B227BBEA; Sat, 6 Apr 2024 01:49:30 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 BB80F27BBE2 for ; Sat, 6 Apr 2024 01:49:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsuEs-0000zZ-JG; Fri, 05 Apr 2024 20:48:58 -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 1rsuEr-0000z0-78 for guix-patches@gnu.org; Fri, 05 Apr 2024 20:48:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsuEq-0000Dx-Up for guix-patches@gnu.org; Fri, 05 Apr 2024 20:48:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rsuEw-0007c6-Ps for guix-patches@gnu.org; Fri, 05 Apr 2024 20:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70224] [PATCH 1/2] gnu: c-toxcore: Update to 0.2.19. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 00:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70224@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70224-submit@debbugs.gnu.org id=B70224.171236448428773 (code B ref 70224); Sat, 06 Apr 2024 00:49:02 +0000 Received: (at 70224) by debbugs.gnu.org; 6 Apr 2024 00:48:04 +0000 Received: from localhost ([127.0.0.1]:37786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsuDw-0007Sx-HJ for submit@debbugs.gnu.org; Fri, 05 Apr 2024 20:48:03 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsuDs-0007RJ-R9 for 70224@debbugs.gnu.org; Fri, 05 Apr 2024 20:47:58 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 6A6D6240028 for <70224@debbugs.gnu.org>; Sat, 6 Apr 2024 02:47:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712364464; bh=yl3yEFAZ0GCqCloSC6MzF+XtAgQkqsl6QjcetZZET6s=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=TIkLOAUHYJkfUvJ+mfnuaV8UnEWc7rh90PwXTD7ey1LDrPw6SWGbvE+H8QbCORnJX PDlsunm2nsVHrpXebXu2aM14/NcSITWo+kmO5sSlVK8YuGwdrLTn8WOze0mRZCk1Vq q62KzCupzramyh2EFuGrUzLalpBeraAI/o8yPq6+UsU5Jf68YdsCuTijndOMifGNYy eGt7AFgPA0avmeFcBfcchcZq+1KvejUasUB7hQgsrP48KQKDlb4gY2wr2x5oXDafDS Z3RerD8lDeMRrRl2EfISEV5NzUM6GV8D/Z3NceVnNpjcjnEh0vYuCMzQMSkKzkJ0cw d2AAwBJb5QpCw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4VBGsq1ZtHz9rwn; Sat, 6 Apr 2024 02:47:42 +0200 (CEST) From: Vinicius Monego Date: Sat, 6 Apr 2024 00:47:18 +0000 Message-Id: <1f80fc5b8d0b0f10e7bc9097a7ac55f14305e028.1712364159.git.monego@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/messaging.scm (c-toxcore): Update to 0.2.19. [source]: Fetch sources recursively. [arguments]<#:configure-flags>: Use G-Expressions. Pass "-DENABLE_STATIC=false". Change-Id: I42fc47b45e1afdbb2c60c80bc56e1b839923ec34 --- gnu/packages/messaging.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 03b7368ae0..0cd02ae348 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2020, 2021 Robert Karszniewicz ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021, 2023 Denis 'GNUtoo' Carikli -;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2021, 2024 Vinicius Monego ;;; Copyright © 2021 jgart ;;; Copyright © 2022 Aleksandr Vityazev ;;; Copyright © 2022 Ricardo Wurmus @@ -1666,20 +1666,24 @@ (define-public libtoxcore (define-public c-toxcore (package (name "c-toxcore") - (version "0.2.12") + (version "0.2.19") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/TokTok/c-toxcore") - (commit (string-append "v" version)))) + (commit (string-append "v" version)) + ;; XXX: c-toxcore now depends on a package called 'cmp', an + ;; implementation of MessagePack in C. Fetch the submodule + ;; for now, maybe package it later. + (recursive? #t))) (file-name (git-file-name name version)) (sha256 (base32 - "0a6sqpm00d2rn0nviqfz4gh9ck1wzci6rxgmqmcyryl5ca19ffvp")))) + "0wq6grc5lfjip39gm0ji1cw6b1sdv1zvimg1g40haqzhj51755za")))) (arguments - `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable - ; for now. + (list #:tests? #f ; figure out how to run the tests + #:configure-flags #~(list "-DENABLE_STATIC=false"))) (build-system cmake-build-system) (native-inputs (list pkg-config)) From patchwork Sat Apr 6 00:47:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62755 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 224E427BBE9; Sat, 6 Apr 2024 01:49:28 +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=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=ham 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 4CE3327BBEB for ; Sat, 6 Apr 2024 01:49:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsuEt-0000za-1d; Fri, 05 Apr 2024 20:48:59 -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 1rsuEr-0000zM-LZ for guix-patches@gnu.org; Fri, 05 Apr 2024 20:48:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsuEr-0000EN-DA for guix-patches@gnu.org; Fri, 05 Apr 2024 20:48:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rsuEx-0007cF-7Q for guix-patches@gnu.org; Fri, 05 Apr 2024 20:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70224] [PATCH 2/2] gnu: toxic: Update to 0.15.1. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 00:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70224@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70224-submit@debbugs.gnu.org id=B70224.171236448428782 (code B ref 70224); Sat, 06 Apr 2024 00:49:03 +0000 Received: (at 70224) by debbugs.gnu.org; 6 Apr 2024 00:48:04 +0000 Received: from localhost ([127.0.0.1]:37796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsuDz-0007U2-VM for submit@debbugs.gnu.org; Fri, 05 Apr 2024 20:48:04 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsuDw-0007Ry-FV for 70224@debbugs.gnu.org; Fri, 05 Apr 2024 20:48:01 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id A8E9B240101 for <70224@debbugs.gnu.org>; Sat, 6 Apr 2024 02:47:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712364468; bh=28AlsjMWR+I8JS+L87BEhxSMkI/Onaytp3cqPISrxOc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=kDavFY6T3XABSm64ojAGb9fNfy82qps5RpMFSNHo9M+c5u0g9K6NIyLorqqqpdb+f 0WWeN12bfkKQaC4+7AmGQqB09NLVHHyJFqt5VCApJEgn3oztJDw9FwcnFsEprAwqH1 nSWURipvwgWK/mhO1YPGNPLljC1fldhsPz4MAJbNFMZq2GR/RzLohhFYBjuemuqj9M 7YnQAkH+A2K02h4l6nd0j9Y5ewPUWaJCzkA8GwONIarQjgnQC70QBMXDwh7l8jhUAZ 15lLHIi7RpWQdKYYO55BfE7wd5sOb5Tj74D7T+AekSqifAl4QSOBM5FBkL2EzVY5bF vhRimM9/iK8nQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4VBGsv3W0Sz9rwn; Sat, 6 Apr 2024 02:47:47 +0200 (CEST) From: Vinicius Monego Date: Sat, 6 Apr 2024 00:47:19 +0000 Message-Id: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/messaging.scm (toxic): Update to 0.15.1. [arguments]: Use G-Expressions. <#:make-flags>: Use gexp variables and cc-for-target. <#:phases>: Remove trailing #t. Change-Id: If1d46888e26b16ffcbbca48dc2c88b921e30c433 --- gnu/packages/messaging.scm | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0cd02ae348..6278bec2ef 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2234,7 +2234,7 @@ (define-public libircclient (define-public toxic (package (name "toxic") - (version "0.8.4") + (version "0.15.1") (source (origin (method git-fetch) @@ -2242,29 +2242,25 @@ (define-public toxic (url "https://github.com/JFreegman/toxic") (commit (string-append "v" version)))) (sha256 - (base32 "0p1cmj1kyp506y5xm04mhlznhf5wcylvgsn6b307ms91vjqs3fg2")) + (base32 "1cbgw9my7nd8b215a3db2jc74nibi9kj0yk5q3c9dnh306as6wzs")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests - #:make-flags - (list - "CC=gcc" - (string-append "PREFIX=" - (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'enable-python-scripting - (lambda _ - ;; XXX: For compatibility with Python 3.8, adjust python3-config - ;; invokation to include --embed; see - ;; . - (substitute* "cfg/checks/python.mk" - (("python3-config --ldflags") - "python3-config --ldflags --embed")) - (setenv "ENABLE_PYTHON" "1") - #t))))) + (list #:tests? #f ; no tests + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'enable-python-scripting + (lambda _ + ;; XXX: For compatibility with Python 3.8, adjust + ;; python3-config invocation to include --embed; see + ;; . + (substitute* "cfg/checks/python.mk" + (("python3-config --ldflags") + "python3-config --ldflags --embed")) + (setenv "ENABLE_PYTHON" "1")))))) (inputs (list c-toxcore curl