From patchwork Sat Sep 21 11:34:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68234 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6D2C127BBEA; Sat, 21 Sep 2024 12:36:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BA43327BBE2 for ; Sat, 21 Sep 2024 12:36:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sryOy-00025D-KF; Sat, 21 Sep 2024 07:35:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sryOt-00023j-DV for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sryOt-0004F6-0z for guix-patches@gnu.org; Sat, 21 Sep 2024 07:35:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=xTzh81FaoBO9c0BbcLDB9XUp5b92F6krH4HzZWa0vZw=; b=md0GDDPzrIkfkNcZRbn0iKCjvH99BKGOjGKwk+WBjjHX8tCH0he/5dNyNfOI1WFtIXUXwUrXWoZVLxnJ+k7q1aB3of/5b8EjZ34rMaaZpulsaDP5Z0MEbI8uQvVKv/L/8eKiZnsMaQInIz1u4fteS7edAou3fikFmkx3n0OBNgg9QTbrQo23Dtfau5AU25JYs9j2S5+plIXpdBL+ckOPTdp8ED1PQNqO9JNxWtssbdVJGn4sV2pq2F3PqfVWN2bn6AiJq0julLpm6DomBDZ3VjQ6S3tu3xleMwVBkMJ1EYnomw4dxqgGnYWy8QKh41g+qj1ilt++HWRx32xxpZA/Nw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sryPC-0001Pd-7A; Sat, 21 Sep 2024 07:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v7 1/9] gnu: xdg-desktop-portal: Update to 1.18.4. References: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> In-Reply-To: <2d3ccba28b9d4ff2168394bd7b3bff552e4d2183.1719897489.git.i@dan.games> Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 11:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.17269185355294 (code B ref 71897); Sat, 21 Sep 2024 11:36:02 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 11:35:35 +0000 Received: from localhost ([127.0.0.1]:37453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOl-0001NJ-45 for submit@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:35 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:44153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sryOg-0001H4-T3 for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 07:35:33 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfout.phl.internal (Postfix) with ESMTP id 0170C13802F9 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:05 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Sat, 21 Sep 2024 07:35:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1726918504; x=1727004904; bh=xTzh81FaoB O9c0BbcLDB9XUp5b92F6krH4HzZWa0vZw=; b=acQUqWIKH8YAjIKgWYuP9kn9nr ixeyao/W4fNBHX2800R9QESyRnFPK76RzzDkaJxz7ho7Q3SpH1J2i4sdxr+NQqjt cCyRlRknnQ7iBh/WMKpjtLq9IjBviJG8jte0+A3M2Id/QJFEebY59vViDybteYVQ YVBg/csOFo4I66fbXZnKI0n4M/g/5zd4YgzdG7/+jMCAYJPEqyPrKJ765jt/81y/ +on/KjebFuE7f+s5kGil47De5dGppikQc0ZZvWkV5X5/MWb4NGXZ/L9Gue0QFT/K 608sUJ31vmGUzclLa7FwfoxwegBNeRfAsKO20J4mfw1+2eQpW6z0D1I6Rjgw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1726918504; x=1727004904; bh=xTzh81FaoBO9c0BbcLDB9XUp5b92 F6krH4HzZWa0vZw=; b=jLu/TqoZhKXISyAWKxu7Ep0dAJPPlca12+lzyIc07Hpn KTIrhWrOwFbbR9q8ygOdz0piBgaz9X/5FQlJorLjTe1rzJ0Udny/z4WCJh7NU7Hl MvOgXUcUlWK+gwq4TGKbQ2/EjkfWe/ewhrKrTwRbOqL0nw6XHOozNk/NsFgL+vpK Gc6gt8IBO5jZgZxdZ6wrVMBxqtWNiUGHDqeG1KgW2YV5spzYzaJFrUl2u1q0leNq 1fojpUdoPWAMZjAmlON42ioeb6LwSQaJphPokO72P7MfY4RLVp3mVPAZNNTRdJjw K4QDNfxI22A9m70Mjr4urhx7DIhaddMcag6rKHDTlw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofggtgfgsehtkeertdertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgv sheqnecuggftrfgrthhtvghrnhepgeejhefggffggfeiheekvdekveetgfejteefuddtfe evtdetuddtfeehhefhtdehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnhgspghrtghpthhtohepuddpmhhoug gvpehsmhhtphhouhhtpdhrtghpthhtohepjedukeeljeesuggvsggsuhhgshdrghhnuhdr ohhrgh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 07:35:03 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 19:34:35 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4. [patches]: Disable portal tests. [native-inputs]: Remove autoconf, automake, libtool and which. Add python, python-dbusmock, python-pytest and python-pytest-xdist. [inputs]: Add bubblewrap. [phases]<#:configure-flags>: Update flags to meson options. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 25 +++++---- ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++ 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch base-commit: 9d75215a59629ab224154ef6b843043289291f81 diff --git a/gnu/local.mk b/gnu/local.mk index 8e7abc8a47..802f4be4fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2303,6 +2303,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 993bb84ec6..46199bac00 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2024 aurtzy ;;; Copyright © 2024 Dariqq ;;; Copyright © 2024 Wilko Meyer +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -136,6 +137,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2986,7 +2988,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2995,18 +2997,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; disable portal tests since they try to use fuse + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3018,7 +3023,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan +Date: Tue, 2 Jul 2024 19:37:38 +0800 +Subject: [PATCH] tests: remove portal tests. + +--- + tests/meson.build | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index a2dafee..bcd87be 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -181,18 +181,6 @@ portal_tests = [ + + test_env = env_tests + test_env.set('XDG_CURRENT_DESKTOP', 'test') +-foreach p : portal_tests +- test( +- 'test-portals-@0@'.format(p), +- test_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)], +- depends: [test_backends, test_portals], +- env: test_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + # Split the portal tests into one test per portal, this makes debugging a lot + # easier. +@@ -204,18 +192,6 @@ portal_limited = [ + + limited_env = env_tests + limited_env.set('XDG_CURRENT_DESKTOP', 'limited') +-foreach p : portal_limited +- test( +- 'limited-portals-@0@'.format(p), +- limited_portals, +- args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)], +- depends: [test_backends, limited_portals], +- env: limited_env, +- is_parallel: false, +- protocol: test_protocol, +- suite: 'portals', +- ) +-endforeach + + if enable_installed_tests + install_data( + +base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd +-- +2.41.0 +