From patchwork Sun Sep 8 21:02:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 67786 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 452F227BBEC; Sun, 8 Sep 2024 22:16:08 +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=-5.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS 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 5718D27BBE9 for ; Sun, 8 Sep 2024 22:16:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snPFU-0005u2-Ua; Sun, 08 Sep 2024 17:15:09 -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 1snPFP-0005nw-8P for guix-patches@gnu.org; Sun, 08 Sep 2024 17:15:03 -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 1snPFO-000894-UT for guix-patches@gnu.org; Sun, 08 Sep 2024 17:15:02 -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:References:In-Reply-To:From:To:Subject; bh=34uBchcF/DMXjZ63PKHh/bloki7Mr1kYsap4WRLQf9U=; b=PzXjGPOzyp2VKQ7zZOhAinMHfUuW4UTPCcYGL0C19nZvl5LlI+23U4HoW7tWKywuxBhYv/CZi/Jm41MKxD1RyTEr9oVyOi5nZAxxKsVqvVexMgl7xlWSrZQkJblxpN8Z/jNjvfvSSBPjfJwpwcd7AQlhdzclJVfnhMgypgSoxKl+sPLxoo/kAoFoGMg91tjfW+RdlbD8yua6ZoQziS/mvB+EkLstPCAM119OujwR854gt4DcrxTbd1/9TN+02TW8icQRVsExwC1qTxRS0N1miJJ0X0BtM2lan7hV/53kMdFL9v4ZDxMNvYn6+fXG3lmbN2w9kU6+VAZq80MsmC+N4Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snPFR-0004LA-HN; Sun, 08 Sep 2024 17:15:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73128] [PATCH gnome-team 08/12] gnu: xdg-desktop-portal: Update to 1.18.4. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 21:15:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73128 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73128@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 73128-submit@debbugs.gnu.org id=B73128.172583005616516 (code B ref 73128); Sun, 08 Sep 2024 21:15:05 +0000 Received: (at 73128) by debbugs.gnu.org; 8 Sep 2024 21:14:16 +0000 Received: from localhost ([127.0.0.1]:60177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snPEd-0004IE-PA for submit@debbugs.gnu.org; Sun, 08 Sep 2024 17:14:16 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:50330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snPEX-0004G9-Ca for 73128@debbugs.gnu.org; Sun, 08 Sep 2024 17:14:10 -0400 Received: by mail-wr1-f67.google.com with SMTP id ffacd0b85a97d-3787f30d892so2256862f8f.0 for <73128@debbugs.gnu.org>; Sun, 08 Sep 2024 14:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725829981; x=1726434781; darn=debbugs.gnu.org; h=mime-version:to:subject:date:references:in-reply-to:message-id:from :from:to:cc:subject:date:message-id:reply-to; bh=34uBchcF/DMXjZ63PKHh/bloki7Mr1kYsap4WRLQf9U=; b=Ny9ohGrw7VrfboIxT+KSPMjSerPxucTd1AazqHC7QNA9qkKy8/kf60J/YSwOif9j7Q H6V8m/nGkEG2RKxKcOANhGygGgO5FQI37QFLPKpKfHsGIXdlI34HQ8tL+1wFYynCJxMr Y3pxkt9x7TDFqoMbkXShK9Xi2gANiPDfrLl7TrL/eMdbUiGzNlkwefGl7HpsJg+oH/8d IEpz5am5hc7EWj//m04AAvoryxsJvryj/jP9810zsWm4d2D9VPMC5mHB3Vu6d+WrGYrh VN3E8fFiam9i5D4e1Ci8T0qD7eFkn0boavQOQrz03GORWwsZJgS1n3f+vN3nbnEEKpfN mj1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725829981; x=1726434781; h=mime-version:to:subject:date:references:in-reply-to:message-id:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=34uBchcF/DMXjZ63PKHh/bloki7Mr1kYsap4WRLQf9U=; b=ACq80FlbzO5ESoNoPsPP34uP3F2RYyqZvu4vbvOa7Ljv1Qv19yyi2vddIMvwpjCpxE WcHsdpcB3bSTgGQEbjlD2VJ5a1vJdHaOZ1eXxocmIiAEXZrY7q8mCe5D6sv4PXs0vC1S Ft7bomTccKFnduFxoZXHBBFBXnOsn5S0sQO+AsE7gaIK0bcDJzKB9rOL8Xl9lK9reaqd q8d2jlg8oefCwes4bNUJPnGKQpHD2kZLid5lYq/H3tcTi/f7cviW1CHkqi9lBH6CLttf DF5q8x3l21SuuFampUZgShhjmuBCheVuFiWO04fE6vp/9Z4T9lgyhmFEhJ4zWzFHtKBP mlYg== X-Gm-Message-State: AOJu0Yw30QZcBxiTAGzJd2MlWGVC4lzJJg2rSVtePeFK+gEIvQOW7cdc DXsQDlj+iF0tmK/4SE4NEJpiUIyeSS+yftven+M/dbXxSVqfwiNQvBrLtyvN X-Google-Smtp-Source: AGHT+IEYYmOQN2muu/JOdCe7q6mnRrjj8MA2M5xze8V8GwQOAQQjvpPuN06RpvoJu0FLgnqjyMXcYw== X-Received: by 2002:a05:6000:128d:b0:374:ba23:4b3f with SMTP id ffacd0b85a97d-378895b798emr6274377f8f.9.1725829980939; Sun, 08 Sep 2024 14:13:00 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378956e8674sm4255411f8f.115.2024.09.08.14.13.00 for <73128@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Sep 2024 14:13:00 -0700 (PDT) From: dan X-Google-Original-From: dan Message-ID: <7c123db7b090e8bf4bd194984e00b45a4e250c75.1725829379.git.liliana.prikler@gmail.com> In-Reply-To: References: Date: Sun, 8 Sep 2024 23:02:59 +0200 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. [arguments]<#: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 bbf342119c..4c956eee82 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2295,6 +2295,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 5ce90e1f69..911ed110a0 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) @@ -3026,7 +3028,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) @@ -3035,18 +3037,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) @@ -3058,7 +3063,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 +