Received: (at 73520) by debbugs.gnu.org; 19 Jan 2025 12:27:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 19 07:27:45 2025
Received: from localhost ([127.0.0.1]:45176 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tZUP3-0000qK-0r
for submit <at> debbugs.gnu.org; Sun, 19 Jan 2025 07:27:45 -0500
Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:52508)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1tZUOz-0000q4-VJ
for 73520 <at> debbugs.gnu.org; Sun, 19 Jan 2025 07:27:42 -0500
Received: by mail-pl1-x632.google.com with SMTP id
d9443c01a7336-21661be2c2dso65808515ad.1
for <73520 <at> debbugs.gnu.org>; Sun, 19 Jan 2025 04:27:41 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1737289655; x=1737894455; darn=debbugs.gnu.org;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=6wXUl8HsRV64Hc5ImTc+ppgKDzdjiqLW081JHaDIsCo=;
b=PBou7h3i+/L6or5X5OTF5MyhPqRaWSC8EtveeTED8sZI53i+tgUGCHApOtuCQJQFXs
/+mRA12/rnvRuRDUd940h0WholQBoyKsaUd5nMTSSbFCOvASEeSAfJWjHdca509BcPZn
M0JCGQosEGMgudNDIERLNMlTQ4bD7MIOsBJcevhL6XSBY8jZkSlX1QwMQwQPg1/UC+P9
fRQNSn6A5PHOqCVFB5/NNbrg1l6buYTxkaGE4tYQzZ8f+8xlNoQWY64dkCUl4TFH0qSR
WBY4FmRtWwXJ3O3lVapBkc298tXL2mAy6AGLgaYxmfvTNLZUrIZtfquTeN39WYwy2yrE
g3zg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1737289655; x=1737894455;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=6wXUl8HsRV64Hc5ImTc+ppgKDzdjiqLW081JHaDIsCo=;
b=qi7h9ZHiMW9TBcQHaPocs7jt4U6q5M1CRXlLnd5fifSRLTQImke2xPFZZYzvJEWtwB
EIrXmArxscA1oPWj+Nbd3NbLVobrdSFAuwLrmp6ZG89o2FXYIBKD/H8agZqaSnm2l0xS
XBgl1SByQq0AebG9qeU9a7Csj5M56cnDzuRJbCfuRVUUqSaqcyd0xKboZgXgsh1fBCB9
Js6ZctGSrAh0WqlqXvbOmDrRdHSuFMePfKe0ex/l6ub3a0KUbM/RAXvnXjANG92GaThO
Gfb9QAGKD5xM+Ug9uof4dUyUvX3Q9MK5wBls/ktTlH1Ai0oezhab3tYE6lJ5xvUgHaN5
cBCg==
X-Forwarded-Encrypted: i=1;
AJvYcCUJkZnv5YYol9wzpqVRXW08ypecnWdbnVqchD7Gt94Z13M/Wok+AeDyB3aA/COcYdQMJiI1jQ==@debbugs.gnu.org
X-Gm-Message-State: AOJu0YxajH2STwvkOZf/9U/SQ1/NLmxNfeg4D3WWUdcIJKvS7jUzq9Op
zcn1pS4taFZuQqKl0Z2ZteSSHrmJUKv29MT7R+UIQ2oRTi74Rs/REflYbk9WLOg=
X-Gm-Gg: ASbGnctG2NvQV1wVQ49I7keSRXj693/lc1STPan4o8/Vi81oGt87MnSm7aIA+f9OEpF
0+CSBYomfTM6mLOr6WXR/xEoBSlFTUJImbeKsPns3I4ZE3qkgn8nJHKoBtORL1xWdOmLGgjwisT
b0VGQBbVWaI+rUpV+OsRZcnlbS0KfkI5L4e36gbcj2gIPerEd4Al+82Xo4lJSN85pLaVhGaMaSe
8RdH7yR11LonFwZahJLzW8Ygmc5vUBr0TGbDQre13hlyVwUt8mrlaBkgIB1VTPWqSE=
X-Google-Smtp-Source: AGHT+IHrO+cKkdEPx4CDmqNqdFF4YiSz+F5g/xt0eEZpJRDGXLLEvd3cESsNDoepAk26t7SAmdJ6Eg==
X-Received: by 2002:a05:6a00:4086:b0:71e:e4f:3e58 with SMTP id
d2e1a72fcca58-72dafb55a35mr12645585b3a.17.1737289654771;
Sun, 19 Jan 2025 04:27:34 -0800 (PST)
Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-72dab7f0efcsm5299372b3a.18.2025.01.19.04.27.32
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 19 Jan 2025 04:27:34 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: John Kehayias <john.kehayias@HIDDEN>
Subject: Re: [bug#73520] [PATCH 0/2] Potential fix for the latest
xdg-desktop-portal
In-Reply-To: <87ikqe3pqv.fsf@HIDDEN> (John Kehayias's message of "Fri,
17 Jan 2025 06:42:54 +0000")
References: <87ikqe3pqv.fsf@HIDDEN>
Date: Sun, 19 Jan 2025 21:27:23 +0900
Message-ID: <87v7ub6las.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 73520
Cc: 73520 <at> debbugs.gnu.org, Rodion Goritskov <rodion.goritskov@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Rodion (and John!),
John Kehayias <john.kehayias@HIDDEN> writes:
[...]
>> Hello!
>>
>> The problem with the xdg-desktop-portal is due to the configuration
>> changes introduced in this commit [1].
>
> By problem, do you mean (or also mean) what was reported as breaking in
> Gnome in <https://issues.guix.gnu.org/73403#2>? Have been able to test
> that this patch fixes that issue?
I'm not Rodion, but I assume that's what they meant!
>> Now it relies on using the configuration file to decide which
>> xdg-desktop-portal implementation to use. However, as Guix uses
>> XDG_DESKTOP_PORTAL_DIR to specify the portal (not the
>> xdg-portal-configuration) directory, the newest xdg-desktop-portal
>> skip configuration search at all [2].
>> If we patch the process of configuration search a little bit - just
>> to continue searching in case the XDG_DESKTOP_PORTAL_DIR is
>> specified, but doesn't contain any {*}-portals.conf files (our
>> case), we will have the right configuration files (at least for KDE
>> I have tested this changes on) to be read by xdg-desktop-portal
>> according to priorities (XDG_DATA_DIRS in our case) [3] (so they
>> could be even overridden in users' home directory).
>>
>
> Thanks for the details! I haven't had a chance to look at this carefully
> yet. Has this been reported upstream? Is this something that should be
> fixed there or is this too particular to a Guix system?
Is it expected that XDG_DESKTOP_PORTAL_DIR as set by Guix can lack a
any *-portals.conf files? That seems odd.
If there's a good reason for that to happen (a valid use case), then an
issue should be opened upstream to start some conversation about this
change of behavior and the best way it should be addressed.
--
Thanks,
Maxim
guix-patches@HIDDEN:bug#73520; Package guix-patches.
Full text available.
Received: (at 73520) by debbugs.gnu.org; 17 Jan 2025 06:43:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 17 01:43:10 2025
Received: from localhost ([127.0.0.1]:35769 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tYg4T-0007Fw-Ia
for submit <at> debbugs.gnu.org; Fri, 17 Jan 2025 01:43:10 -0500
Received: from mail-40134.protonmail.ch ([185.70.40.134]:36985)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <john.kehayias@HIDDEN>)
id 1tYg4Q-0007FG-63
for 73520 <at> debbugs.gnu.org; Fri, 17 Jan 2025 01:43:08 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;
s=protonmail3; t=1737096179; x=1737355379;
bh=UeXCAElVne+8KE4ddzGKUCHDq3zwSOAo1FMkNX0r9fE=;
h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector:
List-Unsubscribe:List-Unsubscribe-Post;
b=U/wauI/8+Ba5XGG4vKcBclqUoasWY+ioubHc4xsYAMg7IWFFiZAvJfB0ZDAuxgKvW
OqdcnAp4JuuIBHtQmHK1qleUauyM275LjDXs7bgRC/NCAwUVe8HsM4/rzTk2By2yTG
biNJDH2jkTELGy8PM8s8W+e1NhdsEWHNYbTbgxJwxYyEoPYI74kuMmzGfZfgON25VV
Lt/+QAl7foPKNLfFSJxmJ/vVWoE+/9FbpPo2JmY6X4D7ZPQ35pdLOcymc9zVRE/K6h
nWc4t5UOH58Dkha5QBObdSBtnk2AXHxCuEBkngbwvlF78ZdCE6N6vJVvQBewu+Dgqw
4AyNoSRLesGeA==
Date: Fri, 17 Jan 2025 06:42:54 +0000
To: Rodion Goritskov <rodion.goritskov@HIDDEN>
From: John Kehayias <john.kehayias@HIDDEN>
Subject: Re: [bug#73520] [PATCH 0/2] Potential fix for the latest
xdg-desktop-portal
Message-ID: <87ikqe3pqv.fsf@HIDDEN>
Feedback-ID: 7805494:user:proton
X-Pm-Message-ID: c855bcc8dcc894d446f19cac5e2e68de5b1d966f
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 73520
Cc: 73520 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
CC'ing Maxim from 73403 though maybe we should include some Gnome-team
people? Though the actual xdg-desktop-portal stuff is pretty general and
doesn't fall under any particular team.
On Fri, Sep 27, 2024 at 11:17 PM, Rodion Goritskov wrote:
> Hello!
>
> The problem with the xdg-desktop-portal is due to the configuration
> changes introduced in this commit [1].
By problem, do you mean (or also mean) what was reported as breaking in
Gnome in <https://issues.guix.gnu.org/73403#2>? Have been able to test
that this patch fixes that issue?
> Now it relies on using the configuration file to decide which xdg-desktop=
-portal implementation to use. However, as Guix uses XDG_DESKTOP_PORTAL_DIR=
to specify the portal (not the xdg-portal-configuration) directory, the ne=
west xdg-desktop-portal skip configuration search at all [2].
> If we patch the process of configuration search a little bit - just to co=
ntinue searching in case the XDG_DESKTOP_PORTAL_DIR is specified, but doesn=
't contain any {*}-portals.conf files (our case), we will have the right co=
nfiguration files (at least for KDE I have tested this changes on) to be re=
ad by xdg-desktop-portal according to priorities (XDG_DATA_DIRS in our case=
) [3] (so they could be even overridden in users' home directory).
>
Thanks for the details! I haven't had a chance to look at this carefully
yet. Has this been reported upstream? Is this something that should be
fixed there or is this too particular to a Guix system?
> It's a bit hacky, but works fine.
>
Works is the important part to start :)
> [1]: https://github.com/flatpak/xdg-desktop-portal/commit/939f0b0fcec6a42=
c1acdc397986547e9805359ff
> [2]: https://github.com/flatpak/xdg-desktop-portal/blob/1b5a16932493324fa=
0f21cfb1c3f9c1d16cb6a19/src/portal-impl.c#L441
> [3]: https://github.com/flatpak/xdg-desktop-portal/blob/main/doc/portals.=
conf.rst.in
>
> Rodion Goritskov (2):
> gnu: xdg-desktop-portal-next: Fix configuration file search.
> gnu: xdg-desktop-portal: Update to 1.18.4.
>
> gnu/local.mk | 1 +
> gnu/packages/freedesktop.scm | 77 ++++++-------------
> ...al-disable-configuration-search-exit.patch | 28 +++++++
> gnu/packages/telegram.scm | 2 +-
> 4 files changed, 55 insertions(+), 53 deletions(-)
> create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-confi=
guration-search-exit.patch
>
>
> base-commit: 9a141b5bd633227ea31776b9ce7ca40928de2442
Thanks!
John
guix-patches@HIDDEN:bug#73520; Package guix-patches.
Full text available.
Received: (at 73520) by debbugs.gnu.org; 28 Sep 2024 07:44:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 28 03:44:10 2024
Received: from localhost ([127.0.0.1]:51180 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1suS7d-0001Ta-IQ
for submit <at> debbugs.gnu.org; Sat, 28 Sep 2024 03:44:10 -0400
Received: from mail-wr1-f51.google.com ([209.85.221.51]:59419)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <rodion.goritskov@HIDDEN>) id 1suS7b-0001T5-CY
for 73520 <at> debbugs.gnu.org; Sat, 28 Sep 2024 03:44:07 -0400
Received: by mail-wr1-f51.google.com with SMTP id
ffacd0b85a97d-37cd8a5aac9so706800f8f.2
for <73520 <at> debbugs.gnu.org>; Sat, 28 Sep 2024 00:43:37 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1727509352; x=1728114152; 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=N5RYFOl3sbqAava+tFqnph0pX6EPGbRCy/w5rIFyRVM=;
b=SArAE0Oq9kyzBq6Z5JLHR/raqReRfGsCH9mX+LiXGGgacBcEboD2EY9b9pM/ycpZMC
xc5EANA3ZWONb2UBYsJrjPIF5SkQ4AhZHoWGmC2eaHGhog40PFIa768wuF7oSH30PSnV
ijcIYsES5AoksbwhbjYIbKtPjtF+z5TmXD/QPx/sKWH/1fR8GZRSBrAEiYQDckE0dqPQ
HjEzUyIwYfrMvuT2ynBrjmWVnHdb/njW/9o1aHyj04iXisvcSwcAx368u0iIrB3Rbkhl
D3GwY2LKVD93namOix4g4McSPt58ZP08NIOzuoTRuqX37BaWFluxu4yo9Nj80nuWRxop
Loog==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1727509352; x=1728114152;
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=N5RYFOl3sbqAava+tFqnph0pX6EPGbRCy/w5rIFyRVM=;
b=LELhOwa+p30z9P0p7KmKAsCdyJmv11xRIO+Nj+JxMCpkRZ3HOqZTq8j3XdZaLAHdlj
3VVYcQQR4Gboj5euTBWgS+LfQ+EAMdPGypZwtMhxMtDQqR0kxMJdFQubuPK/Jy7wKZ0X
uF4OC9/0JVVlVntnVq0oExa1iCVhSGXQJ6OVex1rPvAdFgx7Y2yJKYh/SmAMtIIxPKZn
UxZAwT2foxBKHkTCWDRDQwR4b9PjF8YxlmjmsofA9WTqTe/vOpCwiG9JHLX3ocMM4dLj
uG+tt5OnaVH2dfUcGWYgL1NMSGa/GwY0vL/v4KAEhHlFGqq8G7FwrN5+gVh62nMcODcR
eCiA==
X-Gm-Message-State: AOJu0Ywm/v/NRvRsUCPaj8mS2r/NNFwO7UJqVvIeHWnjhwS36OWGwugD
UshCtCC7R0H70t0/xtIN32TnjGq1ZpcDgiH0NZrzIRTrCRWVmTvr4CuSC7hb
X-Google-Smtp-Source: AGHT+IGwf2f+qYCjzrqUi0PI9plhqoG/Qy7HqxUUK4PLJviSY4/1L2h1KgYM45DbGBbxVDBFiUdLTg==
X-Received: by 2002:adf:e84f:0:b0:37c:d001:856f with SMTP id
ffacd0b85a97d-37cd5b12567mr3967994f8f.56.1727509351385;
Sat, 28 Sep 2024 00:42:31 -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.30
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 28 Sep 2024 00:42:30 -0700 (PDT)
From: Rodion Goritskov <rodion.goritskov@HIDDEN>
To: 73520 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: xdg-desktop-portal: Update to 1.18.4.
Date: Sat, 28 Sep 2024 11:41:35 +0400
Message-ID: <4d6858377ab01fff649eb70b92e01cafe4b42ab0.1727461684.git.rodion.goritskov@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1727461684.git.rodion.goritskov@HIDDEN>
References: <cover.1727461684.git.rodion.goritskov@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 73520
Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4.
* gnu/packages/telegram.scm (telegram-desktop): Change native-input to xdg-desktop-portal.
Change-Id: I25ac64ce62f994e1e2cffbdbd8e8a7779a6b9658
---
gnu/packages/freedesktop.scm | 78 ++++++++++++------------------------
gnu/packages/telegram.scm | 2 +-
2 files changed, 26 insertions(+), 54 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 73bd5c8a3d..f86c611c57 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3012,7 +3012,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)
@@ -3021,30 +3021,34 @@ (define-public xdg-desktop-portal
version "/xdg-desktop-portal-" version ".tar.xz"))
(sha256
(base32
- "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav"))))
- (build-system gnu-build-system)
+ "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q"))
+ (patches (search-patches
+ "xdg-desktop-portal-disable-portal-tests.patch"
+ "xdg-desktop-portal-disable-configuration-search-exit.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)))
+ (list pkg-config
+ `(,glib "bin")
+ gettext-minimal
+ python
+ python-dbusmock
+ python-pytest
+ python-pytest-xdist))
(inputs
- `(("gdk-pixbuf" ,gdk-pixbuf)
- ("glib" ,glib)
- ("flatpak" ,flatpak)
- ("fontconfig" ,fontconfig)
- ("json-glib" ,json-glib)
- ("libportal" ,libportal)
- ("dbus" ,dbus)
- ("geoclue" ,geoclue)
- ("pipewire" ,pipewire)
- ("fuse" ,fuse)))
+ (list bubblewrap
+ gdk-pixbuf
+ glib
+ flatpak
+ fontconfig
+ json-glib
+ libportal
+ dbus
+ geoclue
+ pipewire
+ fuse))
(arguments
`(#:configure-flags
- (list "--with-systemd=no")
+ (list "-Dsystemd=disabled")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'po-chmod
@@ -3073,38 +3077,6 @@ (define-public xdg-desktop-portal
and others.")
(license license:lgpl2.1+)))
-(define-public xdg-desktop-portal-next
- (package
- (inherit xdg-desktop-portal)
- (version "1.18.4")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/flatpak/xdg-desktop-portal/releases/download/"
- version "/xdg-desktop-portal-" version ".tar.xz"))
- (sha256
- (base32
- "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q"))
- (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)
- ((#:configure-flags _ ''())
- #~(list "-Dsystemd=disabled"))))
- (native-inputs
- (list pkg-config
- `(,glib "bin")
- gettext-minimal
- python
- python-dbusmock
- python-pytest
- python-pytest-xdist))
- (inputs (modify-inputs (package-inputs xdg-desktop-portal)
- (prepend bubblewrap)))))
-
(define-public xdg-desktop-portal-gtk
(package
(name "xdg-desktop-portal-gtk")
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index cfcd92fcbc..c0b2122bf5 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -537,7 +537,7 @@ (define-public telegram-desktop
`(,gtk+ "bin")
pkg-config
python-wrapper
- xdg-desktop-portal-next))
+ xdg-desktop-portal))
(inputs
(list abseil-cpp-cxxstd17
alsa-lib
--
2.46.0
rodion.goritskov@HIDDEN, guix-patches@HIDDEN:bug#73520; Package guix-patches.
Full text available.
Received: (at 73520) by debbugs.gnu.org; 28 Sep 2024 07:44:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 28 03:44:03 2024
Received: from localhost ([127.0.0.1]:51171 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1suS7X-0001TH-4M
for submit <at> 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 <rodion.goritskov@HIDDEN>) id 1suS7U-0001SS-JL
for 73520 <at> 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 <at> 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 <rodion.goritskov@HIDDEN>
To: 73520 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: xdg-desktop-portal-next: Fix configuration file
search.
Date: Sat, 28 Sep 2024 11:41:34 +0400
Message-ID: <6c0a8919ba4ccd7dea35b27b9f6ed9a22c57882a.1727461684.git.rodion.goritskov@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1727461684.git.rodion.goritskov@HIDDEN>
References: <cover.1727461684.git.rodion.goritskov@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 73520
Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <rodion.goritskov@HIDDEN>
+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
+
--
2.46.0
rodion.goritskov@HIDDEN, guix-patches@HIDDEN:bug#73520; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 27 Sep 2024 21:32:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 27 17:32:47 2024
Received: from localhost ([127.0.0.1]:57883 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1suIZy-0003qB-QM
for submit <at> debbugs.gnu.org; Fri, 27 Sep 2024 17:32:47 -0400
Received: from lists.gnu.org ([209.51.188.17]:39414)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <rodion.goritskov@HIDDEN>) id 1suIZw-0003q2-Bc
for submit <at> debbugs.gnu.org; Fri, 27 Sep 2024 17:32:45 -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 <rodion.goritskov@HIDDEN>)
id 1suGTY-0001on-4V
for guix-patches@HIDDEN; Fri, 27 Sep 2024 15:18:00 -0400
Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <rodion.goritskov@HIDDEN>)
id 1suGTT-0006Hj-9U
for guix-patches@HIDDEN; Fri, 27 Sep 2024 15:17:59 -0400
Received: by mail-wr1-x432.google.com with SMTP id
ffacd0b85a97d-37cd8972738so695119f8f.3
for <guix-patches@HIDDEN>; Fri, 27 Sep 2024 12:17:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1727464673; x=1728069473; darn=gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=f7u4/IQDEyW9+qIXI/8FPaJubHYYVS1XqmHBrzxiaKg=;
b=Dzd4Ty7Ks2oLqh5gm0HZYA3ASGswoGwYSn6TbNgVk9GVnw2sEpLetMWbW1J8FNNJDr
eTy2hmK/t/T+eB5xBMVbsgokpNgujre1fZqvzP9LuGxcwWHDDsh0ct8L8igFSGDtEeUR
WOp3HpC9uw6DTyq00cPFyrTjI6c4utu0TrhlbojZ4p/V8qXsoqGoASwG2aa/O1IpIveo
W6lPu2ipCCq6MrahzkEy/1aRUa8a+DVe1hkMmGR9an97bVU+3g19kSaN8nM2YPJPNiL4
inCpggWaAq+UJ1i+FlbwCyXwxer562ZT4RwxtXnyAPrt0Mf4aE/SPo0wWixLSG1wDpYR
ClDQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1727464673; x=1728069473;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=f7u4/IQDEyW9+qIXI/8FPaJubHYYVS1XqmHBrzxiaKg=;
b=GQ2McoPpGYsIyW0KNVRq7030czaUUqIt+zSuMITol/JmVs5bWBkwVIMrILt61qUJGH
+SiL/wxt4GhBefZIYyCcaUskjC5KB+DSF4Up/xo96xW8ZzYCRVfc4+QkxcG78IHQQdZY
4OrIBpnMGw9+gZzAvtr607GzIN0gcTT69fOUCGCGdxOYIm/dvwzE34TwZvdDXmt+IpJI
B9XS/gFeTFaco4GeCRbmFhMYmns0/bnFlt+12uJmgO2dFvj7jO5OvVGkGG8KUvGfYHS2
Kxmisv2o+LWXrq/fY0my4QiqmvdQacPjf0Rhvh232U/i2c4ppX9JUq6dxp5GkQJ9oEJB
u28A==
X-Gm-Message-State: AOJu0YzEGslVIIBlsubg06WhxOfOfxP/2agL7ypGvWb+5uAjrFAXauOK
ktaY+Fo0T1er4zXnWhchdgGK1zlOHTQYSGafmD08CpXwdOK4Mq0s2YLXE6zR
X-Google-Smtp-Source: AGHT+IGqcGWWhrccaA3+HM1ECHmcvVDzU+muMnfW1fmslsO3hU75syoNUEc7AmKypdEqkWd7wQxmkQ==
X-Received: by 2002:a5d:5e11:0:b0:37c:ddab:a625 with SMTP id
ffacd0b85a97d-37cddaba685mr740855f8f.25.1727464672900;
Fri, 27 Sep 2024 12:17:52 -0700 (PDT)
Received: from bumblebee-mighty.lan ([92.51.75.166])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-37cd564d2c7sm3242123f8f.9.2024.09.27.12.17.51
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 27 Sep 2024 12:17:52 -0700 (PDT)
From: Rodion Goritskov <rodion.goritskov@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 0/2] Potential fix for the latest xdg-desktop-portal
Date: Fri, 27 Sep 2024 23:17:16 +0400
Message-ID: <cover.1727461684.git.rodion.goritskov@HIDDEN>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::432;
envelope-from=rodion.goritskov@HIDDEN; helo=mail-wr1-x432.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)
Hello!
The problem with the xdg-desktop-portal is due to the configuration changes introduced in this commit [1].
Now it relies on using the configuration file to decide which xdg-desktop-portal implementation to use. However, as Guix uses XDG_DESKTOP_PORTAL_DIR to specify the portal (not the xdg-portal-configuration) directory, the newest xdg-desktop-portal skip configuration search at all [2].
If we patch the process of configuration search a little bit - just to continue searching in case the XDG_DESKTOP_PORTAL_DIR is specified, but doesn't contain any {*}-portals.conf files (our case), we will have the right configuration files (at least for KDE I have tested this changes on) to be read by xdg-desktop-portal according to priorities (XDG_DATA_DIRS in our case) [3] (so they could be even overridden in users' home directory).
It's a bit hacky, but works fine.
[1]: https://github.com/flatpak/xdg-desktop-portal/commit/939f0b0fcec6a42c1acdc397986547e9805359ff
[2]: https://github.com/flatpak/xdg-desktop-portal/blob/1b5a16932493324fa0f21cfb1c3f9c1d16cb6a19/src/portal-impl.c#L441
[3]: https://github.com/flatpak/xdg-desktop-portal/blob/main/doc/portals.conf.rst.in
Rodion Goritskov (2):
gnu: xdg-desktop-portal-next: Fix configuration file search.
gnu: xdg-desktop-portal: Update to 1.18.4.
gnu/local.mk | 1 +
gnu/packages/freedesktop.scm | 77 ++++++-------------
...al-disable-configuration-search-exit.patch | 28 +++++++
gnu/packages/telegram.scm | 2 +-
4 files changed, 55 insertions(+), 53 deletions(-)
create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch
base-commit: 9a141b5bd633227ea31776b9ce7ca40928de2442
--
2.46.0
Rodion Goritskov <rodion.goritskov@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#73520; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.