From unknown Sat Aug 16 13:45:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70414] [PATCH] Gnu: update flatpak to 1.45.5. Resent-From: dziltener@lyrion.ch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Apr 2024 11:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70414 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70414@debbugs.gnu.org Cc: dziltener@lyrion.ch X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17132678256714 (code B ref -1); Tue, 16 Apr 2024 11:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Apr 2024 11:43:45 +0000 Received: from localhost ([127.0.0.1]:43409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwhDz-0001k8-1w for submit@debbugs.gnu.org; Tue, 16 Apr 2024 07:43:44 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwhDv-0001iW-11 for submit@debbugs.gnu.org; Tue, 16 Apr 2024 07:43:41 -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 1rwhDb-0004Tp-9a for guix-patches@gnu.org; Tue, 16 Apr 2024 07:43:19 -0400 Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199] helo=lyrion.ch) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwhDX-0001DD-5i for guix-patches@gnu.org; Tue, 16 Apr 2024 07:43:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1713267789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VDvUF7V/iTO0KifaFKmv5H3upLZ5NA7lQQS7y8ygclg=; b=p1Mt4aGKMF4mVCEarvAkYdQfQ3kDKiomdzyeOmCBN/yeAxxom0J7upE1+0/eW5U2HNFe88 jvQVCybX/A1nAgb46QD/6WtnQQ2N2sbzznqUDVJ9dmvWa29Upwji5GhBrf7aCmntaZHqIM sRunn8//EgSG49dFfrORC6DLIAZt1aHVHsoL02SWej09bj96R78qKLxaKtJp+l2Z0WlcVI zGpVw2/mL9gYa1mdYQuaHvnO7dAye22PjkMk1Mta0Kz4Ey6DtQFAPRSG/tq5KS18ddoXa/ 7lPTG1T5RJQLsVF3IsDNb2TnDkvGqvZ/AuLQzGBcgZ7PSpgyKxz6lFbV8VtbGQ== Received: from ziltis-machine.fritz.box ( [2a00:1f:99c0:3c01:8fc9:e8ec:45e0:6cde]) by lyrion.ch (OpenSMTPD) with ESMTPSA id 58bc2a98 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 16 Apr 2024 11:43:09 +0000 (UTC) From: dziltener@lyrion.ch Date: Tue, 16 Apr 2024 13:42:15 +0200 Message-ID: <20240416114247.31927-1-dziltener@lyrion.ch> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=195.15.241.199; envelope-from=dziltener@lyrion.ch; helo=lyrion.ch X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.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, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) 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: -0.1 (/) From: Daniel Ziltener This updates Flatpak to 1.45.5. --- gnu/packages/package-management.scm | 56 ++++++++++++------- ...flatpak-unset-gdk-pixbuf-for-sandbox.patch | 4 +- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 247807c394..8f8cbbdf3e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -2022,55 +2022,64 @@ (define-public libostree (define-public flatpak (package (name "flatpak") - (version "1.14.4") + (version "1.14.5") (source (origin (method url-fetch) - (uri (string-append "https://github.com/flatpak/flatpak/releases/download/" - version "/flatpak-" version ".tar.xz")) + (uri + (string-append "https://github.com/flatpak/flatpak/releases/download/" + version "/flatpak-" version ".tar.xz")) (sha256 - (base32 "16b7f7n2mms6zgm0lj3fn86ny11xjn8cd3mrk1slwhvwnv8dnd4a")) + (base32 + "1b7z4wzh2zgphcal95vj4x7wbr9s89p2a4c0l0g4w4xcwx6ccw2v")) (patches (search-patches "flatpak-fix-path.patch" "flatpak-unset-gdk-pixbuf-for-sandbox.patch")))) - ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. (build-system glib-or-gtk-build-system) - (arguments (list #:configure-flags #~(list + "--with-curl" "--enable-documentation=no" ;; FIXME "--enable-system-helper=no" - "--localstatedir=/var" (string-append "--with-system-bubblewrap=" (assoc-ref %build-inputs "bubblewrap") "/bin/bwrap") (string-append "--with-system-dbus-proxy=" (assoc-ref %build-inputs "xdg-dbus-proxy") - "/bin/xdg-dbus-proxy")) + "/bin/xdg-dbus-proxy") + "--localstatedir=/var") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) + (lambda* + (#:key inputs #:allow-other-keys) (copy-recursively (search-input-directory inputs "lib/locale") "/tmp/locale") - (for-each make-file-writable (find-files "/tmp")) + (for-each make-file-writable + (find-files "/tmp")) (substitute* "tests/make-test-runtime.sh" - (("cp `which.*") "echo guix\n") + (("cp `which.*") + "echo guix\n") (("cp -r /usr/lib/locale/C\\.\\*") (string-append "mkdir ${DIR}/usr/lib/locale/en_US; \ cp -r /tmp/locale/*/en_US.*"))) (substitute* "tests/libtest.sh" - (("/bin/kill") (which "kill")) - (("/usr/bin/python3") (which "python3"))) + (("/bin/kill") + (which "kill")) + (("/usr/bin/python3") + (which "python3"))) #t)) (add-after 'unpack 'p11-kit-fix - (lambda* (#:key inputs #:allow-other-keys) - (let ((p11-path (search-input-file inputs "/bin/p11-kit"))) + (lambda* + (#:key inputs #:allow-other-keys) + (let + ((p11-path + (search-input-file inputs "/bin/p11-kit"))) (substitute* "session-helper/flatpak-session-helper.c" (("\"p11-kit\",") (string-append "\"" p11-path "\",")) @@ -2080,7 +2089,8 @@ (define-public flatpak ;; Many tests fail for unknown reasons, so we just run a few basic ;; tests. (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* + (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") (invoke "make" "check" @@ -2088,9 +2098,9 @@ (define-public flatpak testcommon"))))))) (native-inputs (list bison - dbus ; for dbus-daemon + dbus ; for dbus-daemon gettext-minimal - `(,glib "bin") ; for glib-mkenums + gdbus-codegen + `(,glib "bin") ; for glib-mkenums + gdbus-codegen (libc-utf8-locales-for-target) gobject-introspection libcap @@ -2105,20 +2115,24 @@ (define-public flatpak bubblewrap curl dconf - fuse-2 + fuse gdk-pixbuf gpgme json-glib libarchive + libcap libostree libseccomp libsoup-minimal-2 libxau libxml2 p11-kit + polkit util-linux - xdg-dbus-proxy)) - (propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas)) + xdg-dbus-proxy + zstd)) + (propagated-inputs + (list glib-networking gnupg gsettings-desktop-schemas)) (home-page "https://flatpak.org") (synopsis "System for building, distributing, and running sandboxed desktop applications") diff --git a/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch b/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch index bf9c487ba8..7773b11f7e 100644 --- a/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch +++ b/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch @@ -9,11 +9,13 @@ of host system. --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = { +@@ -1900,8 +1900,9 @@ static const ExportData default_exports[] = { {"XKB_CONFIG_ROOT", NULL}, {"GIO_EXTRA_MODULES", NULL}, {"GDK_BACKEND", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, + {"VK_DRIVER_FILES", NULL}, + {"VK_ICD_FILENAMES", NULL}, }; static const ExportData no_ld_so_cache_exports[] = { -- 2.41.0 From unknown Sat Aug 16 13:45:33 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: dziltener@lyrion.ch Subject: bug#70414: closed (Re: [bug#70414] [PATCH] Gnu: update flatpak to 1.45.5.) Message-ID: References: <87cyqfiiyp.fsf@iscas.ac.cn> <20240416114247.31927-1-dziltener@lyrion.ch> X-Gnu-PR-Message: they-closed 70414 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 70414@debbugs.gnu.org Date: Wed, 24 Apr 2024 02:39:09 +0000 Content-Type: multipart/mixed; boundary="----------=_1713926349-17982-1" This is a multi-part message in MIME format... ------------=_1713926349-17982-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #70414: [PATCH] Gnu: update flatpak to 1.45.5. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 70414@debbugs.gnu.org. --=20 70414: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D70414 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1713926349-17982-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 70414-done) by debbugs.gnu.org; 24 Apr 2024 02:38:27 +0000 Received: from localhost ([127.0.0.1]:55762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzSWe-0004Yj-GA for submit@debbugs.gnu.org; Tue, 23 Apr 2024 22:38:26 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:58314 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzSWX-0004VR-09 for 70414-done@debbugs.gnu.org; Tue, 23 Apr 2024 22:38:21 -0400 Received: from m (unknown [183.247.5.102]) by APP-01 (Coremail) with SMTP id qwCowABXN1B_cChmLNOrBQ--.19276S2; Wed, 24 Apr 2024 10:37:51 +0800 (CST) From: Z572 To: dziltener--- via Guix-patches via Subject: Re: [bug#70414] [PATCH] Gnu: update flatpak to 1.45.5. In-Reply-To: <20240416114247.31927-1-dziltener@lyrion.ch> (dziltener's message of "Tue, 16 Apr 2024 13:42:15 +0200") References: <20240416114247.31927-1-dziltener@lyrion.ch> User-Agent: mu4e 1.12.2; emacs 30.0.50 Date: Wed, 24 Apr 2024 10:37:50 +0800 Message-ID: <87cyqfiiyp.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: qwCowABXN1B_cChmLNOrBQ--.19276S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUY17k0a2IF6w4xM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r4j 6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr 1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY 62kv0487M2AExVA0xI801c8C04v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I 8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWU AwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x 0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_ Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxU2c dbUUUUU X-Originating-IP: [183.247.5.102] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70414-done Cc: dziltener@lyrion.ch, 70414-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 (---) --=-=-= Content-Type: text/plain Duplicate, https://issues.guix.gnu.org/70417 , close. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYocH4ACgkQO1qpk+Gi 3/C1PxAAk6rux/IRpEu8AcsPFQhVfQVpz9/eYlbyAzroJ36tkRhsMNUfxotoQGD/ qehKNUQCneh3iyRCyEKm4+W/JQBjaN8o3/qzxnpqG12l8Q4W0d7ebpsxRXD0Bx6O FinhS8ebp7Vr2+tojl2fTmhiDpXbAV0gobJRSSJnbzrrWZdQ0wvraXWYmRVOOlD4 KVM16caFSe712vNwDMoPEMKqkgujfX9pyqSYRMcdrKHJ8ZYoSXGx2D2/ce6S4UUH Exs7sV0OjKKBFwp3X9agwYlOd2FSyI3uc5lnHCT0RFR6lYEd29CYLcrVShpOtMJb y76RT1O1zIqwEQIHTlzK3fOr4yDLDCpVXtBIn5ufEOBVHof5dgnoDReDF/8I49MU MzzgyQ5PZXKCKkBVaamSBuuJjcPXrDC1+xaZcbQGZEMXMP03sEWDgc2FsJeepUbA Bg1GxtRA+On6+wqJV11Fb1kUO+ZKc1M6DRCZZHyqWmH9Gd6XU49+HdtCKuNIArV2 M6BMP1xSEbMqCV/mf1ggmEmn58+YQhFvM0SXfiZIfKMG1IqQ/LA0RvbEgxt1AseW RLVgtk1opAZ01mmRXYrKOczeqJpQycsDzP7FZrJ6jomu/gON7z4aEPocwON154n2 oH2Ub1vSGRIEQycCnrF9yL6KUpTRz4ftJPOal3l0t/W4AYm3epY= =IttL -----END PGP SIGNATURE----- --=-=-=-- ------------=_1713926349-17982-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 Apr 2024 11:43:45 +0000 Received: from localhost ([127.0.0.1]:43409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwhDz-0001k8-1w for submit@debbugs.gnu.org; Tue, 16 Apr 2024 07:43:44 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwhDv-0001iW-11 for submit@debbugs.gnu.org; Tue, 16 Apr 2024 07:43:41 -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 1rwhDb-0004Tp-9a for guix-patches@gnu.org; Tue, 16 Apr 2024 07:43:19 -0400 Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199] helo=lyrion.ch) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwhDX-0001DD-5i for guix-patches@gnu.org; Tue, 16 Apr 2024 07:43:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1713267789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VDvUF7V/iTO0KifaFKmv5H3upLZ5NA7lQQS7y8ygclg=; b=p1Mt4aGKMF4mVCEarvAkYdQfQ3kDKiomdzyeOmCBN/yeAxxom0J7upE1+0/eW5U2HNFe88 jvQVCybX/A1nAgb46QD/6WtnQQ2N2sbzznqUDVJ9dmvWa29Upwji5GhBrf7aCmntaZHqIM sRunn8//EgSG49dFfrORC6DLIAZt1aHVHsoL02SWej09bj96R78qKLxaKtJp+l2Z0WlcVI zGpVw2/mL9gYa1mdYQuaHvnO7dAye22PjkMk1Mta0Kz4Ey6DtQFAPRSG/tq5KS18ddoXa/ 7lPTG1T5RJQLsVF3IsDNb2TnDkvGqvZ/AuLQzGBcgZ7PSpgyKxz6lFbV8VtbGQ== Received: from ziltis-machine.fritz.box ( [2a00:1f:99c0:3c01:8fc9:e8ec:45e0:6cde]) by lyrion.ch (OpenSMTPD) with ESMTPSA id 58bc2a98 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 16 Apr 2024 11:43:09 +0000 (UTC) From: dziltener@lyrion.ch To: guix-patches@gnu.org Subject: [PATCH] Gnu: update flatpak to 1.45.5. Date: Tue, 16 Apr 2024 13:42:15 +0200 Message-ID: <20240416114247.31927-1-dziltener@lyrion.ch> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=195.15.241.199; envelope-from=dziltener@lyrion.ch; helo=lyrion.ch X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.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, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: dziltener@lyrion.ch 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: -0.1 (/) From: Daniel Ziltener This updates Flatpak to 1.45.5. --- gnu/packages/package-management.scm | 56 ++++++++++++------- ...flatpak-unset-gdk-pixbuf-for-sandbox.patch | 4 +- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 247807c394..8f8cbbdf3e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -2022,55 +2022,64 @@ (define-public libostree (define-public flatpak (package (name "flatpak") - (version "1.14.4") + (version "1.14.5") (source (origin (method url-fetch) - (uri (string-append "https://github.com/flatpak/flatpak/releases/download/" - version "/flatpak-" version ".tar.xz")) + (uri + (string-append "https://github.com/flatpak/flatpak/releases/download/" + version "/flatpak-" version ".tar.xz")) (sha256 - (base32 "16b7f7n2mms6zgm0lj3fn86ny11xjn8cd3mrk1slwhvwnv8dnd4a")) + (base32 + "1b7z4wzh2zgphcal95vj4x7wbr9s89p2a4c0l0g4w4xcwx6ccw2v")) (patches (search-patches "flatpak-fix-path.patch" "flatpak-unset-gdk-pixbuf-for-sandbox.patch")))) - ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. (build-system glib-or-gtk-build-system) - (arguments (list #:configure-flags #~(list + "--with-curl" "--enable-documentation=no" ;; FIXME "--enable-system-helper=no" - "--localstatedir=/var" (string-append "--with-system-bubblewrap=" (assoc-ref %build-inputs "bubblewrap") "/bin/bwrap") (string-append "--with-system-dbus-proxy=" (assoc-ref %build-inputs "xdg-dbus-proxy") - "/bin/xdg-dbus-proxy")) + "/bin/xdg-dbus-proxy") + "--localstatedir=/var") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) + (lambda* + (#:key inputs #:allow-other-keys) (copy-recursively (search-input-directory inputs "lib/locale") "/tmp/locale") - (for-each make-file-writable (find-files "/tmp")) + (for-each make-file-writable + (find-files "/tmp")) (substitute* "tests/make-test-runtime.sh" - (("cp `which.*") "echo guix\n") + (("cp `which.*") + "echo guix\n") (("cp -r /usr/lib/locale/C\\.\\*") (string-append "mkdir ${DIR}/usr/lib/locale/en_US; \ cp -r /tmp/locale/*/en_US.*"))) (substitute* "tests/libtest.sh" - (("/bin/kill") (which "kill")) - (("/usr/bin/python3") (which "python3"))) + (("/bin/kill") + (which "kill")) + (("/usr/bin/python3") + (which "python3"))) #t)) (add-after 'unpack 'p11-kit-fix - (lambda* (#:key inputs #:allow-other-keys) - (let ((p11-path (search-input-file inputs "/bin/p11-kit"))) + (lambda* + (#:key inputs #:allow-other-keys) + (let + ((p11-path + (search-input-file inputs "/bin/p11-kit"))) (substitute* "session-helper/flatpak-session-helper.c" (("\"p11-kit\",") (string-append "\"" p11-path "\",")) @@ -2080,7 +2089,8 @@ (define-public flatpak ;; Many tests fail for unknown reasons, so we just run a few basic ;; tests. (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* + (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") (invoke "make" "check" @@ -2088,9 +2098,9 @@ (define-public flatpak testcommon"))))))) (native-inputs (list bison - dbus ; for dbus-daemon + dbus ; for dbus-daemon gettext-minimal - `(,glib "bin") ; for glib-mkenums + gdbus-codegen + `(,glib "bin") ; for glib-mkenums + gdbus-codegen (libc-utf8-locales-for-target) gobject-introspection libcap @@ -2105,20 +2115,24 @@ (define-public flatpak bubblewrap curl dconf - fuse-2 + fuse gdk-pixbuf gpgme json-glib libarchive + libcap libostree libseccomp libsoup-minimal-2 libxau libxml2 p11-kit + polkit util-linux - xdg-dbus-proxy)) - (propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas)) + xdg-dbus-proxy + zstd)) + (propagated-inputs + (list glib-networking gnupg gsettings-desktop-schemas)) (home-page "https://flatpak.org") (synopsis "System for building, distributing, and running sandboxed desktop applications") diff --git a/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch b/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch index bf9c487ba8..7773b11f7e 100644 --- a/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch +++ b/gnu/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch @@ -9,11 +9,13 @@ of host system. --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = { +@@ -1900,8 +1900,9 @@ static const ExportData default_exports[] = { {"XKB_CONFIG_ROOT", NULL}, {"GIO_EXTRA_MODULES", NULL}, {"GDK_BACKEND", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, + {"VK_DRIVER_FILES", NULL}, + {"VK_ICD_FILENAMES", NULL}, }; static const ExportData no_ld_so_cache_exports[] = { -- 2.41.0 ------------=_1713926349-17982-1-- From unknown Sat Aug 16 13:45:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70414] [PATCH] Gnu: update flatpak to 1.45.5. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Apr 2024 02:40:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70414 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70414@debbugs.gnu.org Cc: dziltener@lyrion.ch, 70414-done@debbugs.gnu.org X-Debbugs-Original-To: dziltener--- via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.171392635918165 (code B ref -1); Wed, 24 Apr 2024 02:40:13 +0000 Received: (at submit) by debbugs.gnu.org; 24 Apr 2024 02:39:19 +0000 Received: from localhost ([127.0.0.1]:55773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzSXS-0004iE-W2 for submit@debbugs.gnu.org; Tue, 23 Apr 2024 22:39:18 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzSWc-0004XN-HW for submit@debbugs.gnu.org; Tue, 23 Apr 2024 22:38:25 -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 1rzSWF-0001UE-1h for guix-patches@gnu.org; Tue, 23 Apr 2024 22:37:59 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1rzSWC-0001VP-LY for guix-patches@gnu.org; Tue, 23 Apr 2024 22:37:58 -0400 Received: from m (unknown [183.247.5.102]) by APP-01 (Coremail) with SMTP id qwCowABXN1B_cChmLNOrBQ--.19276S2; Wed, 24 Apr 2024 10:37:51 +0800 (CST) From: Z572 In-Reply-To: <20240416114247.31927-1-dziltener@lyrion.ch> (dziltener's message of "Tue, 16 Apr 2024 13:42:15 +0200") References: <20240416114247.31927-1-dziltener@lyrion.ch> User-Agent: mu4e 1.12.2; emacs 30.0.50 Date: Wed, 24 Apr 2024 10:37:50 +0800 Message-ID: <87cyqfiiyp.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: qwCowABXN1B_cChmLNOrBQ--.19276S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUY17k0a2IF6w4xM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r4j 6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr 1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY 62kv0487M2AExVA0xI801c8C04v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I 8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWU AwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x 0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_ Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxU2c dbUUUUU X-Originating-IP: [183.247.5.102] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.21; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) 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: -0.1 (/) --=-=-= Content-Type: text/plain Duplicate, https://issues.guix.gnu.org/70417 , close. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYocH4ACgkQO1qpk+Gi 3/C1PxAAk6rux/IRpEu8AcsPFQhVfQVpz9/eYlbyAzroJ36tkRhsMNUfxotoQGD/ qehKNUQCneh3iyRCyEKm4+W/JQBjaN8o3/qzxnpqG12l8Q4W0d7ebpsxRXD0Bx6O FinhS8ebp7Vr2+tojl2fTmhiDpXbAV0gobJRSSJnbzrrWZdQ0wvraXWYmRVOOlD4 KVM16caFSe712vNwDMoPEMKqkgujfX9pyqSYRMcdrKHJ8ZYoSXGx2D2/ce6S4UUH Exs7sV0OjKKBFwp3X9agwYlOd2FSyI3uc5lnHCT0RFR6lYEd29CYLcrVShpOtMJb y76RT1O1zIqwEQIHTlzK3fOr4yDLDCpVXtBIn5ufEOBVHof5dgnoDReDF/8I49MU MzzgyQ5PZXKCKkBVaamSBuuJjcPXrDC1+xaZcbQGZEMXMP03sEWDgc2FsJeepUbA Bg1GxtRA+On6+wqJV11Fb1kUO+ZKc1M6DRCZZHyqWmH9Gd6XU49+HdtCKuNIArV2 M6BMP1xSEbMqCV/mf1ggmEmn58+YQhFvM0SXfiZIfKMG1IqQ/LA0RvbEgxt1AseW RLVgtk1opAZ01mmRXYrKOczeqJpQycsDzP7FZrJ6jomu/gON7z4aEPocwON154n2 oH2Ub1vSGRIEQycCnrF9yL6KUpTRz4ftJPOal3l0t/W4AYm3epY= =IttL -----END PGP SIGNATURE----- --=-=-=--