From patchwork Sun Aug 4 14:30:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 66669 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 3363D27BBEA; Sun, 4 Aug 2024 15:32:23 +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 15F9C27BBE2 for ; Sun, 4 Aug 2024 15:32:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sacH0-0004ir-Bd; Sun, 04 Aug 2024 10:31: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 1sacGw-0004iT-JY for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:46 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sacGw-000777-72 for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31: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=23+1R76N4MuyR+f6g0L2dF8BBqwBFP+mr+28dnO7yQo=; b=LR6p3mqeSwyoc3cy6Ds5JVtmLi2oAZqzPF97FpZW1gkIxrEjMPEzSRT/N6IuCusuAWTFAtl1oL1dTqBUDKlG2YiRpB6z5gFt1x7+h6WR+WYrZS+71HpxWfsWJn9sZGxTE+OeEdSYyf0gl1sjsRqORw4ne+BjeJ+Yw0sbu9a3Rqfm1fWVc7hjOVYX1DkYDMU82L5ssgKXj8CRxuHRiIAC1GxZ4pVDvRPyzw4PF2jUg3GxsJAU0jkTa9uSkVtyfoFVX4OJDYchiCO5a4duOXTjjq0LN86RTiFtkby1UwCplziJBNh6G26p+tc1vCL+oeXh72kA0IV2TiZKeYzZIMaywQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sacHE-00015X-QG; Sun, 04 Aug 2024 10:32:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v6 1/7] gnu: xdg-desktop-portal: Update to 1.18.4. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 14:32: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 X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.17227819114081 (code B ref 71897); Sun, 04 Aug 2024 14:32:04 +0000 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:51 +0000 Received: from localhost ([127.0.0.1]:56868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacGz-00013W-NU for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:50 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:60965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacGt-00012m-Jb for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:45 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.nyi.internal (Postfix) with ESMTP id 4B05B13876A6 for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:17 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 04 Aug 2024 10:31:17 -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=fm1; t=1722781877; x=1722868277; bh=23+1R76N4MuyR+f6g0L2dF8BBqwBFP+mr+28dnO7yQo=; b= faY/Bpb+DPRta2ftwtiA5Kc+3am3jEf5OXd5RsJ3n8vW1rgDggS3pEvHZsqMOHKg 2Veb/yUV5WxReRZpoPZenyDF9NiYWzrem3WHfKwNpbM5WbRMEw/v1iV7/5BWK5j7 CKmwAaQU385G/SNXOQJpECjNeB/YBQAlqBQQk9Fi6NfjWdkVPS9TdCt66cd7gdmR O6YHlg2Kt9uS7bDj3qriU4B0s3esF2WqJBEU02EbpXdirpHBh4sqTaC4okawlgCs 2bJWGY5jWZCGpuCgRlr6V8G6W2ERMmN6sK8THvdxXgplWUUdD59Z7FXQ6M1haeuK OaJkNFx3+R2nQgC1gQoPGQ== 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=fm3; t=1722781877; x= 1722868277; bh=23+1R76N4MuyR+f6g0L2dF8BBqwBFP+mr+28dnO7yQo=; b=o v24KCxyIbls91+HmKTEqC4sk7wyfRpzVGlhjptQh+sFff2PvMjByf9V+M5zAONEt +pNE1Kzy1eNBbulu1myplwuEYoFNEU/vbjs1426CddBRy0TnPzXxoU9G+JAiqmV7 QmKo2/TGRWSLdRf57ZW17xIcj95dt3vFs+iQharB9lBSERI2XbPfNxYCXoqympSO aPMkCE6f12o/bdIFT9Tmz9Pexv1tC5yFbVp1+mH3yAsbFfqw5GzbavGNCdt9WDpt 35wBXoatDCwizBUmiLc9yI5/Hnvhf52rU1CziNUHk/TK4yzALKVCJjSRkvbTeFZz WQABOB/yoa89e6vpOSb/g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpeehfeekffeiffekueehvdffjeeuvdejleektdeiueelhedtudegieefueeile eggfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehi segurghnrdhgrghmvghspdhnsggprhgtphhtthhopedt X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:15 -0400 (EDT) From: dan Date: Sun, 4 Aug 2024 22:30:44 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 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/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 diff --git a/gnu/local.mk b/gnu/local.mk index 6d2b14e72d..d8fcb13cfe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2245,6 +2245,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 8e0c5f0cf3..99a4469264 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. ;;; @@ -135,6 +136,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) @@ -3048,7 +3050,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) @@ -3057,18 +3059,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) @@ -3080,7 +3085,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 Sun Aug 4 14:30:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 66671 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 9AAB527BBE9; Sun, 4 Aug 2024 15:32:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 BEC8827BBE2 for ; Sun, 4 Aug 2024 15:32:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sacH1-0004ja-8B; Sun, 04 Aug 2024 10:31: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 1sacH0-0004it-Ci for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:50 -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 1sacGz-00077P-Vj for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:50 -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=7r2BbvPiuTVQMCZ741IpmIWNI/RdhItLoL+dzqvdp6A=; b=JQlNSD5i3pB5siHzTVBOHLJZTPcxp5ds7K9v8NOI3LoBYMw6juykkqBzBw5Hy+9bk/EwZzY/z9rIas9faoQ3LJyxogNx72YCBsgEDZrS8RDeTg+USn3ystcUIEb0o5sV9u9kuzl77Ji+46a0OJgIm7sk0XSZqHS0Hjkuiwdg0csUES5hkqwaTeuotIBeJjwY48CQ+VeUpwa1OgdX+4G9oy3q+eN6X0FLKoXasCmo1U8ZVJtwYLg0sR+dlspo70EbIlxUpZol6Da+358b5r402WZfBGej70fo9wE6+w/zrWV1cnF87hNg0OqW3R/tL1tTUbuam4XFppgpErExuui4QA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sacHH-00015l-JH; Sun, 04 Aug 2024 10:32:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v6 2/7] 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, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 14:32:07 +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 X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.17227819134097 (code B ref 71897); Sun, 04 Aug 2024 14:32:07 +0000 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:53 +0000 Received: from localhost ([127.0.0.1]:56870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH2-00013n-Bz for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:52 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:41939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacGw-00012r-6o for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:46 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id E6EC011482FB for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:19 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 04 Aug 2024 10:31:19 -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=fm1; t=1722781879; x= 1722868279; bh=7r2BbvPiuTVQMCZ741IpmIWNI/RdhItLoL+dzqvdp6A=; b=A azX3ozaW3DNE36jHFmF0TOw933F8kGMHQbkYdk4OZ4JAOtTYorttxjEvp25e900/ UemWlNv9g98STF8oqf4bfXO67xfE3ddtGIfxuKU+UhPWfYRDSNIQX5DV/savtS3D 6qY/1FWaPkd8jfhe9QHJpZMDlWCWzTuDY7fORysuc9gdtbrKBKiUWGb8wA9ayC84 h+Nj16A1a8zLDdzYlmCAceg6x2mC7qzdcvY4SoVWY4V/dPdCi6c7CVqTu3h2f+Vd gGb02vk0QJmsm7kdqg4lPpSZ31shUk26MLLe8cjuLgiu0ZEoQvODb5zrrMcor5eO A7/nhupf+0a1+sfq2kiCA== 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=fm3; t=1722781879; x=1722868279; bh=7r2BbvPiuTVQM CZ741IpmIWNI/RdhItLoL+dzqvdp6A=; b=QGKOd0b9mVoldWPD3uesXd9qypq7i aKvwYAEHvDedmOA4bEUCw+fURjYKkBXwOMSR2S5QGMrwZbHDkGO4eKl38YPoRfYe dzqHf1nb8xa0PmS5pQPY0pGvvfmiGHQkCHuApECLMMsY3TBztzKQVshRx71Cwixi K5HtS3JByuHTa1JP3VL27rzyM73MjXeVZJv4sXRcVdZ4hDbI77caBbHMgEn44yF6 /ohe9R35QVpym3jaEL46GYnoXrrLXX4brQQOW6aWX6DzgguWgTUSOthXG9H7bsHv v6ZyZRrjVNgadVFj7sH4ASONb4W2IiT2cQaLst+7p/g7vpplsexXxw9NQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepfeffffdtheettedvleeiheegheetvdetteehgfetiedvteeggedtjedtuddule dunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihes uggrnhdrghgrmhgvshdpnhgspghrtghpthhtoheptd X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:18 -0400 (EDT) From: dan Date: Sun, 4 Aug 2024 22:30:45 +0800 Message-ID: <7a857b480ff7c3a055b03a1f780468657b1373b0.1722781401.git.i@dan.games> X-Mailer: git-send-email 2.45.2 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 99a4469264..d06ce2a48a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3064,25 +3064,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 Sun Aug 4 14:30:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 66668 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 3361727BBE9; Sun, 4 Aug 2024 15:32: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=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 6A49327BBE2 for ; Sun, 4 Aug 2024 15:32:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sacH5-0004lT-UG; Sun, 04 Aug 2024 10:31:55 -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 1sacH3-0004k2-Sk for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:53 -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 1sacH3-00077q-Ho for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:53 -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=A0tcpwjdwvTe0AC8pV/Q+t+FXDxdKrr8QRbVovQZxY8=; b=bIhuTMPltAhpEy/nVcv1k+LXlsqrtXAHahad8VmfEgdZ6Q3dqNjUFJZOxbCNYBqGRslTW/xBcOtWgZwewFoGROBSNWzXoG6mPhJ74Eu9PWvyTB81dlTdOxCAe3Fz8RM/XqsZRXr7BZ0CeGOnDx3IQv/bpOg0EPTswggzimp3LfCVHZ89GJVMJf540o8AE+H9DmwBUR/Tz38f5XEeiWtxKvx8U0ZL/rkT614R9bRvx5sZN7Pad0SiYtz+X3WxEXvMRY8aiSV+UuhwmpgkbHXbBGku7WdQodI4sIVk8u1m3Mec1ViOy0Lo7Y8bRRBDiMA/Wnuwr5Ii21s6h42Bxhwcpw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sacHK-000169-Ae; Sun, 04 Aug 2024 10:32:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v6 3/7] gnu: Add cppgir. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 14:32:10 +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 , Vivien Kraus X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.17227819144107 (code B ref 71897); Sun, 04 Aug 2024 14:32:10 +0000 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:54 +0000 Received: from localhost ([127.0.0.1]:56874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH3-000147-DY for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:54 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:43211) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacGy-00012z-T3 for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:50 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.nyi.internal (Postfix) with ESMTP id 97F4A1387AFB for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 04 Aug 2024 10:31:22 -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=fm1; t=1722781882; x=1722868282; bh=A0tcpwjdwvTe0AC8pV/Q+t+FXDxdKrr8QRbVovQZxY8=; b= TucCmUDjz8VS1RsQYnSgMwmZiS46uKyH2NrTB4BrGJ3i4TsT2tC8/j4pKNryjMfD OZKnjQiHgDpdCNY1ECknRr6XMlvkQpdLtMbZLE9qxSf/NYlYerMmlySvDts/Rfk6 PVnkPHh/V37IWT2ngDK6OpWqbMRtRjIMLLiHmc36YqPCAISEf9kR7NVkaMY9LXIF nvShIj4u6Lo1jSUihvAwUtVS8InT2RsGCcP7sWef63LlkKdQiNMVlK3e6o56KZEO avy+a/Hp6FO5sk5hhxCBFIyIFXCOEm1jm7rgnadk48unnGP2hnflG+KABWQl+Lge n4ib0Lldjwe6HpVV8HnT3Q== 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=fm3; t=1722781882; x= 1722868282; bh=A0tcpwjdwvTe0AC8pV/Q+t+FXDxdKrr8QRbVovQZxY8=; b=U 1dAiCES6S+YrSEZ5bsqDsKn4v8HjahVCd5lFB2XNxQntto4bgz1eyBJ1OvnexhfK yJgmDUMANLlb79I2eQzm89+5VIIeH1S0LhnNyMfYTks1AWAh/ckApTtLIjJzlu6G L8hcjBEFWfSNyv36xt2Eh/IymsZqfwhcKNQliUUVqVbQcR0VMMUk6JS/r38JasAZ Nihm0XUamFY2131kz5sI5Ro9m/7It/dOCaz3fTTNFFxZudwt1ZaoVu3lDyzX1KQG cJAreuEbqfv62IUWQ7KRStsHaK29nWXsU7njg9dYJFK11dSrOh2xoDedZBp65PsG GneawKaVRtpsS/URetSgA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpefgtedttdfgtddtieffudeffeelgedtuddtvdevheektdeifedvieefieffie ejueenucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtg hpthhtoheptd X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:21 -0400 (EDT) From: dan Date: Sun, 4 Aug 2024 22:30:46 +0800 Message-ID: <080c4a79813c969bc7de849993632a23e2a20e5c.1722781401.git.i@dan.games> X-Mailer: git-send-email 2.45.2 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 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b11046f05d..3a44207afe 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,6 +72,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) @@ -1594,3 +1596,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 Sun Aug 4 14:30:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 66673 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 8EE2927BBE9; Sun, 4 Aug 2024 15:32:43 +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 A714E27BBE2 for ; Sun, 4 Aug 2024 15:32:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sacH4-0004k7-0o; Sun, 04 Aug 2024 10:31: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 1sacH2-0004jt-Mj for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:52 -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 1sacH2-00077g-Ay for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:52 -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=QphVA2QQiWZbYnBq6lhAgKH6ivQYdGWmg1iKe8I3cJg=; b=rtedBdoXGzAlf4pIHGAc1BCGje7buP84bfeBgajNsEKiVBQ9sqNLErXrR81n2eVuYtPdiczOP3NlrCszcu2jXG764JQfuOAllJ/wUAYbAOEONbWd7ZpDlgIfc5EyPkrIoRFBAGYazkjsA2tEeaDSOi/TxOdc5RhaMq6n8+a9C0EuEuYhFqrlH3zJ9epbup9R19dZkyDG7WSDDK5x6ZcB0f1ZsbRDmf1GwpNcnD+IgpM4ZbWCnUmYttU5KDlmxpH0DQv+vsvI+c8LvT7vpNrrYt+ZENYkvIpRxTqbtI8GCDkp2mCOltF69t5iOMYsLCa5rx4CvFDkOHBVPiZSL9+4bQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sacHM-00016R-J6; Sun, 04 Aug 2024 10:32:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v6 4/7] 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, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 14:32:12 +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 , Vivien Kraus X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.17227819184128 (code B ref 71897); Sun, 04 Aug 2024 14:32:12 +0000 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:58 +0000 Received: from localhost ([127.0.0.1]:56878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH6-00014Q-Le for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:57 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:52933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH1-00013F-D3 for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:51 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 16B9C11482C5 for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:25 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 04 Aug 2024 10:31:25 -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=fm1; t=1722781885; x= 1722868285; bh=QphVA2QQiWZbYnBq6lhAgKH6ivQYdGWmg1iKe8I3cJg=; b=f cq53P8PDkA04e//MDfURF7XaNX1MmxzI0DpBdYXQjv7DULdi0oOjdxLruQRGrLvn az5006xCZwqKgtbiPT+xSbhPtLcWMVtLIpow/3UHWW4TErnFxUAQiqw2vZAvk9zY OriAenEVB/X4ppo+mY2y65Zp+2Q0/+iTV5+J2mLgZYVsoMtn3RA5MfmVmGTnwoOI 0Ru7+mdcbUSrx+Xy3b+72KY2t89HBnSdR7E5JTvTiS/iTKcWQWzaUJcZhYtydxTZ Wy0yBRMce0SOdPxQ3VvI+SlQJAts6qNZx7q0LfOjS+mD4rFLGvy7sr1QPeE06hXi SahxhUWkQ03qbIdzLakGQ== 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=fm3; t=1722781885; x=1722868285; bh=QphVA2QQiWZbY nBq6lhAgKH6ivQYdGWmg1iKe8I3cJg=; b=QtiUpPIjdGydGXorbkHHkfw7OYnuk mTwD3YjOH9D8L9UK1gMop2r/KpE8Jrrj8atuK5IwHgoQaNf+w1oyuNIdUAIMqKCA tdHvSFl2TvSG35tDsrMe4ebzx17Jc//VgWEg2UCA0GpwWLhdj54PgVqCf3HqvgvW xN6yam1foPXHbZSQ8q1t8o9RCbztKcKKviDuCwHqI6KKFe8i4h/wHCf2EqkAD8g9 IfWeEAUjY/czfT9w+DXr9dWy4+7P53P+mLEVsou2Naewx1jlJok3HyBz/Wv7Fmdg eqWb/QwDuIsHCKXRLh5GYuj7jvvyD4fl7qthhXbOL0f0eRKae50qRpXZQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepleelgffffeeigfelteduleeigfejvdetuefggfehgffgieevhfdvveeffedtle ejnecuffhomhgrihhnpehgihhtlhgrsgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtph htthhopedt X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:23 -0400 (EDT) From: dan Date: Sun, 4 Aug 2024 22:30:47 +0800 Message-ID: <79e90f0617407bd98ce3d554791e825dd26e420c.1722781401.git.i@dan.games> X-Mailer: git-send-email 2.45.2 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 3a44207afe..29ac8d5542 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1623,3 +1623,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 Sun Aug 4 14:30:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 66674 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 EBA1527BBE9; Sun, 4 Aug 2024 15:32:51 +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 BB8F727BBE2 for ; Sun, 4 Aug 2024 15:32:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sacH6-0004m6-UO; Sun, 04 Aug 2024 10:31:56 -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 1sacH4-0004kx-V5 for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:54 -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 1sacH4-00077y-Jw for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:54 -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=QygqV4XkWIW9xHDHZxhR6fSCNOtcRrv3z1nmct8Hloc=; b=vnUqKGcLsSwn9KkwfdyYXF7cYAUqIzCedLgVihHF+S5WwwVa2gsMZQAx0HelaS+T9idlw2hWV1mt7QEI99Terpfg7f+N2uJi8J0mdAx8ooGQOOE6jsbG63TeMyL4FaKtxk1TuhWrD8JCy+n6wxxlp0Te5uiimvKdLb23inU60L3wstBxjHe2Ek7IRo0QKI22TqZ8dwd/MxX74xjMBJcae9e4GWwUt7taF8ikIuOljPfgo4nBxpEvU80m7+zOnHazaxX9f8qWt6Ih8ekgfALUe0ij3sjNaZl3Whl4QVrPyslTcEqVg03DUiyW/Ww74ESr8/l7hNVpDwF3ocgd+CPFYg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sacHN-00016e-Sx; Sun, 04 Aug 2024 10:32:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v6 5/7] gnu: Add ada. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 14:32:13 +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 X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.17227819194143 (code B ref 71897); Sun, 04 Aug 2024 14:32:13 +0000 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:31:59 +0000 Received: from localhost ([127.0.0.1]:56882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH8-00014c-21 for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:58 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:55177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH3-00013R-UM for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id A476A13876A6 for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:27 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 04 Aug 2024 10:31:27 -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=fm1; t=1722781887; x= 1722868287; bh=QygqV4XkWIW9xHDHZxhR6fSCNOtcRrv3z1nmct8Hloc=; b=P wDIHixhGEHfrYUE86yqWwlnFG5n7y2mIx9ngKYhGbp7aoK8fKi2Ki4ICahGs9lhy rm04b9mgIc/GUuByA6byveS4VBPwGpGKxA74L1T6nEMvdt12c0bdc1iJmnNT0TzM jIKCVAG8q1V8wT+8Z10lqOZQPas4tOqdbwA/UjrWHcmuup7T1QnmmJpnwcxFgOyK W7QZg2DUp+PihUz6AZ3et3b2OwNy2F/rydl3cxcYUMCYwNq4w/tQFdbZln7TVLm9 BH6mza4IubCYMHyR7MWO+ox5ldSvq/iq4PwWflvX07NmP9Tmn7Urj/CZcl54CYVk 8YyB3nh72vR6zkccttmlg== 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=fm3; t=1722781887; x=1722868287; bh=QygqV4XkWIW9x HDHZxhR6fSCNOtcRrv3z1nmct8Hloc=; b=sxBEKolj73c0DNsCHolNChfRJvk3B 9SUGPQDaUmGVr2S5o2v4FTeFMdf4d8YZhFB6gkkKIHB89wRvbslhVJOQqHs6wYCP 4rrH2+asMVUVuNGDMp8rBNnePtgNrqaiSeCWl6/7L8Tbmc81d2S4CgTQSGI0yroP YSox4Lb0/44viQtXKSJ4/JaeAtROSD6abMYL58iUHVLYc9cx9ORo/EKiOpU/zYyG HA6ojEEGj1FdRyegThhZszgeP/5pR0cpxTJCTyq2vkZqXs1VkCOsdoZT0kk8UheQ oMfsl5I3th9vNAZRqbcOJks59cjN2Mq2ToWuo7i4FnLQ4J0lgvU9HdoEw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtph htthhopedt X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:26 -0400 (EDT) From: dan Date: Sun, 4 Aug 2024 22:30:48 +0800 Message-ID: <08f02411d27405aa3f34de957a34a25df21c8acc.1722781401.git.i@dan.games> X-Mailer: git-send-email 2.45.2 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 (ada): New variable. Change-Id: I9924bba53ed58bbf306bf073c9724cd7bd6f570a --- gnu/packages/cpp.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c1c2a4028b..de607f4756 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3244,3 +3244,26 @@ (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 ada + (package + (name "ada") + (version "2.9.0") + (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 "1d2mj2zmw0dkkgas3bap2xwlizsy0qdpqwcavb4hqx7xp5xnm7yn")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DADA_TESTING=OFF" "-DADA_TOOLS=OFF"))) + (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+))) From patchwork Sun Aug 4 14:30:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 66672 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 E386227BBEA; Sun, 4 Aug 2024 15:32:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, TVD_SPACE_RATIO,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3BACA27BBE2 for ; Sun, 4 Aug 2024 15:32:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sacH9-0004mY-5S; Sun, 04 Aug 2024 10:31:59 -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 1sacH6-0004lU-73 for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:56 -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 1sacH5-000787-RO for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:55 -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=ItaBuPVYCw8srw68Q2isEf5uLqYYAQXlEm7GFf06g84=; b=KYn8xzgwsLKe0D1owzKjCQEYB0E4pd6zwNU6giYP9RRI47z37AeckrNArp1Q5phoD5QZZUrMrUuxYK3e6+WTEoS5O9hsOlv9cC+VN7tPmdKSYkuMebUWS2VAsFQ+4nTt2758vSPFdqUFCDN2uXy9pfNYsKd5F+SMU6B2BHPDMJdpgdKFHPdo/4+RKfWxWCzsSe22/agY0B05YIZiKnHcI92lgS9YB5XjRsPNCiHqOILFHHh56LZU6lamLqQUI2k3HWkwE2ScR3twcuZlDX4oHdTbJUDzUDEXllM/cRDcz5KIiEg31ltpO06sVXEZ62GtnyYpzMLp2XEuyrRSQDm2Fg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sacHQ-00016t-44; Sun, 04 Aug 2024 10:32:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v6 6/7] 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, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 14:32:16 +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 X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.17227819234174 (code B ref 71897); Sun, 04 Aug 2024 14:32:16 +0000 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:32:03 +0000 Received: from localhost ([127.0.0.1]:56886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacHB-00014x-3U for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:32:01 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:47971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH7-000140-Jh for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:31:58 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 2174911482FB for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:30 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 04 Aug 2024 10:31: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=fm1; t=1722781890; x= 1722868290; bh=ItaBuPVYCw8srw68Q2isEf5uLqYYAQXlEm7GFf06g84=; b=e jMvLK7+FI/fRZl/haDXfWCGCfmZaz61dG6FklE23bJQ/1J5mc8NzOl2w1lm5VpHu daQtceghOf7GUZKUG3q+uashz+UuAssHFxJ0KEmRDtVS/K6B+ubhpvYjexDuW7+C A3boyWZHzyZqq7MB4WdlGE3hvBYIt4jLmW51qH0fNsWQKUSXZTpJE6RfwCz8QPmy FB236ApFCEr1oxS0cmIVXrA69HfvQZQC0gRoRk7pcoO339VoVu8LvU/vhIppeDtU xV70aHW8JHVr3w9S/Sy4J/XN5o49d2aX5MkkJKdrcPV+Vf6iKRTThfv0Qoq9WVvy hn850KTdzjUhFG3BbZRug== 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=fm3; t=1722781890; x=1722868290; bh=ItaBuPVYCw8sr w68Q2isEf5uLqYYAQXlEm7GFf06g84=; b=TKbjZ3hpb9894s2CnLDbURApgEIxi yZfMO1LQPpo45TRt8iiWQQ5ehXVJoy7jgPgQQHD6EdvIZYsetp8rXlj00hBIEEoH tZfnBwLYoApGaTbkfYucaHIq7SrgVmvibX5WF/wCcsclDkxkai1YcQBSGAA+vDe3 ikUKw3uirN5U6YrcpQa1it/TdOHk2wfZqYxTT1ZX185ML7wCj2Z8oJPW9dQMHEea hyv3htisYoaMumxc8j8w2BPQ1eX2mQSy2sSIGT8526xLQoYmejLq1gunNQsK5Ye0 8mfwvcRange/tJ5GTGNj30NZb8FoRkNzZB1nYxrJYNcAYUn4JbT9pEr3A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtph htthhopedt X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:29 -0400 (EDT) From: dan Date: Sun, 4 Aug 2024 22:30:49 +0800 Message-ID: <0a0d673493941e0300795c8fdf4576dff0a24e71.1722781401.git.i@dan.games> X-Mailer: git-send-email 2.45.2 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 a77164b93e..88b4baa0da 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 Sun Aug 4 14:30:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 66670 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 B0B1627BBE9; Sun, 4 Aug 2024 15:32:32 +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 4EB0727BBE2 for ; Sun, 4 Aug 2024 15:32:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sacH9-0004mZ-DK; Sun, 04 Aug 2024 10:31:59 -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 1sacH7-0004mM-IL for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:57 -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 1sacH7-00078I-6T for guix-patches@gnu.org; Sun, 04 Aug 2024 10:31:57 -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=zsbd6Ongk40JljG/9DuO3P/nI+MVwHbBKOPxA1X8Bwk=; b=CHf7hxuoetV2d3VkfKovslT+WsCwmAXYCwfnHcobOP9pJo9Jc6jsKzAuGvwrZjDu8skK+/AYxDFYeozUMINuZuCIbM2U8kOu1Vf3fsGaaqWPNx693Z+YKdLRdogv4mcMkVg9YlD8kwC7FBi1ksGibMNb9y2LX1Cb8alXnW9hHmS+ixYoMYKvNZbxn3nhM96Yc1x5RXss0+tRGIHpvbObcTCsP+2ZgPQRoDNye6h2TX69NGcLL+RffAKGPTIL2NN7OKqltDQp8/rdOUOWVYShmkWWXmbWi/G7hjyUJ/mySXPBWHUxJ+/cqIIkNtbzcjUcK70+6Yg4nJvJd21EJI3LgA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sacHR-000179-Ki; Sun, 04 Aug 2024 10:32:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v6 7/7] gnu: telegram-desktop: Update to 5.3.2. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 14:32:17 +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 X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.17227819294216 (code B ref 71897); Sun, 04 Aug 2024 14:32:17 +0000 Received: (at 71897) by debbugs.gnu.org; 4 Aug 2024 14:32:09 +0000 Received: from localhost ([127.0.0.1]:56891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacHH-00015e-0b for submit@debbugs.gnu.org; Sun, 04 Aug 2024 10:32:08 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:43067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sacH9-000149-8o for 71897@debbugs.gnu.org; Sun, 04 Aug 2024 10:32:01 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id 00D9D1387EAA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:33 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 04 Aug 2024 10:31:32 -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=fm1; t=1722781892; x=1722868292; bh=zsbd6Ongk40JljG/9DuO3P/nI+MVwHbBKOPxA1X8Bwk=; b= Po/WvPA6ZzqwVpIxva3x+v2XyZOEGbwuHe/HgT30Wx2b9X5BBgNAjEL5GopwuDDd fwsG+j9+hIp5XNP+a9Gc03MdZ6q3QpWQ166zWpj2N5Gz5e8RybMCMy+785DmUWWL P3n70laFQAz57odCiC/q3sJZxfo6TTtKmFb3n/9fPKFoEeXKEz9I1ELRTGFEv8r7 tX1Mf+yBdfXfuy8/mKmttnUkuXI1Q31A5pSE2EmFO4yxCr/dYJVEksDIeIf0PMSp PCmXyuMasUEqpGGHaC+UJFQmMEVJ03MQdf0f4yHLAx656dW9a+j21Ra/G9kfa19W wVuXpobtL2jkUqmR3r1GqQ== 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=fm3; t=1722781892; x= 1722868292; bh=zsbd6Ongk40JljG/9DuO3P/nI+MVwHbBKOPxA1X8Bwk=; b=f +QEn0Y1ggCu6XviQbasjAmgNNY1Kh8sA74XP7EZzkuBmlC78gZZeIdwQiAPdsb8c hGf3Jcxk+YhVUZYsB5ssLcKRRz9/2oOkJREod391MCUN5OgLuiOY7l0zI26vdHn6 lUPb2UUcIuzX+Oc3qj0/jxlXvMCja720k9Ntvo9W5s1TrWx5aiTOKmGqfB3jWu92 vPs2L7Mc/DUBsPoP67aRx69sOljLrRekWKsL2KIa+MRqUsxzMQ9fjChE3nYJsSdw A3oNAaf9xX09B4ypc2z6achxL/Uo5uF0T5846c114kyRrzdrETd6xR4KQMlphNMD SiqN1MqPb92uMmgjZgb7Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkeeggdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculdduvddmnecujfgurhephffvuf ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhg rghmvghsqeenucggtffrrghtthgvrhhnpeeikeeuvddtveelgeehudehleehteffhffhff fhvdevgeevkeehhfffieeuieegieenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhk ihhtfigrrhgvrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtghpthhtoheptd X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sun, 4 Aug 2024 10:31:31 -0400 (EDT) From: dan Date: Sun, 4 Aug 2024 22:30:50 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 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.3.2. [#: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 | 97 ++++++++++++------- 6 files changed, 197 insertions(+), 41 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 d8fcb13cfe..6bce751788 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2139,6 +2139,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 88b4baa0da..486e742d5e 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.3.2") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -97,67 +99,72 @@ (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 "08de4f18f5e4459689957b3aa115e10d8cbef9d6"))) (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")))) + "0a2y9dpszw686lk83k3psvid6kqrwnx7z4zcb35xahn4ab3pp7il")))) (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 "ca4503b3075fcaed5719b6ff1f40e40d14d08d95"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "1clzv85gbix9km2id2c4r0dpsc6jjrybrs4z6bpzfriwahhd64a5")))) (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 @@ -188,24 +195,24 @@ (define lib-spellcheck-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "ae89fefd239ecc47d4dab7ba29f9e230376a57d3"))) + (commit "0b7622ff38778e9cd03d3997de59351973480a1f"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0s9fjxpxxvj1xgzg3sfw6079blgmdvbb5cy6wb921sqaqwf52j6x")))) (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 @@ -224,52 +231,52 @@ (define lib-ui-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "8db5d1aa533334c75ed2598ecf3607768ae9b418"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "0zkxjqg112wp1120vqc8qw0hm9dwhf51p8v9mrc76i4p1bd7m571")))) (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 "c27c69953db52cfcb56abc3d422764f0fb4c2152"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "0r86c5r0dhrvvjaaava5jfayk3gmimnb74b6dbwmzd6dcw35nfip")))) (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 "0pw11f3a616niimq9xpqxh2mcrd88q3dw22m3avrn90lmqb7mp12")) (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 ada + `(,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