From unknown Tue Jun 24 05:10:01 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#53273 <53273@debbugs.gnu.org> To: bug#53273 <53273@debbugs.gnu.org> Subject: Status: [PATCH] Update libostree, simplify inputs for flatpak/libostree Reply-To: bug#53273 <53273@debbugs.gnu.org> Date: Tue, 24 Jun 2025 12:10:01 +0000 retitle 53273 [PATCH] Update libostree, simplify inputs for flatpak/libostr= ee reassign 53273 guix-patches submitter 53273 kiasoc5@tutanota.com severity 53273 normal tag 53273 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 14 17:26:41 2022 Received: (at submit) by debbugs.gnu.org; 14 Jan 2022 22:26:41 +0000 Received: from localhost ([127.0.0.1]:38488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8V1p-0007f9-EL for submit@debbugs.gnu.org; Fri, 14 Jan 2022 17:26:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:55276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8V1l-0007ex-7M for submit@debbugs.gnu.org; Fri, 14 Jan 2022 17:26:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8V1k-0001Ps-Rw for guix-patches@gnu.org; Fri, 14 Jan 2022 17:26:32 -0500 Received: from w1.tutanota.de ([81.3.6.162]:47158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8V1W-0003JE-Iu for guix-patches@gnu.org; Fri, 14 Jan 2022 17:26:32 -0500 Received: from w3.tutanota.de (unknown [192.168.1.164]) by w1.tutanota.de (Postfix) with ESMTP id 50592FBF5FB for ; Fri, 14 Jan 2022 22:26:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1642199174; s=s1; d=tutanota.com; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=D9BYHbNQN3ougfE72PL2o0ZnsWfklE15GdWnrVRS5co=; b=xM+WpqhgvHtEsiI0AzBmWGif+VXApiTYVtaaaUK+dywo/PHVx0jhEpOGl2ima7oc Y3F8PShhpWGzigzq02iIWGeXlSefom5dgn/CqRuokcRje5X15j87ujReLWIG+T7df6s vlbivFoeCD2ou4GlqchaLFmPL8u8shtVgz7PrULemoW7DLipcd7TG9p9uvGwni21GO5 6pE0JDcPr2tF8IYaZwX69DmDl2myV1gxttQhVUzwsLB8jCYInfNEBigSrKOGb4IhMyH 84CdoPSG9/NEYTF8mzMvSwftLkbgFk323CmEKBQz53+3MHcraLH76c1LQATay7YRjqc LQLRPpnQSA== Date: Fri, 14 Jan 2022 23:26:14 +0100 (CET) From: kiasoc5@tutanota.com To: Guix Patches Message-ID: Subject: [PATCH] Update libostree, simplify inputs for flatpak/libostree MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_166953_1302214080.1642199174316" Received-SPF: pass client-ip=81.3.6.162; envelope-from=kiasoc5@tutanota.com; helo=w1.tutanota.de 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, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) ------=_Part_166953_1302214080.1642199174316 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit ------=_Part_166953_1302214080.1642199174316 Content-Type: text/x-patch; charset=us-ascii; name=0001-gnu-libostree-Update-to-2022.1.patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-libostree-Update-to-2022.1.patch >From 1d45930b362cac3d7d136bcaa8d5130b985add2c Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Fri, 14 Jan 2022 17:04:06 -0500 Subject: [PATCH 1/2] gnu: libostree: Update to 2022.1. * gnu/packages/package-management (libostree): Update to 2022.1. [native-inputs, inputs]: Remove labels --- gnu/packages/package-management.scm | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ba5736f851..9e37c44fdd 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1709,7 +1709,7 @@ (define-public msitools (define-public libostree (package (name "libostree") - (version "2021.6") + (version "2022.1") (source (origin (method url-fetch) @@ -1717,7 +1717,7 @@ (define-public libostree "https://github.com/ostreedev/ostree/releases/download/v" (version-major+minor version) "/libostree-" version ".tar.xz")) (sha256 - (base32 "0cgmnjf4mr4wn4fliq6ncs0q9qwblrlizjfhx57p7m332g5k21p8")))) + (base32 "1mfakwm0sjvb1vvl3jhc451yyf723k7c4vv1yqs8law4arw0x823")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1734,23 +1734,23 @@ (define-public libostree ;; tap-driver.sh: fatal: I/O or internal error #:tests? #f)) (native-inputs - `(("attr" ,attr) ; for tests - ("bison" ,bison) - ("glib:bin" ,glib "bin") ; for 'glib-mkenums' - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("xsltproc" ,libxslt))) + (list attr ; for tests + bison + `(,glib "bin") ; for 'glib-mkenums' + gobject-introspection + pkg-config + libxslt)) (inputs - `(("avahi" ,avahi) - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl) - ("e2fsprogs" ,e2fsprogs) - ("fuse" ,fuse) - ("glib" ,glib) - ("gpgme" ,gpgme) - ("libarchive" ,libarchive) - ("libsoup" ,libsoup-minimal-2) ; needs libsoup-2.4 - ("util-linux" ,util-linux))) + (list avahi + docbook-xml + docbook-xsl + e2fsprogs + fuse + glib + gpgme + libarchive + libsoup-minimal-2 ; needs libsoup-2.4 + util-linux)) (home-page "https://ostree.readthedocs.io/en/latest/") (synopsis "Operating system and container binary deployment and upgrades") (description base-commit: a9e45262465bffae8e9b5c58dca77b18b2962521 -- 2.34.1 ------=_Part_166953_1302214080.1642199174316 Content-Type: text/x-patch; charset=us-ascii; name=0002-gnu-flatpak-Simplify-inputs.patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-flatpak-Simplify-inputs.patch >From 01e12448b31bf54bebc473605ca4b38e179e7730 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Fri, 14 Jan 2022 17:05:19 -0500 Subject: [PATCH 2/2] gnu: flatpak: Simplify inputs. * gnu/packages/package-management.scm (flatpak)[native-inputs, inputs]: Remove labels. [arguments]<#:phases>: Edit 'p11-kit-fix to use p11-kit instead of p11-kit-next. --- gnu/packages/package-management.scm | 58 ++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9e37c44fdd..0cf6344cab 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1808,7 +1808,7 @@ (define-public flatpak #t)) (add-after 'unpack 'p11-kit-fix (lambda* (#:key inputs #:allow-other-keys) - (let ((p11-path (string-append (assoc-ref inputs "p11-kit-next") + (let ((p11-path (string-append (assoc-ref inputs "p11-kit") "/bin/p11-kit"))) (substitute* "session-helper/flatpak-session-helper.c" (("\"p11-kit\",") @@ -1824,37 +1824,37 @@ (define-public flatpak (invoke "make" "check" "TESTS=tests/test-basic.sh tests/test-config.sh testcommon")))))) (native-inputs - `(("bison" ,bison) - ("dbus" ,dbus) ; for dbus-daemon - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-mkenums + gdbus-codegen - ("glibc-utf8-locales" ,glibc-utf8-locales) - ("gobject-introspection" ,gobject-introspection) - ("libcap" ,libcap) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("python-pyparsing" ,python-pyparsing) - ("socat" ,socat) - ("which" ,which))) + (list bison + dbus ; for dbus-daemon + gettext-minimal + `(,glib "bin") ; for glib-mkenums + gdbus-codegen + glibc-utf8-locales + gobject-introspection + libcap + pkg-config + python + python-pyparsing + socat + which)) (propagated-inputs (list glib-networking gnupg-2.2.32 gsettings-desktop-schemas)) (inputs - `(("appstream-glib" ,appstream-glib) - ("bubblewrap" ,bubblewrap) - ("dconf" ,dconf) - ("fuse" ,fuse) - ("gdk-pixbuf" ,gdk-pixbuf) - ("gpgme" ,gpgme) - ("json-glib" ,json-glib) - ("libarchive" ,libarchive) - ("libostree" ,libostree) - ("libseccomp" ,libseccomp) - ("libsoup" ,libsoup-minimal-2) - ("libxau" ,libxau) - ("libxml2" ,libxml2) - ("p11-kit-next" ,p11-kit-next) - ("util-linux" ,util-linux) - ("xdg-dbus-proxy" ,xdg-dbus-proxy))) + (list appstream-glib + bubblewrap + dconf + fuse + gdk-pixbuf + gpgme + json-glib + libarchive + libostree + libseccomp + libsoup-minimal-2 + libxau + libxml2 + p11-kit-next + util-linux + xdg-dbus-proxy)) (home-page "https://flatpak.org") (synopsis "System for building, distributing, and running sandboxed desktop applications") -- 2.34.1 ------=_Part_166953_1302214080.1642199174316-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 20 08:50:16 2022 Received: (at 53273-done) by debbugs.gnu.org; 20 Jan 2022 13:50:16 +0000 Received: from localhost ([127.0.0.1]:56857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAXpQ-00026Y-56 for submit@debbugs.gnu.org; Thu, 20 Jan 2022 08:50:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAXpO-00026K-W0 for 53273-done@debbugs.gnu.org; Thu, 20 Jan 2022 08:50:15 -0500 Received: from [2001:470:142:3::e] (port=41760 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAXpJ-00061V-FR; Thu, 20 Jan 2022 08:50:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=AAkr+NLXJQc2FLI3f9+IcqyCNmPsK8FkG3YW/hRAXt4=; b=C1qodInWT6VS3a1V6qek KmpsbG+/DYS4amkTsFzsOFy85jkPgxO/6/UNyjumE8foJ+cW8PzXHrAsLV6bwTD0QcUH0tI2iG9MX oPnEzkRTyPpMYNs/3BVjpVd4N1lGq4PY05q5LPDV6ANfJsav9NQH7CZ03zco6U/4qpDoO1GZJxU54 FAa4G+V3c2VeDpxeNSX+5017XpzBsKm3TrP9JqXunMUa+8Hl/fSuusTu8i+BAkpR7r0G6ijhB9jE3 Sj7RTYBXOJdP8qeH31GTj7uQBl7havRVD+pAZ3O9H7N5LsaSq+WrnxTrZbB+SOgh6xBLJzNob3Lu0 ebc+U/exNqVZlg==; Received: from [2a01:e0a:19b:d9a0:2f3b:16f2:b776:3ef9] (port=36474 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAXpF-00009t-Ht; Thu, 20 Jan 2022 08:50:06 -0500 From: Mathieu Othacehe To: kiasoc5@tutanota.com Subject: Re: bug#53273: [PATCH] Update libostree, simplify inputs for flatpak/libostree References: Date: Thu, 20 Jan 2022 14:50:03 +0100 In-Reply-To: (kiasoc5@tutanota.com's message of "Fri, 14 Jan 2022 23:26:14 +0100 (CET)") Message-ID: <877dau34ac.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53273-done Cc: 53273-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, > - (let ((p11-path (string-append (assoc-ref inputs "p11-kit-next") > + (let ((p11-path (string-append (assoc-ref inputs "p11-kit") > "/bin/p11-kit"))) I used search-input-file here to stop relying on labels. Pushed both patches. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 20 08:50:24 2022 Received: (at 53273-done) by debbugs.gnu.org; 20 Jan 2022 13:50:24 +0000 Received: from localhost ([127.0.0.1]:56861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAXpY-00026s-BI for submit@debbugs.gnu.org; Thu, 20 Jan 2022 08:50:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAXpX-00026h-AD for 53273-done@debbugs.gnu.org; Thu, 20 Jan 2022 08:50:23 -0500 Received: from [2001:470:142:3::e] (port=41764 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAXpN-00061y-PQ; Thu, 20 Jan 2022 08:50:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=AAkr+NLXJQc2FLI3f9+IcqyCNmPsK8FkG3YW/hRAXt4=; b=oqxwAYWBRaLZ1zT1thOI 8KI6qU/j4gvO2i3rVb5SiLwCGSAsD/WEVygo9cfNmhvf20vkaMund1UybBS/DzjZaT7PnYy4fHXG+ AhRJhPd50cqTiMq4zsCePOqrOiADa1RtctttAW/hdzqpbYOZUjWLi7bJOIyOE275TATXRCsMqpkk2 Y1q7zazblOe/P9ttP5uB+9Lqv23UsCcOHXXVY6FnSGvFhpGBUCaQ44ALVWIKbGTu/4qG9y6GjhHyV qbc05R+VViL6YsaFG4XxuUt1VnTgRsPVPz1hgY+xO5yWazUrbh9KFGJBfFDlYXyjk8dCtuXpT6RJk rCNJjK++dJQ0Og==; Received: from [2a01:e0a:19b:d9a0:2f3b:16f2:b776:3ef9] (port=36476 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAXpM-0000BX-Ne; Thu, 20 Jan 2022 08:50:13 -0500 From: Mathieu Othacehe To: kiasoc5@tutanota.com Subject: Re: bug#53273: [PATCH] Update libostree, simplify inputs for flatpak/libostree In-Reply-To: (kiasoc5@tutanota.com's message of "Fri, 14 Jan 2022 23:26:14 +0100 (CET)") References: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) Date: Thu, 20 Jan 2022 14:50:10 +0100 Message-ID: <875yqe34a5.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53273-done Cc: 53273-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, > - (let ((p11-path (string-append (assoc-ref inputs "p11-kit-next") > + (let ((p11-path (string-append (assoc-ref inputs "p11-kit") > "/bin/p11-kit"))) I used search-input-file here to stop relying on labels. Pushed both patches. Thanks, Mathieu From unknown Tue Jun 24 05:10:01 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 18 Feb 2022 12:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator