From patchwork Fri Sep 13 07:37:01 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: 67915 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 1BB5527BBEA; Fri, 13 Sep 2024 08:49:54 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 6E5E727BBE2 for ; Fri, 13 Sep 2024 08:49:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sp13A-0000rQ-Ae; Fri, 13 Sep 2024 03:49: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 1sp133-0000nD-8H for guix-patches@gnu.org; Fri, 13 Sep 2024 03:48:57 -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 1sp132-0002m0-Ap for guix-patches@gnu.org; Fri, 13 Sep 2024 03:48:56 -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=4S/irST/l2YxsEEANRlLVXWPgOI7NEFFyivpgULYNxw=; b=NJAg6X5S298RW/mUcfvlgy5sJMqtq1ihrXB8+NcV86Eur+ELJK/mm+BNjh7jrAzMLbwi2oJpQ9AA/z7PWj3wDE5cdBYEJeTXNfP61ehdPtUrHVYL47nU8SjWrL9vXFyARfbz8my0ZU1EqUFOpCW2awPU03NG+ihPIRKSsc9c0SqYCbveB+9PsmJhF4ncCAeYju3+IL95mP0IlH26b3psysd/jA9dYNGp+59ZEHBvAba5zimylBfPbTh/Tt/6G6XSecMKl8giK/D2gS1DuczPwdJ2KPliUlUtbOikk4etygIpnxN5+BroS5lbhCz1wykD8YcyXgVF8ZC0HNyA4IrHSw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sp13B-0003fz-4F; Fri, 13 Sep 2024 03:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73128] [PATCH gnome-team v2 08/13] 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: Fri, 13 Sep 2024 07:49: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.172621373714023 (code B ref 73128); Fri, 13 Sep 2024 07:49:05 +0000 Received: (at 73128) by debbugs.gnu.org; 13 Sep 2024 07:48:57 +0000 Received: from localhost ([127.0.0.1]:42401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp132-0003dz-NK for submit@debbugs.gnu.org; Fri, 13 Sep 2024 03:48:57 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:56471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp12u-0003bm-Mx for 73128@debbugs.gnu.org; Fri, 13 Sep 2024 03:48:49 -0400 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-a90349aa7e5so177926166b.0 for <73128@debbugs.gnu.org>; Fri, 13 Sep 2024 00:48:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726213654; x=1726818454; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:references :in-reply-to:message-id:from:from:to:cc:subject:date:message-id :reply-to; bh=4S/irST/l2YxsEEANRlLVXWPgOI7NEFFyivpgULYNxw=; b=LZ1/zzt+dnfxQywYK+azjXxoGiBKpcMzYCAqFNxA/ZNAv93TY0wgTrigrZfD16+xeK oqkm5WZV6wH+0mDY4P4Zxqvwe7opDu0UvvWPZ+Gk3k0kWmB03Ao6UuW0xzNEnutf7u0d yCUQ/Ls9CU4+aZuHSEWLfPhqibyOShqOzGgdu2JNqZkWMuuzL8ia5pyPTMOl/w9cRNyP JaVN/T/4RztroV99h0hCFoGTPWC2Q86TSMn4t5GQZ7X121N81EOX3z8i+Q6gmRAKJmV1 NzuFdGuOpAifsFLZyxvQ8iHh58lRdjrbaYDhF/MWZNAdehV4G+KxGB1L4lEqticrzYWj nwkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726213654; x=1726818454; h=to:content-transfer-encoding:mime-version:subject:date:references :in-reply-to:message-id:from:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=4S/irST/l2YxsEEANRlLVXWPgOI7NEFFyivpgULYNxw=; b=TWo7oAbfI+klUhtUFOH0PQYl0aMMuS4RfOYvJJo8K1sXFL0S+k/eLiRZQYRwmYilgw JG80kMYHDneeHG1FaklZ+D6CdLkY4ySpM9H3zJg00ox/uD2eY+GNeXV9T6WqJgQqm4aB 3lDfntkYRuiFZf9rfWiSwTpO4TxaZPsRircQzoFEMkdunD8jbKL8nCtUpJnDFmKiWhqV 9FjomE8yeQ3DG8fhTlnyI+YDs8L7bO6xxnU/7VGMx+jLgbjLCAgsLdQb3LJbrhPrsxLj dX3gXRAHdApqU2Ai/1Elq8kqbYJzyECQ3PfjzB94ckznWXfhRkBoQ6rnszE2SkPpd7zk cWRA== X-Gm-Message-State: AOJu0Yzv56x/BOUYD504bRwh1FZnVFwlMHobc0kIuJ4yIznYvMzHr4C3 wzLOUITAtNRuDJ2jINiGsCA+5jijNpgRaDoRuwWWNZNMHreuNO9g02QiMZQv X-Google-Smtp-Source: AGHT+IFQwuUigs/jcJtO0d0dNcJQJo7WmxckNxxpJyb2iSRGNdarQgXOAVz4e9it+caxdQIog/x1yQ== X-Received: by 2002:a17:907:e699:b0:a8a:8c4c:3e2a with SMTP id a640c23a62f3a-a902944e6cfmr441813266b.23.1726213654173; Fri, 13 Sep 2024 00:47:34 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25c61279sm836767466b.108.2024.09.13.00.47.33 for <73128@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 00:47:33 -0700 (PDT) From: dan X-Google-Original-From: dan Message-ID: <004d5b08864f2b7fed3337a9ddd0153734e6c440.1726213021.git.liliana.prikler@gmail.com> In-Reply-To: References: Date: Fri, 13 Sep 2024 09:37:01 +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>: Replace “--with-systemd=no” with “-Dsystemd=disabled”. Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 Signed-off-by: Liliana Marie Prikler --- 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 f898f28a30..e593bf4ebb 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) @@ -3038,7 +3040,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) @@ -3047,18 +3049,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) @@ -3070,7 +3075,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: Fri, 13 Sep 2024 09:37:01 +0200 +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 +