From patchwork Tue Apr 16 11:42:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 63082 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 4C2FA27BBE9; Tue, 16 Apr 2024 12:44:27 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 C79A227BBEA for ; Tue, 16 Apr 2024 12:44:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwhE8-0004ZP-Vq; Tue, 16 Apr 2024 07:43:53 -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 1rwhE6-0004ZD-NN for guix-patches@gnu.org; Tue, 16 Apr 2024 07:43:50 -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 1rwhE6-0001GI-6w for guix-patches@gnu.org; Tue, 16 Apr 2024 07:43:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwhEI-0001mx-Db for guix-patches@gnu.org; Tue, 16 Apr 2024 07:44:02 -0400 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) 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 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-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: , Reply-to: dziltener@lyrion.ch X-ACL-Warn: , dziltener--- via Guix-patches X-Patchwork-Original-From: dziltener--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 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[] = {