From patchwork Sun Jun 15 20:26:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43088 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 AB9B527BC4A; Sun, 15 Jun 2025 21:27: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 0F21D27BC49 for ; Sun, 15 Jun 2025 21:27:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQtwj-0005zI-DE; Sun, 15 Jun 2025 16:27:17 -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 1uQtwV-0005wr-2I for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27: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 1uQtwU-0002nY-QI for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=HkkfuQRBexlxqzERFA4E03gkqu8Bi5WbdYfiusezuBI=; b=BQQVijL9mwV6z4Rwpa4d42C/7peuX4D5Mhzn1RlIXmkKsrM3x2CyAsz4ffOgL+L02VKP3ik1U+fMhPWPtSYkX5eIHD0qSahF7fDIG3Oc913tEQMWYyKLFLoy/5x3qAQpxpvbpCrafb3jc/rGURAJ5O+uinYfgSNeHftxqAKuFffY8fJta3i4QJq2+P5dPgdKvS+IQUnPF3nCfR99O9u9yyzauazcXPwbsJBar+29UlwQz9bz05S9J2Z6DrvOgKYf2oOWHzX/yFujK84AXP8GFi1yaGW107WiuHWLg+u4KAJpKLtb3WvDsWzR+/PP+hY6oV5uFBh2qumwziio+kXFkQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uQtwU-0002YX-Bp for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 1/8] gnu: expected-lite: Update to 0.8.0. References: <20250614054315.3451-1-gay@disroot.org> In-Reply-To: <20250614054315.3451-1-gay@disroot.org> Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17500192059695 (code B ref 78790); Sun, 15 Jun 2025 20:27:02 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:45 +0000 Received: from localhost ([127.0.0.1]:33283 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwC-0002W4-5E for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:44 -0400 Received: from layka.disroot.org ([178.21.23.139]:43602) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtw9-0002Vd-HA for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:42 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 901DB25F98; Sun, 15 Jun 2025 22:26:39 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id mc0fcUDJT3cJ; Sun, 15 Jun 2025 22:26:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019198; bh=nKCpKldP/lMuGpI04ODSY2citXXUhwLa4b8cpYxaYvI=; h=From:To:Cc:Subject:Date; b=JYgRFvPq6b88v0JiAlGxwTgS6CKXbuKbeluxRu+lDdaDShS+NPJWR0TueHlJ0xJXv +1FwCNUBO3IcgF2yjquhT1+p7xeZ/qBTZIwdtbG3VeoqgGKLNZZY9EjVJe7JsOLWUV 5shDZIbPNSWE+SSJ2DA1mKNhJ3ixRISUasaob2zBNhoGAuvBgQZY4y7WQ3g3fNCrgS vTGMxD20jX2kprGSYV1mK+CxUGHGTPIhSvv/Yl8pcBLVUXJszsdq1pY6u5lZcSgGUC DTO32MV9EElPRXX2qicrMs32CUF/cxxtpObhbIemIJade31OpliB5bXndcKuDHc7o+ S36n2lOuKmhGw== Date: Sun, 15 Jun 2025 23:26:10 +0300 Message-ID: <20250615202617.7162-1-gay@disroot.org> 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo 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/cpp.scm (expected-lite): Update to 0.8.0. Change-Id: I50c896df694a41e5d0a2282d2112108eefc46e50 --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 461070c520..68c5ebc342 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -498,7 +498,7 @@ (define-public edlib (define-public expected-lite (package (name "expected-lite") - (version "0.6.3") + (version "0.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -507,7 +507,7 @@ (define-public expected-lite (file-name (git-file-name name version)) (sha256 (base32 - "0d58nqh2fwdzdpln2wlnf898wyfxdnskq6ff33azbg92d5ibzys2")))) + "0dqa6ivqqyg5c2xyp1dakqnm4mf1m4g8bsi5jscgvv82pi3zxdzh")))) (build-system cmake-build-system) (home-page "https://github.com/martinmoene/expected-lite") (synopsis "Expected objects in C++11 and later") From patchwork Sun Jun 15 20:26:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43087 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 2C37027BC4A; Sun, 15 Jun 2025 21:27: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 4B53627BC4B for ; Sun, 15 Jun 2025 21:27:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQtwY-0005xT-6q; Sun, 15 Jun 2025 16:27: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 1uQtwV-0005wt-9Y for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27: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 1uQtwU-0002nc-UO for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=z71HGPda0uiWpy3cJtjcmA5cAIXTV59k3fFhvxL2NNg=; b=teAOU2EtlnOgueqRc5n0yuZ0qbtpdT6CjHtS6Ey2YnMWpjryEe0EAccvrrKkkQnhp11e9CEig6V7cVGFRrnJMxF1+K8NSp1vchzqfH6niEJlOImgWK/euMaVEhD2R9FjaC3//xnJ1QIsqLWbyFyNS5hCL5m028FAO4lT94F3Xcc9+KhXSfEoHZnDdtgVqPyCG7pWRVHZS03wUNGyP+avsbvXCwu+/sDJIbZAyMz99jFxQRaQOp9NkgEQ+QBDJDwSZLR8y6/IqkicQvS85XWf7uHilERUkLCIQxo9ZHZwO1dK6Em4/dufAio+L/VGSumwENqGbjyMo0uNKcDEXB0VCg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uQtwU-0002Ye-PY for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 2/8] gnu: restinio: Update to 0.7.7. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17500192089727 (code B ref 78790); Sun, 15 Jun 2025 20:27:02 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:48 +0000 Received: from localhost ([127.0.0.1]:33288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwF-0002Wo-Se for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:48 -0400 Received: from layka.disroot.org ([178.21.23.139]:43618) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtw9-0002Vf-HB for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:42 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5269E25DAC; Sun, 15 Jun 2025 22:26:40 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id jm4ydrCVKAvZ; Sun, 15 Jun 2025 22:26:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019199; bh=ZyynaqRjImfxZNdNSal6iPj8pzI3QKMKo/IZ979LVAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hGhXFaIyCsI/1/SauwIwarTIXLup44Txs/sy3dQZWUqCm/NQTGMeDOzzuBQyQSU2o QxJ8XbdGUxyjE5iOJ51GNYe1Aj0AomfxlpgyKm1eqq3BIqmwP8kIgG7Y0FoZGIyVBM kkK3qESAkpqDOqydywpbvsMBGHwspAIHUpUbCYD/HfTqF6kSqjuZYAejMd0NSlR1BQ svsJeI+AIOPfQo0OxrXOohONn2MyimSAdi+IpRLpTJBbnNHalF5GkTKZbOlBrJYWY1 gaAHP5Qskrhn/dYmvqFrd44WmbXitcjDjztJzHobEyO7gE9idRRx9/v+fh+vteCNLP gU+WcGUaQMXUA== Date: Sun, 15 Jun 2025 23:26:11 +0300 Message-ID: <20250615202617.7162-2-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo 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 (restinio): Update to 0.7.7. [native-inputs]: Move expected-lite to... [propagated-inputs]: ... here. Change-Id: Ifba66e16382c3ded9349f97e885960b0fb6fd286 --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 66a266c823..6ef265e0eb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3854,7 +3854,7 @@ (define-public restbed (define-public restinio (package (name "restinio") - (version "0.7.2") + (version "0.7.7") (source (origin (method git-fetch) (uri (git-reference @@ -3863,7 +3863,7 @@ (define-public restinio (file-name (git-file-name name version)) (sha256 (base32 - "03ajv1d034z6sjf2xapy8zq1mq2xkz5dqvn51vz2p26ws5axbzrn")))) + "0nzkh9kxk6mz570w4pygmfnyila5mkxcgzifi73wshd4yp7q3f3d")))) (build-system cmake-build-system) (arguments (list @@ -3882,7 +3882,6 @@ (define-public restinio (chdir "dev")))))) (native-inputs (list catch2-3 - expected-lite json-dto)) (inputs (list openssl @@ -3890,6 +3889,7 @@ (define-public restinio (propagated-inputs ;; These are all #include'd by restinio's .hpp header files. (list asio + expected-lite fmt llhttp pcre From patchwork Sun Jun 15 20:26:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43092 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 73B0E27BC4B; Sun, 15 Jun 2025 21:27: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 3871127BC49 for ; Sun, 15 Jun 2025 21:27:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQtwr-00061v-8r; Sun, 15 Jun 2025 16:27:25 -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 1uQtwV-0005x8-QU for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27: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 1uQtwV-0002nm-Hv for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ajSFYdSmWKqLZTzJrCDcY/pMaCUdBbnx5sWfMzD/vhI=; b=H2HspgwufQhfiugj1+08xdsmrAb32OYUjOFcNHWXxBmyHUSxEgUdXRy3vL4nEd5d0pz8YYBp69bYsUOudlKFW58zWFQ5mYhIUu4gE6UqmgaUHsBpbqX4Fi/GVnnnU1MxcZIhQCu0fdSaYS7bmQdeaMzb04GyKMD0oeqEVbP8Ez6/x34B8A7gB4IFDcMsR9HwIFTP9tTsa85QPB57Eet4r+0xqJ70kUC5x+hzrxC+JdIjWlhI5HX7Wo5azfe60djGUXGFsxTy35rf4snwiaNcq2EOL6wiGBahW6M3JTid3xj9lLQ+pvAbMf0yG4DolEklbWXvZUErn+f/Tk3MCp8kDA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uQtwV-0002Yo-8F for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 3/8] gnu: pjproject-jami: Update to 2.13.1-3.8fc165b. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17500192089735 (code B ref 78790); Sun, 15 Jun 2025 20:27:03 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:48 +0000 Received: from localhost ([127.0.0.1]:33290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwG-0002Ws-9q for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:48 -0400 Received: from layka.disroot.org ([178.21.23.139]:43624) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwA-0002Vj-Gk for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:42 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A072526099; Sun, 15 Jun 2025 22:26:41 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ILjRq4FEBD3Y; Sun, 15 Jun 2025 22:26:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019201; bh=1Z2tIwZVfb+DVgym5Ui1fzMdblJlpYWf5gQS9xjyMkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=as027TZa97V5ZEToHhHp7H2Id89qftyUXXf2ARSffcYrGWyhfPjWWk1zV+Hj1MCqu sINGoUCp/0kTin9Tb8bybZbK41ZieCcXqlWtxu22pVcJGzwvY6gLnDU1xk1z5bm1Gc 6r2fThfOQlGsYBc0eRnGBtOJESX1NUQygp5ZroC+hRHM9Xg8iKYaK641le0lct9lRx 0+71yMU3u6gKo148uOE0phnfJ/1qwLonitEvqkOEqCoXvcmN1Xro7ZHNu5mhViw32k JR7Qvh2Ja+8tQtujkAOqrDMWOh0stsEi/zuFq2qfwv7FFT4wneWMx+nsiuRw9VsBHy sQCfyxL/4O7Rw== Date: Sun, 15 Jun 2025 23:26:12 +0300 Message-ID: <20250615202617.7162-3-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo 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/telephony (pjproject-jami): Update to 2.13.1-3.8fc165b. Change-Id: I7694ad474e55214a68071ef88996129123c64a96 --- gnu/packages/telephony.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 2cba0296e6..a6a43a37df 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -863,8 +863,8 @@ (define-public pjproject (license license:gpl2+))) (define-public pjproject-jami - (let ((commit "797f1a38cc1066acc4adc9561aa1288afabe72d5") - (revision "2")) + (let ((commit "8fc165b833eea6e3c88d67a541385424b129fd3f") + (revision "3")) (package (inherit pjproject) (name "pjproject-jami") @@ -885,7 +885,7 @@ (define-public pjproject-jami (file-name (git-file-name name version)) (sha256 (base32 - "1ssiffc48qg43c45fbpx86i1gbi969b8y34922z62irxbljdnc4m")))) + "146gwpkhia9d7lqk3czlrwy0m3b8d9mhi2l05gffs0i0hljrj3mq")))) (arguments (substitute-keyword-arguments (package-arguments pjproject) ((#:configure-flags _ ''()) From patchwork Sun Jun 15 20:26:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43089 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 9F6C827BC4B; Sun, 15 Jun 2025 21:27: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 2920227BC49 for ; Sun, 15 Jun 2025 21:27:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQtwl-0005zn-D7; Sun, 15 Jun 2025 16:27:21 -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 1uQtwW-0005xI-Du for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27: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 1uQtwW-0002nu-5E for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=RbwCA8/3xM89iLmKkyvwDWO1cktry9DIdIn/WRKC1vU=; b=eeJxhvItZt/NBiGKwFh1xVqxjs+4ig/Ou026FpSb73+knvQZWBVR459EymPucuKSz3JccQMBo44B36u1sMKQXlq6yllJUTQcimfDPKA+hqatFbOCTYaQyFCWOvQhuWUL4L6pEdHSY0q/2tOGfU4ReGjoUZ92/JA9nu6GQeW8GBhnw4FL9ifrmEwK/r/ndTnAhPATB0qrNJkzV5Uc5LQ2X9fUccYcT41LXLAYK361iW1UZ9HRk/FcEkUZ+hQ65tcKqRNS7XsQFHNrfIPKhWkiSRxGzSNiiUkwCTKaJJt8RYAksjZF4t/pW1ND+oJhniAZtWmwX89fx4TTFNp2GRV3Kg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uQtwW-0002Z0-05 for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 4/8] gnu: opendht: Update to 3.4.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17500192099743 (code B ref 78790); Sun, 15 Jun 2025 20:27:03 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:49 +0000 Received: from localhost ([127.0.0.1]:33292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwG-0002Wy-Ol for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:49 -0400 Received: from layka.disroot.org ([178.21.23.139]:43630) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwB-0002Vv-JX for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:44 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B10A0260BC; Sun, 15 Jun 2025 22:26:42 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id gCFNLnuHeL2h; Sun, 15 Jun 2025 22:26:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019201; bh=KoQe9XZnpMp2KmyCmSQead5AvcHxfgLxKdXbT8vUaNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=O6lg9IvVUe8lZWSFXY1xq9XCUVsop18HpCzxtI5z5jgSydN8NTEN9JadEXmG1ggBT sfV4Sa2VWid+gQwlsLszdAbNbVKhC7YRoI6oNPZMBI1gI6HWO2oZlVUqXfxKz9pT3M 1jK5yoniulGZyAliHY3y4kKbLJL5x3GAQzIHpCmgPVgeJB6FP9u4ojV2ku6GDvRJfN FEX8QJtJ0PG6XfOdWBUTpo5svSAdohG54v3P66Cvxe6fyMcZgVgE0SkKDcTzH//2rh J2X6kGWbh2jjPLUfV1hJTMcVBFA5fKexLg3CuSwAophQpSoh60CweCzekVW4GU0/5+ qpHFlVMAECTfQ== Date: Sun, 15 Jun 2025 23:26:13 +0300 Message-ID: <20250615202617.7162-4-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo 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 3.4.0. [version]: Do not use git-version. [inputs]: Replace restinio-0.6 by restinio. Add llhttp. [arguments] <#:phases> {pkgconfig-disable-iouring}: New phase. Change-Id: I6fed7fe1c8ba0d75d0dca8406010f7c8dd89609e --- gnu/packages/networking.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6ef265e0eb..594991efea 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3935,22 +3935,18 @@ (define-public restinio-0.6 (replace "llhttp" http-parser))))) (define-public opendht - ;; Temporarily use the latest commit, as the latest release lacks a 'detach' - ;; procedure used by a recent DhtNet, required by Jami. - (let ((commit "318d02c55a7061a771a632ff2224b0d195a80d42") - (revision "0")) (package (name "opendht") - (version (git-version "3.1.11" revision commit)) + (version "3.4.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/opendht") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0d4m9bxvwa1pz8r0sfrjjyml4yp5v7n4vy8ad7k4hcryyvd5npb0")))) + "069y4mgygjsfp5szfbqr7l30g7fbcqqj62h11byyq9k24rl7ilsq")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments @@ -4001,6 +3997,13 @@ (define-public opendht (("extra_link_args=\\[(.*)\\]" _ args) (string-append "extra_link_args=[" args ", '-Wl,-rpath=" #$output "/lib']"))))) + ;; TODO: build with liburing, requires cmake or meson. + (add-after 'unpack 'pkgconfig-disable-iouring + (lambda _ + ;; This one causes configure error in dhtnet. + (substitute* "opendht.pc.in" + (("@iouring_lib@") + "")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -4030,12 +4033,13 @@ (define-public opendht readline)) (propagated-inputs (list msgpack-cxx ;included in several installed headers - restinio-0.6 ;included in opendht/http.h + restinio ;included in opendht/http.h ;; The following are listed in the 'Requires.private' field of ;; opendht.pc: argon2 gnutls jsoncpp + llhttp nettle openssl ;required for the DHT proxy python)) @@ -4072,7 +4076,7 @@ (define-public opendht @item dhtchat A very simple IM client working over the DHT. @end table") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public dhtnet ;; There is no tag nor release; use the latest available commit. From patchwork Sun Jun 15 20:26:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43090 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 91B3A27BC4B; Sun, 15 Jun 2025 21:27:38 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 532D427BC49 for ; Sun, 15 Jun 2025 21:27:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQtx0-00069C-1Y; Sun, 15 Jun 2025 16:27:34 -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 1uQtwY-0005xl-Cj for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27: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 1uQtwX-0002o4-82 for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=eGJkXIXDW3rj6BkmiuEY4on63hKuKEsINlKFIQdIKaQ=; b=RVyTdQGfhCI7FOshG5NDEdTQYTP1kCKdQMyKG/mvtJOl40fsD4KoDDjvytDotZ3u215CyhfM5p1bvwe9C7JqUKkmaq/B1YpGzsdhFUty0nYo80IBNZwER4ACAyEeEN7Emf6k7C5vvj/Rx5/zXJKYU0GWjTXG1WmaFw/+RkD4w5I9UIcXPKyQGfFVL9R4byGmi/G4rqMRuctxNXe2tMNZv36chqDgyKwKomrpOZXG4LW7XDUogg1WgH76hGcqbd0nYkS+2peRC7FJKGYWpRNFc8EKXIOOhmQJewthCY7w1Gq44vkJ8XevjhlsRJpGyOobehZYVi+WBOgTXnPgplOfkw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uQtwX-0002ZI-10 for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 5/8] gnu: dhtnet: Update to 0.0.1-4.6c5ee3a. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17500192099753 (code B ref 78790); Sun, 15 Jun 2025 20:27:04 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:49 +0000 Received: from localhost ([127.0.0.1]:33294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwH-0002X5-4S for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:49 -0400 Received: from layka.disroot.org ([178.21.23.139]:43646) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwB-0002W2-Vm for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:44 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1BE3E25DAC; Sun, 15 Jun 2025 22:26:43 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id gdtW7dmg0Frq; Sun, 15 Jun 2025 22:26:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019202; bh=jt2IPAOAGwGBnxjw6ekk8dM+jgPM7ZpDNDYgVL4n7/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=I7VEZ6wTVT5Mck5djH4dzHUu8di9tZGEQ0YRv/U9g4sHe9kGY3KBOhcR259YzozgL MaBZVX3UajoCOgJ0hG5DeItPmXKSRvUxAKtBxlkPzSiPrHyt1Fz9jPv7y6yBMvT1F6 qrM24GCZsTVU10iIuIFX10n8RpGzHH3Z7fWe7slI10jruRTgjpcTotUMAPu9Yzgx6F 5n2kEE/x0JFTBzlk7nl3CuZKBOIAQjcN8Rh1yvhVlbku+U6tVZ6BTyLDk17gIPjgVa 0jm47wqxdbLzOY3GlW/2KrNiQPXxZZc4gNjxDdU5a/t0k7wG72Qr0iTLyqc39+TeqV 34S31QdzNXHUQ== Date: Sun, 15 Jun 2025 23:26:14 +0300 Message-ID: <20250615202617.7162-5-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo 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 (dhtnet): Update to 0.0.1-4.6c5ee3a. [arguments] <#:configure-flags>: Add -DDNC_SYSTEMD=OFF. Change-Id: I57187bd254cf2dc5f9a4ba874b80411acf2f44d9 --- gnu/packages/networking.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 594991efea..f1609a9aa4 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4080,8 +4080,8 @@ (define-public opendht (define-public dhtnet ;; There is no tag nor release; use the latest available commit. - (let ((revision "3") - (commit "77331098ff663a5ac54fae7d0bedafe076c575a1")) + (let ((revision "4") + (commit "6c5ee3a21556d668d047cdedb5c4b746c3c6bdb2")) (package (name "dhtnet") ;; The base version is taken from the CMakeLists.txt file (see: @@ -4095,14 +4095,15 @@ (define-public dhtnet (file-name (git-file-name name version)) (sha256 (base32 - "1ch736misnlv2aqalj3n62gnz5xlhmip9xfv1aimp0aqinfc94p7")))) + "0np0h19gcibn9d4hyn9vjvlxjc6ma8cg8j1qxh1cam5c9i49h1xv")))) (outputs (list "out" "debug")) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_DEPENDENCIES=OFF" "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON") + "-DBUILD_TESTING=ON" + "-DDNC_SYSTEMD=OFF") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'delete-problematic-tests From patchwork Sun Jun 15 20:26:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43094 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 A93DC27BC4B; Sun, 15 Jun 2025 21:27:58 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 BC91E27BC49 for ; Sun, 15 Jun 2025 21:27:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQtwx-00064b-0w; Sun, 15 Jun 2025 16:27:32 -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 1uQtwY-0005xo-Dg for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27: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 1uQtwY-0002o7-0A for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=UI3EjchTRLXdUhM6Av1wo8uy3tvPMwdCDep6TM1ahZ0=; b=n0za3X0T/iL9yqT+NgNkbg2K4tV/gFeEvLYHlDBG49ycYpTjGESkq8prypn8K8i1GyLs6zWRSBBBas0QUHXGgx5+UhBNdoD+ktUa+EYoFOg1y6zBi4vEyIw6F7rQmbJFHBE2Eyck1sz26sYGPk4TZnm74PiTDXKBStakukxSeK6dd7aDVm1IQYllzRQZrVGsHDCryaVn5/XAU4tnF1zqXOJMW3MTBqOr2eHZ1fp7sRiDoaVfiqyNvaNZzJwNscsSoPiPSM76Qy+YI7zPcC+Tm8Qmf8umXiIwEoYgfPVkDBD0rnzDOEyWrh9W5Gjh5HmsGH9XbUQSEoq2oxvRUc2j3g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uQtwX-0002ZY-RQ for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 6/8] gnu: zxing-cpp: Update to 2.3.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17500192109763 (code B ref 78790); Sun, 15 Jun 2025 20:27:05 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:50 +0000 Received: from localhost ([127.0.0.1]:33296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwH-0002XH-Jx for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:50 -0400 Received: from layka.disroot.org ([178.21.23.139]:43662) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwD-0002WE-32 for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:46 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3912C2607C; Sun, 15 Jun 2025 22:26:44 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id XiUuX9tgI9ps; Sun, 15 Jun 2025 22:26:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019203; bh=9FfSpS+UpLy2Mc1E/2UogwD5O3PinTjXc8WrXinlH4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WAR6VyNW4EdZyaGrYKTYzd+d7sDHZeJbnOiL/Zvsh1r5ONWfLjjkeIoqZBAeQM3gT X066+Q5T20bo9b06duniViqMJPpalYS8aFuYWVwit1PcmjeyBCDI5C4C4ggMbN9Exz dksfvIIGmgxNNs9HkRkyJeOAyPexjwsdN9ooKwBZevu5Uxd76UCRZJVs+vHnouhiTi lsGMvl2nFYMQhB5ldRUFMkGDIpaOkLUQx5C2YjWP5Mj+IQzP+5tpTvI3PWeykuf8p2 syZEjkn8gHEiVZN7o4KeiQrkE9R4GGEghOsBJRG0KaJIN/A5bEuoYFVyr1AQJY08HK Er4opfYJ1qSVg== Date: Sun, 15 Jun 2025 23:26:15 +0300 Message-ID: <20250615202617.7162-6-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo 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/aidc.scm (zxing-cpp): Update to 2.3.0. [version]: Do not use git-version. [source]: Update URL. [native-inputs]: Add pkg-config. [inputs]: Add libpng, zint and zlib. [arguments] <#:configure-flags>: Add -DZXING_READERS=ON, -DZXING_WRITERS=BOTH, -DZXING_DEPENDENCIES=LOCAL, -DZXING_EXAMPLES=OFF, -DZXING_USE_BUNDLED_ZINT=OFF and -DZXING_UNIT_TESTS=ON. <#:phases> (install-headers): New phase. (zxing-cpp-1.2a): New variable. (zxing-cpp-1.2) [source]: Update URL. * gnu/packages/linphone.scm (liblinphone)[inputs]: Replace zxing-cpp with zxing-cpp-1.2a. * gnu/packages/messaging.scm (kaidan)[inputs]: Likewise. Change-Id: Ib03af79feef03f9c9e1a5b97d39b7d6c18d3ff1d --- gnu/packages/aidc.scm | 53 +++++++++++++++++++++++++++++++------- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 2 +- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index c48e800b77..bd55ce74ff 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -32,6 +32,7 @@ (define-module (gnu packages aidc) #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages elf) #:use-module (gnu packages imagemagick) #:use-module (gnu packages gettext) @@ -83,29 +84,63 @@ (define-public zint (license (list license:bsd-3 license:gpl3+)))) (define-public zxing-cpp + (package + (name "zxing-cpp") + (version "2.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zxing-cpp/zxing-cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hdr73fllnsp3zpmrhw6cjla39lihwg1khgvddsf4v57a0lmiy3f")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DZXING_READERS=ON" + "-DZXING_WRITERS=BOTH" + "-DZXING_DEPENDENCIES=LOCAL" + "-DZXING_EXAMPLES=OFF" ;requires stb.pc + "-DZXING_USE_BUNDLED_ZINT=OFF" + "-DZXING_UNIT_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-headers + (lambda* (#:key source #:allow-other-keys) + (invoke "sh" "-c" + (string-append "cp " source "/core/src/*.h " + #$output "/include/ZXing/"))))))) + (native-inputs (list fmt-8 googletest pkg-config)) + (inputs (list libpng zint zlib)) + (synopsis "C++ port of ZXing") + (description "ZXing-CPP is a barcode scanning library.") + (home-page "https://github.com/zxing-cpp/zxing-cpp") + (license license:asl2.0))) + +;;; This older variant is kept for kaidan, liblinphone and yosys-clang. +(define-public zxing-cpp-1.2a ;; Use the master branch as it includes unreleased build system improvements ;; allowing to use system libraries (instead of attempting to fetch them ;; from the Internet). (let ((revision "0") (commit "00783db7aa3bcf8620a301854ac71c0ceaaca0c1")) - (package + (package/inherit zxing-cpp (name "zxing-cpp") (version (git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nu-book/zxing-cpp") + (url "https://github.com/zxing-cpp/zxing-cpp") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "1yl2cpaqiv1g4nq9v0xfj1vd5faz55k4541vz6hsffvcxgn9nmc5")))) - (build-system cmake-build-system) - (native-inputs (list fmt-8 googletest)) - (synopsis "C++ port of ZXing") - (description "ZXing-CPP is a barcode scanning library.") - (home-page "https://github.com/nu-book/zxing-cpp") - (license license:asl2.0)))) + (arguments '(#:configure-flags '())) + (native-inputs (list fmt-8 googletest))))) ;;; This older variant is kept for gst-plugins-bad (see: ;;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1684). @@ -116,7 +151,7 @@ (define-public zxing-cpp-1.2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nu-book/zxing-cpp") + (url "https://github.com/zxing-cpp/zxing-cpp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 239c18c595..24cd6bbcc8 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -802,7 +802,7 @@ (define-public liblinphone sqlite xsd zlib - zxing-cpp)) + zxing-cpp-1.2a)) (synopsis "Belledonne Communications Softphone Library") (description "Liblinphone is a high-level SIP library integrating all calling and instant messaging features into an unified diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c2928c0042..bddc4786cd 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1515,7 +1515,7 @@ (define-public kaidan qqc2-desktop-style qxmpp sonnet - zxing-cpp)) + zxing-cpp-1.2a)) (home-page "https://www.kaidan.im/") (synopsis "Qt-based XMPP/Jabber Client") (description "Kaidan is a chat client. It uses the open communication From patchwork Sun Jun 15 20:26:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43093 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 9D3CB27BC49; Sun, 15 Jun 2025 21:27:57 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 B98C327BC4A for ; Sun, 15 Jun 2025 21:27:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQtwr-00062p-Ja; Sun, 15 Jun 2025 16:27:25 -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 1uQtwY-0005y2-Mc for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:09 -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 1uQtwY-0002oG-Dz for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=iWvPNED3ODxcTnEZ2yLX3yxqPeXycutceflcOYIxy+E=; b=bqdK1thR4nNjwGMI+Q1Dj3NRY6ISqrlbuVMUmgeevEcf7UWaxnk1x2FITdqa1N8C1L/mTv5uGjAFNNoxcPfB5D4JEJI54O2t/I+07bhCzNSgBiC94NQYW4PPbRdDLZMCsRGqdsr6oggW/oDSuzrRveFk2lWEVYVYtBIYE9/ueklyVQ/dumGxMijX0rDlFtqS6eg/JTfbmTfVZMjh3k5yXBGy5kZZFS7qZ56uOogI1Xs5PnOmNr1fDX07VyvL99hKTTIStuhvJMJs5hvq9/CwZ0+88bjn8Vrtf6WtkTvOItbEyAn31uC5lbjSONXtF5BCs4rOGh0lYUMKk0b+9kkUNw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uQtwY-0002Zf-8v for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 7/8] gnu: jami: Update to 20250610.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17500192129776 (code B ref 78790); Sun, 15 Jun 2025 20:27:06 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:52 +0000 Received: from localhost ([127.0.0.1]:33298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwJ-0002XX-Dg for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:52 -0400 Received: from layka.disroot.org ([178.21.23.139]:45828) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwE-0002WR-Mg for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:47 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D13BB25DB2; Sun, 15 Jun 2025 22:26:45 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Hjytkk-o1Sfn; Sun, 15 Jun 2025 22:26:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019203; bh=kv3kbc567gi2444H+CA46aJpeTF31A4kToRE9PgVS/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VcF9VowagIoQDsYxX8Sl7nAqzR4BtvB/O93Be2/4CzG/Vb2xCoOsaeRKhH6lzgaOl sS+78Dqvfli2UwhMqb/7mROxKqLOfqxxwek+F8xRiZdGzuTogf0TFx6iMh2/m5J3oW ASxx0PsWrka5JPFpqBMPOtDS3pwauaKnBia5XHu5rAPuvDy7EPhqUKKnD1PUjNlfnG 4snTIsAaSgCupyyfKTRCZ4GFCFLhKjpFkLy8P1kkZmQpsme2PAoF7Pwxc2/Oa2aQjS dpu3iluRDOBQc2c36+/nRGHAfCYn/ea55jIfuiGE3jKWHYOvWotLH96//nbEJLaDCO rPOcpU0xZwOCw== Date: Sun, 15 Jun 2025 23:26:16 +0300 Message-ID: <20250615202617.7162-7-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo 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 Fixes * gnu/packages/patches/jami.scm (libjami): Update to 20250610.0. [source]: Unregister libgit2 patch. [inputs]: Delete guile-3.0. [arguments] <#:configure-flags>: Delete --enable-agent. (jami): Update to 20250610.0. [native-inputs]: Add git. [inputs]: Add hunspell and zxing-cpp. [propagated-inputs]: Add qtwebengine. * gnu/packages/patches/jami-qwindowkit.patch, gnu/packages/patches/jami-unbundle-dependencies.patch: Update for jami 20250610.0. * gnu/local.mk: Unregister patch. * gnu/packages/patches/libjami-libgit2-compatibility.patch: Remove file. Change-Id: I118454aa7c214271725358928b751f4d43cac2db --- gnu/local.mk | 1 - gnu/packages/jami.scm | 26 ++++++++++++------- gnu/packages/patches/jami-qwindowkit.patch | 2 +- .../patches/jami-unbundle-dependencies.patch | 25 +++++++++++++++++- .../libjami-libgit2-compatibility.patch | 23 ---------------- 5 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/libjami-libgit2-compatibility.patch diff --git a/gnu/local.mk b/gnu/local.mk index a3feb7bc72..68ba49fa3f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1748,7 +1748,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libgrss-CVE-2016-2001.patch \ %D%/packages/patches/libjami-ac-config-files.patch \ - %D%/packages/patches/libjami-libgit2-compatibility.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/libofa-ftbfs-1.diff \ diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index db45c9973e..56f50ec37a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -36,6 +36,7 @@ (define-module (gnu packages jami) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages hunspell) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages markup) @@ -78,8 +79,8 @@ (define-module (gnu packages jami) ;;; When updating Jami, make sure that the patches used for ffmpeg-jami are up ;;; to date with those listed in ;;; . -(define %jami-nightly-version "20240524.0") -(define %jami-daemon-commit "fd2f2815448ce4072dcbc3995950788573d63f3b") +(define %jami-nightly-version "20250610.0") +(define %jami-daemon-commit "3280fa373a186c8cd4926849ef94d41bcf97c129") (define webrtc-audio-processing/jami ;; libjami still requires an 0.x version of this package. Remove it when @@ -152,10 +153,9 @@ (define-public libjami (file-name (git-file-name name version)) (sha256 (base32 - "1bw0laj93w4pvlxsr5abz59805ypbmg21z5393yzm82j4d35cfyr")) + "1sxrm0q4p9al6ar3svnni080cnclgf6yi9sy503n60srg47jvs87")) (patches (search-patches - "libjami-ac-config-files.patch" - "libjami-libgit2-compatibility.patch")))) + "libjami-ac-config-files.patch")))) (outputs '("out" "bin" "debug")) ;"bin' contains jamid (build-system gnu-build-system) (arguments @@ -169,7 +169,9 @@ (define-public libjami ;; execution of test plans described in Scheme. It may be useful in ;; user scripts too, until more general purpose Scheme bindings are made ;; available (see: test/agent/README.md). - #:configure-flags #~(list "--enable-agent" "--enable-debug") + ;; BROKEN: Doesn't compiler. + ;#:configure-flags #~(list "--enable-agent" "--enable-debug") + #:configure-flags #~(list "--enable-debug") #:make-flags #~(list"V=1") ;build verbosely #:phases #~(modify-phases %standard-phases @@ -203,7 +205,7 @@ (define-public libjami dhtnet eudev ffmpeg-jami - guile-3.0 + ;guile-3.0 jack-1 jsoncpp libarchive @@ -290,7 +292,7 @@ (define-public jami (file-name (git-file-name name version)) (sha256 (base32 - "1wqi50n80khyngj48brc8wg3m6jq471h9gm62yxpj4f8z5j81ncd")) + "11hydcclfllvdsd08fdmsqxldgk957rr0xyjqgr9hdh7y0l95a9a")) (patches (search-patches "jami-enable-testing.patch" "jami-libjami-headers-search.patch" @@ -360,7 +362,8 @@ (define-public jami ;; "ctest" "-R" "Qml_Tests" ctest-args) ))))))) (native-inputs - (list googletest + (list git + googletest pkg-config python qthttpserver @@ -370,6 +373,7 @@ (define-public jami (inputs (list ffmpeg-jami glib ;for integration with GNOME + hunspell libjami libnotify libxcb @@ -385,7 +389,9 @@ (define-public jami qtsvg qwindowkit tidy-html ;used by src/app/htmlparser.h - vulkan-loader)) + vulkan-loader + zxing-cpp)) + (propagated-inputs (list qtwebengine)) ;bug (home-page "https://jami.net") (synopsis "Qt Jami client") (description "This package provides the Jami Qt client. Jami is a secure diff --git a/gnu/packages/patches/jami-qwindowkit.patch b/gnu/packages/patches/jami-qwindowkit.patch index 65248a6940..3a341a4286 100644 --- a/gnu/packages/patches/jami-qwindowkit.patch +++ b/gnu/packages/patches/jami-qwindowkit.patch @@ -13,7 +13,7 @@ index 6d2dccfb..8dedff50 100644 - TARGET qwindowkit + TARGET QWindowKit URL https://github.com/stdware/qwindowkit.git - BRANCH 79b1f3110754f9c21af2d7dacbd07b1a9dbaf6ef + BRANCH 758b00cb6c2d924be3a1ea137ec366dc33a5132d PATCHES ${QWINDOWKIT_PATCHES} OPTIONS ${QWINDOWKIT_OPTIONS} ) diff --git a/gnu/packages/patches/jami-unbundle-dependencies.patch b/gnu/packages/patches/jami-unbundle-dependencies.patch index 2732087daf..074f8ef07e 100644 --- a/gnu/packages/patches/jami-unbundle-dependencies.patch +++ b/gnu/packages/patches/jami-unbundle-dependencies.patch @@ -1,5 +1,7 @@ Forwarded here: https://lists.gnu.org/archive/html/jami/2024-01/msg00007.html +ZXing-cpp addition to patch is not sent upstream. + From a302dc0a0faf2778331745a1d01bc3071e182d4d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 8 Jan 2024 16:07:05 -0500 @@ -19,7 +21,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index e802357f..6d2dccfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -600,20 +600,34 @@ add_subdirectory(3rdparty/SortFilterProxyModel) +@@ -696,29 +696,50 @@ add_subdirectory(3rdparty/SortFilterProx set(SFPM_OBJECTS $) # md4c @@ -62,6 +64,27 @@ index e802357f..6d2dccfb 100644 + list(APPEND CLIENT_LINK_DIRS ${tidy_BINARY_DIR}/Release) + list(APPEND CLIENT_INCLUDE_DIRS ${tidy_SOURCE_DIR}/include) + list(APPEND CLIENT_LIBS tidy-static) ++endif() + + # ZXing-cpp configuration +-set(BUILD_EXAMPLES OFF CACHE BOOL "") +-set(BUILD_BLACKBOX_TESTS OFF CACHE BOOL "") +-add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL) ++pkg_check_modules(zxing IMPORTED_TARGET zxing) ++if(zxing_FOUND) ++ message(STATUS "Using system-provided ZXing-cpp") ++ list(APPEND CLIENT_INCLUDE_DIRS ${zxing_INCLUDE_DIRS}) ++ list(APPEND CLIENT_LIBS PkgConfig::zxing) ++else() ++ set(BUILD_EXAMPLES OFF CACHE BOOL "") ++ set(BUILD_BLACKBOX_TESTS OFF CACHE BOOL "") ++ add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL) + + # Add ZXing-cpp to includes and libraries +-list(APPEND CLIENT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src) +-list(APPEND CLIENT_LIBS ZXing) ++ list(APPEND CLIENT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src) ++ list(APPEND CLIENT_LIBS ZXing) +endif() # common executable sources diff --git a/gnu/packages/patches/libjami-libgit2-compatibility.patch b/gnu/packages/patches/libjami-libgit2-compatibility.patch deleted file mode 100644 index 20896deac4..0000000000 --- a/gnu/packages/patches/libjami-libgit2-compatibility.patch +++ /dev/null @@ -1,23 +0,0 @@ -Libgit2 1.8.0 went for 'git_commit *const' but 1.8.4 reverted back to -'const git_commit *'. - ---- a/src/jamidht/conversationrepository.cpp -+++ b/src/jamidht/conversationrepository.cpp -@@ -783,7 +783,7 @@ ConversationRepository::Impl::createMergeCommit(git_index* index, const std::str - // Commit - git_buf to_sign = {}; - // Check if the libgit2 library version is 1.8.0 or higher --#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 ) -+#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 && LIBGIT2_VER_REVISION <= 3) - // For libgit2 version 1.8.0 and above - git_commit* const parents_ptr[2] {parents[0].get(), parents[1].get()}; - #else -@@ -1870,7 +1870,7 @@ ConversationRepository::Impl::commit(const std::string& msg, bool verifyDevice) - - git_buf to_sign = {}; - // Check if the libgit2 library version is 1.8.0 or higher --#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 ) -+#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 && LIBGIT2_VER_REVISION <= 3) - // For libgit2 version 1.8.0 and above - git_commit* const head_ref[1] = {head_commit.get()}; - #else From patchwork Sun Jun 15 20:26:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43091 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 12C0327BC4A; Sun, 15 Jun 2025 21:27: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 3747427BC49 for ; Sun, 15 Jun 2025 21:27:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uQtx0-0006A8-9F; Sun, 15 Jun 2025 16:27:34 -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 1uQtwZ-0005yc-JV for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:09 -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 1uQtwZ-0002oP-75 for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=HgegenlnGPUPmKk6Xkynl+4ZJZUlM+hK8F7nQbF2KAo=; b=PzS3DvzZKALAyHsQV8xuT6wiWaqXAANYgIi/rWsr1YReJTG3wDwkF6QBQar8DgpwxZ0NaCxy3kxml9LOyclA4Cw/cLtTEIdLdOdFmsSkLNnIMBAABd0qqF1xHWEt5hhUWNt2kd4897Vvl1rAm2lKK/+1LKAuyDoFSiRtIy09sfkHkyC2iCRiOBbKRc5iWGm/X5Vetyc5uswUIlYyznesPRx+/2zYfucmgts1Hrxy8bUxXUQchEnYzRYcezhl+BbDR/awUErL6eZkKl7atY83NMWn/vTalm74P9XSWLlcHoBoxdbhLKx02HiFx2TaKVfNh5379FafWf0vgOyudA6SMw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uQtwZ-0002Zu-1v for guix-patches@gnu.org; Sun, 15 Jun 2025 16:27:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 8/8] gnu: Remove restinio-0.6. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17500192129783 (code B ref 78790); Sun, 15 Jun 2025 20:27:07 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:52 +0000 Received: from localhost ([127.0.0.1]:33300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwK-0002Xd-5s for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:52 -0400 Received: from layka.disroot.org ([178.21.23.139]:45834) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwF-0002WX-7y for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:47 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4511B25F98; Sun, 15 Jun 2025 22:26:46 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Hdv4GmrDKs9I; Sun, 15 Jun 2025 22:26:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019205; bh=MdwBVkizOpbzCA7VXqYXReQPNmfH3qNIBdeuASpmbSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fOfPotK/lkNU8Mf0XBati0GXQPbS/kaIAJge9iV7Q2ItKj8ooqIib6m1EE5405f0T XNwQpEK32e8PmRsBE3BSZbIh/pM426fiL4a/NjKDDlwOYi5n0T7WFULPSj+Y6WG2x2 kxfvUjRpn12IrRsjYtA5ie6heUgCJGeX7+jxP47Us+rLqOor1gU+Ez6ndvzangiXWR zIEzlJnAO9Ho5fJVqcwpPEYRXppzuP6H2YpibBBjwvtbKlN54qBMReKgilXNI2rDhg gINsu2PFLuKPVwrXnipky7bsLgyRG5j9ltwv5hy6CbAOFeKgAGYnFwlT2LHHZPj7Q2 fohw9kIHsd2/A== Date: Sun, 15 Jun 2025 23:26:17 +0300 Message-ID: <20250615202617.7162-8-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo 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 (restinio-0.6): Delete variable. Change-Id: Ic4dd1b99ddeb17027ae6e732190a4e8a818e9a40 --- gnu/packages/networking.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f1609a9aa4..ddcbf424d6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3902,38 +3902,6 @@ (define-public restinio and targeted primarily for asynchronous processing of HTTP-requests.") (license license:bsd-3))) -(define-public restinio-0.6 - (package - (inherit restinio) - (name "restinio") - (version "0.6.19") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Stiffstream/restinio") - (commit (string-append "v." version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1qrb1qr075r5059w984c4slgpsiwv94j6fmi9naa5l48dbi1p7jz")))) - (arguments - (list - #:configure-flags #~(list "-DRESTINIO_FIND_DEPS=ON" - "-DRESTINIO_INSTALL=ON" - "-DRESTINIO_TEST=ON" - "-DRESTINIO_USE_EXTERNAL_HTTP_PARSER=ON" - "-DRESTINIO_USE_EXTERNAL_SOBJECTIZER=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "dev")))))) - (native-inputs (list catch2 clara json-dto)) - ;; These are all #include'd by restinio's .hpp header files. - (propagated-inputs - (modify-inputs (package-propagated-inputs restinio) - (replace "llhttp" http-parser))))) - (define-public opendht (package (name "opendht")