From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WFpFEkH4Smf8SwAAqHPOHw:P1 (envelope-from ) for ; Sat, 30 Nov 2024 11:34:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id WFpFEkH4Smf8SwAAqHPOHw (envelope-from ) for ; Sat, 30 Nov 2024 12:34:25 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=sjj1q5+M; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=C9BCeg+8; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 15C3286329 for ; Sat, 30 Nov 2024 12:34:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHLji-0000ll-FI; Sat, 30 Nov 2024 06:34:06 -0500 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 1tHLjf-0000kD-BQ for guix-patches@gnu.org; Sat, 30 Nov 2024 06:34:03 -0500 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 1tHLjf-000621-1v for guix-patches@gnu.org; Sat, 30 Nov 2024 06:34:03 -0500 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:References:In-Reply-To:To:Subject; bh=lDWOcMuOcb2mZeuc8WbwE3bEUGFKhOz1v3buBVpl0Rw=; b=sjj1q5+MU/uhUBraxt1P4fGahdK9QScotkijdp6UavCRDscoXePnvgcL+7ZaP/QKusQosUQAk3yEBRNGhO2KoBA8xwW2/iv1w4YZA8EkxAH4HKO88NLz/TN63MTgo1e/i8ddEFzNLh7TG+Nr7EuBejgnA326AjEhtTf214g0SOQLoRMIqr0YoiKhF9xPz0703slgMh38pKh+x+toKzRtZYYm0HDwO6KhFpuqL+o7racIX4+JKw33E92r3ilgGk2YUrUI+M5lORr+hWdNeTzl/QKgaaEWZzfwWEDP8atuWIOImW8hJ6O18mBXB69B1r/qaVfgVVBkbuWpelBLgTVQ3w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHLje-0003dT-I6; Sat, 30 Nov 2024 06:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74622] [PATCH gnome-team 04/10] gnu: Make xdg-desktop-portal-next the new xdg-desktop-portal. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sat, 30 Nov 2024 11:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74622 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74622@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 74622-submit@debbugs.gnu.org id=B74622.173296638313798 (code B ref 74622); Sat, 30 Nov 2024 11:34:02 +0000 Received: (at 74622) by debbugs.gnu.org; 30 Nov 2024 11:33:03 +0000 Received: from localhost ([127.0.0.1]:45735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHLig-0003aO-LZ for submit@debbugs.gnu.org; Sat, 30 Nov 2024 06:33:03 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:60740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHLic-0003ZI-0M for 74622@debbugs.gnu.org; Sat, 30 Nov 2024 06:32:58 -0500 Received: by mail-wr1-f68.google.com with SMTP id ffacd0b85a97d-385d7f89489so1387062f8f.1 for <74622@debbugs.gnu.org>; Sat, 30 Nov 2024 03:32:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732966317; x=1733571117; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=lDWOcMuOcb2mZeuc8WbwE3bEUGFKhOz1v3buBVpl0Rw=; b=C9BCeg+8kJBKQAA7VXezu7vfbsLIwx0LlkIzH/Yfzx5uBAb8HnxOdiNwWnMWOv6IaO RafbwjzNiI1EjJdUFCRr5bjzwKmJVD7P1OJZaSPmNgwnE9DF7On/+4woBeIz+1y5uiUE JO81ulDBznQrqxOP72778l7WjLqkjHnYjNuQ0Y40RcXedHN/22zueB6s9/DLlE3+QTvs 3n2TDC+RcJBa2if7/cmFDi1oqH1u+s2hB4p8IEljzDrFBL7JL/iJ+K/oR8bBJqqVCNxi MFxVwaCTHKpsQm1FaOdn62Ok3mawfToe1buoYVFwqh4N4oSULsEGto1AY5g0VEBXlXmd lqrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732966317; x=1733571117; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lDWOcMuOcb2mZeuc8WbwE3bEUGFKhOz1v3buBVpl0Rw=; b=Jkrph4hIRDg3KNX+sy+4DvYdziBUWW9kq75dVjImBjX3P8PhSzK3ZmwPhxXmiELPTK yAQmCHDvrX4Vm/hsFmaXyADkIGfwDFNxeAMJzVgWmFj2cU2RKSc5sRNS+07U+MFmBlvA z9haDYTgafaLZYGeSjkBq+9iNflCor8vfOCShzkoJqy3OIouru7bPKqMiWxtgfjx4GGn sWDagEcOvS/CiBl+uwCvhvfGhIEL4wOIEoQfCk6gIvzfYa05M8XoAK+/1f2m1arz+rYH SWceWZZfuCLPcTtRL/gbExZ306VHtz5yimM1eB0tD/WftMrK+dvI62+bPMIn4yh6b9CD nf8w== X-Gm-Message-State: AOJu0YzzfoJW8slB0oX62uM/ZhTQ1kf0e5SNsXKJ4N0Puw/0Po+hmgRj JG3aoFXuvMOakqDUrvJ1Mjl0wozqGLzDQc4k2Fw7BXkl5kkd1cmvYUNgsUBp X-Gm-Gg: ASbGncsZv/CCL5ID5W14Te2DTTfRa20Zng/c38MYDCgvIJhk959HkN++zWrD6qxf8aB Gkxp9jOj5OTaxNvGuHMHWjLf/8obW73geSHum0pn+r07NUFGUuJTIA5bkoOpXy7+rO6gowzcgop VEy6XKL2iawzw10iljttOQlmXQp6prVQlYk2eU26VxJL8Gad8/85uG8RKy1fOa8C1aJl1+f6lJ1 BSay0G/ufv5tU+aANfNxGkMGD4QFgZvXuc+IS8Z3xDx1FJUCAxWgfaCR59+XIOJq9zdvnrUDmUD a8ZIMKwgmC5aStusNGTwlwVeHA== X-Google-Smtp-Source: AGHT+IEci07vcXmFu9tR3eM8LnOmMuGDuwpeioKeK8BNJ0Zd4YCjV3UQ9lvCa9jmAX2Pf9tLzXi1+A== X-Received: by 2002:a05:6000:1ac6:b0:385:e5d8:3ec2 with SMTP id ffacd0b85a97d-385e5d84079mr1066982f8f.28.1732966317141; Sat, 30 Nov 2024 03:31:57 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-385ccd36557sm6932149f8f.24.2024.11.30.03.31.55 for <74622@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Nov 2024 03:31:56 -0800 (PST) Message-ID: <44bf760314f56fe79cb822a91b6ae54f408b42e7.1732964015.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 24 Nov 2024 16:06:16 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 3.01 X-Spam-Score: 3.01 X-Migadu-Queue-Id: 15C3286329 X-TUID: RAGkWj+kPFUP * gnu/packages/freedesktop.scm (xdg-desktop-portal-next): Inline into… (xdg-desktop-portal): … this. --- gnu/packages/freedesktop.scm | 80 ++++++++++++------------------------ 1 file changed, 26 insertions(+), 54 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d197b5f553..64d7218a5c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3122,7 +3122,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) @@ -3131,30 +3131,13 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) - (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))) + "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) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod @@ -3165,6 +3148,26 @@ (define-public xdg-desktop-portal (find-files "po" "\\.po$")))) (add-after 'unpack 'set-home-directory (lambda _ (setenv "HOME" "/tmp")))))) + (native-inputs + (list pkg-config + `(,glib "bin") + gettext-minimal + python + python-dbusmock + python-pytest + python-pytest-xdist)) + (inputs + (list bubblewrap + gdk-pixbuf + glib + flatpak + fontconfig + json-glib + libportal + dbus + geoclue + pipewire + fuse)) (native-search-paths (list (search-path-specification (variable "XDG_DESKTOP_PORTAL_DIR") @@ -3183,37 +3186,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")) - ;; Disable portal tests since they try to use fuse. - (patches (search-patches "xdg-desktop-portal-disable-portal-tests.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") -- 2.46.0