From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id SPYCNz0QVGfbhQAA62LTzQ:P1 (envelope-from ) for ; Sat, 07 Dec 2024 09:07:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id SPYCNz0QVGfbhQAA62LTzQ (envelope-from ) for ; Sat, 07 Dec 2024 10:07:09 +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=jVQjoUtD; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=K+6jygdz; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733562429; a=rsa-sha256; cv=none; b=dUaCdHEE4NTHqPHDAeMM2oAMODjU+5ofq+utMfP2vXaxzp+xkVfwPclG2bihfJShtxdXKd c4G2fhLvIxiRX9t7/NeDqvERYBIC8o+IZghmgbEbVRM148VD18PZmnpA3b+DRDjqjRsFu8 JjHnKNN7gGpesYEHLRfCHE9btSW4xVtP7tCAVzhMXBGd4wNZXZyS92uMq2yiaus0f+24ef a7ZGzrD+MbLXj4y9KYzDGCqwmPj7JguS8oAAISBgwLU+9RdqFfQ0q1Te5tfm0rsUbqT2f8 B/qXS0UQ3urn9We4peZSn1UOKlIt3rQXD5usczCiA3SGhP8lHTeqhKa/vR5spg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=jVQjoUtD; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=K+6jygdz; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733562429; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=lDWOcMuOcb2mZeuc8WbwE3bEUGFKhOz1v3buBVpl0Rw=; b=PLGLMSei1P1l/3c1op7LUM0v8yPHGd51j8jIX7ptHeh/NePyOteVfXWHd0Xm5eBWgu+0ps H9hySGIWU7kGDnItk987Yna3JbKjdeySL6s+0PRCKgRsiQh/8xEdZyJLujj/6AxwkmWbTq ydiSna4wJhI8OhWqxOnVgmHQeaTDKzVzdUemilduOAMWfOlM4jK0H5oSxxOULTuuQD3/oU GiUG+/sxKMcJYdYSpSi9qKjNngAu8UMNoO8sloQATnYBIY9ovPn6Qh3b1bobCoUsB87w/G WtwTceXfXLtJhJwO+vJppAgwa1a+xK39TwW0p4VTUhMIEnrwTsTrvi2l2qfx/Q== 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 8779767896 for ; Sat, 07 Dec 2024 10:07:09 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tJq3q-0000EQ-AL; Sat, 07 Dec 2024 03:21:10 -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 1tJq3m-0000By-Qn for guix-patches@gnu.org; Sat, 07 Dec 2024 03:21:06 -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 1tJq3m-00066g-Iv for guix-patches@gnu.org; Sat, 07 Dec 2024 03:21:06 -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=jVQjoUtDd3ST0B3jwQzpVhJiAZ6Lel5/DQz5ndPYgBCUpqpURwKgt2O1ENFoB913TzGQUsto9zFSWJDG0EKPs4U2F7otENRCrRClf0ZNzUwjYPXB+m7WTSXF8Z84dXYfwptsKeJiKi/gGrMKeZWvfklqNJs8libYoFqWayQEegWD0GcIBEJFIUWkhJvSkc9FkxOnN86VUN6d3pUx/iNgrs6SS+ltMBKk6e/ca/WCJTnDIidIKuBhfkiUwG4tcoicGbL6FsySKur7WYn+tJA/DsJq+N8cMrypHTYFr1f6PdGZH4TZG7og6qaGhAmxC1gOPzeZc3Uez5jHKdhMufRfww==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tJq3m-0006Zl-Dg; Sat, 07 Dec 2024 03:21:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74622] [PATCH gnome-team v2 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, 07 Dec 2024 08:21:06 +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.173355963125120 (code B ref 74622); Sat, 07 Dec 2024 08:21:06 +0000 Received: (at 74622) by debbugs.gnu.org; 7 Dec 2024 08:20:31 +0000 Received: from localhost ([127.0.0.1]:45298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tJq38-0006Ww-VY for submit@debbugs.gnu.org; Sat, 07 Dec 2024 03:20:31 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54279) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tJq2r-0006Pb-FS for 74622@debbugs.gnu.org; Sat, 07 Dec 2024 03:20:11 -0500 Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-434ab114753so18630605e9.0 for <74622@debbugs.gnu.org>; Sat, 07 Dec 2024 00:20:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733559544; x=1734164344; 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=K+6jygdzEVcvSOWP5Uzq+VsfU0Gd+RSbXk9Z1add4UivPpgFXP93yrorqU5SXh6quX jzSdJxgXhga4o4U9CNbFYBBoQnwfe8dHMNCmJr4qbkQ22J/T0mLbc78CGcTq4GyycDK/ GaPk0D1NinMLRe2loSFFnsc1wTbTX1Hlc/w6MCI3rb29t3C866D1pqNrPszrDJE7s/Dn AF8Egu5QFTDthyYgYuW8bm3Sq5ULgrFWUhRQAP+NPXCanervF3g2vOp8uxCK/Jb8fYbv Q+OjDo8V1hV2yYeIsrlVJbKfxNOrxbSTG1sAYdfZ1Pi0Do46vNpNx1mlN+deMQbMwn0f f12g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733559544; x=1734164344; 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=mK3S70gVnED+PuyvtPv1jObqXZdesAdZ7YPusoh7YDI3uNmiRYw328pQ4whOsiVap+ 74GawA+zG1g9NL90/1rOYy8XOdXbo5VxFHQCV0zHxZ8iV1/fUjn3PVskeXTvBBpMuRCh sCQ6zjlmcsPHzp8iNxUMcKUeO8CHOEkDSvwTPnZ641UNFu0XaJEu/GQbFZKh2bJ7dbWE 0C/k/WObMdtFDSV2eT9mqv/GRXYTffficP3gZCBU3d1g9CQTdffbu1dpWqnTg/6qqcIX uDTRSKMVAYPICrFUE8UWeKfRrRQQFnE4jA/aeYzwe8TbhtFbvwm8tvKZUIC6cRLE6q9J Dz+g== X-Gm-Message-State: AOJu0Yz0JUh2fxpncMwljJ3wQYqXSXQtZjNZ9KW9QIk76EJZvdB0vXE0 +pGPxnJLG9JSQW9MExMU+wOD/Vad3itBm8lAWHrJOpHk9S3Q5eIwLZbV+EJT X-Gm-Gg: ASbGnct++aWCzmFw7FzFXRzQRCngvfjlLPDNheLoagQRod1pdoyeEQAfA026/UXtplE lBNHfjaE63x56Aq0NfwYX570UVihfUdMSqjOqTuaRj1MowMDM/55uz+tEhHg9tuVu4hNVY5KIpl Ic5idIyee86whoJoD6KQXxB9M/mND6oPBnmV1JLuFMOfKE5fFqJ/sVvNgE0DbYy4qcHzTToqLMx jZeAU+lgc6szlzUUt3yHZqdbRVFA+lspJvtxpS0S1phw7KI/7jrrUMZyHlFRql0nglwbQj106BJ /HDgy+r9CR27Dpf4fojaHjwMkw== X-Google-Smtp-Source: AGHT+IGencwsY1mzwuZE79qzYxH+RCVfpFz/13t3zzVk5/QjzbEy7wbI73jrmpEtOB7o4X8hug/ewA== X-Received: by 2002:a7b:c5c5:0:b0:434:9e46:5bc with SMTP id 5b1f17b1804b1-434ddfae40dmr53586375e9.10.1733559543733; Sat, 07 Dec 2024 00:19:03 -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 5b1f17b1804b1-434ef283e87sm5107725e9.39.2024.12.07.00.19.03 for <74622@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Dec 2024 00:19:03 -0800 (PST) Message-ID: <44bf760314f56fe79cb822a91b6ae54f408b42e7.1733559490.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.15 X-Spam-Score: -3.15 X-Migadu-Queue-Id: 8779767896 X-Migadu-Scanner: mx12.migadu.com X-TUID: QqG8alktVMWJ * 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