From patchwork Sat Jan 11 23:15:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 36981 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 BB8A227BBEA; Sat, 11 Jan 2025 23:17:18 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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=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 1EEB127BBE2 for ; Sat, 11 Jan 2025 23:17:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tWkj5-0000Bj-6J; Sat, 11 Jan 2025 18:17:07 -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 1tWkj1-0000As-FK for guix-patches@gnu.org; Sat, 11 Jan 2025 18:17:03 -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 1tWkj1-0003bA-6S for guix-patches@gnu.org; Sat, 11 Jan 2025 18:17:03 -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=6tDEN+EnSVSE2BER2vk9M/kSET/hAo0kND5Bhv2U6Gs=; b=OYJYbQn0I0Hzo/CFp+9/55zj05gOvGVp/1qmRGwHb4jsWQ5D063d1eUychyccX/jXj83SOgHSDmxKv7i8MHEjfJNC3bpAKGPjyAQol8ASRSgV06+7y1m+Xm6+FXMxgn3o4ukPp61HlatR3kYRQ6aTRTwLHlDMq08y2jbCMG84hfoPUY9uyvcuqvdYWpR3CBZa13qsAqHMUBmPGHTvlCQtggEMuUidg21elmmhMxsiZeJ3MoNghK7/PsYvno8Je1nKMLF+LyqxC7KX6/2vbWkJEFCW1gIVMSYIEXmkxHuxTXVbhi/lPNvWz27fG/mKkyBKecIRHX0uCrlGkq7wwMPsg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tWkj1-0002NY-2F for guix-patches@gnu.org; Sat, 11 Jan 2025 18:17:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75503] [PATCH 3/4] gnu: kpmcore: Support filesystems. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Jan 2025 23:17:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75503 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75503@debbugs.gnu.org Cc: Sughosha Received: via spool by 75503-submit@debbugs.gnu.org id=B75503.17366373639048 (code B ref 75503); Sat, 11 Jan 2025 23:17:03 +0000 Received: (at 75503) by debbugs.gnu.org; 11 Jan 2025 23:16:03 +0000 Received: from localhost ([127.0.0.1]:45328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWki2-0002Lb-Sp for submit@debbugs.gnu.org; Sat, 11 Jan 2025 18:16:03 -0500 Received: from layka.disroot.org ([178.21.23.139]:40770) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tWkhy-0002Ks-0q for 75503@debbugs.gnu.org; Sat, 11 Jan 2025 18:15:58 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1146825CE7; Sun, 12 Jan 2025 00:15:57 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id M1Jy-_mQ9yo3; Sun, 12 Jan 2025 00:15:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1736637355; bh=aS95bYrq8kJquMBIrXOxxdZP8NtrDn+mW+08+VEJtjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BAaNLQTda2rZEQ61kVj0pg5WEmZc4z6aFFS6o5B4Alxq9Er4zs1MOPnJZ2xb9GSyt g+54XgZc7n8pbsQPGN+vSaFf5Ol35hYSVYgaHTvwtNAyG0lxt6co5de+G7G/hNinW2 sK8Xh5TYN9JrsXriycX2K0ewBvLnBjl3QkFaeXWePTaqF5/P0lLnI7q5xE7qr8Jc7M Xod4aDYHiT0NfcjQmAV7Ey19hEos1VLa6yIfTA32utKcFYMHHPbDD5ay/Koi4zFkCT 938xMWrD4YFKNbNgEYjFIqve99k0gY2j42erpjZ5gl53y8mE54PeKbjaLtb32W8mVs TUk7LY8ES0N2w== Date: Sun, 12 Jan 2025 04:45:23 +0530 Message-ID: <1412ede1633b77ff8cb340760ba9f4df6b868cef.1736636962.git.sughosha@disroot.org> 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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/kde.scm (kpmcore)[inputs]: Switch to the old input style; Add eudev, cryptsetup, bcachefs-tools, btrfs-progs, dosfstools, e2fsprogs, exfatprogs, f2fs-tools, fatresize, jfsutils, lvm2, mdadm, nilfs-utils, ntfs-3g, udftools, util-linux and zfs. [arguments]<#:phases>: Add patch-trustedprefixes phase. Change-Id: Ib39b8997411cce89494006e3e00ed81d17ded16f --- gnu/packages/kde.scm | 64 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 9 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index ce64619feb..a08634bee8 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -58,12 +58,15 @@ (define-module (gnu packages kde) #:use-module (gnu packages code) #:use-module (gnu packages cpp) #:use-module (gnu packages compression) + #:use-module (gnu packages cryptsetup) #:use-module (gnu packages curl) + #:use-module (gnu packages disk) #:use-module (gnu packages djvu) #:use-module (gnu packages documentation) #:use-module (gnu packages gnupg) #:use-module (gnu packages graphics) #:use-module (gnu packages ebook) + #:use-module (gnu packages file-systems) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) @@ -1269,14 +1272,33 @@ (define-public kpmcore (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list kauth - kcoreaddons - ki18n - kwidgetsaddons - polkit-qt6 - qtbase - qca-qt6 - `(,util-linux "lib"))) + `(("kauth" ,kauth) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kwidgetsaddons" ,kwidgetsaddons) + ("polkit-qt6" ,polkit-qt6) + ("qtbase" ,qtbase) + ("qca-qt6" ,qca-qt6) + ("util-linux:lib" ,util-linux "lib") + + ;; For external commands + ("eudev" ,eudev) + ("cryptsetup" ,cryptsetup) + ("bcachefs-tools" ,bcachefs-tools) + ("btrfs-progs" ,btrfs-progs) + ("dosfstools" ,dosfstools) + ("e2fsprogs" ,e2fsprogs) + ("exfatprogs" ,exfatprogs) + ("f2fs-tools" ,f2fs-tools) + ("fatresize" ,fatresize) + ("jfsutils" ,jfsutils) + ("lvm2" ,lvm2) + ("mdadm" ,mdadm) + ("nilfs-utils" ,nilfs-utils) + ("ntfs-3g" ,ntfs-3g) + ("udftools" ,udftools) + ("util-linux" ,util-linux) + ("zfs" ,zfs))) (arguments (list #:phases @@ -1287,7 +1309,31 @@ (define-public kpmcore (("DESTINATION \\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") "DESTINATION share/polkit-1/actions")) (substitute* "src/backend/corebackend.cpp" - (("\\/usr") #$output))))))) + (("\\/usr") #$output)))) + (add-before 'configure 'patch-trustedprefixes + (lambda* (#:key inputs #:allow-other-keys) + (call-with-output-file "src/util/trustedprefixes" + (lambda (port) + (map (lambda (name) + (display (assoc-ref inputs name) port) + (newline port)) + '("eudev" + "cryptsetup" + "bcachefs-tools" + "btrfs-progs" + "dosfstools" + "e2fsprogs" + "exfatprogs" + "f2fs-tools" + "fatresize" + "jfsutils" + "lvm2" + "mdadm" + "nilfs-utils" + "ntfs-3g" + "udftools" + "util-linux" + "zfs"))))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Library for managing partitions") (description "Library for managing partitions.")