From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 8M94NUf+g2ZECAEA62LTzQ:P1 (envelope-from ) for ; Tue, 02 Jul 2024 13:19:04 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 8M94NUf+g2ZECAEA62LTzQ (envelope-from ) for ; Tue, 02 Jul 2024 15:19:03 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm3 header.b=aZxMAWKB; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="c VD3Ibw"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1719926343; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=cq/k55gjCarnRpO2StTDUCH/By46JoT/7wKUMxObkcM=; b=EqvGLjiwm30H6a46NU9b0fpdMvh3KuNh8SUcGpX4oZNSPmntQXkC/+gmeIANdhNJ1VSz2q 87wz+pd2xjm1hqnpt5VHru6t0uL3S7rzFUx874EAo2Uf3zeU4yDToghNPgXlB8FzXqXvKu gzAykFVQIE2Wp3wOjPRqFx2TNAgF9QuNvU9138qLTfTKn+DqcO3AhbOOGPPAp4vIbwwjrA H69g0INLQaty4UAGa8FwqCOLd7hwfZTJFDQKtZfsRd7GDQd00M9CZeNq26bzyhiRpwj6hA rm1QopaepRu9cm7ZDqV5gOe7iPLDGl2nBcdNba9yHyEBkeWWusAf/tQYjoKkWw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719926343; a=rsa-sha256; cv=none; b=iE4LAYQKaxgImZXV+5f26e5rBk/2c/cCIn8iAOXJ2KCiOENTqy8P9+YbsZYGar1wAglDF1 /XRNvPvTBsfMddkSqcI4X66jlraT89py4QPx8BPo+75uxqBrO0WtCRtd+W5DeRqUu6etQX XpVfXo5CGyyVvtYVLAkp3N1Xrk4T5VWE+hzkANl1fkPxTswMxapR5Oh4NWvW8sXbkcbuy4 e2INy4q2odT5q0k9FB3ktzbuYH4ne83kMWBOFPuYWppRpvfKF89hIqE4DxVjeN3l5KIhS6 /2Y+j626yTpZemPZfjxKomVdypP/Fz3uYx3KvoyGHO2dQKRlqha0Pqp94VvMyQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm3 header.b=aZxMAWKB; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="c VD3Ibw"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8695E63A9F for ; Tue, 02 Jul 2024 15:19:03 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOdPE-0001Tp-FO; Tue, 02 Jul 2024 09:18: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 1sOdOV-0000z6-KQ for guix-patches@gnu.org; Tue, 02 Jul 2024 09:18:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOdOU-0006uT-48 for guix-patches@gnu.org; Tue, 02 Jul 2024 09:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOdOU-0000HB-BB; Tue, 02 Jul 2024 09:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH 2/3] 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, guix-patches@gnu.org Resent-Date: Tue, 02 Jul 2024 13:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: dan , Maxim Cournoyer X-Debbugs-Original-Xcc: dan , Maxim Cournoyer Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.17199262721023 (code B ref 71897); Tue, 02 Jul 2024 13:18:02 +0000 Received: (at 71897) by debbugs.gnu.org; 2 Jul 2024 13:17:52 +0000 Received: from localhost ([127.0.0.1]:36268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdOJ-0000GH-Hw for submit@debbugs.gnu.org; Tue, 02 Jul 2024 09:17:52 -0400 Received: from fhigh5-smtp.messagingengine.com ([103.168.172.156]:54699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOdOG-0000Fu-FP for 71897@debbugs.gnu.org; Tue, 02 Jul 2024 09:17:49 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 254951140264 for <71897@debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:42 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 02 Jul 2024 09:17:42 -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=1719926262; x=1720012662; bh=cq/k55gjCarnRpO2StTDUCH/By46JoT/7wKUMxObkcM=; b= aZxMAWKBSWviyPWa1pQ48zYkTHpxVgEzGibDV573apa9P0/r28Ifp+oWV4XKXv7t 6Y2PzO1L+2P5Qzg4SQtGv9cMdA0TF3GO+NUihFWAAmchLlejtdeFhwc7vqgdTuK7 lCm2iYovnnmZAp9XBijVi+m+sHU2EkAUPmt5g4vRsEFo9wSF+f61I7fxuqgrvMuz EE5Em3wBaK9/BVBMSP4u/G/yNA6q1StI6M1jW9gpdD0+bso/crZmztWTJleRjD+f ksKCOluprsKgJ3+1xWToeq2yZdhbihXEzxxaFzif+KTXH9HqUZdgJTNmKrOUYrBn caiRb/lzjJysuoP9GMHKaw== 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=1719926262; x= 1720012662; bh=cq/k55gjCarnRpO2StTDUCH/By46JoT/7wKUMxObkcM=; b=c VD3Ibww6bTTDIraSMpjK7h9PZrlCI2+iqmVkLfKvmf2yi3UE564ixVNlwGqigkRS Lc/Vgktw+Kro9BHp03Us4lCGJo6T061R94ZdjaTXorhZTEIyufwYSpAMqTFfeKQI ypiccc/3zwrNlSzjljUpSoZzzF2bRQgBtu+bxHBgMIgNZY1TOlUqJu4O4w7zw9Qd Wjj/Spnm2HURZKYA5m98j9MD7dZwVGAFDe3eitBe/FUYETVO7mK+ZnmYC3AjX8+C tScKHEg9q2pUhtTyln3PHIeu9Zk1XA5yUhdPTQayqUKzW0chjQvW/0atLdtltD0P vsZI6ESorxolJHfvM6GZA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpeehfeekffeiffekueehvdffjeeuvdejleektdeiueelhedtudegieefueeile eggfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehi segurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Tue, 2 Jul 2024 09:17:41 -0400 (EDT) From: dan Date: Tue, 2 Jul 2024 21:17:15 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -1.48 X-Spam-Score: -1.48 X-Migadu-Queue-Id: 8695E63A9F X-Migadu-Scanner: mx11.migadu.com X-TUID: VkgsyXPC6k5w * 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 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 + -- 2.41.0