From patchwork Sat Sep 21 11:34:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68234 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 6D2C127BBEA; Sat, 21 Sep 2024 12:36: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 BA43327BBE2 for ; Sat, 21 Sep 2024 12:36:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sryOy-00025D-KF; Sat, 21 Sep 2024 07:35:48 -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 1sryOt-00023j-DV for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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 1sryOt-0004F6-0z for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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:Date:From:To:In-Reply-To:References:Subject; bh=xTzh81FaoBO9c0BbcLDB9XUp5b92F6krH4HzZWa0vZw=; b=md0GDDPzrIkfkNcZRbn0iKCjvH99BKGOjGKwk+WBjjHX8tCH0he/5dNyNfOI1WFtIXUXwUrXWoZVLxnJ+k7q1aB3of/5b8EjZ34rMaaZpulsaDP5Z0MEbI8uQvVKv/L/8eKiZnsMaQInIz1u4fteS7edAou3fikFmkx3n0OBNgg9QTbrQo23Dtfau5AU25JYs9j2S5+plIXpdBL+ckOPTdp8ED1PQNqO9JNxWtssbdVJGn4sV2pq2F3PqfVWN2bn6AiJq0julLpm6DomBDZ3VjQ6S3tu3xleMwVBkMJ1EYnomw4dxqgGnYWy8QKh41g+qj1ilt++HWRx32xxpZA/Nw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sryPC-0001Pd-7A; Sat, 21 Sep 2024 07:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v7 1/9] 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 11:36: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: 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.17269185355294 (code B ref 71897); Sat, 21 Sep 2024 11:36:02 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:35 +0000 Received: from localhost ([127.0.0.1]:37453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOl-0001NJ-45 for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:35 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:44153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOg-0001H4-T3 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:33 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfout.phl.internal (Postfix) with ESMTP id 0170C13802F9 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:05 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Sat, 21 Sep 2024 07:35:05 -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:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1726918504; x=1727004904; bh=xTzh81FaoB O9c0BbcLDB9XUp5b92F6krH4HzZWa0vZw=; b=acQUqWIKH8YAjIKgWYuP9kn9nr ixeyao/W4fNBHX2800R9QESyRnFPK76RzzDkaJxz7ho7Q3SpH1J2i4sdxr+NQqjt cCyRlRknnQ7iBh/WMKpjtLq9IjBviJG8jte0+A3M2Id/QJFEebY59vViDybteYVQ YVBg/csOFo4I66fbXZnKI0n4M/g/5zd4YgzdG7/+jMCAYJPEqyPrKJ765jt/81y/ +on/KjebFuE7f+s5kGil47De5dGppikQc0ZZvWkV5X5/MWb4NGXZ/L9Gue0QFT/K 608sUJ31vmGUzclLa7FwfoxwegBNeRfAsKO20J4mfw1+2eQpW6z0D1I6Rjgw== 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: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=1726918504; x=1727004904; bh=xTzh81FaoBO9c0BbcLDB9XUp5b92 F6krH4HzZWa0vZw=; b=jLu/TqoZhKXISyAWKxu7Ep0dAJPPlca12+lzyIc07Hpn KTIrhWrOwFbbR9q8ygOdz0piBgaz9X/5FQlJorLjTe1rzJ0Udny/z4WCJh7NU7Hl MvOgXUcUlWK+gwq4TGKbQ2/EjkfWe/ewhrKrTwRbOqL0nw6XHOozNk/NsFgL+vpK Gc6gt8IBO5jZgZxdZ6wrVMBxqtWNiUGHDqeG1KgW2YV5spzYzaJFrUl2u1q0leNq 1fojpUdoPWAMZjAmlON42ioeb6LwSQaJphPokO72P7MfY4RLVp3mVPAZNNTRdJjw K4QDNfxI22A9m70Mjr4urhx7DIhaddMcag6rKHDTlw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofggtgfgsehtkeertdertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgv sheqnecuggftrfgrthhtvghrnhepgeejhefggffggfeiheekvdekveetgfejteefuddtfe evtdetuddtfeehhefhtdehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtghpthhtohepuddpmhhoug gvpehsmhhtphhouhhtpdhrtghpthhtohepjedukeeljeesuggvsggsuhhgshdrghhnuhdr ohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:03 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 19:34:35 +0800 Message-ID: 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. [phases]<#:configure-flags>: Update flags to meson options. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 --- 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..46199bac00 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 11:34:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68232 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 B574B27BBE9; Sat, 21 Sep 2024 12:36:27 +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 1D6BC27BBEC for ; Sat, 21 Sep 2024 12:36:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sryP3-00027a-Tq; Sat, 21 Sep 2024 07:35:54 -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 1sryOt-00023k-Dn for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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 1sryOt-0004F5-3w for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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=+2XxSOfMb65RvTqwwdqRBQCQZEvbzK6GZkgv4Tsd37c=; b=mlAE0jMiAlH9buLLg6dBZeunk/bu0wQxiItaa4KrsZJbGJpsdm2i7s3dvNujnPDaY6/aXFoIlMx7qXPh2OisaUgggedfDbATwnj/vPlg0zWFSqs+7Rw0Rk75Lip2cLrO03MYYVNUDurrTguQwYI3m/J+cSIfZtoUFdVYHd29AWgR99e0VMtbTU5pR6eNmn+Zocp1ZUEu3UegevO2e2m6RlNOxEKQuDOPcKsrwIlSca2EnZ6nMBKi0XOePsc4RAisR9s01za5nRB7F9R2YUqeLwzDeX6qbCpHCSQlOAPNN2dZEFdqyVCXmEBIG2n1Po9i/V5i5iO7KQ+eGnsyCekb0Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sryPC-0001Pj-MO; Sat, 21 Sep 2024 07:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v7 2/9] gnu: xdg-desktop-portal: Update input 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 11:36: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: 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.17269185365301 (code B ref 71897); Sat, 21 Sep 2024 11:36:02 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:36 +0000 Received: from localhost ([127.0.0.1]:37455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOl-0001NL-P3 for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:36 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:49699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOj-0001JU-8Q for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:33 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfout.phl.internal (Postfix) with ESMTP id F3C8213802F2 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:07 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Sat, 21 Sep 2024 07:35:07 -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=1726918507; x= 1727004907; bh=+2XxSOfMb65RvTqwwdqRBQCQZEvbzK6GZkgv4Tsd37c=; b=N /r8IGcybLmkh0Yy374xjvRdOjxP8PmDVYL3exOCIoRCcFOLfewyZh/tLfgPtZNCO RUJ0UCzJBuJJUYWIc5PQxfjv579ggGc5WjQhZvcDgKqegtinYr6rfGfjnBKfrAHW JiWYDhm7NlpBgYWEess9PRQSfZj45OfbMFnrL2qjOTa9Ww2fAg6gpDu23Xg3d9vt htqbiM4vStQMO+A+D7BTawYpSQRIUjgODRBWEXGwRch0Iis5ZC6layWK+s5MozUP ayNN/WqJ5bzeowhkpmkMjo/GxiTwbuR6AeGWr25tIsZpPf/yOFQw1fy5pdT4vvAj rcmNW9GoSwmrBErbqmRfg== 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=1726918507; x=1727004907; bh=+2XxSOfMb65Rv TqwwdqRBQCQZEvbzK6GZkgv4Tsd37c=; b=DDt5zoacDWrSeDrCPC5ufSbUjYErI 43HgmrRhI5JI9+2XOmeR3EkwpDj/0txfLCSA7EAeKAIRubXBdFPt/Mui7vOvJMOL dgy2G2HF0yCs+VyIS0Y9kp3EBdCYQGOWWqUTZKiWyEoubplSwOZ5Zalx7gdFimLb KauWBcSzw83M42SuoucW1pVzNs7ioWJ1RKrDlAQKt6X1CAyVlocA3Mx8LXkutGif kie2/p/muvAe/PZ6dVZVY7A/xtvorE4r8r91TYOlPtE3hZm165hkfG+DZkA0xvym lCrfnzcNRJ8UmzUhBx97d+mwRm1mvBVKYshep+qKMQLezo04JpwBsvbXQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggedvucetufdoteggodetrfdotf 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 07:35:06 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 19:34:36 +0800 Message-ID: <40209aa7c18e3d39cb2935e6573875204e7724a7.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update input style. Change-Id: Iec0630cd945dfcd4db67af30211cbfd4d058766d --- gnu/packages/freedesktop.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 46199bac00..e02b3d89dc 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3002,25 +3002,25 @@ (define-public xdg-desktop-portal (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))) + (list gettext-minimal + (list glib "bin") + pkg-config + python + python-dbusmock + python-pytest + 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))) + (list bubblewrap + dbus + flatpak + fontconfig + fuse + gdk-pixbuf + geoclue + glib + json-glib + libportal + pipewire)) (arguments `(#:configure-flags (list "-Dsystemd=disabled") From patchwork Sat Sep 21 11:34:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68228 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 B305527BBE2; Sat, 21 Sep 2024 12:36:01 +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 779EF27BBE9 for ; Sat, 21 Sep 2024 12:36:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sryOz-00025P-A9; Sat, 21 Sep 2024 07:35: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 1sryOu-00023z-BJ for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35:44 -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 1sryOt-0004FG-VJ for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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=E3vBdmd4NNiyPGZwq+rt33Ii907fOXVEULqddZJmwhE=; b=J+M+fGlUiKr2RLH9OXUwzkJvc/iMNsrU58I8qtPv5nTo8Vo5j6Izc7xdRkgsE0cm6l5SPkFNFrA27IryJEiJjWIdeDS7roBAyzhaHir2NRbWx+Pic5asY7TIJPgqN/YhmHs50YxWcqF9sX2Td1A4K6o/XxdhgfSRfJvN3wbgF3X87dxC0BVozxCu+6VxpCRG798jbhR6323Kl7sw0nFFW2d3rYbyOeRnE3wkWtqThx8tETmS1C77PMwa/Xi0IiM9ame1R/IR2lEhmngN/aufnLFImg8crV6ShVYGB/ywG+EnbuJ/UgHnFpeqxDZahIP5W0/p7y29Cr7E9Acg8FDPYQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sryPD-0001Px-7b; Sat, 21 Sep 2024 07:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v7 3/9] 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 11:36: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.17269185435333 (code B ref 71897); Sat, 21 Sep 2024 11:36:03 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:43 +0000 Received: from localhost ([127.0.0.1]:37461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOs-0001Np-5J for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:43 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:50803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOm-0001Mz-55 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:39 -0400 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id DCCAF13802F8 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:10 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sat, 21 Sep 2024 07:35:10 -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=1726918510; x=1727004910; bh=E3vBdmd4NNiyPGZwq+rt33Ii907fOXVEULqddZJmwhE=; b= e/cLqomJjd8uwYGd+FwtbRORWepZmPq4gytTcN7t/yU4sV85d+12Aci14nPi8KOJ rViDd6qTw8O8+jSXB3UbRINl7Fc6DXhhvF4vqbLwl6MRJUeCn86kYriPuo7axdh3 5vtXP1YBJdEyXBMCaEUlOV32qK9IY4lVqGjPXqqWkjrGm1ZjqSqOH22j2aWsmE7o KgeV/3+lt/p/V9vEYk6z+WMCioCsT4MlEr83sGXY1jp54R9IYqW9zqNPY8vprAjp A9dqEiw27vCRIWT/XCQfctlVfnDyXklXiodimVdDyxpkyE4n+bvZGVgH7R58n+Da RaIhSoWmudKNzaXrHA94sA== 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=1726918510; x= 1727004910; bh=E3vBdmd4NNiyPGZwq+rt33Ii907fOXVEULqddZJmwhE=; b=K IU8TH96rPy80ZSejkr8cPLKpDmhu8PQKjA24bx7yBZIOLnuNvykECyUVj/8e+9Nc SMoaNFfK6egFzwpv6Y3djWpI21gj0jeaZ5r8PU75QXlldVBTmPfygobwmVlGDlB2 ZxYJOsDDpcuhaJ83zvJu8Yu4GAQByJ00CIecLxyBYYpPrGku8Pp08nTew+deVUqg 9TSJbtoV/G/N60CpxWCDvNNelOgutfe0kfxnNUDnBwmm2DrfOanhy8pHO852cGRQ mGryJWo217mJjb64SMYZ6gfomWipLeWR6Di+R0ulRyI/3PkmBYHnYTyqgwOy+Qcj 83oj4oJrC5tpw7/cY9g8A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf 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 07:35:09 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 19:34:37 +0800 Message-ID: <3b31fc145f1afc287f95c57249a3dd16d87ac779.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (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 11:34:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68229 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 C906E27BBEB; Sat, 21 Sep 2024 12:36:19 +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 83BD427BBE2 for ; Sat, 21 Sep 2024 12:36:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sryP2-00026V-Ab; Sat, 21 Sep 2024 07:35:52 -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 1sryOv-00024C-Dw for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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 1sryOv-0004FX-5I for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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=Kc56k18rt3CVc0itDOUXwAK203nw+RFffLnTMKJZEgQ=; b=KYe4RRIfCMIUjrBVILX+iVurc5jlTYoluwbiiYIFDVtt/xc9YQNIJ/9dmQ+PLkc5+jIRkRIo2C6uIg6Hd9S0+TuYFhh32ArMsqyXsP8fkPIYwvRB2AiJ1yWeBqHRCOgYWXKGL7ObfztQaXjHQQX7UcvkZh0M8KyaciqjnxfpGP13N5JX96PjifHsxOqx8HoL9ydUPbkB/zrYuliVLs3s2hynKoTucE4752CeUU+xKPWSzW4haxFpKb56fu7uxSDyzh6nP4ZMELiylv3ENNZqIPIt2BE/+0PebmVS6gQg/KS9oWSBubnSEng9WuNFLUJwQmLlRaJokbqzdGJzB4P6mA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sryPD-0001Q5-L1; Sat, 21 Sep 2024 07:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v7 4/9] 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 11:36: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.17269185445342 (code B ref 71897); Sat, 21 Sep 2024 11:36:03 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:44 +0000 Received: from localhost ([127.0.0.1]:37465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOt-0001Ny-8A for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:43 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:48887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOp-0001NH-3M for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:39 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfout.phl.internal (Postfix) with ESMTP id CF06E13802F2 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:13 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Sat, 21 Sep 2024 07:35:13 -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=1726918513; x= 1727004913; bh=Kc56k18rt3CVc0itDOUXwAK203nw+RFffLnTMKJZEgQ=; b=E C0USvH25/4eQxmdA7WvRtS9qYqTbgixBWJEJIQDr0Yx5lVWVmuSSruJHnhqm2+RX HOu0P5bWVIDvya6gLhQUDC5g/ct0L+Y20ZxQXCTDevho+gotOwNYlfSLAISd+47v ScTbFeluaYEzaZeTjcYEPfbJDEDJrYgTdgfEhz/WlyaKMJM+yQ1XWpzVFDHiOr3Z il8QYWmuKJSKPEItxzwplfhFmxkh0ALxiK7RD4AEeXoeyRH4GRH2aqClpCpjD7nc FZisprvIC2VIG5VcaFAv9g7URS8fWGbylfGPss0OS2rUju3Ld3skhFeY60V948rc XNamjifjtqx91Dmj7aBLA== 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=1726918513; x=1727004913; bh=Kc56k18rt3CVc 0itDOUXwAK203nw+RFffLnTMKJZEgQ=; b=UIAG6unconF5LLIozPa5iz5KF/b3N 6cdnYbUwFNS3mEp1Wz7iSdnQRVMT6j9IrTaejIXXZ9xf9awDCd2MNyOHeNMyLawL 3F1IOyUEcwwd5G0oA/Lan9iNEU0DRlTuCaJUzWTElV9ci9RVC1bZxSoKZp1ZXw8m 8Jv9JhCmtawDZTBWxwqBNHJZMH1pzBJHYWSfR5/tU0q1W2v2SMoNI0dGnbIcjZYR nVN6MUesB+9vfGKdv0ZyCAH5tGuSm+90TZD0bo9DXZsMlSsgSLlXYJC8arhktwJG 8wK4O9utYKqhHE8PPfVRu2+pM+1YKVP1cRzsCRSN/yazRJrqOBjbMKKLw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggedvucetufdoteggodetrfdotf 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 07:35:12 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 19:34:38 +0800 Message-ID: <5ea5fdcad7469cd5b47ebf4d99d9b2948a3fec0c.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (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 11:34:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68230 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 073B827BBE2; Sat, 21 Sep 2024 12:36:20 +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 7E98B27BBE9 for ; Sat, 21 Sep 2024 12:36:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sryP0-00025R-Uf; Sat, 21 Sep 2024 07:35: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 1sryOu-000240-DT for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35:44 -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 1sryOu-0004FH-44 for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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=4VZSxwnGY/koEx83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=vyv4wOvQs/JQ9jmGnnl2tc+WkXsqjyeLrjFSswl9YGVW9O52ZPcvRvWspWRNfZRXZIHJWcFSbKNrrSyQ8xzDwc2lpn9ylxml3pi5xUxXfmLraDsRGGT6sMWru6U9ZFDrFs9k+hbOPBKHwg33dtlf9y/Uz6udx9o2g/rwpSDbIODJZt69BT9xHxPjQB7oDGOe1Q+XlXYf/9wAuyroW12Csm7UdqCLxgnrbwm9FKCVEZVT3rRU2WZg5oqp1LWiTTigdcDR/juFLh7mFikN9F1QVtAVIa3BQLcUjO1LBVWRW5GAVim04W4QaU4Ozb43Fwp1LUj5E7M0SX1zWmyhXnLskQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sryPE-0001QG-5w; Sat, 21 Sep 2024 07:36:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v7 5/9] 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 11:36: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.17269185485362 (code B ref 71897); Sat, 21 Sep 2024 11:36:04 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:48 +0000 Received: from localhost ([127.0.0.1]:37469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOx-0001OP-Ue for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:48 -0400 Received: from fhigh4-smtp.messagingengine.com ([103.168.172.155]:39863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOs-0001NZ-B5 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:42 -0400 Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id EFEF21140233 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:16 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Sat, 21 Sep 2024 07:35:16 -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=1726918516; x= 1727004916; bh=4VZSxwnGY/koEx83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=h wQ9kz7T+Z9ALyiv6Na6L2DueUD87zRInpB0vCEXO7GyUaLzIefHfbuYM7mWksNun UY/WsVgO/39kXMq4i0lqPaxLA3i53t/LvyG6GWAe5LQhOjB8E12rClkOX8cJB5pT YaztGUmP+LejTm76C7krtbveYmpdUud7MhSLtzaU8N4slY+eCxpH7Bq0V64vfC7g u3Fe0xgXuSgk1EnMjCc3V/1tU8iMBzRj/GVbNa8QlXPm/DKyXFWbt/vH6J7No99o 4RuyEzS0NmQzjxBXgw8pZlQeazS4bfKqqfmdqaXF39CKDeXZ7fBYURbNFWZ07tFO lcD2G3EEvGCN+XECSSsjg== 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=1726918516; x=1727004916; bh=4VZSxwnGY/koE x83zW/rTcyIAmjQbDiHKNmiT3D9gCw=; b=mIH0inBrXQLuicfhSnNzHZlteVf5/ 5cWBOhgK/nmcAubOCuwVZPP/raQjpKCFvyHDB/+/e4dag6acYDFl4IPq77WaZ9PZ U4fhWbJKqRDSaWAECTHCNuq3WQ/PTOnV+utMAC/aOCdUqrJ2kbARSBxPleGny9ex JoGe+zojmR+o7nIgtzutZ6wxbd0ubJGYaXREWUipiOjz82XJ0g/kYADLdad+EUpT guyyAdgYlsdtvwl5OEn4KUtfYwHHTwGinJ852Iqchr+4YtpIZ7bDU3+THLarAp8p Yhq274ipofKGsScW3ql9U2w6fwXONMN4ou12E5o7kA6Rq38g86roPgmYA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggedvucetufdoteggodetrfdotf 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 07:35:15 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 19:34:39 +0800 Message-ID: <16a437abfa07b281d01143c7785366abda3a330c.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (simdjson): Update to 3.10.1. Change-Id: I6711077e162bcfbf6702d521fdeec44e3b21f074 --- 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 11:34:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68236 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 900F227BBEA; Sat, 21 Sep 2024 12:36:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 CE31227BBE2 for ; Sat, 21 Sep 2024 12:36:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sryP1-00025V-9Z; Sat, 21 Sep 2024 07:35: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 1sryOv-00024A-12 for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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 1sryOu-0004FQ-K6 for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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=kNnslu7Qd760CTNfzyRGZm1su8+Xxu8QOGBCj1aNzIY=; b=ohgirOwZ9NoUg9TZJf19IikTXJc/Atb2zWkxujXNVuhTjONiM6A03FgBWBw5MqlOYGdklOvJYOwUVAQ0z4x+A6iZB2xhMUtvnEVOqxYsHWC/CKsciQfkawaWN/CuWPBnKVIxB9zNa854sz79Wx+fCanIUWMyhvTBrKoiotZ5FIDAW5ybwHSILaAHyiaf7Av15REFDxYMq5Hpvk1QJUMH6W5uniiUjQZ7rA79LF3yZl5ydH5jrua8fLVKfA/QLun+fEbtC0UWLaiDBw0mEEpryFcwTu/qdIU0KWY5kAcj2hjHTBxkTz7BAfNs/PcRmKGdCCalgJ5mAueV9lJc8+ATBg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sryPE-0001QQ-LO; Sat, 21 Sep 2024 07:36:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v7 6/9] gnu: Add ada. 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 11:36: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.17269185495369 (code B ref 71897); Sat, 21 Sep 2024 11:36:04 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:49 +0000 Received: from localhost ([127.0.0.1]:37471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOy-0001OR-8g for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:48 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:43147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOv-0001Nm-AE for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:45 -0400 Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id 05DEC13802F2 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:20 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Sat, 21 Sep 2024 07:35:20 -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=1726918520; x= 1727004920; bh=kNnslu7Qd760CTNfzyRGZm1su8+Xxu8QOGBCj1aNzIY=; b=l gqZUWf3pmS8dYVcbv7ohZTXC0x91V2eY8pvGPBuxw4kiZpGfReYSxK/ykyZZuJ62 ArRXSF6clgFGjqZh8Py2ri6xIePbj6FdqzhxzSpt9MhjmxfwWIiU5rjzCqYySymS b5wSBCG3vaRTzKXOllb4HMbqMx9KbH/karZCZRHAufvSHVUc3TxFwDaAllXYW0QT b9vvS/ulj/eMNbM/Vig9IToTqdIM3B7UmL+vBgDToqEKbJ1TTo9OXatAAz0/oXHo WrlMENKo7Rjh4/J1/ycdloe6WHa/G/nhVSKA7Diu0SRTiMKXXEtYJmiWP0DOBwBg FMLf6sHklQEsG4zQGbzCg== 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=1726918520; x=1727004920; bh=kNnslu7Qd760C TNfzyRGZm1su8+Xxu8QOGBCj1aNzIY=; b=AYuf1oz2Dr+LvXB00bQ7qAq0nFZb8 irRw6B7fJVc3f9/lga6ZeR+PrT+caFkVO7+39Bt5YGWwmfWdGwttkVA635aoxvy3 Z8TyQyiEiHq6iQc1IEiSHaAiHe3VClL8NExQHN8sn2b/DU057QZ25XZpYmFhoVLu 2JMgyic1R1vbA3DfP/suPyHkhcGNHHqSSPUOb4G5/pYxrFKzWD3/4ij516knN50R Flhk/kyKHiBxiwVjf+2ao0R/krckwj2Hrmnvb7imhlydVrK5PxjVc90+A4777KBk fVxfGfThiaNYfRadKC9lC0de28vyTA7Nvu6QiKO/kVhwrhOoKGrk90NNg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf 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 07:35:18 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 19:34:40 +0800 Message-ID: <51fada8dc43be4563c0cbef38b19f9dc4ca03429.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/cpp-ada-url-parser-find-system-testing-dependencies.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/cpp.scm (ada): 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 11:34:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68231 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 5572227BBE9; Sat, 21 Sep 2024 12:36:27 +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=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 0A62F27BBEB for ; Sat, 21 Sep 2024 12:36:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sryP1-00025s-PO; Sat, 21 Sep 2024 07:35: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 1sryOv-00024B-C9 for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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 1sryOv-0004FW-3w for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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=RVuU+SsScYsqY2cfL+vg2iCem3FSnlUcpZT84xva8uspVNQ7Sc0eNu78BEgnNcJebpJhivlTGXcjW7XvOukcXo5gGAmiDOp/LgscMhQFghqWNpJRQbUHWaEU+rp3jkaKraET9PlTxnk1+mtX8y3+tyEeHvOc4fVOXSoWxiemJ3tk22p6dgCsiv8akvBIvb/CtCkUbT9mDGWow1xOXuM4WBUeIrMuCAm85Dw29kcorr8fiAVe/TQ+rvaDldIgs8GV4tLEL819piXTWTxNDwVNKzLAA4L9PTIBzTVi9fcIEAwXr/zFMXBPO7YhZbWglR+WGp5wsg2yMt+BOpcJvurhtA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sryPF-0001Qb-74; Sat, 21 Sep 2024 07:36:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v7 7/9] 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 11:36: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.17269185545393 (code B ref 71897); Sat, 21 Sep 2024 11:36:05 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:54 +0000 Received: from localhost ([127.0.0.1]:37477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryP4-0001Oq-00 for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:54 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:39861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOy-0001O5-L2 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:49 -0400 Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfout.phl.internal (Postfix) with ESMTP id 6014C1380307 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:23 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Sat, 21 Sep 2024 07:35:23 -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=1726918523; x= 1727004923; bh=CGfP3BtmV5YLyvohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=T oWxQchsrNDiB6BbwzVMWAMDvrhsae1yVVHhy/1K5J9tyU0de7oZOnL45XKYE56Ba tJrNLek4twuiHzo5lNmxoz/l+7yQmfUX9Jn9r71tpA9FqMlvkn+vXUpR7QaKBHY9 WPJrANyBVEGsVXBg551MlCZAKd6Eb8fxCStse3AmVFtyoet+u+Z15jGI5NvdY5fH n0HwpmuZjteqOuHK1nQfE+r9vMIAj3g1SPPAssMd8TsCJwBkTxKiQQJ+679T+U/u QAw7+mz36LEYEdGMye3hw2bJ8kXrPfa+4MhdkUb5O4n7yKoObMw1JYt/K0WQv9e6 AECjsxwp3qAKLh4q4zT0w== 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=1726918523; x=1727004923; bh=CGfP3BtmV5YLy vohOIZZ0SMwXg32uckWwX0jKdo3zCs=; b=TaDLSpmrTepcn/V45ILk28xHqN7GM 3YLHJUPKS/z34CWosTGm7ZYtFRjIYgSpPqmel6Srd1Z9bS7j0wndjClNOsy0q5hy 9s+Y3x8MR+JNauGTVXA5ivDy3tdwkHjYhtdyawU+OLB+YUWdnM8kbp83qjNYSqgD VLljSTkduyUfE0OPazjfE8SRQfP1qyrIiJrP2stX0e7ALS32isFS5aNHYKkSd+XM xBePOoNNgJFNfQAig2o42+W4koLC4kP3H7+ENpkRsYy0pbPMojLllu548ZO6gF+H XSQJaoHSjnt1xeXrUC0okReboSFzuIfw4XYhpAezk54hbmeU86AwgErcg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf 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 07:35:21 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 19:34:41 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 --- 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 11:34:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68233 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 43A2127BBE9; Sat, 21 Sep 2024 12:36:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 07FF727BBEA for ; Sat, 21 Sep 2024 12:36:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sryP1-00025U-4P; Sat, 21 Sep 2024 07:35: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 1sryOw-00024w-Os for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35:47 -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 1sryOv-0004Fg-JP for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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=1qelBTBzlVxN7W66/lwjJAMmy66ViUr36KYeCEysQXs=; b=UKKc/H0x7xx+P0JxExu6AsrokRCy8GuNj1WMqwTbUVouIYelgbp59ZbeI02dsHqUM4qXX+ZV37oYPWSFqZdViz9glofnYFJ1qOqgcG7RW86yAbg9xNnZzY9ZCbfazKwxl+8D+Q6zzQuhIiZL2zUMeJ0KV+Y5qPyTpLYu2801F48m1Ijhvw9kQ8dKwxTb7zPkQv9+QG88k/d8qG6aVwhGjKtnG6K7XpXOzSNo/vXzIWwdq4PuRBVgrkb6JvFL9N4GCBX7V5xJiwH/Qde2ZEtij3mql2f+FylpEKMBLFGI45GM6/jjBa0mZpdmKCdqUoOtDoik8Ez6GJ0WQYjqkwY23Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sryPF-0001Qn-LQ; Sat, 21 Sep 2024 07:36:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v7 8/9] 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 11:36: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.17269185585414 (code B ref 71897); Sat, 21 Sep 2024 11:36:05 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:58 +0000 Received: from localhost ([127.0.0.1]:37481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryP7-0001PD-D5 for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:58 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:52689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryP1-0001ON-Vk for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:54 -0400 Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfout.phl.internal (Postfix) with ESMTP id B0D9B13802F2 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:26 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Sat, 21 Sep 2024 07:35:26 -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=1726918526; x=1727004926; bh=1qelBTBzlVxN7W66/lwjJAMmy66ViUr36KYeCEysQXs=; b= PGlQvEEmeY0hPtj8wQWF5hVQTgcsC33VXkaqB/7/bPdolfuw6kX9N36Fczwk0pSk 4LJ5TRKR20Ld2yWkYDEuDF4mdmyb49uyVSC3WiUKchkwIYWVId8XIObZsHybTEVD sCMlB18/GfeUgViFWB2qVb8miQ94d4ajK0Sojm7vEWRTlJ4wKS3JkuwLrrliZluf 38U9aJndQ2rLMZ58uJQM/VTHynZJEwvpieAvkQeCBR4LxU2E/Izf9DADUW80ugDU qrd4ihWZITtWyUFshzvpW9zeuQPQA3LNtUFgoY8tH0esqyzrgrMMwOhuANB4ycZ2 yuzJS6umjRkkUDAnGIMwcQ== 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=1726918526; x= 1727004926; bh=1qelBTBzlVxN7W66/lwjJAMmy66ViUr36KYeCEysQXs=; b=R eE+au7C07ak/vACMAYv5Nf1yhPR8He+yxQPAQuqIPkxSIhfYXbNwqJimXcPGXiKp D29xsGyEUVfCX3UO8w5DDoOP2na9sO4pxWgZxL4NFzHrVoAboA4ENUdUsHU+1ji8 scDG3IRdtXjQsIfVOGYTYtn3Z5ZSHgpMuaug0IEz3PWkrWbbSFzFal9kysXztUNg hsQdLcqa83GL40FQBiBIGC2nF67ZcT2LMm2BIRp486kj/i4w5DCrQKSI5zaF2PPh q7TVtpS1ZtDGAcpKzgPJBFU9HQrH97GbjnIPFswiQXR+gI8Gk1mfbdJ+tPPemeTO Qq+/sP5vXo7UxS38EmAtQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf 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 07:35:24 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 19:34:42 +0800 Message-ID: <2320704096aebf544e4b992a631ea74674d30868.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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. [#:phases]: Add libprisma-for-telegram-desktop. : New phase. : New phase. : New phase. [native-inputs]: Add ada, gobject-introspection and xdg-desktop-portal. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite. Change-Id: I78df3434a2cd04afc54107b7fecd5e5a8df85564 * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Change-Id: I086ca5016477b5e7713985c4ade4e2828b98a6ca --- 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 | 105 ++++++++++++------ 6 files changed, 201 insertions(+), 45 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..91e743aff3 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) @@ -82,11 +84,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 +99,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 +195,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 +292,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 +414,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 +434,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 @@ -493,21 +500,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 From patchwork Sat Sep 21 11:34:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68235 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 073FE27BBE9; Sat, 21 Sep 2024 12:36:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 A71F527BBE2 for ; Sat, 21 Sep 2024 12:36:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sryP1-00025a-Jx; Sat, 21 Sep 2024 07:35: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 1sryOw-00024x-P1 for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35:47 -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 1sryOw-0004Fl-4s for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35: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=+IqDJxbRLKVJjItiYX3AsaO/kzsZWBwzD4y2x13OsLM=; b=MG2i5bE4DFTVon1wmFqSMSJoZHq0UyuvU1cc1xhu5MZcUe3mRiGVP8mNtt8tc425geajr0zqCNkgpc15w121i6+EiH+8fqVk4T37nilXGZVyc+RCVBFk0+1m2jUrdQ277iPfXFA5Jy3Q6WHuIZM7SAaI+d+YMhdswUq2DXd3ifUag7911W0rYNkGwPoYSsRAbmP+e5cdLt8/85dkza64W5/6VDsUBSQgxLUTWmlH3I3en/yXD8zsSE3OU/lYxwP0wLGdAMV6K2o2rLaCsgDgXQHXUtDKQUoRQylbfFEJH9vXsNjcT5vYYCcXAnCYlrN97i+LHLOmxU8F2cDZLGey7g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sryPG-0001Qw-71; Sat, 21 Sep 2024 07:36:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v7 9/9] gnu: telegram-desktop: Disable jemalloc. 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 11:36:06 +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.17269185595420 (code B ref 71897); Sat, 21 Sep 2024 11:36:06 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:59 +0000 Received: from localhost ([127.0.0.1]:37483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryP8-0001PH-MO for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:58 -0400 Received: from fhigh4-smtp.messagingengine.com ([103.168.172.155]:38367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryP5-0001Ol-8U for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:55 -0400 Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id 0196D114028E for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:30 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Sat, 21 Sep 2024 07:35:30 -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=1726918529; x= 1727004929; bh=+IqDJxbRLKVJjItiYX3AsaO/kzsZWBwzD4y2x13OsLM=; b=k +PuTSaQ4dodSan3iBubF9UZ0EJb7bftjBALKqi46E7Ei2NSNgiJHlCA0ijN4/PJ2 Big9rkQJnkVO9Ygfw9fD1U3Pxzq5RjvAe0jDuvjFv2528kHDwb50rCkfWj+isSPr 7Owjevrk4yD5LF3ca8Pa3q3cXHT4if170KrU64hSsnlsY3IFDdc+STl7oTK4yT7O tcvByZ/j80uzPQFblj10b1QURAbX7KbPLmG89tl17cubiSYzbTvOTialO17qe2Xr oaJ0T30Ss5+NWPEHeT3mCNQISw0hhgCY8QypXzYJxKj3oyr7/kFh+3Qg9It2iB5o zlVrBBl2Fjq059Nli+pzw== 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=1726918529; x=1727004929; bh=+IqDJxbRLKVJj ItiYX3AsaO/kzsZWBwzD4y2x13OsLM=; b=ERV1BUeS9y3BVAcFdij+GupqSqgp1 1M5nRWEuPhPvaAhfBbSEmXZmPRqTAeXxg6tBeuuVPgE7ouIGRh+Ya/czKj+IKoWW nHK+esyfuWeR3ixMMccXftArl9Ck/scLsQMLUDjx/ssu+s5IcA8XBIPxUEqiE3t3 ef3pGcEyjba/9eH8j3uGcZF2ioIpErkqTYXNFWXtWD79ctTpqIiBeSfsS4aTbPjq nKsKuPFsZu7PAxZ9klNVDrfRApxu+R9MShGbrNidY/gA/jITPqW03QqlGTJ7OK8m zho1kpQa+4ChJj0SUPsushQG9XNErAy3RBEixCW54IJscf9xIA3aUrgkw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf 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 07:35:28 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 19:34:43 +0800 Message-ID: <185fc21ea297d89df26282d06e39aa2b0cf8664a.1726918430.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm: Disable jemalloc. Change-Id: Ia89ca0fef6ddaa9f6eb32637471110a0cec7ec54 --- gnu/packages/telegram.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 91e743aff3..327fd0d2b3 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -46,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) @@ -475,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 @@ -547,7 +549,6 @@ (define-public telegram-desktop gtk+ hime hunspell - jemalloc kcoreaddons-5 kimageformats-5 libdispatch