From patchwork Sat Sep 28 07:41:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodion Goritskov X-Patchwork-Id: 31531 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 E1A4D27BBE2; Sat, 28 Sep 2024 08:45:00 +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 0B9A527BBEA for ; Sat, 28 Sep 2024 08:44:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suS82-0006bA-Br; Sat, 28 Sep 2024 03:44:34 -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 1suS81-0006ao-1Y for guix-patches@gnu.org; Sat, 28 Sep 2024 03:44:33 -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 1suS80-00014r-Oz for guix-patches@gnu.org; Sat, 28 Sep 2024 03:44:32 -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:References:In-Reply-To:Date:From:To:Subject; bh=0GiYfvVcaBEZ8uDgNVDilesb78YCB7qY/blvIS1qrv0=; b=h0ifC+hL7U3Upbw+n2PXOO1wpFdS/9l5t3HCs0fJlVoaLm2FzAg4C4ZRFvOK391LV0udked8HoweYlfY/mmjEukzFotWiaLWqOtHBqu/VyiR0KV297Lq1hNp3mBmbo0mfZVjESeJcKsAmO7Vf5Wca+0Vd7MQK7KSXJ1V1HC1Pbqg2Ru0waEbHVMaxr7B+B8GonMjSc+UP+rgVOibm2M+6XUk8Ec6x52ICFO4FcHkeH10cSq5AMKXPhrXuamc/jRTEJEso/rLFT73LTx7LRM4SNQr7I1Jvk6U4+DzUdFzh1npFUBi8UC7Z5LBDgxJ0bHTXPaXf4z2E1ZpLQccJh3/1w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suS8U-0001W6-Bw; Sat, 28 Sep 2024 03:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73520] [PATCH 1/2] gnu: xdg-desktop-portal-next: Fix configuration file search. Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: rodion.goritskov@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 28 Sep 2024 07:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73520 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73520@debbugs.gnu.org Cc: Rodion Goritskov , Rodion Goritskov X-Debbugs-Original-Xcc: Rodion Goritskov Received: via spool by 73520-submit@debbugs.gnu.org id=B73520.17275094435664 (code B ref 73520); Sat, 28 Sep 2024 07:45:02 +0000 Received: (at 73520) by debbugs.gnu.org; 28 Sep 2024 07:44:03 +0000 Received: from localhost ([127.0.0.1]:51171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suS7X-0001TH-4M for submit@debbugs.gnu.org; Sat, 28 Sep 2024 03:44:03 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:42419) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suS7U-0001SS-JL for 73520@debbugs.gnu.org; Sat, 28 Sep 2024 03:44:01 -0400 Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-37cc60c9838so1629357f8f.1 for <73520@debbugs.gnu.org>; Sat, 28 Sep 2024 00:43:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727509344; x=1728114144; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0GiYfvVcaBEZ8uDgNVDilesb78YCB7qY/blvIS1qrv0=; b=AWVIWY/qU6CyZER+V0qRlCpEoC/tcQIKZXIqpZ+qMmD7XZeaB6MMt8Sm7R2320fHn9 0H4Y6Zb6f3hgjPhZbAVgcjgMbmANbT4dNHT9oYDPdcHkEyknib9vxHQu5TxBijpdRS6S Vy2sInD7lVcvn49kdEi6lLGcuEkMC4erA1JHqWZf4KEZwmrBvDFzxZ+5cEGwYoFR8JuS Db7+5E1MrlMWdU7DQAzTT5FFixI33OZUpU83NOlMYa5R19LupfdUqG432ijzarjgIzKX oonJoDtbNOjdEBHzT8drb0QS5XbHje/8gVuOBoL4Nbtm2d1VXj86SGw+ZigKXnteHzAU 14Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727509344; x=1728114144; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0GiYfvVcaBEZ8uDgNVDilesb78YCB7qY/blvIS1qrv0=; b=EPizT7HGnSKBLbFbPVnxs4JX11p3UpN2Sddbd9urwoO3jqJmlgO6ENwpj1ov6DFkRl /HPafhS277tJw1JQ4W2tw+NqivBfqYGSzLvHx5rZvUa+iTiv+ZpGiU+DJub4A0XW6UgB JjRQV+s3+TI1YeqnyjW78KrvBM/K/gq3RcSJm+HoY1mnSz0ALUOAuSDopbf1ikKH0RqC LMv9Csk2jBfCAHdG5wkNLfKtNXODeFhOPifHQZ7zfAFlE7IS6MvS5EN6NJYKljjvEVjf q+RpE0ECl6TYkFUesEGXA8B7TpOuOg0F8h6wlYSn3Se/ubsS0nvIPvbjjv+TAVWIahHk FaOw== X-Gm-Message-State: AOJu0YzvOqxVSrCgjL1blZoCam861y93vKmGzKQd015vZ8OcWakPiqLR OP6CLLX3WF9LtGYormhfpZlfrNQhZzIm974Q0U9BT+1Wk6+8RLmiT5npoONI X-Google-Smtp-Source: AGHT+IH/ExPJ3gT4Lf1YFFC2BQqDylvsGO5D3aeqIVVbHpZ4ENOeVKu/lOgpKLbKH0bDAp6e3K+fiA== X-Received: by 2002:adf:a357:0:b0:374:d2a3:d213 with SMTP id ffacd0b85a97d-37cd5696d2emr3305315f8f.18.1727509344297; Sat, 28 Sep 2024 00:42:24 -0700 (PDT) Received: from bumblebee-mighty.lan ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd564d41dsm4211930f8f.17.2024.09.28.00.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Sep 2024 00:42:23 -0700 (PDT) From: Rodion Goritskov Date: Sat, 28 Sep 2024 11:41:34 +0400 Message-ID: <6c0a8919ba4ccd7dea35b27b9f6ed9a22c57882a.1727461684.git.rodion.goritskov@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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/local.mk: Add patch. * gnu/packages/freedesktop.scm (xdg-desktop-portal-next): Add patch. * gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch: New file Change-Id: Idd637f5613e7d1403fc3a0feeff53a7931e68fc6 --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 5 ++-- ...al-disable-configuration-search-exit.patch | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch diff --git a/gnu/local.mk b/gnu/local.mk index c2027f9eeb..dc08ff2b82 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2311,6 +2311,7 @@ dist_patch_DATA = \ %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-disable-configuration-search-exit.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 23ed788689..73bd5c8a3d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3086,8 +3086,9 @@ (define-public xdg-desktop-portal-next (sha256 (base32 "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) - ;; Disable portal tests since they try to use fuse. - (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (patches (search-patches + "xdg-desktop-portal-disable-portal-tests.patch" + "xdg-desktop-portal-disable-configuration-search-exit.patch")))) (build-system meson-build-system) (arguments (substitute-keyword-arguments (package-arguments xdg-desktop-portal) diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch b/gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch new file mode 100644 index 0000000000..4cb77de806 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch @@ -0,0 +1,28 @@ +From 37003d1f99246c88cbe7cf2f83616642e0fdf3fb Mon Sep 17 00:00:00 2001 +From: Rodion Goritskov +Date: Fri, 27 Sep 2024 00:44:07 +0400 +Subject: [PATCH] portal-impl: Check if there are any configuration files in XDG_DESKTOP_PORTAL_DIR before exiting configuration search + +--- + src/portal-impl.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/portal-impl.c b/src/portal-impl.c +index 8c1fd53..8708409 100644 +--- a/src/portal-impl.c ++++ b/src/portal-impl.c +@@ -438,9 +438,8 @@ load_portal_configuration (gboolean opt_verbose) + + if (portal_dir != NULL) + { +- load_config_directory (portal_dir, desktops, opt_verbose); +- /* All other config directories are ignored when this is set */ +- return; ++ if (load_config_directory (portal_dir, desktops, opt_verbose)) ++ return; + } + + /* $XDG_CONFIG_HOME/xdg-desktop-portal/(DESKTOP-)portals.conf */ +-- +2.46.0 +