From patchwork Sun May 4 15:03:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 42291 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 7D07227BC4A; Sun, 4 May 2025 16:04:35 +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=-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=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 DF41727BC49 for ; Sun, 4 May 2025 16:04:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBasz-0004J9-KE; Sun, 04 May 2025 11:04:09 -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 1uBass-0004Ij-Rb for guix-patches@gnu.org; Sun, 04 May 2025 11:04:04 -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 1uBass-0004My-HA for guix-patches@gnu.org; Sun, 04 May 2025 11:04:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=wNlFI7BIdb5hboyRChk37tDCQiWFflywtDAJ8BknqCA=; b=NJwUMgXIgwBxD0H5d69hDmEEnQSpgx4SftznVT0zgEQicjGbaPAoW7y6/3+Ju4HjkPWW0RtiI0XynlVIgQTXr9siAevad7/zeamr6mJHupbrQl/+28I9hBY5aZ5qth0brJfbO5FSlc7s79v1eyzRcbts3pGCGu2F6Ucq4zlMRGag0ouP9sHUlpi6Qcvh0xjsdQ329oCgTROm9DH+BdV2ATO8W3iLMPW1hyeevGknJuZTwhgNuwarApedhed915V0Qa/FSmRvlMx/m/i8KVkwNohNCwhZCARMfuL3BOnxnfxnfRzjq9KRcczHT5Do3BENkWD9Llwi5TqOwvvkRJw23g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBasr-0007OG-Sg; Sun, 04 May 2025 11:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78243] [PATCH v3] gnu: kio-extras: Fix kiod path. References: <13d164d792a7a36b72ad62b9fe1cbd447cb4ec78.1746369172.git.sughosha@disroot.org> In-Reply-To: <13d164d792a7a36b72ad62b9fe1cbd447cb4ec78.1746369172.git.sughosha@disroot.org> Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: sughosha@disroot.org, z572@z572.online, guix-patches@gnu.org Resent-Date: Sun, 04 May 2025 15:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78243 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78243@debbugs.gnu.org Cc: Sughosha , Sughosha , Zheng Junjie X-Debbugs-Original-Xcc: Sughosha , Zheng Junjie Received: via spool by 78243-submit@debbugs.gnu.org id=B78243.174637101028184 (code B ref 78243); Sun, 04 May 2025 15:04:01 +0000 Received: (at 78243) by debbugs.gnu.org; 4 May 2025 15:03:30 +0000 Received: from localhost ([127.0.0.1]:57194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBasM-0007KW-FF for submit@debbugs.gnu.org; Sun, 04 May 2025 11:03:30 -0400 Received: from layka.disroot.org ([178.21.23.139]:44022) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uBasI-0007KI-HK for 78243@debbugs.gnu.org; Sun, 04 May 2025 11:03:27 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8459320EE2; Sun, 4 May 2025 17:03:24 +0200 (CEST) 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 v1nPgtVvqRt5; Sun, 4 May 2025 17:03:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1746371003; bh=zdfIkD6K+wbsrZjWZjlNE00TiyhbQ52BlPtSizh4NeU=; h=From:To:Cc:Subject:Date; b=jVCEwCqOPMAnUPPaO90gI2kvZ6mqE60i2nOKm0UFX9xUq25O7wXPg1ixEeWnL4D63 t8+C69+la9PAQeNDGr7ovhSvZCv1b54pWgxjfOIo1lAE+Z0GMi/A7wu5voTzMDF0/V 0NI0UKUihjxAMMUsyVkA84u6+Z7MZgLk7vA44bYCXI/ceJR5RltubqZaNPtU54MPUo L+sUEdvwgReaZlatwWecpIdpHbeCB70+im+58K8j9hccTsQ4ANlIwcIkV+lulqbyte pVBBB262cmdtpYtBBhoLX0NrjYdTRBoz68amJK2z8Nw8xstwZlCsC/jdrovci8K8Ur lrB4Mf1yAIN/w== Date: Sun, 4 May 2025 20:33:16 +0530 Message-ID: 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 (kio-extras)[arguments]: Realign. <#:phases>: Add fix-kiod-path phase. Change-Id: Ifda410609323dc55797a9e97191909824679dd8f --- gnu/packages/kde.scm | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) base-commit: cea6eedfcea2defa526bc58d4fb2085cc8c0cb36 diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index cf9b0a5298f..c0b94c6bcfe 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -753,13 +753,27 @@ (define-public kio-extras "0h720wcgsdx9h5vlr4flxrd3djmhwvlwkrf0yzwsf4amcb9wds8r")))) (build-system cmake-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - (invoke "ctest" "-E" "(thumbnailtest|testkioarchive)"))))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "TMPDIR" (getcwd)) + (invoke "ctest" "-E" + "(thumbnailtest|testkioarchive)")))) + (add-after 'install 'fix-kiod-path + (lambda _ + (let* ((kio #$(this-package-input "kio")) + (kf-version + #$(version-major + (package-version (this-package-input "kio"))))) + (substitute* (string-append #$output + "/share/dbus-1/services/" + "org.kde.kmtpd5.service") + (("Exec=.*$") + (string-append "Exec=" kio "/libexec/kf" kf-version + "/kiod" kf-version "\n"))))))))) (native-inputs (list extra-cmake-modules dbus kdoctools pkg-config qttools)) ;; TODO: libappimage (inputs (list gperf