From patchwork Mon Nov 11 06:16:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 70232 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 C944827BBE2; Mon, 11 Nov 2024 06:24:23 +0000 (GMT) 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_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 36D4927BBE9 for ; Mon, 11 Nov 2024 06:24:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tANpO-0001uB-Oh; Mon, 11 Nov 2024 01:23: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 1tANpI-0001sI-JT for guix-patches@gnu.org; Mon, 11 Nov 2024 01:23: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 1tANpI-00072n-AC for guix-patches@gnu.org; Mon, 11 Nov 2024 01:23:04 -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:References:In-Reply-To:Date:From:To:Subject; bh=3qq9rGwyvFNXcTwPuIKBxLrEYcPmLY5TOe/2WXx6fvc=; b=YqVMysmaQBTQVfD7D8e5b0Mfjm7sfOsfmkKkVymkTcB3uC7XNyOtzd9+ASDFwFLI5xii6TXYOqji5XU4zoCv//koPw657RZ8/8A4ECx9iXFfo+obHPHp764VdoYILcdlVAsMa9ZQLvv0DugeKwBAg3/VvbnH25d26rVnIZlBMp/CzkR7X8e8Qv8Y3DgEkPqkeuvYyhsfWdLPBLg5H87KohyC8/9a/qh3ruMy7hmGPOjvI6kC/PVrnsHu0F0SuFcwKkE17laQUJdDMv2kUymCB3KAnzhPdc8OfcTtX0Vj9BCniJD0N8poKJQTBCPeFnzl4MnU+GHcgK1YM7sGyWmgTQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tANpH-00069H-AN; Mon, 11 Nov 2024 01:23:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74306] [PATCH gnome-team 02/44] gnu: gvfs: Patch mount, umount and lsof commands. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 11 Nov 2024 06:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74306@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus X-Debbugs-Original-Xcc: Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 74306-submit@debbugs.gnu.org id=B74306.173130615623450 (code B ref 74306); Mon, 11 Nov 2024 06:23:03 +0000 Received: (at 74306) by debbugs.gnu.org; 11 Nov 2024 06:22:36 +0000 Received: from localhost ([127.0.0.1]:57590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANop-000666-EY for submit@debbugs.gnu.org; Mon, 11 Nov 2024 01:22:35 -0500 Received: from mail-oi1-f177.google.com ([209.85.167.177]:46577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANom-00065Y-8j for 74306@debbugs.gnu.org; Mon, 11 Nov 2024 01:22:32 -0500 Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-3e5f86e59f1so2287891b6e.1 for <74306@debbugs.gnu.org>; Sun, 10 Nov 2024 22:22:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731306086; x=1731910886; 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=3qq9rGwyvFNXcTwPuIKBxLrEYcPmLY5TOe/2WXx6fvc=; b=Gkye11hPp4+D2+/av6WN+uSzkXdRTJv9CkrofKsoB2zhBYsuCVWFK9dH85vGnOPTCj jJ1DkyySH1/9uUNzwmnvnHpcuv5u7+uDiPHnhw3cloL6IDt1E8tCD+0sOKmOR2rOg3qH 9O65oVfYXvLI0rCF3CmBqgstogtwU8+TuC8z4LxJ6//IJQU5700WcSJAHwMbEGP48Wed BDeSVK3CedLVBMyTtqCzODm5Uu6YtmgC6d7oRwGULi1h5a7iXn6jIN4R7zQ7hUDIlMQ/ xkwGb27OMl4vfObXJUC6MV5jEMGJNrUF92R9UfeM00ilNfAe7k01alon62KHzlCK0ulF PdQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731306086; x=1731910886; 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=3qq9rGwyvFNXcTwPuIKBxLrEYcPmLY5TOe/2WXx6fvc=; b=wkNyYZ/R/R/dZW87Ww0YOY0lYIeMR6k/tAcn4R6Q9q6FZYV+pJRbjjafUKgT2Drz9m LH/qGpVH7b6B2oByyguBafC4hs+rL/hL8PMk3PI+TAicUi6g8BzJs1d6RqHi986Ei1Mq Ynw4PQgHCQHhMJq149qOxGjIrFlPabeIYJdffHaqWK8q8z2HjL2ETHAnWZLaD8AhexdK jBXTiGyM3fG3VEcCKgD12J+uGAmhYTsSpxPKrWQiKwDw8OPtNvW8jpOVcGhsJjnLR0Ov TckOoYSmoLuNfusBzTv8fOj5iPySnJJ8W1SO6nmvJvTwYacBuF14FZH4SXKO2Rqfe4Db DHeA== X-Gm-Message-State: AOJu0YzolHNfvSkG5MSMMfcUxRhYRK0/NcEL2adlNWZOnPryJrqeaF3l /BVBFIDJI/nNxJUzVa1jV2kvtHCj+Z6oZeYmLOujfwNnyLmoYq1OIN0ZRQ== X-Google-Smtp-Source: AGHT+IGpyc7lFim1B+3bmR/0mPnzVUP3jc6SX2XzVbQdKswlKiDB16FDK4Htwp0kyB1tLqZgaATe8w== X-Received: by 2002:a05:6808:170b:b0:3e3:c411:adf0 with SMTP id 5614622812f47-3e79468fdedmr10108750b6e.21.1731306086153; Sun, 10 Nov 2024 22:21:26 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7f41f5ea0d5sm7782996a12.47.2024.11.10.22.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2024 22:21:25 -0800 (PST) From: Maxim Cournoyer Date: Mon, 11 Nov 2024 15:16:45 +0900 Message-ID: <0f2edef9eafcf2450416798ed2e2b2b1c063df7e.1731303037.git.maxim.cournoyer@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/gnome.scm (gvfs) [phases]: New argument. [inputs]: Add lsof and util-linux. Change-Id: If9c72e6de96f008be9decb4b7d89b0052c0f8f43 --- gnu/packages/freedesktop.scm | 9 +++++++++ gnu/packages/gnome.scm | 37 +++++++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 604205cbbe..0128922295 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1850,6 +1850,15 @@ (define-public udisks (string-append "--with-udevdir=" #$output "/lib/udev")) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-commands + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/udisksstate.c" + (("\"umount -l") + (string-append "\"" (search-input-file inputs "bin/umount") + " -l"))) + (substitute* "src/udiskslinuxdrive.c" + (("\"eject %s") + (string-append "\"" (search-input-file inputs "bin/eject")))))) (add-before 'configure 'fix-girdir (lambda _ ;; Install introspection data to its own output. diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 36a8e99b02..775c6bf1fd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -167,6 +167,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages linux) #:use-module (gnu packages lirc) #:use-module (gnu packages llvm) + #:use-module (gnu packages lsof) #:use-module (gnu packages lua) #:use-module (gnu packages mail) #:use-module (gnu packages man) @@ -7106,14 +7107,30 @@ (define-public gvfs "0cgjlxrs4qr08igqjpkhfxpzydj8m9y9n92z091knkj5170x5bbj")))) (build-system meson-build-system) (arguments - (list #:glib-or-gtk? #t - #:configure-flags - #~(list "-Dsystemduserunitdir=no" - "-Dtmpfilesdir=no" - "-Dman=true" - ;; Otherwise, the RUNPATH will lack the final path component. - (string-append "-Dc_link_args=-Wl,-rpath=" - #$output "/lib/gvfs")))) + (list + #:glib-or-gtk? #t + #:configure-flags + #~(list "-Dsystemduserunitdir=no" + "-Dtmpfilesdir=no" + "-Dman=true" + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + #$output "/lib/gvfs")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-commands + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "monitor/udisks2/gvfsudisks2mount.c" + (("\"lsof -t") + (string-append "\"" (search-input-file inputs "bin/lsof") + " -t")) + (("\"umount %s") + (string-append "\"" (search-input-file inputs "bin/umount") + " %s"))) + (substitute* "monitor/udisks2/gvfsudisks2volume.c" + (("\"mount \\\\\"%s") + (string-append "\"" (search-input-file inputs "bin/mount") + " \\\"%s")))))))) (native-inputs (list `(,glib "bin") ;for glib-genmarshal, etc. gettext-minimal @@ -7143,12 +7160,14 @@ (define-public gvfs libmtp libnfs libsecret + lsof samba libsoup libxml2 openssh polkit - udisks)) + udisks + util-linux)) (home-page "https://wiki.gnome.org/Projects/gvfs") (synopsis "Userspace virtual file system for GIO") (description