From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id UOMjHCqvimaMZwEAe85BDQ:P1 (envelope-from ) for ; Sun, 07 Jul 2024 15:07:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id UOMjHCqvimaMZwEAe85BDQ (envelope-from ) for ; Sun, 07 Jul 2024 17:07:22 +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=jFdjU8mD; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=uKmD4h2J; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720364561; 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=kujeM1f2HtinsOu2H30+Mq4sVgEY/3I2iEtTGVHcBDM=; b=Zf1yPDtnDWdNxFDasNAbmizlFAQR+HAWITiiKpu8p0HW/4e585mQO+3uKcWdJJqOMwiEv4 xdtubV7oEbfVUj2Uh0a6rfAPcWqevDYPQZScO7VLbGqNg9VQLczQ8ZuTx7naiwCVMvXS7K 7caOLiP8QH7nqC7wWglylD4frZ4C1n2Xy9VYPFRzSOKoVURmC/XUSX4mgdqW3Mc+RulVRQ P7cD4J1W530m4U6zVQCAhKFCiNCp/KxJDUtpfwIRveTjJu2mDsb8OyqrL+0tMc+tEUjRqJ naifp/fTqarmpuKFdZpqNi/DxJ5vIFvrnfvJnuL1VHdpeExALXbJHBTufJM00w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm3 header.b=jFdjU8mD; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=uKmD4h2J; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720364561; a=rsa-sha256; cv=none; b=RPc+3ExehmG7S4Af1gmmJ2KH8fMVyKyZ/sk+Z3KloxDjwuyz9AQKVNDzbyd8QQex7pPA92 Bphn9/FERQ+2jiqii7INZMPau4/63oSO4rua6YNo2DySCeZx2gub9uuDV7oGRNIOUScjKx Wz1/gbtFXH2L640H/ZwIFJlFVBo1pzNEgeH/SpsBGmGUlmCebw2AgppDXUqzSdErng0Yiz oVhkPcFXnC0E2V8PgQJmo5JrzHsgOyo+lgMYV6BWsyNhULNL2PBFsMfAQumUBdTxys+BPQ BszY8ibXjz/3niWY1+0IOo2kpmYg2mpfj41ssBcQ1g1k+U3LxSVXBiKn6JuEtg== 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 05B7E69EF8 for ; Sun, 7 Jul 2024 17:02:41 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQTOu-0002m6-9P; Sun, 07 Jul 2024 11:02: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 1sQTOp-0002kI-DF for guix-patches@gnu.org; Sun, 07 Jul 2024 11:01:59 -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 1sQTOp-0004bb-2R for guix-patches@gnu.org; Sun, 07 Jul 2024 11:01:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQTOs-0001nN-BE; Sun, 07 Jul 2024 11:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH 1/5] 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: Sun, 07 Jul 2024 15:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: dan , Maxim Cournoyer , Liliana Marie Prikler X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.17203644776804 (code B ref 71897); Sun, 07 Jul 2024 15:02:02 +0000 Received: (at 71897) by debbugs.gnu.org; 7 Jul 2024 15:01:17 +0000 Received: from localhost ([127.0.0.1]:48953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTO8-0001la-Cg for submit@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:17 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:55349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTO2-0001lC-Qt for 71897@debbugs.gnu.org; Sun, 07 Jul 2024 11:01:14 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfout.nyi.internal (Postfix) with ESMTP id 4796C13804C4 for <71897@debbugs.gnu.org>; Sun, 7 Jul 2024 11:01:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 07 Jul 2024 11:01:01 -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=1720364461; x=1720450861; bh=kujeM1f2Ht insOu2H30+Mq4sVgEY/3I2iEtTGVHcBDM=; b=jFdjU8mDd4dbuc31Qw9q2W0DAU 0hiQsaPghYtD2Wc3HbHi/mMOBQe0SvrfOeS539v91ulbp/k7jnNwfJFJsTVH6fTq 1cMZVPq6rSxN+N4m7b6k//QXeenmwCaLw+Xcq++w9OGevpTSxfMyTtPEIRDMdb1Z wyKEF6G5B0sEtn+wWVqzmHQ/Hc5axw495zgKJeoK0386LqlHOjGU6tRY6i74+JuE /QrKrDpmmzHmCpsyWDHVBtOFtsY2p+zinjxh8RMQ8w1KwATpTDZKC4D3gSj3yjMW w+wyMdTUJEHicXHXB8TRw+gp9p7XICAPaCioPWMd2R1yJVTDh0uDkZjNzDZA== 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=1720364461; x=1720450861; bh=kujeM1f2HtinsOu2H30+Mq4sVgEY /3I2iEtTGVHcBDM=; b=uKmD4h2Je0Ca4kM67CGCJRDbtWf6/yXgEdxWzgGtS2St /+bOlE7cYYIrZlCAODNa8Z+0qCS1bnL5Wi1ZuZ8VsB638KhPgmW8wL/YemDsud6/ PBrw9ymMcokJFMi88Im8288SxcL1wNrdlU8Se0fGsfF8pw9SsTVgumyL2FL+9WXA z+22iHSoGwd9XnAbQLiU6KNodPYXYxARXvnaAE2Xt0vjuP4by9BKUXfQgRpZcJqG WpcX/zzDQK2hHIOx0kfV9syFww6V7yf/68So0PENz7qHx8dxu+yR5ogizSZbIgAH /Ls/ti6IsetAEcQ9NBX+1Ak8e15sM+JliqtR6khsMA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehgdekhecutefuodetggdotefrodftvf 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>; Sun, 7 Jul 2024 11:00:59 -0400 (EDT) From: dan Date: Sun, 7 Jul 2024 23:00:20 +0800 Message-ID: <3743fa793bf867b8112b2883815b573f955c12ce.1720364199.git.i@dan.games> X-Mailer: git-send-email 2.45.2 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 05B7E69EF8 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -2.99 X-Spam-Score: -2.99 X-TUID: q70lVRB4sSpN * 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 329eaf9358..bb53b08b8e 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 + base-commit: c86a07bacc2469e7a00fbc66cfe4f322e4bafb06 -- 2.41.0