From patchwork Sat Sep 21 14:53:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68273 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 6D83927BBEA; Sat, 21 Sep 2024 15:55: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 BA82627BBE2 for ; Sat, 21 Sep 2024 15:55:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss1VU-0001Iz-2k; Sat, 21 Sep 2024 10:54:44 -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 1ss1VT-0001Ie-0G for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:43 -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 1ss1VS-0006Ug-Nw for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:42 -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=dyFA0JqYo6Te3ilJ5+v/D93YhSgGAadoel0JH4n25lc=; b=Z9deA71H93foCAotX7fTEkrsjEQU2DEx8oRS2ZyEZSykExDAhKbPGuuUzHPeZ9IGqOuyrnr07Els25qQgJqMmeLagIpexX7vyygvqVwL5GdhF7kyl/LtpmY7rpNoaIOK1bE2kKoTp3/RzgqrRzqeskgHcYYGLs0xHXwfdCTDevCNsTjr0/UO4WKmHNXe+jCb4+BYEK5GY4fNzvB7De0rWw5Kvzmt75yScKduoxCfSYRbTWfxenSfGnVYp+XAm5FamqnqHmJoguK2g2mLOTT4aOxwDISClOiupFcboz3TD2RCahTyhaHmyXa7oSO3pjzI4wIcJ/ilwTvB2858KgTGww==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ss1Vm-0004d5-J8; Sat, 21 Sep 2024 10:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v8 1/8] gnu: xdg-desktop-portal: Update to 1.18.4. References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> In-Reply-To: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 14:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxim Cournoyer , dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.172693044717617 (code B ref 71897); Sat, 21 Sep 2024 14:55:02 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:07 +0000 Received: from localhost ([127.0.0.1]:40138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Us-0004Zy-Cp for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:07 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:39905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Up-0004ZL-Hz for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:05 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id 9E081114016B; Sat, 21 Sep 2024 10:53:37 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Sat, 21 Sep 2024 10:53:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1726930417; x=1727016817; bh=dy FA0JqYo6Te3ilJ5+v/D93YhSgGAadoel0JH4n25lc=; b=Yva+iDcb4mAAdibl2d uP4VGEStB3pNnOIvdEF6MQevOFDrJwrmW26kdI0fwvHTYI+TCVpNPUbWk6iAbL4F O8OCrCdMHpwW3PKa8M3FG+Zfk5P5P1Zl8mKqAra5+W3SaTcEgArQSXUhmPExWQFy TUTJl2/aF84GjYSHjCw00crhdPJZxhERZvpo8GCKkYiesUrkbzf65hQkohFDcxzW +DapdUjwpGh5NHCFZmX9U6pMPNdQGSWEgu8l+u9GOI1AZc2hh2oXltYr8xIjUS78 4UcXADisnzK9Stf2U6TLOihZ43IBhwfa2179qzwgrh6Q30q7YYMqCf3Gs8FT5wxn e8ig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726930417; x=1727016817; bh=dyFA0JqYo6Te3 ilJ5+v/D93YhSgGAadoel0JH4n25lc=; b=P5IjVUH4eTglYF3wnL0ZEe5kM5ajP tIxk6rFlALSB4Xk6j8wYLbTCbVyO4k6/+ymkM8nlZEqsPIBTvshwi4Z53kVRLOzc 9Phmi0N7t8V4tJHSQY7xlVXfELUBDq8o+ouelonvgzMa8b1/vo5ipq1TtSFzJuG3 Thw4fuf5S5iV+YajvNJeTYZdbnWogFyp/8zNnEEVo/Ef/tDS/EOz0/zKKUqqK5B4 l9UIMJACoLk27sjVItxU9dwmz6jSTQ8FeRCIxh0IgyliqXf6hvW9CP+a1xttaq8J JbSI9fxSib+BuuxJ7iUkOAKvxUoM9xVcTDvqT/7b4TD+0+CIcaG0c3h3Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecu hfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepje efheegveffgefhuedtkeegueevleeiueejgffgjeffvdejleevtdejleelieehnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehmrgigih hmrdgtohhurhhnohihvghrsehgmhgrihhlrdgtohhmpdhrtghpthhtoheplhhilhhirghn rgdrphhrihhklhgvrhesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 21 Sep 2024 10:53:35 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 22:53:07 +0800 Message-ID: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [arguments]<#:configure-flags>: Replace “--with-systemd=no” with “-Dsystemd=disabled”. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch base-commit: 9d75215a59629ab224154ef6b843043289291f81 diff --git a/gnu/local.mk b/gnu/local.mk index 8e7abc8a47..802f4be4fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2303,6 +2303,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 993bb84ec6..f00f4b3956 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq ;;; Copyright © 2024 Wilko Meyer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -136,6 +137,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2986,7 +2988,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2995,18 +2997,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; Disable portal tests since they try to use fuse. + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3018,7 +3023,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 + From patchwork Sat Sep 21 14:53:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68269 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 78F3527BBE2; Sat, 21 Sep 2024 15:55:25 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 0ACF927BBE9 for ; Sat, 21 Sep 2024 15:55:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss1VV-0001JW-Ht; Sat, 21 Sep 2024 10:54:45 -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 1ss1VT-0001Ig-9P for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:43 -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 1ss1VT-0006Ul-0S for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:43 -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=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=QGbYOVTgEAEA++dkmyV9LXc11I2nMEo6zsWRQwY5Jk2eZ6L3FWL9J3M7EcHYuq/3+rfYQV5WtYMAJ8srdNKMcJKkuvFjhxOtYBaAmXxUuL2BkdcqXj8xAjHbSHj0vf1rIWwSjDfhz15fr8+ryaHcE29ySSOAkI5q6DYEUxi4RCTCJ5hGKNxGyyp8l963U0FUpKehquONo7UPRqhFS8Z7bJtimirjDD5lRf5fOZKn02rYa17SJZA8j7VDy9aX2g+ZkOSm0EwNlm+ZPXIA6WqjqAn2sqoX2Qj/xqgvJS9TGnH0NkdDICeg7u8esmX05YRHEUWxtYrey+/7JtHgZPLdpw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ss1Vn-0004dE-2L; Sat, 21 Sep 2024 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v8 2/8] gnu: xdg-desktop-portal: Improve style. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxim Cournoyer , dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.172693044917628 (code B ref 71897); Sat, 21 Sep 2024 14:55:03 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:09 +0000 Received: from localhost ([127.0.0.1]:40142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Uv-0004aG-6U for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:09 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:41739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Us-0004ZR-Ll for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:06 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.phl.internal (Postfix) with ESMTP id 352771140176; Sat, 21 Sep 2024 10:53:41 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Sat, 21 Sep 2024 10:53:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930421; x= 1727016821; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=s iQ7UsHgRbzjZC77wLRixSVqFAFPQvYz52Hz71igR4vwk0XxR4m2bscSsd4er30F4 rFpNMYG0g07mYf+zAQXl1gAtcAQ5G7UYwz9rDxpZGUc2CWPfWRaLXzuj/csGa5ps FuF46Fbo+QoitbQU+bTCrkxGBFR4PwM5dO4dTa2xlAfwRuUpe/dKXY7bbab/rzAw 2UjEuLpIGBs071QCXE9b9+7uRLytHfqmskNJJtsqDBjIPQY4sOi1eMhJhTpYadX4 0sIB6qaq01MDD0OQA/EU8ifkgdIZNgkPPORNFbvLD4Gg3p3dAeeUf4c4b4DCtsG8 m/32qPZilO+60bWU164Fg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1726930421; x= 1727016821; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=J sbn8aHgzEhuacJK7HXRGgIRPSK3JU3hOrLjAp1KEDsUzxREn4cAU2yrxdQlO1j1J ehMzQt5uq8hxz5J+AbibntM9Osqh/eJoIzReT3wh/uglYeDfeeK0Kg3raSYz3P8x uMx+KpNSKLZk3TFOOw9ZWYC8pZdUbYz6DiMilQrbjBPkvRFcgJPqakinmlansScZ lQVBqvyJorVH7T4oRo22bU2BsDw/eZVeyvqvyAvZPWKf37F94vPhcY3bF9Z/2M3e TLE7TyA2oKn5uBRUyqtKtftZifJrYJ495MjdTQrxN0l2LTzhMHxYpUf4HKj7Y2of Li84bV97z8PPf1MmI7v9w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredttden ucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgvrhhnpe dtgeekheeggeettdevtedufedtfffhuddtvedtueeugfegtdettddutedtgedtleenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopeefpdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtoheplhhilh hirghnrgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopehmrgigihhm rdgtohhurhhnohihvghrsehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 21 Sep 2024 10:53:39 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 22:53:08 +0800 Message-ID: <1a93898a36b7b639bb04e077c717c170abe3a05d.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Liliana Marie Prikler * gnu/packages/freedesktop.scm (xdg-desktop-portal) [inputs]: Move after arguments. Drop labels. [native-inputs]: Move after inputs. Drop labels. Reviewed-by: Maxim Cournoyer --- gnu/packages/freedesktop.scm | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f00f4b3956..664adf0cb2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3001,26 +3001,6 @@ (define-public xdg-desktop-portal ;; Disable portal tests since they try to use fuse. (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) (build-system meson-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gettext" ,gettext-minimal) - ("python" ,python) - ("python-dbusmock" ,python-dbusmock) - ("python-pytest" ,python-pytest) - ("python-pytest-xdist" ,python-pytest-xdist))) - (inputs - `(("bubblewrap" ,bubblewrap) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("flatpak" ,flatpak) - ("fontconfig" ,fontconfig) - ("json-glib" ,json-glib) - ("libportal" ,libportal) - ("dbus" ,dbus) - ("geoclue" ,geoclue) - ("pipewire" ,pipewire) - ("fuse" ,fuse))) (arguments `(#:configure-flags (list "-Dsystemd=disabled") @@ -3034,6 +3014,26 @@ (define-public xdg-desktop-portal (find-files "po" "\\.po$")))) (add-after 'unpack 'set-home-directory (lambda _ (setenv "HOME" "/tmp")))))) + (inputs + (list bubblewrap + dbus + flatpak + fontconfig + fuse + gdk-pixbuf + geoclue + glib + json-glib + libportal + pipewire)) + (native-inputs + (list gettext-minimal + `(,glib "bin") + pkg-config + python + python-dbusmock + python-pytest + python-pytest-xdist)) (native-search-paths (list (search-path-specification (variable "XDG_DESKTOP_PORTAL_DIR") From patchwork Sat Sep 21 14:53:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68274 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 125F927BBEA; Sat, 21 Sep 2024 15:55:45 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 8521727BBE2 for ; Sat, 21 Sep 2024 15:55:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss1VW-0001KG-RE; Sat, 21 Sep 2024 10:54:46 -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 1ss1VV-0001Jj-Mo for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:45 -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 1ss1VV-0006Ve-Bh for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:45 -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=E3vBdmd4NNiyPGZwq+rt33Ii907fOXVEULqddZJmwhE=; b=AbPnycYSAfZl/6SmtYt1QEtphHfLGaazW/sRHw1dMpuQc30C0lXW3oPUWhbm/VTyoTBpXDW+zyM4ZdAcQk+20Aj0Hzk5XKxTVNyXA2h4qD8NZbtmei0zF7ib7nMPcAJDXvTqd5PFrNLWs+gpdr1bdgyomG8D4xzJSLI4OP5aAvmuQBlVyECG/EF6bQeKE5nUWcAjC1IA5/CnuNtE7CT0x8rsxkmluLuhQI4VoAl5KmbX93jYYifujNTG2ksfXTDhnWSBvZR/W/ObEg8YZ9AHOL205wbDkI6QKVznwifW41Ihph9OPoYMl6/2fCM5S7rdWzej3m/WW+ueqJkE/EUwyQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ss1Vn-0004dQ-H1; Sat, 21 Sep 2024 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v8 3/8] gnu: Add cppgir. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.172693045517657 (code B ref 71897); Sat, 21 Sep 2024 14:55:03 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:15 +0000 Received: from localhost ([127.0.0.1]:40148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V0-0004ai-It for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:15 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:53051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Uv-0004Zm-I5 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:10 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.phl.internal (Postfix) with ESMTP id 077B4138013A for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:44 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Sat, 21 Sep 2024 10:53:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1726930424; x=1727016824; bh=E3vBdmd4NNiyPGZwq+rt33Ii907fOXVEULqddZJmwhE=; b= ng4ElA+k98ILmc4GHXbHdzLotqlfFZ/mLNXObvq0X7jjrYkmS9KuPJoTWxN9z2KV Yl9FJEF580sN/97igdqwERvY1A2G61fC7c3A+F2rzzWmmDnmY+YkeA6BjyUaxalW RWn0AXVDDfTjHncUBZ1RFgqE4Ao5Lwdv2pLzvqL/o9/FI1z6MGE9G0kSa9Jpg3PP /VuWbOIrGJtVyAxQbgpo8vy/X7awDqKPVOE60Da9ScdzdLqaG5WSJYFM0I0VYlTJ 7BqNj+fL8lgnkkrK56lOfXv2m5vV6jN8KRSdyizXBA4UtZNJDkH0Pw6xQfzs/Zr5 Gct69RbNB2hg5iRbkdy4Fg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1726930424; x= 1727016824; bh=E3vBdmd4NNiyPGZwq+rt33Ii907fOXVEULqddZJmwhE=; b=E 0GP+2CWhWwysBDE0dhK5u/YN3AzuuaWhbtRpMceoli7+5rK1Xw1iFb5oIrf4F/w+ k+QpxTye63GWzaTD/IVaZq9Izx028yw7m09zhzD0RWKfQ/x7UugU7FVMzlSX2p0T Cq76V/vlXzYQ24O+UW6loQZ1CCNfEk73Q0L0FId5pkzcKx7x30ieaY4QK1QGN4pA PF8A8nWvrkHPqrpD8dFHRgjqGYf5BMBkC3ShzlASovZpc7CAR3BYUrC9QG5PANJo aNvXELPcYvCsNDQAdnuL0bhX3CCcrZFaS6eZEDSYG5npHqqwEPjcUE+igLqkhxN1 bg6Zs7znmkaQaPE7QCqug== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgr mhgvsheqnecuggftrfgrthhtvghrnhepgfettddtgfdttdeiffdufeefleegtddutddvve ehkedtieefvdeifeeiffeijeeunecuffhomhgrihhnpehgihhtlhgrsgdrtghomhenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:42 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 22:53:09 +0800 Message-ID: <63bc539416af351630e1008c30c311a62b3c1201.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (cppgir): New variable. Change-Id: Ic4510be6d05b7b3977aa457c6a7fec382c1d3a88 --- gnu/packages/glib.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d6275ea63e..f695d065b3 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2021, 2024 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver @@ -21,6 +21,7 @@ ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Remco van 't Veer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,6 +73,7 @@ (define-module (gnu packages glib) #:use-module (gnu packages perl-check) #:use-module (gnu packages popt) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) @@ -1592,3 +1594,30 @@ (define-public libdex Dex also provides Fibers which allow writing synchronous looking code in C that uses asynchronous and future-based APIs.") (license license:lgpl2.1+))) + +(define-public cppgir + (package + (name "cppgir") + (version "2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cj4myqzb28hgb7zlxlba9y8n4ysxkvv2y9wy6f7ps58mr18h7bl")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DINTERNAL_EXPECTED=OFF"))) + (inputs (list boost fmt expected-lite)) + (home-page "https://gitlab.com/mnauw/cppgir") + (synopsis "GObject introspection C++ binding wrapper generator") + (description "cppgir processes .gir files derived from GObject +introspection annotations into a set of C++ files defining suitable +namespaces, classes and other types that together form a C++ binding.") + (license license:expat))) From patchwork Sat Sep 21 14:53:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68270 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 C984B27BBEA; Sat, 21 Sep 2024 15:55:26 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 4CA3F27BBE2 for ; Sat, 21 Sep 2024 15:55:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss1VW-0001KT-UY; Sat, 21 Sep 2024 10:54:46 -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 1ss1VU-0001JG-Q4 for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:45 -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 1ss1VU-0006VE-AN for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:44 -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=Kc56k18rt3CVc0itDOUXwAK203nw+RFffLnTMKJZEgQ=; b=C7Ev6Wj4xYvIepLdWeK4BIKFglUFONpopmObxKLpGFfdZiVQBjWDvz1BEZtBCs1wNoHrm4BEiA1PCuqSbIEgaPSCsz3p8c0LcD4uHjcmVZlAgHEu3uIRSII0LpSx6ndlppoV3NQvcqbJoaeEfcqQV5h/aQQP0qzjD8C+J6/cASQ8JQkEvK3Cyi9Z/GXRc0nsymh3L9yFlOnIT/Wf81WJcpCMem8nV4zRfHXRB/wn4PCbaCs2zfw4MVnFgjh2PvdTN23fk3xHOlY5FeujUi10d7jxxTH3i3gQP9UEI8AN95itJzubrYkOPUYtHCWHhvN7jJU9nojd1ni1HM0GElET9A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ss1Vo-0004dW-33; Sat, 21 Sep 2024 10:55:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v8 4/8] gnu: Add cppgir-for-telegram-desktop. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 14:55:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher , Vivien Kraus Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.172693045517670 (code B ref 71897); Sat, 21 Sep 2024 14:55:04 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:15 +0000 Received: from localhost ([127.0.0.1]:40152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V1-0004ak-5N for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:15 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:52485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Uy-0004a5-4x for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:12 -0400 Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfout.phl.internal (Postfix) with ESMTP id AB8BE1380174 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:46 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Sat, 21 Sep 2024 10:53:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930426; x= 1727016826; bh=Kc56k18rt3CVc0itDOUXwAK203nw+RFffLnTMKJZEgQ=; b=o LR9Lf1X13SQUipdXsR1P/BZOy+8AWSF7bs7l6N+LYXsreojp8pfX388fA657HczZ N1SPl3N2IIrQuiiy/m/4z8dhIH1bLlj1+eKx9+OBmQLyOig2Wvo634h7MpGACopU QMYHov84YvhrlVp4mIkHJapPOObo7oFVEftJnHF7wVZJrR3OU0I2Jg/8d12u1pmJ ESbY8or5cU+KhvLDxrq3apPnFRmhvVYUxVIcGpgmB6hJMy01dSBebNMjwkYweIU/ APc+xUXuk72PqXrPWxqQjIsbckwCeUUYdYb+xNRyu3HzU8NyCFeW+qvpy4SItl5z 1SpGkRRLsxGh2/bZTfLJA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726930426; x=1727016826; bh=Kc56k18rt3CVc 0itDOUXwAK203nw+RFffLnTMKJZEgQ=; b=nNMkAjoZELoaMluoP8S3rZBwoIovp Kkhgqu1fXS0BF+xQgXpnsX9yxB64Tn/QpQXfIhezKC0WhkwaBP4pruFfV+YdG2cf sgDd1WYVBep+kf2UyzCsZVpRVu6DCNHK10o8cEHTnjol9TecVShTb9HBPgEuH4FX 7jFpykhMRyQ60X94frjfeNpBcDQbe31YmwZTRMxCBUzo4M7VoP5TRLsPtxR0MQrc 4W3lA0chwMECgRp186M8cXmbSsyhDjqSOXWICrb4offO3YQoT3wb6dJzhazU4PBS Frhu1yIY1kdKAkc7CFXTbIaaxQgFNWEs+MBqw881NpMeJRKOlTcGVtSUg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeellefgffefiefgleetudeliefgjedvteeugffghe fggfeivefhvdevfeeftdeljeenucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:45 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 22:53:10 +0800 Message-ID: <38f217e7fe26ca0cf6324222a74ce4c6fecfa9f5.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (cppgir-for-telegram-desktop): New variable. Change-Id: Ib9ca3bd376f32d13939adabd2c52e1eb24e2ddcb --- gnu/packages/glib.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f695d065b3..75954217be 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1621,3 +1621,22 @@ (define-public cppgir introspection annotations into a set of C++ files defining suitable namespaces, classes and other types that together form a C++ binding.") (license license:expat))) + +;; telegram-desktop requires a more recent version of cppgir +(define-public cppgir-for-telegram-desktop + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (inherit cppgir) + (name "cppgir-for-telegram-desktop") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.com/mnauw/cppgir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fa9nf4yljfarihaqj5kd98yysrky7q316mh6l5b1rq39ga15k9b"))))))) From patchwork Sat Sep 21 14:53:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68272 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 AEEF427BBEA; Sat, 21 Sep 2024 15:55:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 40ECB27BBE2 for ; Sat, 21 Sep 2024 15:55:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss1Va-0001Km-KJ; Sat, 21 Sep 2024 10:54:50 -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 1ss1VV-0001JS-AC for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:45 -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 1ss1VV-0006VN-0q for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:45 -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=4VZSxwnGY/koEx83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=K0clNf4hp5qsaFL0lqmK5MJeGe9t3gxEO2ywFpN+3EPkBJb4hMxCkiPHUffArbo1uyQSr+yYxm/bX8HIu9Zl03twB27PkBUtA5RlG42NKc7CAovNNZvborbJdaycyZX9p6I24b6/ak5jsMjyH6honFCH8AKIGeOxl6OltLMBkDloDYSKcctEprDXrtsyHWalQxiNFv22yVZnumy+WRn0eNxSjoVBfWbmeAjsM/ivi0Erj53oGfPv5GPtFEdyJgpNU44qGZ0G4Ua5Adbx6uIuiAbyXwNhJMjaq/mfjfFsTiUF16mVSfwJ6Wc+/xfcpbo6tizjD1wfAruu3pCG+rhNKA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ss1Vo-0004df-JF; Sat, 21 Sep 2024 10:55:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v8 5/8] gnu: simdjson: Update to 3.10.1. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 14:55:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.172693046117691 (code B ref 71897); Sat, 21 Sep 2024 14:55:04 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:21 +0000 Received: from localhost ([127.0.0.1]:40156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V6-0004bF-Qb for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:21 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:49965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V1-0004aP-0F for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:15 -0400 Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfout.phl.internal (Postfix) with ESMTP id 7D4C51380178 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:49 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Sat, 21 Sep 2024 10:53:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930429; x= 1727016829; bh=4VZSxwnGY/koEx83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=o YYGE7PyWGZB+0NTt1ZxFhoSz9/JPrlx+egXhiVGK6mIsGuz/6hdtHQz4UKDBptLW 3EVPVaLDgmB/qOyUGn8pvyzNMGI+F3/CNi084Y2efy14Ltz8f4OpC41rkUmi3O9g znT4euxTuD8SB8unWLdG0Z2rLOj5ifoOVMj60BmXNIYZKs1N2PxLmjVQq9erG7ul QM1MTzUDBKtbnGSQ29jgL03uNj6lDJSpnnki+7Bd7P48/YiwfFEH1IEkHZMDq5/Q MjSNqpis4IrtfK3ieR9uedo9oWLyBsZ2Cm/V5vOmjEbfIRFYXqWjJcZqWP2oRqXM a3BSD3+Z5cKApTASazVfw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726930429; x=1727016829; bh=4VZSxwnGY/koE x83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=MxvyXNPAcPu8t549YyoDCaI29PuBo FJ/ZXdSuWGGuDemqVrSLlxbSr3bCPVWsmceRfCWQWFFnnyx6WQtzbUZ44gg+YbsB yJQmzeq3HoUTyWziKUIRl/IUSsHmsVVwAnkR0CbFxuYBzXKJn7cSnUWmIaMOGYMq ZRPembGLhZo0+Ax3PypYEZrt/sFxY9+l7ADtKd/1blvkJ2loNqiP/bCXRfje/sU9 jcTEIpRza3fCr78vQcCvR1OlcbVQ+k3K530HpObEFmhXVfx2h+TcEaKm3TDd1PhO oIuFUqjtQnw0mHHiVWbj8bcBnOADLbReuqSqqik38aZKD5SAbH2+YMgoQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpeeffffftdehteetvdelieehgeehtedvteethefgte eivdetgeegtdejtdduudeludenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtphhtthhopedupdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvggssghughhsrdhgnhhu rdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:48 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 22:53:11 +0800 Message-ID: <63a164e789af25cac72b63f519d9bf49d89361e8.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (simdjson): Update to 3.10.1. Change-Id: I6711077e162bcfbf6702d521fdeec44e3b21f074 Reviewed-by: Maxim Cournoyer --- 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 7d782c7ea6..c805dae825 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2395,7 +2395,7 @@ (define-public python-jsonnet (define-public simdjson (package (name "simdjson") - (version "3.1.0") + (version "3.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -2404,7 +2404,7 @@ (define-public simdjson (file-name (git-file-name name version)) (sha256 (base32 - "0q784bm8xbz3p782dw02cdds6m71wk3acy94vva8krc9g88142ws")))) + "1qv7lvls7x9aw6mlnwfgchbajsxh6qygp09wpkb2w6mjdbidmi0h")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; tests require downloading dependencies From patchwork Sat Sep 21 14:53:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68267 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 996B027BBE9; Sat, 21 Sep 2024 15:55: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 411BD27BBE2 for ; Sat, 21 Sep 2024 15:55:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss1VZ-0001Kh-1y; Sat, 21 Sep 2024 10:54:49 -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 1ss1VV-0001JH-3M for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:45 -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 1ss1VU-0006VJ-R4 for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:44 -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=vDfSucveZIK50iLboYcGc5vUmcjj0CcgMcm/xqh1bqA=; b=svlvCvV5aJNmlv9pkuNGHnb+Xe3eCSbY+nnwzLZfcHXGh4EZdPyK1sR7d16L6Y2b9ZQZ9Zwi3hitE9GZT1hxAr63I+N2nYtVJU14v2C0/7xBc8C5M6nS6AGkh/TQFJLb4Ie3YnSEqwol5PboyMZJQJ754k7f6ygUs4QYOtmikDpBtnVHcldLa4Hwzie3ou/sOyRmebldMLGJt9/9Bnw8GhXjMwvv8OK9pjhgyKPUnKLMCBEhZfgG7TccskqKJkIoWGkGqHZyAraw7dp9ZfRvon43G1kEyqLKmXVv+HMV2jI6t0Pu15HsXIQdlQ5pLf7RB2O8EQZ50EectCDS61tDDg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ss1Vp-0004dq-3C; Sat, 21 Sep 2024 10:55:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v8 6/8] gnu: Add cpp-ada-url-parser. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 14:55:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.172693046217703 (code B ref 71897); Sat, 21 Sep 2024 14:55:05 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:22 +0000 Received: from localhost ([127.0.0.1]:40160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V7-0004bI-6v for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:21 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:57403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V4-0004ae-2e for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:18 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.phl.internal (Postfix) with ESMTP id 8F951138013A for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:52 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Sat, 21 Sep 2024 10:53:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930432; x= 1727016832; bh=vDfSucveZIK50iLboYcGc5vUmcjj0CcgMcm/xqh1bqA=; b=a D9L472asxXtDc4sDIysQknNFEfbh6Xg3c5VkqnjNxbJHRIuQTSg5V5FtxSdDOhXh +9DTs12MmQIl9y/jf5H9DsiQzIRryoMC7xBNBF0igUKE/sKNQpNRvswz6rsOoTSf 4OK7SEC1aLB6YCjVmSqt3MNskMLmnf1drK5JTi/020yE/mnvWv6Nwl2/G73N2wxA 0KN+2jWpKpTnO+ES0M930hOLm/LKc0A4L9ezEFKBd9SBH+yzjPhrQrNuOGs16BzQ riiGByerfbjV9/IsglVRISt+Fapg5Od93Rpp8N+mNOM14IQjTe3kkpcZaB6GRKrg /wgGiVrirtWJJkM0kt4JQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726930432; x=1727016832; bh=vDfSucveZIK50 iLboYcGc5vUmcjj0CcgMcm/xqh1bqA=; b=ST1XhWDMNKKDnAQB/+mDzCxK9xD30 KWA+A/JYxW50MAB/9PwoH1BOB9YOH3yG2AZ0gMTGM5xq2xPFXEMXMMibrvfsq5Gg Lp18Sk0MUsCSg31G5douYvxtWT7WvkqrlU4UcFk5CWc8dKKqxk3JSzM+toYFOav3 y6scpa96KytRoN4AzC+/onEhYbEGUhHwoAYaA02d+GMxZ/OXK87ZsLa0QL0vHSgt i7wdJ0Og9JD3LS8yWvqtYgjROggmLtTa2fpdWyIBHAeRRMmpEAKkpZYmi8R9n5Lj 1+Vej3MymolAufUxcW2zA8YhNdSS/EvlLMkab7/v0yuWjVSE6Pjf0B1Hw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpefhjedvfeekkefhheeiveeuueeftdejveejleeute eludelgedtueetfefhudeuvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:51 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 22:53:12 +0800 Message-ID: <2ae23a993d9f52c8a4fd5ef0aff148fa5ab4e509.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/cpp.scm (cpp-ada-url-parser): New variable. Change-Id: I9924bba53ed58bbf306bf073c9724cd7bd6f570a --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 26 ++++ ...ser-find-system-testing-dependencies.patch | 130 ++++++++++++++++++ 3 files changed, 157 insertions(+) create mode 100644 gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch diff --git a/gnu/local.mk b/gnu/local.mk index 802f4be4fe..829c5e166e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1103,6 +1103,7 @@ dist_patch_DATA = \ %D%/packages/patches/cool-retro-term-wctype.patch \ %D%/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch \ %D%/packages/patches/coreutils-gnulib-tests.patch \ + %D%/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch\ %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch\ %D%/packages/patches/cpulimit-with-glib-2.32.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c805dae825..92be49967f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3284,3 +3284,29 @@ (define-public tl-optional the std::optional for C++11/14/17, with support for monadic operations added in C++23.") (license license:cc0))) + +(define-public cpp-ada-url-parser + (package + (name "cpp-ada-url-parser") + (version "2.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ada-url/ada.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "0xvvjlia627ajl966gdxzy2b1j0jiimx7zx8ypmffwx0k6x72qam")) + (patches (search-patches "cpp-ada-url-parser-find-system-testing-dependencies.patch")))) + (build-system cmake-build-system) + (native-inputs + (list cxxopts + fmt + googletest + python + simdjson)) + (home-page "https://github.com/ada-url/ada") + (synopsis "URL parser") + (description "Ada is a fast and spec-compliant URL parser written in C++. +Specification for URL parser can be found from the WHATWG website.") + (license license:gpl3+))) diff --git a/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch b/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch new file mode 100644 index 0000000000..b32d162530 --- /dev/null +++ b/gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch @@ -0,0 +1,130 @@ +From 74cac57a3cebe0cfbbc44f46270d5e51986f4881 Mon Sep 17 00:00:00 2001 +From: dan +Date: Sat, 21 Sep 2024 18:49:10 +0800 +Subject: [PATCH] find system testing dependencies. + +--- + CMakeLists.txt | 50 +++++++++----------------------------- + singleheader/amalgamate.py | 2 +- + tools/cli/CMakeLists.txt | 8 ++---- + 3 files changed, 14 insertions(+), 46 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a7ce3796..0903cc31 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,43 +28,23 @@ option(ADA_TESTING "Build tests" ${BUILD_TESTING}) + # errors due to CPM, so this is here to support disabling all the testing + # and tooling for ada if one only wishes to use the ada library. + if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) +- include(cmake/CPM.cmake) +- # CPM requires git as an implicit dependency +- find_package(Git QUIET) + # We use googletest in the tests +- if(Git_FOUND AND ADA_TESTING) +- CPMAddPackage( +- NAME GTest +- GITHUB_REPOSITORY google/googletest +- VERSION 1.14.0 +- OPTIONS "BUILD_GMOCK OFF" "INSTALL_GTEST OFF" +- ) ++ if(ADA_TESTING) ++ find_package(GTest) + endif() + # We use simdjson in both the benchmarks and tests +- if(Git_FOUND AND (ADA_TESTING OR ADA_BENCHMARKS)) +- CPMAddPackage("gh:simdjson/simdjson@3.9.1") ++ if(ADA_TESTING OR ADA_BENCHMARKS) ++ find_package(simdjson) + endif() + # We use Google Benchmark, but it does not build under several 32-bit systems. +- if(Git_FOUND AND ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) +- CPMAddPackage( +- NAME benchmark +- GITHUB_REPOSITORY google/benchmark +- GIT_TAG f91b6b4 +- OPTIONS "BENCHMARK_ENABLE_TESTING OFF" +- "BENCHMARK_ENABLE_INSTALL OFF" +- "BENCHMARK_ENABLE_WERROR OFF" +- +- ) ++ if(ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) ++ find_package(benchmark) + endif() + + if (ADA_TESTING AND NOT EMSCRIPTEN) +- if(Git_FOUND) +- set(CTEST_TEST_TIMEOUT 5) +- message(STATUS "The tests are enabled.") +- add_subdirectory(tests) +- else() +- message(STATUS "The tests are disabled because git was not found.") +- endif() ++ set(CTEST_TEST_TIMEOUT 5) ++ message(STATUS "The tests are enabled.") ++ add_subdirectory(tests) + else() + if(is_top_project) + message(STATUS "The tests are disabled.") +@@ -72,12 +52,8 @@ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) + endif(ADA_TESTING AND NOT EMSCRIPTEN) + + If(ADA_BENCHMARKS AND NOT EMSCRIPTEN) +- if(Git_FOUND) +- message(STATUS "Ada benchmarks enabled.") +- add_subdirectory(benchmarks) +- else() +- message(STATUS "The benchmarks are disabled because git was not found.") +- endif() ++ message(STATUS "Ada benchmarks enabled.") ++ add_subdirectory(benchmarks) + else(ADA_BENCHMARKS AND NOT EMSCRIPTEN) + if(is_top_project) + message(STATUS "Ada benchmarks disabled. Set ADA_BENCHMARKS=ON to enable them.") +@@ -107,11 +83,7 @@ if(NOT ADA_COVERAGE AND NOT EMSCRIPTEN) + endif() + + if(ADA_TOOLS) +- if(Git_FOUND) + add_subdirectory(tools) +- else() +- message(STATUS "The tools are disabled because git was not found.") +- endif() + endif() + + install( +diff --git a/singleheader/amalgamate.py b/singleheader/amalgamate.py +index 52b154b6..94e4e638 100755 +--- a/singleheader/amalgamate.py ++++ b/singleheader/amalgamate.py +@@ -138,7 +138,7 @@ if SCRIPTPATH != AMALGAMATE_OUTPUT_PATH: + + shutil.copy2(os.path.join(AMALGAMATE_INCLUDE_PATH, 'ada_c.h'), AMALGAMATE_OUTPUT_PATH) + +-zf = zipfile.ZipFile(os.path.join(AMALGAMATE_OUTPUT_PATH, 'singleheader.zip'), 'w', zipfile.ZIP_DEFLATED) ++zf = zipfile.ZipFile(os.path.join(AMALGAMATE_OUTPUT_PATH, 'singleheader.zip'), 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False) + zf.write(os.path.join(AMALGAMATE_OUTPUT_PATH, 'ada.cpp'), 'ada.cpp') + zf.write(os.path.join(AMALGAMATE_OUTPUT_PATH, 'ada.h'), 'ada.h') + zf.write(os.path.join(AMALGAMATE_INCLUDE_PATH, 'ada_c.h'), 'ada_c.h') +diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt +index 9f0da167..d0f7e0c9 100644 +--- a/tools/cli/CMakeLists.txt ++++ b/tools/cli/CMakeLists.txt +@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS) + "$" # <--this is in-file + "$") # <--this is out-file path + endif() +-CPMAddPackage("gh:fmtlib/fmt#10.2.1") +-CPMAddPackage( +- GITHUB_REPOSITORY jarro2783/cxxopts +- VERSION 3.2.0 +- OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES" +-) ++find_package(fmt) ++find_package(cxxopts) + target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt) + + if(MSVC OR MINGW) +-- +2.45.2 + From patchwork Sat Sep 21 14:53:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68268 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 01F9227BBE2; Sat, 21 Sep 2024 15:55:24 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, TVD_SPACE_RATIO,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 8526027BBE2 for ; Sat, 21 Sep 2024 15:55:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss1Vb-0001L7-94; Sat, 21 Sep 2024 10:54:51 -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 1ss1VV-0001Jg-Lu for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:45 -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 1ss1VV-0006Vd-9p for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:45 -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=CGfP3BtmV5YLyvohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=Db8J0Oo8eNBqKtpOke3k9y2wOvH4+h9JZH/Ls9IeCTja+NSb3vsFU5143VexjcJeVW5g3wVdf/ah5qr+p/3MPLLlWq748NxbCmMAlzdv2DtLh7Enx2peNPegD/0kteQTGGF+ATffYsfZvOguzJXjQIXbssF2Iqv1u7v19806Lr0PGPi1qHke+HH5Kdh343jtJbfW/zoSU2TjautFCCZTwaJWd7pJ/TNgnwJtyKprguP68xlVdTHcBoANrxRvHtFljKBIotqm5bndOj9dopT8nfdwOM0/MyCEPyB6knDljfVYjys98P7qm/YYgbNW4KcP5VY6uk1z6OFzrIy6ktQnhQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ss1Vp-0004e3-Hx; Sat, 21 Sep 2024 10:55:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v8 7/8] gnu: Add libprisma-for-telegram-desktop. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 14:55:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.172693046817726 (code B ref 71897); Sat, 21 Sep 2024 14:55:05 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:28 +0000 Received: from localhost ([127.0.0.1]:40164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1VE-0004bp-1e for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:28 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:55401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1V7-0004b3-0C for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:21 -0400 Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfout.phl.internal (Postfix) with ESMTP id 7D54F1380174 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:55 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-09.internal (MEProxy); Sat, 21 Sep 2024 10:53:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930435; x= 1727016835; bh=CGfP3BtmV5YLyvohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=h T7VOSjKu/NsxooPTBQD/UXeT33Bgma+S4LHSsdOkzawex3ZE7JIDWp5yq26TQ/8r 6LSSPiXPQhJee9SB4/AOAnjHHu3aRy4Si2A1dgQjFo7hzdfCKhZmM+nEUvhRfQi1 QsvQvZmtmIHcvTF3ofA6lwS2d0AB68qEfeh0Cg99tlAQKHCngiyYKKMEyjv7my1W Ev03YbFuBrziDAVdrHcFaTzRWXancpVINT5ve0jGQnTSeuyqMgDR5s//30HYwxZv 0PouNxdnwETashbs1kHzAtEqPtEckGz0tqbiPUowW3G6peeDgIeFncWSWEYMabvP otDlSMfOiTcc5+32Bh2gQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1726930435; x=1727016835; bh=CGfP3BtmV5YLy vohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=UXQeSQCnl7DvgHq2DzTX+yMcpZbaa eiF25+5sDq+856be+hyYHvfSFmJYJpKYP79BI8Yxk0+tyfSxBqicETU/tcEe7iMS qAJz4TA/7pNXq3uJOP6b41lffxJa37V1SMYR+lUEHdX+1BMZPpOU96mTbebam7eN KASpkEkmTNo/PaYfU7noqHYxnsIkomnVKZgb9pnqpnE7ISjZkRrgbCx6TgxLAgwx BbomZeHjjhEtVcLG3UiSNbZy/plXiGc0YeZWPWbQxVYUOB5dyNe60FVnTKMeTnbV S91CcEfi3brduKjakCYgLrO1c5IlUN+CVmoGvbt3uQEC/vaN0xhY25UCQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghm vghsqeenucggtffrrghtthgvrhhnpefhjedvfeekkefhheeiveeuueeftdejveejleeute eludelgedtueetfefhudeuvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvshdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepjedukeeljeesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:54 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 22:53:13 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 Reviewed-by: Maxim Cournoyer --- gnu/packages/telegram.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 432d6f79a1..af16d4840b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -400,6 +400,18 @@ (define cld3-for-telegram-desktop (base32 "0ayrrhfdwrf4260h9fsirkhhfrcvc3qqnh6h9wj3ixij2lq0wwqb")))) +(define libprisma-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/libprisma") + (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + (define-public telegram-desktop (package (name "telegram-desktop") From patchwork Sat Sep 21 14:53:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68271 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 6565B27BBEA; Sat, 21 Sep 2024 15:55: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 00C0927BBE2 for ; Sat, 21 Sep 2024 15:55:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss1Vb-0001Kw-5L; Sat, 21 Sep 2024 10:54:51 -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 1ss1VW-0001KF-Pt for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:46 -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 1ss1VV-0006WF-Q9 for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:46 -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=YRauKMNqRtr8ILdRS58coftvZLPwaqx9eYHxeGjjTYI=; b=jGXR0pSRutBqUrwkwDOMIkwstsVeCmFyaRHozVLgSwa5yWm3NPVbmulNYHfdRcC6qz6q6Pss0zCTe/JECW53i7WHK+WI3SZ+ErKfsQkp7bO06iq//E5Y58+vffFYJriW5FYFNrc9nSC6HIWIEW1vFrZTkxdyu2sy+u71fc9cD/eMcDNmldSVShzcra7Jz+yXR87EWB6TCIeGFfdpmpCq7f51eQ/p0aB4P43yMpdeEioE8oq9+/0rVanE0iwBt6qp2y0Zs88Y9Zr4quc9Seg51+jnbRRXuP8FLnylQuyOP4y3l8JkVd0qtkSJ8n7ZzN7UzuWXWgt+NufFR9xhgfJQuQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ss1Vq-0004eE-0t; Sat, 21 Sep 2024 10:55:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v8 8/8] gnu: telegram-desktop: Update to 5.5.5. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 14:55:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.172693047017734 (code B ref 71897); Sat, 21 Sep 2024 14:55:05 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:30 +0000 Received: from localhost ([127.0.0.1]:40166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1VE-0004br-Iy for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:29 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:60337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1VA-0004bC-EE for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:26 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id E8B211140162 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:58 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Sat, 21 Sep 2024 10:53:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1726930438; x=1727016838; bh=YRauKMNqRtr8ILdRS58coftvZLPwaqx9eYHxeGjjTYI=; b= ZWeM8vXZWoU5Y3g57qhzLOK2Is2SnxNWVfU5QOjg3QV9PMW76VLnAhZ5cwzej8oj CwfpzkJy8C4DnEwKvh6q6gI0TKeDQ80dVW88w6crZW9aPCHcMtUzYQO6eAir8pNu wyOEjnS5cnP4xD2TFBXUBI0R7yAYu+7br/B7b9MPF92ttlDIbVs63ikIBCaoiAcJ uUUiw/PYuTaj1ndVr3ktibwKhcu+rSM30hr1zWuuEzzv85sKbtqEHWPrq5bmljAV jRmejsBlquIvXqIr5eEwlml4u3AnhI7FbLJ89ie2Xh2nwtkHncpLrMDWJaZphRCP vb32hXzUIYLQht2eVcquIQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1726930438; x= 1727016838; bh=YRauKMNqRtr8ILdRS58coftvZLPwaqx9eYHxeGjjTYI=; b=l WOeKVmcutMCIBJuIk6HLwG7cVbi5c+AfTD9gLpWgWHPs+AZoYyVy2TpD6qIKrnnW Cj9VwfGPBsO92hL60l8rtTVFgk4sz+R9KSsB5WHWSBSEqccg9G7jLcI4eySGszSp KK2/mSglvDOJtu4Ba5SAG1kGUC1iP8s1JORAxtOx5R90Z+7k2tgU2yK8jUmdbvz6 Zw8ar8atDnWSza6Coz79aDpBHCssoHBpgJVfDfgtwFNHb1cH7oLgZtYvoBc2xQOv jkoLRFn0kN+Ii3Of1xhYIvpV0AUpZbmdpg9dfXoWOlgUumvGCOJniHlLP7bAHlJ3 aUTYbD/84LYHEYvLiTY1w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdlud dvmdenucfjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpegu rghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepieekuedvtdevle egheduheelheetfffhhfffhfdvveegveekhefhffeiueeigeeinecuffhomhgrihhnpehg ihhthhhusgdrtghomhdpkhhithifrghrvgdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgt phhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejudekleejseguvg gssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 10:53:57 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 22:53:14 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Update patch file to match upstream changes. * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: Update patch file to match upstream changes. * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/telegram.scm: (libyuv-for-telegram-desktop, cmake-helpers-for-telegram-desktop) (codegen-for-telegram-desktop, lib-base-for-telegram-desktop) (lib-crl-for-telegram-desktop, lib-lottie-for-telegram-desktop) (lib-qr-for-telegram-desktop, lib-storage-for-telegram-desktop) (lib-tl-for-telegram-desktop, lib-webrtc-for-telegram-desktop) (tgcalls-for-telegram-desktop, webrtc-for-telegram-desktop): Bump to submodule checkout. (cmake-helpers-for-telegram-desktop)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): Use %telegram-version. (telegram-desktop): Update to 5.5.5. [:configure-flags]: Add disable jemalloc flag. [#:phases]: Add libprisma-for-telegram-desktop. : New phase. : New phase. : New phase. [native-inputs]: Add cpp-ada-url-parser, gobject-introspection and xdg-desktop-portal. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and remove jemalloc. Change-Id: I0ea3ea5a3e416a9d5b2b5b7b55ca1af679bc3d38 --- gnu/local.mk | 2 + ...gram-desktop-allow-disable-libtgvoip.patch | 6 +- .../telegram-desktop-unbundle-cppgir.patch | 95 +++++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 +++++ ...or-telegram-desktop-unbundle-libsrtp.patch | 7 +- gnu/packages/telegram.scm | 112 +++++++++++------- 6 files changed, 205 insertions(+), 48 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch create mode 100644 gnu/packages/patches/telegram-desktop-unbundle-gsl.patch diff --git a/gnu/local.mk b/gnu/local.mk index 829c5e166e..623da8c3ff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2197,6 +2197,8 @@ dist_patch_DATA = \ %D%/packages/patches/texinfo-headings-single.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ + %D%/packages/patches/telegram-desktop-unbundle-cppgir.patch \ + %D%/packages/patches/telegram-desktop-unbundle-gsl.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/teuchos-remove-duplicate-using.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch index a603bc9d72..1354a1e9cd 100644 --- a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -47,10 +47,9 @@ diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/ca index 5fe9ac677..bebf48e70 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp -@@ -39,8 +39,10 @@ class InstanceImpl; +@@ -39,7 +39,9 @@ class InstanceImpl; class InstanceV2Impl; class InstanceV2ReferenceImpl; - class InstanceV2_4_0_0Impl; +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP class InstanceImplLegacy; void SetLegacyGlobalServerConfig(const std::string &serverConfig); @@ -58,10 +57,9 @@ index 5fe9ac677..bebf48e70 100644 } // namespace tgcalls namespace Calls { -@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register(); +@@ -56,6 +58,8 @@ const auto Register = tgcalls::Register(); const auto RegisterV2 = tgcalls::Register(); const auto RegV2Ref = tgcalls::Register(); - const auto RegisterV240 = tgcalls::Register(); +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP const auto RegisterLegacy = tgcalls::Register(); +#endif diff --git a/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch new file mode 100644 index 0000000000..a24dbe25bb --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,95 @@ +From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/CMakeLists.txt | 4 +++- + external/glib/generate_cppgir.cmake | 7 ++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4be..c862705f 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope + set(BUILD_EXAMPLES OFF) + add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() +-add_cppgir() + + include(generate_cppgir.cmake) ++if (NOT CppGir_FOUND) ++ add_cppgir() ++endif() + generate_cppgir(external_glib Gio-2.0) + + find_package(PkgConfig REQUIRED) +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c15d3f9e..9b0a5ac8 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -4,6 +4,8 @@ + # For license and copyright information please follow this link: + # https://github.com/desktop-app/legal/blob/master/LEGAL + ++find_package(CppGir 2.0) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + +@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir) + ${cppgir_loc}/data/cppgir.ignore + ${cppgir_loc}/data/cppgir_unix.ignore + ) ++ if (CppGir_FOUND) ++ set(ignore_files) # rely on default ignore list ++ endif() + + set(gir_path) + if (IS_ABSOLUTE "${gir}") +@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir) + --class + --class-full + --expected +- --ignore ++ "$<$:--ignore>" + "$" + --output + ${gen_dst} + +From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Sat, 26 Aug 2023 18:23:53 +0300 +Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the + bundled copy + +Closes: #282 +--- + external/glib/generate_cppgir.cmake | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index 9b0a5ac8..2ad82277 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir) + + set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp) + +- set(ignore_files +- ${cppgir_loc}/data/cppgir.ignore +- ${cppgir_loc}/data/cppgir_unix.ignore +- ) +- if (CppGir_FOUND) ++ if (NOT CppGir_FOUND) ++ set(ignore_files ++ ${cppgir_loc}/data/cppgir.ignore ++ ${cppgir_loc}/data/cppgir_unix.ignore ++ ) ++ else() + set(ignore_files) # rely on default ignore list + endif() + diff --git a/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch new file mode 100644 index 0000000000..f89d326a5c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,31 @@ +From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Mon, 23 Oct 2023 15:55:24 +0800 +Subject: [PATCH] Revert "Force usage of GSL fork because of a libstdc++ bug." + +This reverts commit 982546b169df3d479e6511425870327559b38a89. + +--- + external/gsl/CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/external/gsl/CMakeLists.txt b/external/gsl/CMakeLists.txt +index 8eaf19c5..344f9488 100644 +--- a/external/gsl/CMakeLists.txt ++++ b/external/gsl/CMakeLists.txt +@@ -7,7 +7,6 @@ + add_library(external_gsl INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_gsl ALIAS external_gsl) + +-#[[ + if (DESKTOP_APP_USE_PACKAGED) + if (DESKTOP_APP_USE_PACKAGED_LAZY) + find_package(Microsoft.GSL 4.0.0 QUIET) +@@ -20,7 +19,6 @@ if (DESKTOP_APP_USE_PACKAGED) + return() + endif() + endif() +-]] + + # https://gitlab.kitware.com/cmake/cmake/-/issues/25222 + if (NOT EXISTS ${third_party_loc}/GSL/include) diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch index 486f0b1aa5..3317d0a9c1 100644 --- a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch @@ -17,10 +17,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index af7d24c21..66bec8fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2647,6 +2647,9 @@ if (TG_OWT_USE_PROTOBUF) - list(APPEND export_targets proto) - endif() - +@@ -2647,5 +2647,8 @@ if (APPLE) + libyuv + ) +if (LIBSRTP_FOUND) + target_compile_definitions(tg_owt PRIVATE HAVE_LIBSRTP) +endif() diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index af16d4840b..327fd0d2b3 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2024 Ricardo Wurmus +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages assembly) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -44,7 +46,6 @@ (define-module (gnu packages telegram) #:use-module (gnu packages gtk) #:use-module (gnu packages hunspell) #:use-module (gnu packages image) - #:use-module (gnu packages jemalloc) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) #:use-module (gnu packages libevent) @@ -82,11 +83,11 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "4.8.1") +(define %telegram-version "5.5.5") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,79 +98,84 @@ (define libyuv-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "1b4k8yskr9ffl5k8s9i0af1gn1pavsfixla26vh8bij69rdr7f9c"))))) + "1fsvc0f8mckrdzys8lnlnbw6676mjamm6p3ghr2h9liqfa83s6wg"))))) (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "6ab5543b3dd1e40979d258e46d03376931b6c37b"))) + (commit "05a7db2e2d2a59ecf42483debca4944d09154b5b"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + ;; https://github.com/desktop-app/cmake_helpers/pull/320 + ;; https://github.com/desktop-app/cmake_helpers/pull/305 + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "1gapyk5a8rsl8vigbz0l8h9858f2lkhkd2pjy72zivp0mrq8w0hr")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "0af136124083369073b8fdaf45f0816fd2b10bad"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "057bwn9smrgnyfb1vraf50ihbkhjc4d72msl7vnbqc4h5sg8dav9")))) (define lib-base-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "fd9adb30ee906ea02c125eaa58fcfae773fdc677"))) + (commit "547e7f2914d9b5548dd17e70a3a7bf5d6606afc3"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "0sgm2prhd4fw89afh62k7i4i7mj60n170kqz50b0mad927zngxvn")))) (define lib-crl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_crl.git") - (commit "3d7e1e1f1321c3defd21c01882d674e485ecd8df"))) + (commit "c1d6b0273653095b10b4d0f4f7c30b614b690fd5"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "06mzafnjpfr5ih297dh7bxm6bgpg0wy0gv2r2732n5szyrg9sdl6")))) + "1sxn3qccsfbx1289z0fdrb4cggs16a8r75ic6wi81c6lnkrdi3wl")))) (define lib-lottie-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "3e9c2f1026e4b5aa3202fca4cc67ece36c7cebb2"))) + (commit "1a700e5a0d7c3e2f617530354ff2a47c5c72bb4a"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4")))) + "18w35sz6k3wcv07v0szx3avpfdl0rjby6yqm1fzmx7fqw2jn6wpl")))) (define lib-qr-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) + (commit "6fdf60461444ba150e13ac36009c0ffce72c4c83"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) + "1i5n3qvjkf4nv8k75cc0a71xyvpklc4nzg4k2zsfr2pxk0cy7hkw")))) (define lib-rpl-for-telegram-desktop (origin @@ -188,88 +194,88 @@ (define lib-spellcheck-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "ae89fefd239ecc47d4dab7ba29f9e230376a57d3"))) + (commit "e76981e133a1d29f3ceb557f53850a8d822f439a"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0dslsy3d6gmxaj6yv49zjgl2b2mh75j7fpnbynglr02h3m2fdj96")))) (define lib-storage-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_storage.git") - (commit "839609369d04615475cb1518636de3619106a917"))) + (commit "ccdc72548a5065b5991b4e06e610d76bc4f6023e"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0b11ix95dzpkz335q0a6b5yg8qhj33s4fgj9ppl37pszcqq1j3wi")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) + (commit "237cbeb9d1c637759f89a508c1d854caf16e1984"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) + "1ji3gypy4yf9knsgylnyz5gc2kii7lls5ymj1rkf0daixdz931cm")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "c4e3a08e6fb90a6174c8b592d9eb747dd4d3f9c5"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "1lbfy4fbb52lklfwn6kxny3mwl653r4vc80k922kwjfgbcy9c25f")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "b68a95ad4d1ae9a1827671100a7fd76cbe448c3f"))) + (commit "8751e27d50d2f26b5d20673e5ddba38e90953570"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "0f05pqb83qckghzlhnwqbi9qfi9xw7qsv8jampl4qyaq9q0w9p20")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "2de655f58dc327e40d5d9df71300a0d0fdb39c9f"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "12vrif0685vb068mj5sd7cknav1n66jysp18j21nlp0am9pw7ydj")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "9bf4065ea00cbed5e63cec348457ed13143459d0"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1p563a11w8jrid96xf03dg6j39ciz28n5f4r6g28lxhiphbqzfym")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c425281150317753d7bc5182c6572abe20f9a784") + (revision "456")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +291,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "1fj48iq56awnrckncy1qc3zhdzifl725hbb6an7wg2v3zmagvrwn")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -407,7 +413,7 @@ (define libprisma-for-telegram-desktop (url "https://github.com/desktop-app/libprisma") (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) (file-name - (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) (sha256 (base32 "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) @@ -427,7 +433,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "12fdybn085s3i3a8hwi0bmdns7jxvg0k662n04jgffirgsz8n54m")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -468,7 +474,10 @@ (define-public telegram-desktop "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON") + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ;; enabling jemalloc causes SIGSEGV. this probably happened + ;; after upgrading to glibc 2.39. + "-DDESKTOP_APP_DISABLE_JEMALLOC=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'unpack-additional-sources @@ -493,21 +502,45 @@ (define-public telegram-desktop ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) ("Telegram/ThirdParty/cld3" #$cld3-for-telegram-desktop) + ("Telegram/ThirdParty/libprisma" #$libprisma-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) + (add-after 'unpack-additional-sources 'patch-gir-ignore-paths + (lambda _ + (substitute* "cmake/external/glib/generate_cppgir.cmake" + (("\\$\\{cmake_helpers_loc\\}/external/glib/cppgir/data") + (string-append #$(this-package-input "cppgir") "/share/cppgir"))))) + (add-after 'unpack-additional-sources 'use-system-xdg-desktop-portal + (lambda _ + (substitute* (list "Telegram/CMakeLists.txt" + "Telegram/lib_base/CMakeLists.txt") + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") + (string-append #$(this-package-native-input "xdg-desktop-portal") + "/share/dbus-1/interfaces"))))) + ;; has to remove this constexpr otherwise cannot compile with gcc-final + (add-after 'use-system-xdg-desktop-portal 'patch-libwebview + (lambda _ + (substitute* "Telegram/lib_webview/webview/webview_interface.h" + (("constexpr ") "")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list `(,glib "bin") + (list cpp-ada-url-parser + `(,glib "bin") + gobject-introspection `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl + cppgir-for-telegram-desktop crc32c + expected-lite fcitx-qt5 fcitx5-qt ffmpeg @@ -516,7 +549,6 @@ (define-public telegram-desktop gtk+ hime hunspell - jemalloc kcoreaddons-5 kimageformats-5 libdispatch