From patchwork Wed Jul 3 13:22:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 65874 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 A673E27BBE9; Wed, 3 Jul 2024 14:24:29 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 020AB27BBE2 for ; Wed, 3 Jul 2024 14:24:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOzxv-0006YS-Bq; Wed, 03 Jul 2024 09:24:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOzxs-0006X4-Jq for guix-patches@gnu.org; Wed, 03 Jul 2024 09:24:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOzxq-0005Gs-Lo for guix-patches@gnu.org; Wed, 03 Jul 2024 09:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOzxp-0000dy-KA; Wed, 03 Jul 2024 09:24:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v3 1/2] 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, guix-patches@gnu.org Resent-Date: Wed, 03 Jul 2024 13:24:01 +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.17200129932389 (code B ref 71897); Wed, 03 Jul 2024 13:24:01 +0000 Received: (at 71897) by debbugs.gnu.org; 3 Jul 2024 13:23:13 +0000 Received: from localhost ([127.0.0.1]:39172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOzx2-0000cS-Uu for submit@debbugs.gnu.org; Wed, 03 Jul 2024 09:23:13 -0400 Received: from fout8-smtp.messagingengine.com ([103.168.172.151]:56395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOzwz-0000br-Uj for 71897@debbugs.gnu.org; Wed, 03 Jul 2024 09:23:12 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id A029213800FB for <71897@debbugs.gnu.org>; Wed, 3 Jul 2024 09:23:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 03 Jul 2024 09:23:02 -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=1720012982; x=1720099382; bh=Ec85AUeKhS aRbs8YBxrFNE++ra1NA6eylNWE1NN5JUI=; b=DDTEJv7ZvbUZ/m8mBmVF3Uh51d QhXnx6E2IHqpm2kT3V2CeX0qjWXj6haHrj7dzlFVJ2rX4gRTmIUsu48a+U6Tp8sQ lWrguIqmvfe4Ny1XYxcRnrS23YcSr0Pk+FEA04eSNclGEXwUcWjPB/rWUIKIJfm2 AQONCIbNnDfZ63KJbDiTk/vrvdzcjvcMytOgJm5wCxAbQKLcaVyJJ2h2+1cN1ec7 uC7GCZbA8PJxjEyVwu+fAn3eYXyHrcOFRQpghH1/vqJb3TZA+mCpdCSpqMAXAYl1 a1p9LNzwcHPrzavtethxJD8Aba4utnNCOTHQPyPzlf+7CTfuGKDNAPiGJGXg== 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=1720012982; x=1720099382; bh=Ec85AUeKhSaRbs8YBxrFNE++ra1N A6eylNWE1NN5JUI=; b=dT0AJnp5aLzowztupH3NjU8jC7qfgRk+ZhT98PWc9vHc qOG7vVSaKy/FJfCY59u/W5NRPpb59sPquuDmp9CyYwnadcGnY2p6mmGIH2oSKztr GiU1eZK7ONLuMd5mmQwpwqg1nP4LCsEXz3I68pNmo3/BTsG0B5WrwLPn+oBAOVsc 5vzw227RecxwrFSMmY2SgUnQRhmwZQo+1Pn+iRwfonzSUUa10XvibONJqkJeq+qg 91HuUvF0KfuH7SyotUYXNnS1mW55r0/cMaa8s7NIez5r++TmSLqKqrsONZsjNXxl ebO+N1bI5reSYdbmKdNnqTkW9nSl9WoZUHlHw6he1w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudejgdeifecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpeegjeehgffggffgieehkedvkeevtefgjeetfedutdefvedttedutdefheehhfdthe enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegu rghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Wed, 3 Jul 2024 09:23:01 -0400 (EDT) From: dan Date: Wed, 3 Jul 2024 21:22:45 +0800 Message-ID: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> X-Mailer: git-send-email 2.45.2 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]<#:configureflags>: 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: bab73e413b3421f4aa051e9438d147040a52e1be diff --git a/gnu/local.mk b/gnu/local.mk index cf6b1d61b3..973c4a5dad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2240,6 +2240,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 6941450436..2015ee46f8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2022 Samuel Culpepper ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,6 +134,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) @@ -2989,7 +2991,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) @@ -2998,18 +3000,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) @@ -3021,7 +3026,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 Wed Jul 3 13:22:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 65873 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 73EC827BBE2; Wed, 3 Jul 2024 14:24:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0AE6A27BBE9 for ; Wed, 3 Jul 2024 14:24:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOzxs-0006Wp-EO; Wed, 03 Jul 2024 09:24:04 -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 1sOzxq-0006WO-03 for guix-patches@gnu.org; Wed, 03 Jul 2024 09:24:02 -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 1sOzxp-00058V-Nm for guix-patches@gnu.org; Wed, 03 Jul 2024 09:24:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOzxq-0000e5-1F; Wed, 03 Jul 2024 09:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v3 2/2] gnu: telegram-desktop: Update to 5.2.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: Wed, 03 Jul 2024 13:24:01 +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.17200129972410 (code B ref 71897); Wed, 03 Jul 2024 13:24:01 +0000 Received: (at 71897) by debbugs.gnu.org; 3 Jul 2024 13:23:17 +0000 Received: from localhost ([127.0.0.1]:39174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOzx6-0000cl-Jn for submit@debbugs.gnu.org; Wed, 03 Jul 2024 09:23:17 -0400 Received: from fout8-smtp.messagingengine.com ([103.168.172.151]:34913) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOzx2-0000cC-9s for 71897@debbugs.gnu.org; Wed, 03 Jul 2024 09:23:15 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id 628541380189 for <71897@debbugs.gnu.org>; Wed, 3 Jul 2024 09:23:05 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 03 Jul 2024 09:23: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:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1720012985; x=1720099385; bh=Nnr2/VfP9ib7mXT23hot/RYD28zNnQjUXddADVy96Lo=; b= m+9j56ZDRMD3tWdA1LNg+ma537V9rFqJutce0dE1L/28s7TyHlyCd+sNj5ynZA3w 294FgzArm0YENsnWDYK92K/h2IT/PTt33EiPkxXvMOpoZ8v2DW5regm2E7naImEr DGqZZKQg9elawoAWmJVArtdQXMvasdSf66osPibcBNujgF+2BNqj7RPn4JhvDjVf 0yrsc/sLE+wvbOSJ4fE7nvGHWUpI7JOf/Ci1mCCHsMriFkPfklrOlc7UwFsF/RRy XBVte4f1aoCgg1tlhwdqctRPDQBOBQTFtjmCdJePBURRPuCaMwerqDo1xU7mYQZF CwMMsgpAlsvwprCboL3UOw== 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=1720012985; x= 1720099385; bh=Nnr2/VfP9ib7mXT23hot/RYD28zNnQjUXddADVy96Lo=; b=V kESz0EQyVMlbZew9+4szt3B614SlXc2B7Cc4r7fKkDgDTMQ46nzk5EV5LF2JY/8s m5aLC3wPoq5P9T6ezNUenwUsZ6QGQrNyIDWVbjcOqh+13i6QfFKlmgGgmvioaHRb l9APuQqasJz91v4d+4HongqaBy5OmdJI9qujIazQokPRaW239VyVcKtk8GfrfqAZ muceEvmM2VES1mQYNtOGpxJ6GWJM8/A7kYNVFM7++PVZ6638tLlBmPxHXxvP+/h3 dB9YVLSzVsPvPl9aRWo2/LEN5JVkIazEDAP2aX5F6N1yRNqjVOQfwfmefvijJEMy 7B0UB9SNtERB7bypXGUYg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudejgdeifecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculdduvddmnecujfgurhephffvuf ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhg rghmvghsqeenucggtffrrghtthgvrhhnpeduudduffejtdejudehieevtdduuddtvdegle ekueeftdfhfeettdehfeejjeeugeenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhk ihhtfigrrhgvrdgtohhmpdhgihhtlhgrsgdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Wed, 3 Jul 2024 09:23:04 -0400 (EDT) From: dan Date: Wed, 3 Jul 2024 21:22:46 +0800 Message-ID: <97beab597e192df73feba1ec6eda4d112b3864bf.1720012870.git.i@dan.games> X-Mailer: git-send-email 2.45.2 In-Reply-To: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> References: <9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/telegram-desktop-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): New variable. (cppgir-for-telegram-desktop): New variable. (telegram-desktop): Update to 5.2.2. [arguments]<#:phases>: Add libprisma-for-telegram-desktop. : New phase. : New phase. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and gobject-introspection. Change-Id: I75441a6284e3755f510a7d3ba5746bfbb8acbb91 --- gnu/local.mk | 2 + .../telegram-desktop-unbundle-cppgir.patch | 95 +++++++++++++ .../telegram-desktop-unbundle-gsl.patch | 31 +++++ gnu/packages/telegram.scm | 129 +++++++++++++----- 4 files changed, 226 insertions(+), 31 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 973c4a5dad..2d4f866491 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2135,6 +2135,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-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/telegram.scm b/gnu/packages/telegram.scm index 358374a5bb..533e976f6f 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) @@ -54,6 +56,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -82,11 +85,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.2.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 +100,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 "5742caae65e4163e7faec238eb4e3e5c219ad09c"))) (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")))) + "1ld74wd4gyx22gd132ci13sbzis7ypxqiyk4y0mrlhjvmciq9nw1")))) (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 "f30400147d997fedc787e214467d305db6c159e7"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "0mm88xj9q9v5p0z7byjfpbmw8h6rqg9ya9m0jhfzi2s8iglz0cga")))) (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 "078006d29af0002e6cd8c61a405cdeaf65b37142"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "06mzafnjpfr5ih297dh7bxm6bgpg0wy0gv2r2732n5szyrg9sdl6")))) + "18n88ghj3akpkxvllrh1rs19vd0d3xw87hd67qphr30b6ggqs9fd")))) (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 +196,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 "0971b69ca90f1697ef81276d9820dcd6d26de4ac"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "0ihbh1ajns0sf42h9992hnawwjr1n439sgb0g4zirn2bj5i1zbdv")))) (define lib-tl-for-telegram-desktop (origin @@ -224,52 +232,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 "ebd8609ee73d48186b905787dd5bb3bcbb4f9f3f"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "0abpb0gi3k99pm5zh5gh9czhi48jqvr6wy0yli004hswlfqs2nxk")))) (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 "f701713cd798bd7d5f69d318fdefb125d101aa76"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1c8jwdnn26n13yp0rp0l71q6xlxa6wp3cspbm3pnghw964jwgp3z")))) + "1hki5lc2jrack0r7wyixfh3c08jnmnw3pfrggrznvj4kq490z1b4")))) (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 "659b9181240aae16c05ef8ab7e6c4dd527afcf8a"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "1hg8jnpkszf3rrbnkqq9xc3n743602vkjp4kj8rccw7syjmgvrf1")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "b9fa8b84d8abe741183f157218ac038c596a54a5"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1swni7xw5l0q376b6rnf9h93arzjqm9rkv7g6hz67742lf9a0x9z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "c9cc4390ab951f2cbc103ff783a11f398b27660b") + (revision "399")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -285,7 +293,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "0x2hjliiapb9kacbg8fwkz7g09c9k8dc77xxycjh5kmm1fc2i6dd")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -400,6 +408,47 @@ (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" %telegram-version)) + (sha256 + (base32 + "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) + +(define cppgir-for-telegram-desktop + (let ((commit "9c4f5820d94d62ab451501f016bfea97156518f4") + (revision "0")) + (package + (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")))) + (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)))) + (define-public telegram-desktop (package (name "telegram-desktop") @@ -415,7 +464,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "0ik74jdvjlan34mykidgrk8d7p2b2y27ax5szvx7kdas7vmbl7k1")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -481,7 +530,20 @@ (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"))))) (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 @@ -490,17 +552,22 @@ (define-public telegram-desktop (list `(,glib "bin") `(,gtk+ "bin") pkg-config - python-wrapper)) + python-wrapper + xdg-desktop-portal)) (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl crc32c + cppgir-for-telegram-desktop + expected-lite fcitx-qt5 fcitx5-qt ffmpeg glib glibmm-2.76 + gobject-introspection gtk+ hime hunspell