From patchwork Fri Aug 18 18:12:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52992 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 DCAA327BBEA; Fri, 18 Aug 2023 19:18:47 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 57D6927BBE2 for ; Fri, 18 Aug 2023 19:18:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42t-0006iZ-15; Fri, 18 Aug 2023 14:18:03 -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 1qX42r-0006iO-QG for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:01 -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 1qX42r-0000JT-I9 for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42r-0003Ef-VT for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238263012264 (code B ref 65371); Fri, 18 Aug 2023 18:18:01 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:10 +0000 Received: from localhost ([127.0.0.1]:48708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX421-0003Bh-Hj for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:09 -0400 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]:44100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX41z-0003BQ-8P for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:08 -0400 Received: by mail-qt1-x82b.google.com with SMTP id d75a77b69052e-40fe9c38800so7891131cf.0 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382621; x=1692987421; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kJ/CMkfM/lF3ZVXfS9LvtIoP65NzzlARAorsAtDKXDo=; b=hXr023r9k5gML8pAWfVnCv/BXsw21i8Tty+uhCQda4BjI682QDqMnjIDAHdQLpqmWw krKPUgJ3k8owwYvcw7z4GHclXUP41Z6R6N92ZcZPABgqsPyyV27v1+VE+Bwr9JKQ5dM2 iaxuaQTLJj3xgOb3ai++rnbhDr5cWCKGX+bMxZSQslwtnTb657mtMtfCriE7jTyyWLBl NjXfkYJkIZ1JTcEaT6JshXAZi+wVTBy7u6uuzygVm1rhL2LSqFrATUAIZWSDKQC6hV9x Ll4o8nzIi/ScNIjRh4Tiz3FXYqCiqi6GWVibcAa0Fk2C8DS0408dpwntA/zzL7RdVs2x hNkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382621; x=1692987421; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kJ/CMkfM/lF3ZVXfS9LvtIoP65NzzlARAorsAtDKXDo=; b=hkX+9MzKSF+wYxqqqypXngEl8841DEvtf0iGtyNa2kYrTPt9vx41CSvOapGLO/eyEB ij3KaQRCdZqQxVI7pc8/5mjPBWvUIa7dGtdpRTobZx2dNTy1I0d2rzokKJ6q25zH3AHK yqufT64S6mE9khGkiYph6p24Pyx6cdzgX/TXiQAPf5vfFGN2sjL4D5/RzhC80FDRbOLL 2hVqfop2pznIV6p0vCBfG/HS48EyT7XuMPXc2kl5Z7cYwYNCUoJuyjKG2M9Kj2FpQ33/ +p0tEakv383Z+DvTFYzfvOkfnSkYcCcpJ9aa7AphlxWtWvBueCgaLooxdp+wP9NDjKm3 SxNg== X-Gm-Message-State: AOJu0YxLQqGOlxvfLKoVAACnlwFwUV28pGs3v+3IOxh61dzJ7w2EdnnC WIv0zOBljaI75rtO4+ROdhqSwa22DregkQ== X-Google-Smtp-Source: AGHT+IGAn7cVF3a7+zXckJOCceQ82PSXr5uv8eXr3OiK79KeNWUrFX0jPgkpSakZaRJGRGvWpV56Ng== X-Received: by 2002:a05:622a:151:b0:403:aabf:4efb with SMTP id v17-20020a05622a015100b00403aabf4efbmr4274095qtw.44.1692382620852; Fri, 18 Aug 2023 11:17:00 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.16.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:00 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:12:52 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 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/networking.scm (opendht): Update to 2.5.5. [arguments]: Add a new relax-test-timeouts phase. --- gnu/packages/networking.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) base-commit: 97b52b2d48b40ecbc711e30eb6f94af3fbc5bd6d diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 04461fec2d..55c938606f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3759,7 +3759,7 @@ (define-public restinio (define-public opendht (package (name "opendht") - (version "2.4.12") + (version "2.5.5") (source (origin (method git-fetch) (uri (git-reference @@ -3768,7 +3768,7 @@ (define-public opendht (file-name (git-file-name name version)) (sha256 (base32 - "0yji5pziqxfvyfizk3fn9j59bqlfdwfa1a0y9jjfknb2mmlwwb9w")))) + "0i2x0h38h52aynm89n6cjxk0z7nngc1w1zf71zaqx5n54fxxawir")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments @@ -3796,6 +3796,14 @@ (define-public opendht (substitute* "tests/Makefile.am" (("\\bdhtrunnertester\\.(h|cpp)\\b") "")))) + (add-after 'unupack 'relax-test-timeouts + (lambda _ + ;; At least the 'test_send_json' has been seen to fail + ;; non-deterministically, but it seems hard to reproducible that + ;; failure. + (substitute* "tests/httptester.cpp" + (("std::chrono::seconds\\(10)") + "std::chrono::seconds(30)")))) (add-after 'unpack 'fix-python-installation-prefix ;; Specify the installation prefix for the compiled Python module ;; that would otherwise attempt to installs itself to Python's own From patchwork Fri Aug 18 18:12:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52989 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 984D627BBE9; Fri, 18 Aug 2023 19:18:35 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 8605F27BBE2 for ; Fri, 18 Aug 2023 19:18:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42x-0006kw-Cs; Fri, 18 Aug 2023 14:18:07 -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 1qX42t-0006iy-Sr for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:03 -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 1qX42t-0000KE-Kk for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42s-0003Em-Da; Fri, 18 Aug 2023 14:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 02/10] gnu: mmtf-cpp: Update to 1.1.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238263312285 (code B ref 65371); Fri, 18 Aug 2023 18:18:02 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:13 +0000 Received: from localhost ([127.0.0.1]:48711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX424-0003C3-SG for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:13 -0400 Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]:58493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX421-0003BT-8r for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:09 -0400 Received: by mail-qt1-x836.google.com with SMTP id d75a77b69052e-40ffc70e740so7560981cf.0 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382623; x=1692987423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wOMZsjAx2zTG/0Qmcw29zhSdwaJwVituws4dM35MqO8=; b=ABRZQH/5w6FENldw849FVnbQ7GhVZaV7VWZvVYOC0p04JlnxnfUfnoZMbXoqLv+Lft clwQPzuL3VTUdmSoOAwHn3KtWIn58iyYlePjdKedV9UkhY23UjWoWvvcnDdKFpPAwMCT XrflK+/vcQIqtcXkEm8o/G9MFteepPdPfzbPxqAC3K62VHRRGzzh2ntIgQmaez6tmnE3 7UL8nPn3o7PuJcnRBMr/jvMdDy5h6euM8yD+6Dy5vj40kQ/DwiqUkupRMZ7W+paew7uR r1Vw+Fx0efdETv6k4r6gffY2j2oWRkbO39vsr7QHrvh2NqxvW07VBevcqelbBWmiP8PK IiuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382623; x=1692987423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wOMZsjAx2zTG/0Qmcw29zhSdwaJwVituws4dM35MqO8=; b=dTnFLpl1e2iq7ajI3gB0TDz5sVz49O1UB1wDMz29fHGj5Flewzfpd8cndsiTuQT6+G cNN93qtYbz0QnrYtiWkZTTv+kWkTJnFTAaJBMUxSrttuNHFLsqhzuVUktYU0BKGycnHT UJNVubFVA8Xo9QCYsw1eaZyVZ+rK8PROZBavaVDfo6CMWJqUAzZ0Z4ZM/+oJDJU3u5NP UGUZIrb7lCqEE981B/XHbzvE1YW4bINbk5CbF+5Fh2CxBFNvjDNz6zAHGEW4uJn5pSlr J/KB3LbPfWbceAOgY/BKWBzZ2Mpv0od8C8UnSwz6rGp6KNz3MtJzfaF0TlxXV7S/ZcZR 9tRA== X-Gm-Message-State: AOJu0Yw18g4wyncwaZ+GPMiyOQogSctGUEwIUnAW4Akp22YtYHJQC4IT x99PY/GDugLgF5XOIUEvFtPXzckusS3w2Q== X-Google-Smtp-Source: AGHT+IHzT8A6xNgg27CbA56ENAaa6oouTZ82Kv63QUoVcZLfTSUWuBC7qKIjBr3B6VrvhXZIUp59gQ== X-Received: by 2002:ac8:7084:0:b0:40f:efce:dcf with SMTP id y4-20020ac87084000000b0040fefce0dcfmr2701916qto.16.1692382622956; Fri, 18 Aug 2023 11:17:02 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:02 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:12:53 -0400 Message-ID: <4b6e08285ccfd4585fb51a52921e0e65133be244.1692382380.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 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/chemistry.scm (mmtf-cpp): Update to 1.1.0. [propagated-inputs]: Add msgpack-3. --- gnu/packages/chemistry.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 05aaa827f8..25b31c7192 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -248,7 +248,7 @@ (define-public libmsym (define-public mmtf-cpp (package (name "mmtf-cpp") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) @@ -258,11 +258,13 @@ (define-public mmtf-cpp (file-name (git-file-name name version)) (sha256 (base32 - "17ylramda69plf5w0v5hxbl4ggkdi5s15z55cv0pljl12yvyva8l")))) + "0rs2f1ppgqz663c3m22p8wsq6z839bj59zy29chci46ypfhwv6ph")))) (build-system cmake-build-system) ;; Tests require the soon-to-be-deprecated version 1 of the catch-framework. - (arguments - '(#:tests? #f)) + (arguments '(#:tests? #f)) + ;; There is no support for modern msgpack versions yet (see: + ;; https://github.com/rcsb/mmtf-cpp/issues/44). + (propagated-inputs (list msgpack-3)) ;included by mmtf/structure_data.hpp (home-page "https://mmtf.rcsb.org/") (synopsis "C++ API for the Macromolecular Transmission Format") (description "This package is a library for the From patchwork Fri Aug 18 18:12:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52985 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 F2CE927BBEA; Fri, 18 Aug 2023 19:18:10 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 8629427BBE9 for ; Fri, 18 Aug 2023 19:18:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42w-0006k5-3X; Fri, 18 Aug 2023 14:18: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 1qX42u-0006j6-8H for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -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 1qX42u-0000KZ-04 for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42s-0003Es-Pp; Fri, 18 Aug 2023 14:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 03/10] gnu: avogadrolibs: Remove msgpack from native-inputs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238263312291 (code B ref 65371); Fri, 18 Aug 2023 18:18:02 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:13 +0000 Received: from localhost ([127.0.0.1]:48713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX425-0003C6-6w for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:13 -0400 Received: from mail-ot1-x32c.google.com ([2607:f8b0:4864:20::32c]:48250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX423-0003BY-Hz for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:11 -0400 Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6bc886d1504so989038a34.0 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382625; x=1692987425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GB5mzrgqCd5wdBLWF7FxTto7C601nBGzGe/CCCZ36cs=; b=YoAXc303DRuAY0TrLlvIRLgc/xRKyi20ymKyv+uBFuRLvQ09jnjh6L+RWE5i0d02VS GmHxpunA0u86xvOjM9KACiw5+JozwwFs190hx834OOn84rt51CBEYFUg7NBWF0meD2SM PUJEGQ7A+iJVeNWhb90LtLvAvQdNPuMWnwZ+vhUhKivx2F4HWH+Q58QKfgaRKmqWFonL pi6CoAX4BNIpMqL4UJe+bFf8LPl6rxlI3Yr6E2gnT3G9dMIyTUqKgdvwCga3geaupmCa /JsO/ZHOyXRallyF7V4s16HByrjBApEjVxJctU0I1NUbnb5waznagKTarMdKpVhfEoSg Njdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382625; x=1692987425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GB5mzrgqCd5wdBLWF7FxTto7C601nBGzGe/CCCZ36cs=; b=M1CHUaJMFzvl2jEPwJ8lZR6hbqPX3f8G83BVQjYBiv/1sB2FVxmR2d28+6XIxE+3+w AuXahqEI7vpJwAhDvMhcF8YJSFQxhnV8Mn1uSXW04qJONBKGLH4TC2qHRAblWkjPRuAq 30v4wNHXYkJ/8ZkPigyRVzBIvZEu8gH+/gagzUo89/KSz9IT3d3FBnEWc3/Upj5d24tg V26XaKJcTTN4+DhNX4AyyRF/hxjh2iX9ZQAcC59csuiWUGG3HTnGOshWQ9apmzNXSqMP QU3H3rBl1F6p/Jvel1CUMp3SZz+lpwBnxPmZfZmq1tbN29W+naHgGCjEaHDgE+6IQs1H BT+Q== X-Gm-Message-State: AOJu0YxduNFvydGmJS48iDdambF1ZkZ1j9HEECCA16+rSw5q+icoQ9Xv c1GDAIVBVLpudcgdltpZ1IiWgVcY7sG6qQ== X-Google-Smtp-Source: AGHT+IEjCUmmCda+IT7m3sZmzJEPRE6PV44QbMhwNsy1eixepX2mgvQSTfaPszM6aEWsuxD/2m2EXA== X-Received: by 2002:a05:6830:4b0:b0:6bc:9c9b:e787 with SMTP id l16-20020a05683004b000b006bc9c9be787mr3738195otd.8.1692382625044; Fri, 18 Aug 2023 11:17:05 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:04 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:12:54 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 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 It's now propagated by mmtf-cpp. * gnu/packages/chemistry.scm (avogadrolibs) [native-inputs]: Remove msgpack. --- gnu/packages/chemistry.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 25b31c7192..4d5d3d0195 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -87,7 +87,6 @@ (define-public avogadrolibs (native-inputs (list eigen mmtf-cpp - msgpack googletest pkg-config pybind11)) From patchwork Fri Aug 18 18:12:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52986 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 A7BBE27BBF0; Fri, 18 Aug 2023 19:18:33 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 91B3627BBE2 for ; Fri, 18 Aug 2023 19:18:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42w-0006ku-Rf; Fri, 18 Aug 2023 14:18: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 1qX42v-0006k9-TE for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:06 -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 1qX42v-0000L6-LU for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42t-0003F1-7z; Fri, 18 Aug 2023 14:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 04/10] gnu: python-pymol: Remove msgpack from native-inputs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238264012323 (code B ref 65371); Fri, 18 Aug 2023 18:18:03 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:20 +0000 Received: from localhost ([127.0.0.1]:48718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42B-0003Cg-J1 for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:19 -0400 Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]:44290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX425-0003Bb-DG for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:13 -0400 Received: by mail-qt1-x833.google.com with SMTP id d75a77b69052e-40fcc91258fso7794241cf.1 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382627; x=1692987427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/poy55Lx4W2nKkWp5Fr0mTR/Bvy22D1NncYx0SEAOMo=; b=affcmHW+CPXxpOIXzD/GwDvnOBMmKIMJbwlJUZCpRBuvZNmJ/pUTEhpf9FnVVikZt4 QSckMUvmdL+sau98nm52I8hgLs1oefr3Gik0UxGDQzkvLqzo6kKj590m8rn+3/J2nOZ+ iwHxZ5dw7Dyslp5vAtziIeDtTc0W0KFIOVmAew3OVbxXaSJCJtTzRfLrOOtW59GHIHXN dU9MHk1pl1c2q0kTlLmSMVUewCwq3APHEEiuWAxcJY8Ew/0NASAow/7vEELQ3FJernW+ 6rQ7YssDfUvUMpTjWH9qZtYgNcslhuoB654yDLvRlaUqKhl23ya8cr4wguRWkt4Qatti fD+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382627; x=1692987427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/poy55Lx4W2nKkWp5Fr0mTR/Bvy22D1NncYx0SEAOMo=; b=Y4nZc3u+0vW1ocZ/vLXbC+luiikuuCB6qU6qxOwv7K0ibarprBuWBGR8pI3S5mzNVg n5fSMPF56Gm/x8KhsmRePmlCi3yCbz56i7BhOWRpyv37+Wuapu+7/FxwIVhAIfHAq194 BKs0P+vue3l6JXILP+r1I2x+rG/wjR7UY4FvU1aWsUZubUcbLYYpCVCtWFp7RbBroZ5T hGzOPbXqHdqCjsnJFBqAZXGoDJJNQNIyhQQgrlPxx7/ugzamVlqbj6azxYS96YLGU5/u rwkrgkDdHwFePRKQhRaNyGm97xIBUI6Qm7SIUGkdnR5hjOCjHQjVt6/ijgFn8KE9pLy1 JAcg== X-Gm-Message-State: AOJu0Yysp2jLAkbtHyqmgrUWcXf5/3zAViDN1g0m/p19jmrMvwwVSBBh gsXpFjHonvmf8HTWuxBePcFrI7a5ih49Ng== X-Google-Smtp-Source: AGHT+IHJKeJq24vCNGDzVv9oVpjnEGty1k7fpRHzIWfB4BVKMcs3nu3GjzCucsyCZ72I0laAJBwzJg== X-Received: by 2002:ac8:4e96:0:b0:40f:da8b:b975 with SMTP id 22-20020ac84e96000000b0040fda8bb975mr4546413qtp.37.1692382627122; Fri, 18 Aug 2023 11:17:07 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:06 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:12:55 -0400 Message-ID: <93e9d4888847e06bd06c98cb94d972496b26238f.1692382380.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 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 It's now propagated by mmtf-cpp. * gnu/packages/chemistry.scm (python-pymol) [native-inputs]: Remove msgpack. --- gnu/packages/chemistry.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 4d5d3d0195..df96a2f5c1 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -575,7 +575,6 @@ (define-public python-pymol glew libxml2 mmtf-cpp - msgpack python-pyqt glm netcdf)) From patchwork Fri Aug 18 18:12:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52994 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 4A1D427BBE9; Fri, 18 Aug 2023 19:18:56 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 810C627BBE2 for ; Fri, 18 Aug 2023 19:18:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42u-0006j5-8K; Fri, 18 Aug 2023 14:18:04 -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 1qX42t-0006id-Ek for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:03 -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 1qX42t-0000KM-6i for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42t-0003FB-JX for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 05/10] gnu: msgpack: Deprecate with msgpack-c. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238264112339 (code B ref 65371); Fri, 18 Aug 2023 18:18:03 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:21 +0000 Received: from localhost ([127.0.0.1]:48721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42C-0003Cn-3E for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:20 -0400 Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]:48567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX427-0003Bu-Dc for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:16 -0400 Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-76d77da274eso75373285a.1 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382629; x=1692987429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ia1BXZbJtHxHt/CZ5n2zjWaZHde8RDcV6m0Gh5IarRs=; b=bprrWlewsOZCU8MO+nhiObZmTHDQTdmiB5PO3u45h6uODMVfQtKkZtFDxqeWXgE96V Hq06CTta1xAfRHJyI7MYsK5qO+vvmJhLanLvNmSCae99U6w7u5KYUg9UI6jBzWa4yDEi SD8fti87XTen+WZk1xz+Z8h/dRc1bTFVapheZOr8dIheqpft6/D9/jZbhwDddqumQgam le8Rl/Io4P3AUuj7F8rfwgbaJsFlKyeIHi0xsufI/nwSTN3bRkjAZ4LK4hVLYkKq3n8F De9BhRCvtIVEfDbcOfTxPYP/Ta58CJI/Bc8AnFmDI5M/OodgBT/cXdNa2hUQ2Tv+U7hi LJXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382629; x=1692987429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ia1BXZbJtHxHt/CZ5n2zjWaZHde8RDcV6m0Gh5IarRs=; b=euW/Grg2Jc8dtLdJnyPgaF8sNkbxGuhcAgYhUzrth0oEay5OX1o+JQWyH2Pwdt2jHO sEfSxoLSamB39BA+wP1cdcbS+lCjr/oQoEjpMxfZMTlpauDVrbMPQDe7j+cYmvUYCcGu YdEXnS2rbPH4qrmg9ejliwSS6ArUNJ2gCvaXAt+f4fyz+JjsMY1ue5n34LuCJzQt03Jq WQGq4f6fZMmE+AZocvWIkxl0o11z39nKxy2vRQeaEjGDeJJPhxSYEOHptyCn6bJAx7MZ tJW9fdSVMusWT2Sm5EBJEHAHY+QWpB4TlokrVqoUlfNdde9JxgI1QHuuLPGBJufvhsKa +pVg== X-Gm-Message-State: AOJu0YzUHosR5GgEBMH6U9vfG7+iFJQtyOfSM0Da00UZ36ywc6IhOS38 nnCNMVg27icAbxmfUJPSZ7Z5KxmdqO8i8w== X-Google-Smtp-Source: AGHT+IE/isIaajlAzY5QxAi0LFXbupADkLhGUp3sVyhnXpc8ldGrUGfriHysMHwxdtkUGe3TH1bMxw== X-Received: by 2002:a05:622a:130f:b0:40a:6b19:654d with SMTP id v15-20020a05622a130f00b0040a6b19654dmr4348535qtk.67.1692382628962; Fri, 18 Aug 2023 11:17:08 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:08 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:12:56 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 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/serialization.scm (msgpack-c): New variable. (msgpack-cxx): New variable. (msgpack): Rename to... (msgpack-3): ... this, and inherit from msgpack-c. * gnu/packages/vim.scm (eovim) [inputs]: Replace msgpack with msgpack-3. * gnu/packages/terminals.scm (tmate): Likewise. * gnu/packages/networking.scm (opendht) [propagated-inputs]: Replace msgpack with msgpack-cxx. --- gnu/packages/networking.scm | 2 +- gnu/packages/serialization.scm | 71 +++++++++++++++++++++++++++------- gnu/packages/terminals.scm | 6 +-- gnu/packages/vim.scm | 6 +-- 4 files changed, 62 insertions(+), 23 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 55c938606f..a7cb4f876e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3847,7 +3847,7 @@ (define-public opendht fmt readline)) (propagated-inputs - (list msgpack ;included in several installed headers + (list msgpack-cxx ;included in several installed headers restinio ;included in opendht/http.h ;; The following are listed in the 'Requires.private' field of ;; opendht.pc: diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 9c114aaf39..9f2aab250e 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2023 Alexey Abramov ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 Vinicius Monego +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -222,8 +223,60 @@ (define-public cereal-1.3.0 (list doxygen gcc-10 (package-source cereal))))) +(define-public msgpack-c + (package + (name "msgpack-c") + (version "6.0.0") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://github.com/msgpack/msgpack-c/releases/download/" + "c-" version "/" name "-" version ".tar.gz")) + (sha256 + (base32 "1fmf08babfsjq5qkgw034wk2nw6mayxp1qlkm7h55p2jqvigam1n")) + (snippet + '(let ((p (open-file "msgpack-c.pc.in" "a"))) + (display "Requires: zlib\n" p) + (close-output-port p))))) + (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DMSGPACK_BUILD_TESTS=ON"))) + (native-inputs (list googletest)) + (propagated-inputs (list zlib)) ;zbuffer.h includes zlib.h + (home-page "https://www.msgpack.org") + (synopsis "Binary serialization library") + (description "Msgpack is a library for C that implements binary +serialization.") + (license license:boost1.0))) + +(define-public msgpack-cxx + (package + (inherit msgpack-c) + (name "msgpack-cxx") + (version "6.1.0") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://github.com/msgpack/msgpack-c/releases/download/" + "cpp-" version "/" name "-" version ".tar.gz")) + (sha256 + (base32 "1rrrf3nskcv994z3pbq6a5z2021piz118rccmm1y7zlf7klygv93")))) + (build-system cmake-build-system) + (propagated-inputs (list boost zlib)) ;included in headers + (description "Msgpack is a library for C++ that implements binary +serialization."))) + +;;; The msgpack package was split into msgpack-c and msgpack-cxx starting from +;;; version 4.0.0. (define-public msgpack + (deprecated-package "msgpack" msgpack-c)) + +(define-public msgpack-3 (package + (inherit msgpack-c) (name "msgpack") (version "3.3.0") (source @@ -237,23 +290,13 @@ (define-public msgpack '(let ((p (open-file "msgpack.pc.in" "a"))) (display (string-append "Requires: " "zlib" "\n") p) - (close-output-port p) - #t)) + (close-output-port p))) (sha256 (base32 "0yzhq50ijvwrfkr97knhvn54lj3f4hr3zy39yq8wpf6xll94s4bf")))) - (build-system cmake-build-system) - (native-inputs - (list googletest-1.8 pkg-config)) - (propagated-inputs - (list zlib)) ;; Msgpack installs two headers (zbuffer.h, - ;; zbuffer.hpp) which #include . However, 'guix gc --references' - ;; does not detect a store reference to zlib since these headers are not - ;; compiled. - (home-page "https://www.msgpack.org") - (synopsis "Binary serialization library") + (native-inputs (list googletest-1.8)) (description "Msgpack is a library for C/C++ that implements binary -serialization.") - (license license:boost1.0))) +serialization. This is the legacy version that predates the split into C and +C++ specific packages."))) (define-public libmpack (package diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 5fc72d7937..44641360ba 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1172,10 +1172,8 @@ (define-public tmate (base32 "0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi")))) (build-system gnu-build-system) - (inputs - (list libevent libssh msgpack ncurses)) - (native-inputs - (list autoconf automake pkg-config)) + (inputs (list libevent libssh msgpack-3 ncurses)) + (native-inputs (list autoconf automake pkg-config)) (home-page "https://tmate.io/") (synopsis "Terminal sharing application") (description "tmate is a terminal sharing application that allows you to diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d58b022123..16f73e355f 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -814,10 +814,8 @@ (define-public eovim (string-append start nvim)))))) (add-before 'build 'set-home (lambda _ (setenv "HOME" "/tmp")))))) - (native-inputs - (list pkg-config)) - (inputs - (list efl msgpack neovim)) + (native-inputs (list pkg-config)) + (inputs (list efl msgpack-3 neovim)) (home-page "https://github.com/jeanguyomarch/eovim/") (synopsis "EFL GUI for Neovim") (description "Graphical Neovim interface based on the @acronym{EFL, Enlightenment From patchwork Fri Aug 18 18:12:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52993 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 2D02427BBE2; Fri, 18 Aug 2023 19:18:54 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 25F9827BBE9 for ; Fri, 18 Aug 2023 19:18:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42z-0006m6-2k; Fri, 18 Aug 2023 14:18:09 -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 1qX42v-0006jp-7k for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:05 -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 1qX42u-0000Kt-Ve for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42u-0003FI-3S; Fri, 18 Aug 2023 14:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 06/10] gnu: Add sdbus-cpp. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238264112346 (code B ref 65371); Fri, 18 Aug 2023 18:18:04 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:21 +0000 Received: from localhost ([127.0.0.1]:48723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42C-0003Cy-Sb for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:21 -0400 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]:56469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX429-0003C2-Sr for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:18 -0400 Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-40ffbc3488eso7830941cf.0 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382631; x=1692987431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HJPH7Ram9yeMh7JqKQ+YPobXECYmATH2tFwZ7FzTY7U=; b=lqZZ8OfFLTI8kWZSMvrGrzS+s0pVtqSi/guo6S7187io1MHvJQoHogtKnls8Eqbtar mTnY2E5C50IcRIjt4rHLKBjIkpnwYDg1Ti1KmwQPH1jumg/3TGUo0We7KwQVCxGrZuSw liNAVPfn343WeaYap79wX04erCnhUZyo1xkFtOettuKzBq3xExPrhRT7wuZJF/czQMn6 gBr9kG/VhWJWVOkMFpbzQvqRDMyF9rXUZs2Lyjvnb0PBBpa3i8naEBl3sCbcw/m4R5f+ HitIn4O6oHmVTYw0/NVRgJJSBJT1zvp+TuK/bj+xCEpBdlt2CugUkUEPj9sGcIU/19iL A0RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382631; x=1692987431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HJPH7Ram9yeMh7JqKQ+YPobXECYmATH2tFwZ7FzTY7U=; b=f2R9GKykAkIDPRrZMxhJBmm0Xwp1h57w4sIjhvl0yiPRLtWDnwixjS8V5LsOCKhbiX y8lakkbeaBbPZxMA4Ov2uS5pGVvt509eE3wSsRwNDoay4nrjmpDhz/NodqO0zAvkXfsR 1lbG6BfbR4oajE32qdKGHcDNdEOEAybSiVWKJ/dv1/ey5VtSp3Bhh4Sc2bOqebRFIzDW 5hwGAoqoXA6Ri0zglI07ONi3ApwODGZyZOJ2FAESRvMjp49GJuf73kjUhT8DI6HAHS4F KrffXFbX8QQpq95PJSg+JKYGanX0ma4vrRkZO9+zyckqzPMX8kCBxwUOK/Bt6alDHm+B 06cw== X-Gm-Message-State: AOJu0YyEyeX/gvHWjDfEtzxVx5KHw+0ztRikfnktHjWXNvHyiT5TQO14 07VpC3YmDv0cAWlBjTgXyzmGR+E4+V/q0Q== X-Google-Smtp-Source: AGHT+IEqiPHbC8tsu+fOvo+h+1FL50TEnm4WpUj3HN9hhilGcNsr4L41ecxFk7NCeO+nJ4QpJkxHtw== X-Received: by 2002:ac8:5a8b:0:b0:40f:c5ac:8e1d with SMTP id c11-20020ac85a8b000000b0040fc5ac8e1dmr3579123qtc.55.1692382631394; Fri, 18 Aug 2023 11:17:11 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:10 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:12:57 -0400 Message-ID: <7cd1d20fbbb1cf9c620748e22bdfef7feb83ff72.1692382380.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 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/glib.scm (sdbus-cpp): New variable. * gnu/packages/patches/sdbus-c++-elogind.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 43 +++++++++++++ gnu/packages/patches/sdbus-c++-elogind.patch | 63 ++++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 gnu/packages/patches/sdbus-c++-elogind.patch diff --git a/gnu/local.mk b/gnu/local.mk index abe8964f4d..de669c1177 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1938,6 +1938,7 @@ dist_patch_DATA = \ %D%/packages/patches/scons-test-environment.patch \ %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/scsh-nonstring-search-path.patch \ + %D%/packages/patches/sdbus-c++-elogind.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seed-webkit.patch \ %D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a0b85b15d1..588133e93f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1290,6 +1290,49 @@ (define-public dbus-cxx (home-page "https://dbus-cxx.github.io/") (license license:gpl3))) +(define-public sdbus-c++ + ;; Use the latest commit, which includes unreleased fixes to the pkg-config + ;; file. + (let ((commit "3e84b254e9603935cb5fc180c4d2214d7024ccbb") + (revision "0")) + (package + (name "sdbus-c++") + (version (git-version "1.2.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Kistler-Group/sdbus-cpp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xrcp49almi3kwzmwcwv8sayqjxx8m55s5grxarw2hl9jmghwlc3")) + (patches (search-patches "sdbus-c++-elogind.patch")))) + (build-system cmake-build-system) + (arguments + (list + ;; Avoid the integration test, which requires a system bus. + #:test-target "sdbus-c++-unit-tests" + #:configure-flags #~(list "-DBUILD_CODE_GEN=ON" + "-DBUILD_TESTS=ON" + ;; Do not install tests. + "-DTESTS_INSTALL_PATH=/tmp" + "-DCMAKE_VERBOSE_MAKEFILE=ON") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-install-tests + (lambda _ + (substitute* "tests/CMakeLists.txt" + (("/etc/dbus-1/system.d") "/tmp"))))))) + (native-inputs (list googletest pkg-config)) + (inputs (list expat)) + (propagated-inputs (list elogind)) ;required by sdbus-c++.pc + (home-page "https://github.com/Kistler-Group/sdbus-cpp") + (synopsis "High-level C++ D-Bus library") + (description "@code{sdbus-c++} is a high-level C++ D-Bus library designed +to provide easy-to-use yet powerful API in modern C++. It adds another layer +of abstraction on top of @code{sd-bus}, the C D-Bus implementation by systemd.") + (license license:lgpl2.1+)))) + (define-public appstream-glib (package (name "appstream-glib") diff --git a/gnu/packages/patches/sdbus-c++-elogind.patch b/gnu/packages/patches/sdbus-c++-elogind.patch new file mode 100644 index 0000000000..d01838edbc --- /dev/null +++ b/gnu/packages/patches/sdbus-c++-elogind.patch @@ -0,0 +1,63 @@ +Submitted upstream: https://github.com/Kistler-Group/sdbus-cpp/pull/352 + +From 8423c44b6c24ebd59db06ad33704265aa81a1c7a Mon Sep 17 00:00:00 2001 +From: Sven Eden +Date: Thu, 17 Aug 2023 23:16:19 -0400 +Subject: [PATCH] build: Add support for elogind. + +* CMakeLists.txt: Fallback to elogind when libsystemd could not be +found. Set LIBSYSTEMD variable. +* pkgconfig/sdbus-c++.pc.in (Description): Parameterize with above +LIBSYSTEMD variable. + +Signed-off-by: Maxim Cournoyer +--- + CMakeLists.txt | 11 +++++++++++ + pkgconfig/sdbus-c++.pc.in | 2 +- + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 94f71c7..40c15f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,11 +12,22 @@ include(GNUInstallDirs) # Installation directories for `install` command and pkg + # PERFORMING CHECKS & PREPARING THE DEPENDENCIES + #------------------------------- + ++set(LIBSYSTEMD "libsystemd") ++ + option(BUILD_LIBSYSTEMD "Build libsystemd static library and incorporate it into libsdbus-c++" OFF) + + if(NOT BUILD_LIBSYSTEMD) + find_package(PkgConfig REQUIRED) + pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libsystemd>=236) ++ if(NOT TARGET PkgConfig::Systemd) ++ message(WARNING "libsystemd not found, checking for libelogind instead") ++ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libelogind>=236) ++ if(TARGET PkgConfig::Systemd) ++ set(LIBSYSTEMD "libelogind") ++ string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION}) ++ list(GET VERSION_LIST 0 Systemd_VERSION) ++ endif() ++ endif() + if(NOT TARGET PkgConfig::Systemd) + message(FATAL_ERROR "libsystemd of version at least 236 is required, but was not found " + "(if you have systemd in your OS, you may want to install package containing pkgconfig " +diff --git a/pkgconfig/sdbus-c++.pc.in b/pkgconfig/sdbus-c++.pc.in +index 6ad010a..0703476 100644 +--- a/pkgconfig/sdbus-c++.pc.in ++++ b/pkgconfig/sdbus-c++.pc.in +@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @PROJECT_NAME@ + Description: C++ library on top of sd-bus, a systemd D-Bus library +-Requires@PKGCONFIG_REQS@: libsystemd ++Requires@PKGCONFIG_REQS@: @LIBSYSTEMD@ + Version: @SDBUSCPP_VERSION@ + Libs: -L${libdir} -l@PROJECT_NAME@ + Cflags: -I${includedir} + +base-commit: 3e84b254e9603935cb5fc180c4d2214d7024ccbb +-- +2.41.0 + From patchwork Fri Aug 18 18:12:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52987 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 C639527BBF0; Fri, 18 Aug 2023 19:18:34 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 DCEAB27BBEC for ; Fri, 18 Aug 2023 19:18:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42w-0006kd-Kb; Fri, 18 Aug 2023 14:18: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 1qX42u-0006j7-8u for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -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 1qX42u-0000Ka-0n for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42u-0003FQ-H3 for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 07/10] gnu: libnatpmp: Use gexps and simplify. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238264712369 (code B ref 65371); Fri, 18 Aug 2023 18:18:04 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:27 +0000 Received: from localhost ([127.0.0.1]:48728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42I-0003DQ-Kh for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:27 -0400 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]:59468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42B-0003CO-NE for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:20 -0400 Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-40ffb4476d8so7460741cf.2 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382633; x=1692987433; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SqdqIowMOwC6pyiYpp0NmYkeml3RDZM0iW+oYVIjYDc=; b=ZwzhQ/hkjlX1wx6T+qLTSXAkFdNSFTxML8REJULHWFdeALIiU/Nt94ia96nenKKUF9 KaHsvqOHF8EXnCD2VKhsM+yXkkkUxtbNq8Tn28i2NFKU5aiPcS0EyRIpu9wGNPQpTJb/ FZIJ7QRSYKViD62CatdXBiPqPbGhzq7B6l6GRalAq+KS0wmSxina1j53wQkNRm0/SEox /HgS/OcdVUd+pPUEEeNyI2Cml+NF2ozAsaabbfX1qdjccWNwUrHEZduWg8W7xVwSWuQl vTtCgC67DzBbFNx4lP57BA+EYMjgFxBcGL2bNXAn7uYBbyeQ0lt4lZgImdUTIE+TEn4T mGWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382633; x=1692987433; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SqdqIowMOwC6pyiYpp0NmYkeml3RDZM0iW+oYVIjYDc=; b=H6mkBojNcn+pg/zZJDdpOsgabAw1udCusWDInmGtzLdcvjeCHyb9A3q3oKhchO3oqw CLQshnGKMevGdqDmGv27NAUjuzsx9CnjEtZ8UCDD4iDL6B5H3hPhZJjI3Urqat0m5z2/ Z37mGmaTmC7z0NUHsb0cTBW0CpzfakKDr7eooW/sqxKuwuWPrcjS9QG9fYxvYLLQM9Uy GShQb2ucpzB7GUyWnyMsUHZxrTMJBSwtsFb/HxiigkuleX83Pm1V33M8XnLHy0Lgwxpq Y5uRo4xdmdfaASYIKNqAiOmstLROeEhZ1x/8gi8U2TrvXN3y6PLVNh+jQ31Uobc0DS6K YrYA== X-Gm-Message-State: AOJu0YxT3fdh5W3H7rfVYrTciLJvIc3XXYIBEree6xOPJdBxmGDgQxgd lAu6HFeLM/AAXomVaqdiUIuGWV7kqlO/Ng== X-Google-Smtp-Source: AGHT+IE7vKWTNn/3l559ndO7/VDvCI/udP+Q9Xi67sEdeptAPGIACmziQmXHS0uaXf7mCDNNtB/7OA== X-Received: by 2002:a05:622a:2d1:b0:405:5a1b:2767 with SMTP id a17-20020a05622a02d100b004055a1b2767mr3989588qtx.6.1692382633547; Fri, 18 Aug 2023 11:17:13 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:13 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:12:58 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 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/networking.scm (libnatpmp) [arguments]: Use gexps. Use gexp variables and cc-for-target in make flags. --- gnu/packages/networking.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a7cb4f876e..1b2e26c3f6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1435,19 +1435,13 @@ (define-public libnatpmp "0w7wvf4yi8qv659dg9d3ndqvh3bqhgm21gd135spwhq6hhnfv106")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check)) ; no tests - #:make-flags - (let* ((target ,(%current-target-system)) - (gcc (if target - (string-append target "-gcc") - "gcc"))) - (list - (string-append "CC=" gcc) - (string-append "INSTALLPREFIX=" (assoc-ref %outputs "out")) - (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))))) + (list #:phases #~(modify-phases %standard-phases + (delete 'configure) + (delete 'check)) ; no tests + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "INSTALLPREFIX=" #$output) + (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")))) (home-page "http://miniupnp.free.fr/libnatpmp.html") (synopsis "C library implementing NAT-PMP") (description From patchwork Fri Aug 18 18:12:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52988 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 156CE27BBEC; Fri, 18 Aug 2023 19:18:35 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 CD96727BBE9 for ; Fri, 18 Aug 2023 19:18:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42y-0006lm-L5; Fri, 18 Aug 2023 14:18:08 -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 1qX42u-0006jW-Mb for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -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 1qX42u-0000Kn-E7 for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42u-0003FZ-Um for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 08/10] gnu: libnatpmp: Update home page. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238264712378 (code B ref 65371); Fri, 18 Aug 2023 18:18:04 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:27 +0000 Received: from localhost ([127.0.0.1]:48730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42J-0003DS-3r for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:27 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:51664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42E-0003CW-14 for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:22 -0400 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-76d8f2be749so46912385a.3 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382636; x=1692987436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6LGY5enqjux+V1sq1JiuYp+ODYpHRP35rUqGMxSe0Rw=; b=CS3zy0b6I6yU9gDQWOk3ZYWUK5O8ptDgZIM+uG4z9KPyVSJXFOvPaxv4EqMvZvn6r0 eCnahdHo0tW+bbluheI8WwrqqHCJO2a4eafMfKGfv+v09QLfYRdPG7x9gBXkpRO7KETw dqw1PuVElvPcYcVYfRoSmPt8E/IL0zZFDx+uRAyrCXh7BkNEzSVfOGI+TFhePZnFjbHY ZV2YQNQlvbNv4Xq6x5dPqzzbxWeYEgj/KqciHQ3hJLJxN12DarNqDx1oWLeVNU0tgpct K1kptZvbnCUhNS0lmTMQ38BfcF+LGCybcyArCAxwWhr4EH504oewhyHXNfoMwE5YPIjB ghjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382636; x=1692987436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6LGY5enqjux+V1sq1JiuYp+ODYpHRP35rUqGMxSe0Rw=; b=c2Nw6UNUXHlu/1dTrUjkThDoCH79NRNmuqloZCr2oPbmayq5qb9/5h8HQLYoj8txjd ys04GqX5/QRaSU86eZgu3US3eefMxwo6NDry6AxsNtLVaibykRMUMded1PkFLqT4zCij UNUgxnOVf9OVp50b4KsF4Ym7XU9KTGwDpQ78SmSaQ/rhyc9Os/OgB8gYLIjPr5NJ7Zwv 467D5pOyDFeqd1bXMgGeEFCSKziClfeWPAmV5dbuu2A5J4gxp5NRJLxwQuWtabjknU7I Nz8TrBaZkAH8arsnI2HwGvVAAeH/MHgYxbf2JnLPtYluupmzc/Zmv/MKR6huZuXSI5dw uUog== X-Gm-Message-State: AOJu0YxT2pWswGIyXhC45RCWXaWBdbtowiWftxbmVlnIi2o/hna1iee9 SaJTefOhA6jJZgj9x+5LCMzwAQl5A+KP4A== X-Google-Smtp-Source: AGHT+IEUurKcNMT39HnBWGAidZVFiPdZ8YmOOxQXqKVEUTj+e3Lw0sElVwr/FDUQ+l1NKttx7+AS5A== X-Received: by 2002:a05:622a:1804:b0:406:9531:f894 with SMTP id t4-20020a05622a180400b004069531f894mr4360888qtc.54.1692382635814; Fri, 18 Aug 2023 11:17:15 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:15 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:12:59 -0400 Message-ID: <77f26927ad3c38e745cb7d765ea1105c7ba7752e.1692382380.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 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/networking.scm (libnatpmp) [home-page]: Update. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1b2e26c3f6..b00306971c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1442,7 +1442,7 @@ (define-public libnatpmp #~(list (string-append "CC=" #$(cc-for-target)) (string-append "INSTALLPREFIX=" #$output) (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")))) - (home-page "http://miniupnp.free.fr/libnatpmp.html") + (home-page "https://miniupnp.tuxfamily.org/libnatpmp.html") (synopsis "C library implementing NAT-PMP") (description "@code{libnatpmp} is a portable and asynchronous implementation of From patchwork Fri Aug 18 18:13:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52990 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 D05D227BBE2; Fri, 18 Aug 2023 19:18:36 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 C241927BBEA for ; Fri, 18 Aug 2023 19:18:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX431-0006nJ-9V; Fri, 18 Aug 2023 14:18:11 -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 1qX42v-0006jo-7k for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:05 -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 1qX42u-0000Ku-Vh for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42v-0003Fj-Eo for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 09/10] gnu: libnatpmp: Install missing natpmp_declspec.h header. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238264812384 (code B ref 65371); Fri, 18 Aug 2023 18:18:05 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:28 +0000 Received: from localhost ([127.0.0.1]:48732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42J-0003Dc-Ii for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:27 -0400 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]:61481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42F-0003Cb-Vk for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:24 -0400 Received: by mail-qt1-x831.google.com with SMTP id d75a77b69052e-40fd2de0ddcso7652531cf.2 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382637; x=1692987437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P9yO11Nc0KwcMartWZ8nWCkrEKAMpkjPdLs71wQPhrs=; b=BKznlwm3CH3BbjBkE+P6I08py54jsTexXN37emSRSFwxOmcOBgIIaDEqRgcEQ31QZP yjx7vZ3XU55RDTwN3pVussZjziD2wJkErmaU0EbwDoOCBvINdIJKTHldqWkBW7QrPzXj iICpy/AMrfDTdb+Ls94uCiLtVzMglN0iklSslg8yWjPxfWqtAyUR2MYZugcTKRQol1MG cQBh9/k5rRX9lW7s4yuepVDshuErRsG9BWGoZNasZkd65974B3ceRS9svY9IfBl9pbUy xx9d1nz9mtjAWiNVaIR9Uw1TLIvinJePFFMqHoh5F9sJaoOHmpkgG0OkztdZeKpdu9yQ +QvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382637; x=1692987437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P9yO11Nc0KwcMartWZ8nWCkrEKAMpkjPdLs71wQPhrs=; b=Kk3OkRWl6cy3WvbCCnWC+IcgN15U8u02iWZUok2RY5/59Vk8PBHBfgFkKYs3WGbUl5 xyUfXCnfRm0oeYUS3oPkKnyp0BpmnZ43mJlqvuD5CrEVXIBlxYtyWd8G2NdLto4nV/HE 24OaDV11+0rfCQpHX1C86p+LIRfpyTzTCo6QXNYFXT6lfKLSE3gnfCfPRg6MS1un/aAa /VoMTwLuy8Ks/piLcw5mGNReMUJbOLEF/5P8x6DOJ2T3VcNJiHOaJvLFPMdpcf0FifWW kJakep8pO7hrB8u2Ll7XVx7xTJ3Gtnr2EMmUCAsycwVo0Sako/9MTpzOyOU+NF4MGpsc 4qhg== X-Gm-Message-State: AOJu0Yz364X5yBW0ZTQruYmzoce+3vSIwrF08kqw8oWnZOn+z+OqOQgd uqFkfxYSQsDJFychdS1r1z+HU44qVH/+aA== X-Google-Smtp-Source: AGHT+IHQorqtSoO+D1C7uZjOkHGFuymmHIm86Tzn/ySyNZGMJ4201zU3c+CIV6XOWsJoc38Ugw1ZgQ== X-Received: by 2002:a05:622a:44f:b0:3fd:ecdc:1e0f with SMTP id o15-20020a05622a044f00b003fdecdc1e0fmr4247481qtx.17.1692382637665; Fri, 18 Aug 2023 11:17:17 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:17 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:13:00 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 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/networking.scm (libnatpmp) [arguments]: Specify the "HEADERS=natpmp.h natpmp_declspec.h" make flag. --- gnu/packages/networking.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b00306971c..faeaefba0c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1440,6 +1440,11 @@ (define-public libnatpmp (delete 'check)) ; no tests #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + ;; Explicitly specify the headers, otherwise only natpmp.h + ;; would be installed, referring to the missing + ;; natpmp_declspec.h (see: + ;; https://github.com/miniupnp/libnatpmp/issues/41). + (string-append "HEADERS=natpmp.h natpmp_declspec.h") (string-append "INSTALLPREFIX=" #$output) (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")))) (home-page "https://miniupnp.tuxfamily.org/libnatpmp.html") From patchwork Fri Aug 18 18:13:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52991 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 57F0427BBE9; Fri, 18 Aug 2023 19:18:44 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 5C8C427BBE2 for ; Fri, 18 Aug 2023 19:18:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42y-0006lR-2c; Fri, 18 Aug 2023 14:18:08 -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 1qX42v-0006k8-Rc for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:06 -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 1qX42v-0000L5-Jc for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42w-0003Ft-2b; Fri, 18 Aug 2023 14:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 10/10] gnu: jami: Update to 20230619.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238265412403 (code B ref 65371); Fri, 18 Aug 2023 18:18:06 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:34 +0000 Received: from localhost ([127.0.0.1]:48734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42P-0003Dy-Ub for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:34 -0400 Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]:62485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42I-0003D4-Ff for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:28 -0400 Received: by mail-qt1-x836.google.com with SMTP id d75a77b69052e-4085ee5b1e6so10994011cf.0 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382640; x=1692987440; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VdZY7SzxVZB3AmmT9UDSVM1uI4CoOp4LWwHdM9hr9n4=; b=Q4y9MaisomXYKWqO1Vybxo5boVHq4WDdCcn68m2NLq69r0f3sAQheCdc3nGfnh5NLu Y1QIrH0HyvaxpkzuOP+uiv3KXnhj4mTvk5OTa207/Oc3Z6JXsCQjG99PK6DQm5IciRc2 SUKfHxH+2dnJu2SfYAG8/8Nc74X/hnYxakIZpvkQznO3If45n4pEp5o+tR6TRK2yS0CJ iXECgu6RBXj0ya1r5H8oLwyj+mPhOZwYwqTUp8wPEQADyL1oePy+HN8j4gsv3vtJ2bRk bDMZEZE+skVzVepdGyCCiqrGeF7Jj0KdUu6HARdjonHiQm0NaesKQ3tWYG4tqv+VfW0m ZI3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382640; x=1692987440; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VdZY7SzxVZB3AmmT9UDSVM1uI4CoOp4LWwHdM9hr9n4=; b=V+/kRfU4SE5ruaDr0PzOx0Hp2mH33ct0Y1jQGdC865GxvzZuaQZu6+ODbFax+81T6C 9fgjccRj4jELyLqxC7LGOKitAZJeacz81AyzObSGWvIugUlzzkTvuoCXKZXUbYo8Xfcq h61u2eWhfdWsP7BfjDZmKnWDp83+B8XUHsUJGu50DEWInrU5MLA8CBmYM94kg4hLsFUj U0rdnnAJ35H31YsEl+6DWB8vB4hphiER0tF4dOBejqRrxMmgs4XCUuKusV0XcRD++oMZ YXjUOWDZF9xVczo2D5GJppgYrx9lGk+U4yzKvzYPdwkOR5ZCyqHV9cJ3aEh08ijc8PyD Rw+g== X-Gm-Message-State: AOJu0Yy8qlCOhDiNjjSJy25Yw8Z7DYtyHkr5MWkdHuDZf1MP2ivl+jjY OTkuyX0w3c+9NZYl4es5hyLzGiBzn5Mw1A== X-Google-Smtp-Source: AGHT+IH0eP4njNhQyV4JD1nw9nkmsGS1C+PGR76fYCaI5DP1YtBHzWttLuU0q1KlOy+VBJ1RvMwkmQ== X-Received: by 2002:ac8:5781:0:b0:405:466e:a63b with SMTP id v1-20020ac85781000000b00405466ea63bmr4627653qta.9.1692382640187; Fri, 18 Aug 2023 11:17:20 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:19 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:13:01 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 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 (%jami-version): Update to 20230619.1. * gnu/packages/jami.scm (%jami-sources): Update hash. Apply jami-qml-tests-discovery.patch patch. (libjami) [inputs]: Replace dbus-c++ with sdbus-c++. (jami) [arguments]: Delete obsolete change-directory/maybe phase. Adjust check phase. * gnu/packages/patches/jami-qml-tests-discovery.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/jami.scm | 34 ++++++------------- .../patches/jami-qml-tests-discovery.patch | 15 ++++++++ 3 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 gnu/packages/patches/jami-qml-tests-discovery.patch diff --git a/gnu/local.mk b/gnu/local.mk index de669c1177..ac6ccc2ab2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1412,6 +1412,7 @@ dist_patch_DATA = \ %D%/packages/patches/isync-openssl3-fix.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \ %D%/packages/patches/jami-disable-integration-tests.patch \ + %D%/packages/patches/jami-qml-tests-discovery.patch \ %D%/packages/patches/jami-libjami-headers-search.patch \ %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \ %D%/packages/patches/jamvm-1.5.1-armv7-support.patch \ diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index db120f223e..07c25a0601 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -68,7 +68,7 @@ (define-module (gnu packages jami) #:use-module (guix packages) #:use-module (guix utils)) -(define %jami-version "20230323.0") +(define %jami-version "20230619.1") (define %jami-sources ;; Return an origin object of the tarball release sources archive of the @@ -85,9 +85,10 @@ (define %jami-sources '(delete-file-recursively "daemon/contrib/tarballs")) (sha256 (base32 - "0vjsjr37cb87j9hqbmipyxn4877k1wn3l0vzca3l3ldgknglz7v2")) + "0qb8jvgsqak1hbhkksxj2cxkcy6mb46zl904lwhxfgr5992pl33z")) (patches (search-patches "jami-disable-integration-tests.patch" - "jami-libjami-headers-search.patch")))) + "jami-libjami-headers-search.patch" + "jami-qml-tests-discovery.patch")))) ;; Jami maintains a set of patches for some key dependencies (currently ;; pjproject and ffmpeg) of Jami that haven't yet been integrated upstream. @@ -409,7 +410,6 @@ (define-public libjami (inputs (list alsa-lib asio - dbus-c++ eudev ffmpeg-jami guile-3.0 @@ -424,6 +424,7 @@ (define-public libjami openssl pjproject-jami pulseaudio + sdbus-c++ speex speexdsp webrtc-audio-processing @@ -467,11 +468,7 @@ (define-public jami "-DENABLE_LIBWRAP=ON") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'change-directory/maybe - (lambda _ - ;; Allow building from the tarball or a git checkout. - (false-if-exception (chdir "client-qt")))) - (add-after 'change-directory/maybe 'fix-version-string + (add-after 'unpack 'fix-version-string (lambda _ (substitute* "src/app/version.h" (("VERSION_STRING") @@ -488,22 +485,13 @@ (define-public jami ;; The tests require a writable HOME. (setenv "HOME" "/tmp") - (display "Running unittests...\n") - (invoke "tests/unittests" "-mutejamid") + (display "Running unit tests...\n") + (invoke "tests/unit_tests") - ;; XXX: There are currently multiple failures with the - ;; functional tests (see: - ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/883), - ;; so the code below is disabled for now. - ;; + ;; XXX: The QML test suite fails, exiting with status code 1 (see: + ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/883). ;; (display "Running functional tests...\n") - ;; ;; This is to allow building from the source tarball or - ;; ;; directly from the git repository. - ;; (let ((tests-qml (if (file-exists? "../client-qt/tests") - ;; "../client-qt/tests/qml" - ;; "../tests/qml"))) - ;; (invoke "tests/qml_tests" "-mutejamid" - ;; "-input" tests-qml)) + ;; (invoke "tests/qml_tests") )))))) (native-inputs (list googletest diff --git a/gnu/packages/patches/jami-qml-tests-discovery.patch b/gnu/packages/patches/jami-qml-tests-discovery.patch new file mode 100644 index 0000000000..11fd69571c --- /dev/null +++ b/gnu/packages/patches/jami-qml-tests-discovery.patch @@ -0,0 +1,15 @@ +Upstream status: https://review.jami.net/c/jami-client-qt/+/25640 + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index d50908cf..587c9d15 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -73,6 +73,8 @@ endif() + + string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE) + ++set(QUICK_TEST_SOURCE_DIR "${CMAKE_SOURCE_DIR}tests/qml/src") ++ + set(QML_TESTS_SOURCE_FILES + ${CMAKE_SOURCE_DIR}/tests/qml/main.cpp + ${TEST_QML_RESOURCES}