From patchwork Wed Jun 18 11:54:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43108 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 0831D27BC4B; Wed, 18 Jun 2025 12:56:21 +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 B9C2D27BC49 for ; Wed, 18 Jun 2025 12:56:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRrOj-0006BZ-OR; Wed, 18 Jun 2025 07:56:10 -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 1uRrOe-00068k-E4 for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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 1uRrOe-0003k4-4Q for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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:Date:From:To:In-Reply-To:References:Subject; bh=HkkfuQRBexlxqzERFA4E03gkqu8Bi5WbdYfiusezuBI=; b=Z/RtdnehaKjJhsUniDdoIMtngUQo08IeFzxFO52iYR/m/lCisa3c3W7AFUw4RFP3jp67Na7ihM0SX4nwvZSyv6sxFkxvJrM2gGfcJqAv8lCieCi9JeYp8qv1Lr0WHtDpv66fKKszUsqLCU+0fCQ3ECW75gt6uGzjSmx/xTd1jm4oiNg0nzz+Y/7IvSsbs2LJlEjm8BOy0AARY0Kt7iHuSAmLwPvAkHQEm7UZ38BIdCEflOD4Q9DUr3k2YkXNZ1aVme0J/XmDUVj2uqIl1fZeQ4sPC++jcK+DCA9lVvsY+2OvuoDNhcqLsf+dAIevW9YQhRGZl5YnSrIUc9hnDSpv3w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRrOd-0006YE-VJ for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 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: Wed, 18 Jun 2025 11:56: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.175024774225043 (code B ref 78790); Wed, 18 Jun 2025 11:56:03 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:42 +0000 Received: from localhost ([127.0.0.1]:48121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOH-0006Vj-JC for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:41 -0400 Received: from layka.disroot.org ([178.21.23.139]:46482) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO4-0006TC-Vs for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:31 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E071325C0F; Wed, 18 Jun 2025 13:55:26 +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 gqIbp7h1p8GW; Wed, 18 Jun 2025 13:55:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247726; bh=nKCpKldP/lMuGpI04ODSY2citXXUhwLa4b8cpYxaYvI=; h=From:To:Cc:Subject:Date; b=ea1eWcviNqG6v+BmHa5J2lzVORStz4AoQfPX129dFYWMNgoNkNqkYQyrh90edyPZz 9HmQJmO070DmLRBYdsluXC4HdA5Vj+nJ1R5+1fBBCAoLaxiZFLpUpay/DwIVKMJByu EiT54AXYRC34RCvlQyo1sHFP0wHN9jhuaNjPpOb9OAFyz5Pf9eYc1xp+XHzH9uuZC+ uh4SjGs/c4991WM/T0614YMyOITy7g7IyLdViNtF7ZARE9RLCOXiiVOMUY/S8Vlafo sGjGSBdH3J8gM2pM2TVeQjjGIVQ1AmTiACT+xrDN01GOCSvuauYyVUmg8NpkJb9O/8 zyHwzIxPWxE0w== Date: Wed, 18 Jun 2025 14:54:33 +0300 Message-ID: <20250618115507.4993-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 Wed Jun 18 11:54:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43110 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 2C20D27BC4A; Wed, 18 Jun 2025 12:56: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=-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 0CD9F27BC49 for ; Wed, 18 Jun 2025 12:56:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRrOj-0006BD-G0; Wed, 18 Jun 2025 07:56: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 1uRrOd-00068U-0Y for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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 1uRrOc-0003jm-Ox for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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:References:In-Reply-To:Date:From:To:Subject; bh=z71HGPda0uiWpy3cJtjcmA5cAIXTV59k3fFhvxL2NNg=; b=Lh+QIBiyBL16EhYTJ/Drr8tOrFpKOA9KM1fjyFsxaXDmZvaBPyEuq6EqUz2LbS0Sqx7HWW3mpnD+Z3Ra2D5YGMMQ1jVoD9uUpnfV3jmoUnm3ph3U8zFmUu8H07PeCGQ6COx1+uZQ/JhS669HblrQuIJTw73r6cTwqFclVcrRgUR7+ydEnmmVce1wFO8d4OPGDzOo+oLPp2HhFn6OyJjXviDzCeTQYcwHp+oyJJzNmZ3RCo39Kt1Gw9zaal0Nn6UEtSwJDj+FTRLbDcrYTG42O83hB4gayPZ5YZsScIevwmd26U9+9FFXdrGrPSL9OhxSG2ZEhAKHFrIIsYQEonQNSg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRrOc-0006Xn-Io for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 2/8] gnu: restinio: Update to 0.7.7. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56: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.175024773224941 (code B ref 78790); Wed, 18 Jun 2025 11:56:02 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:32 +0000 Received: from localhost ([127.0.0.1]:48111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrO6-0006Ti-Me for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:31 -0400 Received: from layka.disroot.org ([178.21.23.139]:46488) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO4-0006TG-MH for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:29 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 400A425CA7; Wed, 18 Jun 2025 13:55:27 +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 DDY15QmtY8XB; Wed, 18 Jun 2025 13:55:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247726; bh=ZyynaqRjImfxZNdNSal6iPj8pzI3QKMKo/IZ979LVAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QDOh6f3AvQzJSgabyiGkve6gAV0cRQKp03Z75ihA4esmXEN1ehkCU35Dt8DA0DkAm NJ2NtLYuMw57A4pzJ9MYDaSZtHeVUVwHaIhJ+H2dmr17+UlbvJ1d1nAm4mywrPQTwR lXszz/O5FVbAPEw7wI5PuWoumOoOuo7/xcgcTmLRvObOzMB1YU+0iBQEKVXiKFFFT1 P04mfDWuFHvF5SUw53Hsip1a6eDNL2VlLF96HrXHVrOEs0kvCrL85CtW2H5xVlTaFx kFwb79sG4MAjt0dc3qw/maQKmZZYnib7zz8XzbJVQYr/hpD0M8AM3/lg/f1e1E9h2d tSlbx3Y4IerIQ== Date: Wed, 18 Jun 2025 14:54:34 +0300 Message-ID: <20250618115507.4993-2-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-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 Wed Jun 18 11:54:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43112 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 7BB4427BC4B; Wed, 18 Jun 2025 12:57:07 +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 44DAE27BC49 for ; Wed, 18 Jun 2025 12:57:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRrOh-0006AM-FD; Wed, 18 Jun 2025 07:56: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 1uRrOe-00068l-Gw for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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 1uRrOd-0003jv-8X for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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=WAIHoWaVYDfcYDhcf9SRqxBsJ6KVx3+Bj+2uW3VSh0uMwxLGZ6ae2oswZ+VGrHkGjyVU5byC7uk2IcUNPMgxGgX70bHlPNQwvdDjP4Gz/nwuK6TZGij4uccFnOoxntkycoJqgMhRjK7ocd1mdyVww2p+00F5/tqQp+5Yw/iyJuY2WRBbbRd/V92WaE7QPsHBSvRJfw4N07+Bwjl5ZNGvM8plSriDTzPuxAwgXwLTZkKDvPPDDwDNVI3w2yfgnOw1Hp6OxgojuWHlf3sxJUB5Fwnz8G5U+1vFFvOrA0lrz5ddJUkqMTBbRm/1cOx/LcB/15he6gwS+lZc999k2Bo38w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRrOd-0006Xv-3t for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 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: Wed, 18 Jun 2025 11:56: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.175024774125027 (code B ref 78790); Wed, 18 Jun 2025 11:56:03 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:41 +0000 Received: from localhost ([127.0.0.1]:48117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOG-0006VY-Su for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:41 -0400 Received: from layka.disroot.org ([178.21.23.139]:46500) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO4-0006TJ-P0 for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:29 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BC72B25C17; Wed, 18 Jun 2025 13:55:27 +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 8Ef-nmQhs15B; Wed, 18 Jun 2025 13:55:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247727; bh=1Z2tIwZVfb+DVgym5Ui1fzMdblJlpYWf5gQS9xjyMkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jieHkaooGqTuVfZKCpAUOwnDmJWoS9nqu+eoamanDvG5l3Rih/fLGXe9DPX72NXIp dXAlLj/K7tDuTqc2N3VjJdahFUhx8T/v3iMkogzZ+o+C10l4EB+abH50XSbnG1ZqUT vZ7O4eoAZT0raJ2hSg5qy9eRTUYfpwLTvrZSm6EXBQqYxOqj59wpfiWZW503d3IrDx x7gqTW1QI9eTkzXYDzKwWdnRd8NmcoRXi3aDiDGKMvwmUbFPI0KDDvLulV/Os5AMI3 YrJQ/WmSSVMHInyQK501xrb2tk1i63/4SoC8RLdMzPeEX2GsNNtX5tY1m5lvaeAp2u LIovE4pugB9EA== Date: Wed, 18 Jun 2025 14:54:35 +0300 Message-ID: <20250618115507.4993-3-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-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 Wed Jun 18 11:54:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43107 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 841A827BC4B; Wed, 18 Jun 2025 12:56:18 +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 034D727BC4A for ; Wed, 18 Jun 2025 12:56:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRrOk-0006CC-Q8; Wed, 18 Jun 2025 07:56:10 -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 1uRrOf-00069I-7J for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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 1uRrOe-0003kE-M1 for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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=drM48Ojwv0Rs/3fR2gaTqBR00P8ERMlVrILeew7M1YUkAv+/diHRacbGwV1R2vPTwfk1Z/VeUTbVnM8Aci28WR+8+s9j98eVPbF1FI8ZHmD50r3B/fM5AWxVT6zGzmACRr0XsOAXgjg+G2bI9lVWgx5MFnZC3wxyNsDMpg6U6D5MZbJ7n9xhzoeBmdEw8MsjHIOkLZG5I92HQftf1YN/fLAjioP94OxqBB+46hjUQGlNMA26P0ZTXjUIVsmnxLeqc6HXS0ApB92DU/YTjI7QIvnNoYtHHmbj6L4T2QVTyGGED1KqixnArkmdg+2CjXemCZlm7XL7+LYF/JahSZQydw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRrOe-0006YN-Er for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 4/8] gnu: opendht: Update to 3.4.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56: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.175024774325059 (code B ref 78790); Wed, 18 Jun 2025 11:56:04 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:43 +0000 Received: from localhost ([127.0.0.1]:48123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOH-0006Vs-Vl for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:42 -0400 Received: from layka.disroot.org ([178.21.23.139]:46502) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO5-0006TK-CB for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:31 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7830F25F0C; Wed, 18 Jun 2025 13:55:28 +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 nMi7vO3gaWQj; Wed, 18 Jun 2025 13:55:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247727; bh=KoQe9XZnpMp2KmyCmSQead5AvcHxfgLxKdXbT8vUaNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NK0Qc7uQVWWXPJi6485KuQbAnGVeCBxLpK8Aw4/MLqPgLtUVobDqTlpdpLkFWJ8lI HXK1RvfkzP5sm+hQrkhURKqN1AdH2e3WWZrsIq7OjYSJ1mImWLuKl8oHxhqSY4VmDE NnQLcCRItA4mn63eIvGQTcoYMRgE1f9zpN+1bfdE2lnW0vY3NcptLqKwp5wspwJwTS PrEPdRHHuTy6uReIgYidUFuNG7Y5AMK0VDgSOU6QedtaP+M3EnobhT3Gwf1dg4zZgS PJehdXEGW/zxZhKGYzdhSXU84/aAh7HZBEoL29OQbv3ZimoVgnf2EJjJ5F9dS5MQ43 ts2mSenAQ7oWA== Date: Wed, 18 Jun 2025 14:54:36 +0300 Message-ID: <20250618115507.4993-4-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-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 Wed Jun 18 11:54:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43106 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 CEE8727BC4B; Wed, 18 Jun 2025 12:56:14 +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 53E7627BC49 for ; Wed, 18 Jun 2025 12:56:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRrOg-00069O-Tv; Wed, 18 Jun 2025 07:56: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 1uRrOd-00068W-UA for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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 1uRrOd-0003jz-Lj for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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=eGJkXIXDW3rj6BkmiuEY4on63hKuKEsINlKFIQdIKaQ=; b=aXj6KtgatNr/YgvYL/6pi+dfV3/gYrMQG+F4meKHLfrYlq5DZgDnRpiDa0duf7jvIATQS1yLjqoucyDtGpNT03m+h/kglESeIV+Q21nhg6EryTOTekoykMNVMUHR0jNoP1YwMJWQZVUChqt6o4jKqiKzcT/NQaCbJDZGO4SuW+tQP1HdSHol2mtAsh604y2jPSWTYUWo0Zao2pxPp4f4KbXuDy4UsqiUdf69r1DZF9mPnWZE1DzwiQZrhIpFIX1uXf+KLTnh7OEPCPwYf134rMO/JRKBkmgrkm0x73Tiz2k7zIS9PxuvJvC7Y+4dXQr7VDl054cJ2hFPuwV8D9w7YA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRrOd-0006Y5-HY for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 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: Wed, 18 Jun 2025 11:56: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.175024774125034 (code B ref 78790); Wed, 18 Jun 2025 11:56:03 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:41 +0000 Received: from localhost ([127.0.0.1]:48119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOH-0006Vc-7y for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:41 -0400 Received: from layka.disroot.org ([178.21.23.139]:46518) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO5-0006TM-PV for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:31 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C0BE225D34; Wed, 18 Jun 2025 13:55:28 +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 3aULWGUJwE0S; Wed, 18 Jun 2025 13:55:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247728; bh=jt2IPAOAGwGBnxjw6ekk8dM+jgPM7ZpDNDYgVL4n7/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eXH9GuIC0yG9WSngBRoDoA9yzFzVTdzTL1aEC2YN0P9rM6crRHqskSu+Bbzd6W/8g DVdJgAHG/C2L1MreUwJGRy09M+cujquv/X89VZQ/2V50xM+ovLjR6nqOOx9qRSQI/J S8JeAxqbJxoyZBgj0sZG8oNqvedz9TZ7ygDafRrlBpWCTpWZ4+ztEfMd0DPb5THCrk W4Oit3KPnGlzzxacrOIeytRF3vMgkwe/mvo572IvYtAQQ16cOf5tSRLPb72u9gMcYy cQHf64f/REAOFWdUytEEM1Sc7utZVxPKogHyDMDUxUD5jJg9nquzF2L0qrbyLlhoge RaesA5qd4f2IQ== Date: Wed, 18 Jun 2025 14:54:37 +0300 Message-ID: <20250618115507.4993-5-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-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 Wed Jun 18 11:54:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43111 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 378AE27BC4B; Wed, 18 Jun 2025 12:57:05 +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 53E4127BC49 for ; Wed, 18 Jun 2025 12:57:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRrOh-0006AO-HH; Wed, 18 Jun 2025 07:56: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 1uRrOg-00069x-EU for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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 1uRrOg-0003kc-38 for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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=F6XpTWiFZRCZGpy7S4VtNq7kLv8L/8gaOPgg99lErvOMQTMjslK+3FBTKo8F1/m5Ad8cGIrxFHRbjZgK3bfxj4ATP7Fgn2O7mrEnOqDID9YIvbQ0b0Ag70/t+dY934NS//MKXRzwHBmhwwXVhUCMlxu1YutrxtjcGabHlx3VbjI2WcjcPFANu/Th2nwjW42ii5NzDfSVjLt19nCaQzsQX9k0WV5Jaxid7G1gT1p0mRdODTC/4PObOgREuLhnYwY3sRFY2M9DNzM2Mc2LOIQ9phbk1+sVZcS7XzgDu29LkqPDGWVrSVd9oRvpjztmkSfSpXzzdDtSu757crUHB1Jd2w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRrOf-0006Yr-TV for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 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: Wed, 18 Jun 2025 11:56: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.175024775425116 (code B ref 78790); Wed, 18 Jun 2025 11:56:05 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:54 +0000 Received: from localhost ([127.0.0.1]:48135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOT-0006Wx-PE for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:54 -0400 Received: from layka.disroot.org ([178.21.23.139]:46528) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO6-0006Td-R1 for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:34 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DC02C2611E; Wed, 18 Jun 2025 13:55:29 +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 ljobkhZCsgY7; Wed, 18 Jun 2025 13:55:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247728; bh=9FfSpS+UpLy2Mc1E/2UogwD5O3PinTjXc8WrXinlH4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DQYMJeHJDIIsQVSSyvmqQZxnjjuBlqaSYUwrtHAxujXyB0JkTsBy1C4z1tHdU7MB4 nWRqjaHjxcI7wxvVyniLHhfqVY6Zru+4w91USC/jjsEU/byku2Z89Q6BHByxqdAvzN HTJoPsy0r1IE7jwS+PeY0bzz5D9W+28W2erBlEmmEodLf1/hp4MntzZMmDatcVj+Ub X+mN0zABuWGCwAIgaUGRPmEXMHkNjNU09DYRsrPLVZZHFkAWD1dHSZm2chz3VDpZXA W88n1rw4XS+5JmOl5mgz3T3CRLVaeNA+Zyne6VkpXPdG7gE7ORlExO+XlRfF5vaEbw knFWX1J4S1Pcg== Date: Wed, 18 Jun 2025 14:54:38 +0300 Message-ID: <20250618115507.4993-6-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-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 Wed Jun 18 11:54:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43113 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 8CFFE27BC4A; Wed, 18 Jun 2025 12:57:12 +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 1B92727BC49 for ; Wed, 18 Jun 2025 12:57:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRrOh-0006Ak-Re; Wed, 18 Jun 2025 07:56: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 1uRrOg-00069w-EU for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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 1uRrOf-0003kZ-Jp for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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=3mY9CfnN0BXdpo7sFXV5eB5HI6X5aYpFX8CN3Z2Xlmc=; b=pdtTQTr896hoWHuI0wW5Mu5BhPYZeuGOF3aVYGXrYjm6v0RFsqg6DkBDlZ7jKvcWmDvA2Qj6MjExeuBkgr59o94AKmwI+xC2YLPPfaRZSrl+mQkcCpg7gf4nmjTsHfm2nxlM0Eec2xkaQ4zTzR3svdiC+Anm46+enErEdS5vVLnkAZtuslINj9JTtnJE6+e2GJl5eNHe1Y/AdLFUkewaYGOh9i6mKkPKPp9uSVG2pCLnHg4Hl2/blnphG3KT/DTgmM2yaa1ltFuSNZeP/ya/aJpRZAzOri3ibX0ILJsMZih8Xp6AZFK5WJZtZvH4ZidUzYWSxFNviRna/zwG6pRHTA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRrOf-0006Yh-Eb for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 7/8] gnu: jami: Update to 20250610.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56: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.175024775325110 (code B ref 78790); Wed, 18 Jun 2025 11:56:05 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:53 +0000 Received: from localhost ([127.0.0.1]:48132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOS-0006Wu-Sc for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:53 -0400 Received: from layka.disroot.org ([178.21.23.139]:46552) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO8-0006U2-Hu for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:36 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 75BE12614B; Wed, 18 Jun 2025 13:55:31 +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 RSzxfpZ0CrmR; Wed, 18 Jun 2025 13:55:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247729; bh=g4dlyKZPw4sI8LPIZziZ44bbkF6i8bX8FX/W7zmtARE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M63sej2/IPnAEqUJwuDPZEqjWAoiIUEjZK3OYFL71uKMrX4mngRuOX/zuQfVoVTbY Y4LGlwvjbg4FWLyTi3g33JAxO87TRSiP5jPtHAhtW6ErjklxfpG/pJ8D9pvJmwqfXD Gt1WhvAxguIVTl5/8r+MFn59uyuIPq1AZxG+A/hk4ZyVNabTJJXh4zRT4EkIeDYtRT i9QOWHkcqTEJe7fME9HT8/tcYOl7P7VgLSLQ9dMOj65wdvy5VLnW2+hny1OoiWcOKX frZdjwWI/dfn8Hd0KHSj+pJhRO66ED9IsObLfd8zcY8JiHYEKwK4hAdHTJhByvzE9W J9LJYU22X2DBw== Date: Wed, 18 Jun 2025 14:54:39 +0300 Message-ID: <20250618115507.4993-7-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-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. [source]: Add patch. [native-inputs]: Add git. [inputs]: Add hunspell and zxing-cpp. * gnu/packages/patches/jami-qwindowkit.patch, gnu/packages/patches/jami-unbundle-dependencies.patch: Update for jami 20250610.0. * gnu/local.mk: Unregister patch. Register new patch. * gnu/packages/patches/libjami-libgit2-compatibility.patch: Remove file. * gnu/packages/patches/jami-disable-webengine.patch: New file. Change-Id: I118454aa7c214271725358928b751f4d43cac2db --- gnu/local.mk | 2 +- gnu/packages/jami.scm | 26 ++++++----- .../patches/jami-disable-webengine.patch | 43 +++++++++++++++++++ gnu/packages/patches/jami-qwindowkit.patch | 2 +- .../patches/jami-unbundle-dependencies.patch | 25 ++++++++++- .../libjami-libgit2-compatibility.patch | 23 ---------- 6 files changed, 85 insertions(+), 36 deletions(-) create mode 100644 gnu/packages/patches/jami-disable-webengine.patch delete mode 100644 gnu/packages/patches/libjami-libgit2-compatibility.patch diff --git a/gnu/local.mk b/gnu/local.mk index a3feb7bc72..253c191f3d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1625,6 +1625,7 @@ dist_patch_DATA = \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \ %D%/packages/patches/jamesdsp-fix-bulid-on-pipewire-1.4.0.patch\ + %D%/packages/patches/jami-disable-webengine.patch \ %D%/packages/patches/jami-enable-testing.patch \ %D%/packages/patches/jami-libjami-headers-search.patch \ %D%/packages/patches/jami-qwindowkit.patch \ @@ -1748,7 +1749,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..d4e776df0c 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,8 +292,9 @@ (define-public jami (file-name (git-file-name name version)) (sha256 (base32 - "1wqi50n80khyngj48brc8wg3m6jq471h9gm62yxpj4f8z5j81ncd")) + "11hydcclfllvdsd08fdmsqxldgk957rr0xyjqgr9hdh7y0l95a9a")) (patches (search-patches + "jami-disable-webengine.patch" "jami-enable-testing.patch" "jami-libjami-headers-search.patch" "jami-qwindowkit.patch" @@ -360,7 +363,8 @@ (define-public jami ;; "ctest" "-R" "Qml_Tests" ctest-args) ))))))) (native-inputs - (list googletest + (list git + googletest pkg-config python qthttpserver @@ -370,6 +374,7 @@ (define-public jami (inputs (list ffmpeg-jami glib ;for integration with GNOME + hunspell libjami libnotify libxcb @@ -385,7 +390,8 @@ (define-public jami qtsvg qwindowkit tidy-html ;used by src/app/htmlparser.h - vulkan-loader)) + vulkan-loader + zxing-cpp)) (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-disable-webengine.patch b/gnu/packages/patches/jami-disable-webengine.patch new file mode 100644 index 0000000000..686fd58881 --- /dev/null +++ b/gnu/packages/patches/jami-disable-webengine.patch @@ -0,0 +1,43 @@ +Disable qtwebengine for good. + +--- a/src/app/LayoutManager.qml 2025-06-18 02:28:42.298627257 +0300 ++++ b/src/app/LayoutManager.qml 2025-06-18 02:34:07.528403540 +0300 +@@ -17,7 +17,6 @@ + + import QtQuick + import QtQuick.Controls +-import QtWebEngine + + import net.jami.Adapters 1.1 + import net.jami.Enums 1.1 +@@ -41,9 +40,6 @@ QtObject { + // Used to store if a CallStackView component is fullscreened. + property bool isCallFullscreen: false + +- // Used to store if a WebEngineView component is fullscreened. +- property bool isWebFullscreen: false +- + // QWK: Provide spacing for widgets that may be occluded by the system buttons. + property QtObject qwkSystemButtonSpacing: QtObject { + id: qwkSystemButtonSpacing +@@ -253,9 +249,6 @@ QtObject { + isCallFullscreen = fullScreenItems + .filter(o => o.item.objectName === "callViewLoader") + .length +- isWebFullscreen = fullScreenItems +- .filter(o => o.item instanceof WebEngineView) +- .length + } + + // Listen for a hangup combined with a fullscreen call state and +--- a/src/app/mainview/components/CallStackView.qml 2025-06-18 02:36:58.863782993 +0300 ++++ b/src/app/mainview/components/CallStackView.qml 2025-06-18 02:38:00.994456741 +0300 +@@ -43,7 +43,7 @@ Item { + Shortcut { + sequence: "F11" + context: Qt.ApplicationShortcut +- enabled: CurrentConversation.hasCall && !layoutManager.isWebFullscreen ++ enabled: CurrentConversation.hasCall + onActivated: toggleFullScreen(); + } + 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 Wed Jun 18 11:54:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43109 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 06AD527BC4B; Wed, 18 Jun 2025 12:56:31 +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 BE27627BC49 for ; Wed, 18 Jun 2025 12:56:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRrOl-0006CU-T9; Wed, 18 Jun 2025 07:56: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 1uRrOf-00069M-Cb for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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 1uRrOf-0003kS-4J for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56: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=1YdkQmAY50cAkczXGUSR1LKkUcVdjpCKqhMJgkybRBY=; b=oDbkzheD6miUzi8zACxcovjuAtKowdI1N3E7N9dO5vw391Uz0KhK4K0UmmbJAlckscu1P/XzQGEWhzBZVHi/j7eSro75nfh8M0m3J0AKKHFRDBTzzXJp99k3WsJrkNAbcWNidJhZ0zBuVL5AUgQ7GUHe65Ten0iWSVl+E2ovfDoOKG1X7DEZFbHPC9IW9KVVsJzGsp+hL77U4+7f+9xDCL+vGg8GqiqS6r9+mNnteQN7Yj13LzK+9t6SRs/3UnbiH29ibE0vO3usjdlCOxf29UUVZKtLPwMYMDLQOVZg2dW+pB9uZ4WKy3EYsbWhxaaCxGnvmK0Hanb2Q7CXoX6TOQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRrOe-0006YX-Vh for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 8/8] gnu: Remove restinio-0.6. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56: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.175024774325069 (code B ref 78790); Wed, 18 Jun 2025 11:56:04 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:43 +0000 Received: from localhost ([127.0.0.1]:48125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOI-0006W8-VZ for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:43 -0400 Received: from layka.disroot.org ([178.21.23.139]:46544) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO7-0006Th-GO for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:33 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7C80925C17; Wed, 18 Jun 2025 13:55:30 +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 gueamznd9XsE; Wed, 18 Jun 2025 13:55:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247729; bh=XYVJsxSSYGXPGrSa25MavtW9aQ0nJGMJpZ8gGhb5Gs4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bAgda9eivyPphWuZ+HgyjpMgGEaF642ZM+Y1ukLXVX7Vk6Et2juhuRCAs7JTdTbOK 1PoGic+s29X7yLqCAE9PWboJQw67lUI8D7/kEf4mNJN4d97iW6vpramyVuftWrMJ1s g18Fd1cMkEQsKIXHn6WIhYNZdVL2hd9g1U5JJb0dsg32vwhBYTwpmxBPHQk2vrTU8E TXK1d1fuVEgYqctBf3jBesNh2m+98f97c4hyb76RoRx9ugegC8zYudVQ7Ir4HPbFpN bzyeOexfV4QbqsxMoZOYl033J/wS1QRO7A/OSTD0l7/yjJYOhpG/DyNcBi8+R8FbMo 0sh2W3QlkVnxw== Date: Wed, 18 Jun 2025 14:54:40 +0300 Message-ID: <20250618115507.4993-8-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-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: Ib889810f129ee276303222c1b35b3789bfa2cbde --- 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")