From patchwork Sat Sep 28 07:41:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodion Goritskov X-Patchwork-Id: 31530 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 62D7727BBEC; 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 094CE27BBE2 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 1suS84-0006bV-LU; Sat, 28 Sep 2024 03:44:36 -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-0006ax-Jn 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 1suS81-00014x-BA for guix-patches@gnu.org; Sat, 28 Sep 2024 03:44:33 -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=N5RYFOl3sbqAava+tFqnph0pX6EPGbRCy/w5rIFyRVM=; b=G1PcXumLq9bwCOeNwPAADK92Lbz8RlEJ0KbsAs5L4mptKUH0WnJlPnG0j4y2oj5WR8nIznQ4TqGR/UJFpi140L1lQW4sLV1Y9vmyVKwqvGwOaEMWrQLWTkI7PhoWAdAKYPxcIGf+B/ViwIbUZy8I8cfg5OvCwOhwbbnzF+aDZ8nzW9LRI5MnlEgfI9lhbIIRkxl00YD7WL2il5BsJzO1lXVG4YSPlFDnmPGKSPv2/VJU63DupE6UekKd4N++4ceMVrAse4XoXrepXQ0y64MS3MUcXYdQ+Xyd/hHfKZima5fNKfJiFpoFfsZWdvp/MEPCZBX3sFxWa8bw/u8oWA1itw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suS8U-0001WE-UO; Sat, 28 Sep 2024 03:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73520] [PATCH 2/2] gnu: xdg-desktop-portal: Update to 1.18.4. 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.17275094505684 (code B ref 73520); Sat, 28 Sep 2024 07:45:02 +0000 Received: (at 73520) by debbugs.gnu.org; 28 Sep 2024 07:44:10 +0000 Received: from localhost ([127.0.0.1]:51180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suS7d-0001Ta-IQ for submit@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 ) id 1suS7b-0001T5-CY for 73520@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@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 Date: Sat, 28 Sep 2024 11:41:35 +0400 Message-ID: <4d6858377ab01fff649eb70b92e01cafe4b42ab0.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/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