From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id CCCzKdcIvWQXJQAASxT56A (envelope-from ) for ; Sun, 23 Jul 2023 13:02:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id GOHDKdcIvWQ1wQAA9RJhRA (envelope-from ) for ; Sun, 23 Jul 2023 13:02:47 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8BF9248269 for ; Sun, 23 Jul 2023 13:02:47 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=g43HnYY5; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690110167; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=aYEoumMg6SeVvnieyg3rMlgI5bi5wgKAsr/5w3Tb1bM=; b=aWSMRJ7VBmlcx9dI9+CZm1bAZuoOUH8uEphw/q5bRZ9o+UfQofXwW45nhrx3ODViOsYoLg FVWmtOq+ya//2Y4iIBAw13ly3LH8kuJHcNhycrSlxYWC0cgFwMva3QLHHGi+faSMC32VME 8usjv3Z7+iVgk1jy+IFJqwba2GjtLfTDqNZ7Nb+WDGU8nJFwj2uQzq+atofhKLjFc2rC/U 1OHwFZ+cqQ/ryBPyEmZW/tGhSDhNNEscK1+L65aHchMUEOIDahdq4oboT9mIMSw/Kd5zE8 UUUKvqZS+MzdsxvfngnQMVPUdjUBBzFncIuoeo8lVhSnIakMTIFFfkXIVagSDw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690110167; a=rsa-sha256; cv=none; b=nrRlnkq/DF/PAwWwh1vcNZHzu5/pyg+KjllopxuFd5W2Fibe0/fLZGths4RQTNwvs4Okyf n3UISc4pnCwt+vuezUNzfiqye1QmHEvwshOv1neHBPxDxR95z91aYV99KQwcNc3+zZGBk7 IgtreczF3+NdPa8OUwsJs6shjmlx4jCKFA7vOloH6IeAm/UFBj/pYlq4F2AlAQ+OnRnZ1c XS5Gget5AQ0L/fPnhHmYV0UA9YhEuDkROaXuYY0j5XlXnythoEt2eFcNWjyXMOwtHnmX+L nldxIEgIZgh9j46KG/LTX/w7EAvX1vmZSltuCmKLWdA6IRdpaEEAPA6qgFDB2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=g43HnYY5; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNWqn-0002Jz-Cw; Sun, 23 Jul 2023 07:02: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 1qNWqi-0002H3-9J for guix-patches@gnu.org; Sun, 23 Jul 2023 07:02: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 1qNWqg-0004Vd-9o for guix-patches@gnu.org; Sun, 23 Jul 2023 07:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNWqf-0002M3-W4 for guix-patches@gnu.org; Sun, 23 Jul 2023 07:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 143/209] gnu: khelpcenter: use G-expressions. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 11:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64798@debbugs.gnu.org Received: via spool by 64798-submit@debbugs.gnu.org id=B64798.16901100778918 (code B ref 64798); Sun, 23 Jul 2023 11:02:01 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 11:01:17 +0000 Received: from localhost ([127.0.0.1]:38659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNWpw-0002Jb-AN for submit@debbugs.gnu.org; Sun, 23 Jul 2023 07:01:16 -0400 Received: from out203-205-221-191.mail.qq.com ([203.205.221.191]:44206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNWps-0002Ii-Be for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 07:01:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690110063; bh=aYEoumMg6SeVvnieyg3rMlgI5bi5wgKAsr/5w3Tb1bM=; h=From:To:Subject:Date:In-Reply-To:References; b=g43HnYY50lysMaFQrBQl66Q/t/jd6jm8MmZ5WuJBihjDXoB+Q49XGtRpOtrtsZF+x VHOED6GOtU2d/cq632b98MVShO9ALLsYthd08XoBQhfyUS9+lN1+/QhggAAmnFePGo pm6H81trbopkHKV3bLPg3t6PtiOJeUm6w3QcJ/KI= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 408C61D; Sun, 23 Jul 2023 19:01:00 +0800 X-QQ-mid: xmsmtpt1690110061tsjazeip7 Message-ID: X-QQ-XMAILINFO: MoSeGP9U/MKsYTXRJPuE9Pg+FF7tnzIj2PoO2CAYyOfq78ilH4hRaX2qvwOHm+ lKBHmQZ+PUI1tcc4bNfR0A81St8jr5NpOM57OddfqYirAg7p11CWqdrDYN4RHKB38IlJs8l/DChd 8EvGk91z7LVgnB64gCODzpylNLNaOQHml8qphUWdl4MiuwnY9M4OuJSSO8rMGpDqoSCFaJigfWlj nHQCCcuC58s2enkXTs3eAfo8tr6h3jppZ84DPFXwexkIe+nj138kNRUNA22E1k/V8VWWo1a0KHns /XZ492EHPbcfLkk16z9Y2lWOXtZFNvJAoR58MTQiFS0a1HduGE8HeMNz4KBt7yUt02RyzvA/I009 wYcNQMYmShtqBh4VntKv9CZPKyHIbOqtoba0PicZrnK3SFTT9Pr6p+AVc9Z+yud/wZdrlPloI0Qg JF3bd8EDi6XeEg9MdK3gC8v3UJ5fhCUGVfUu08adAhcA6hSYFjcdn6ALTnPRySJReoDEYqIXOSFg kBwMM6IdFmHbkU6klDqKZXxTOqjWuGk1k38xbGG/nvL21eNxPxMA60gN8A2FzzWMOZS1WWk6SDZC vcx38IRiU89ybtRAzal69YY7oRddwhBtRWKdfSWzO/6fS7MDXXOdZfcYdKOAw90JZTFlwQIP7G6X zfb3UKdZF1088xiQWgVMh37gOKPT6Le26HOBVhFn7InJpTjD5aj4++VUiStk2WA4vsvAph5k4IVB ZsEVCiUx5r9AFzHOL/rSmxkXEHfEqdrgUHWPstYtQ9oxBCn8s3KTNmv+5iX8sJ80DGr+Q/G446WC JbxBwb6rVbuHGQj/yW8sCxEQx0kFuBG3l9kkvdGx0IlRbefTXATq2CwCzUQF3KDCYSzjtdxTcHKT izpDtVgt9B9r5XOBTIBCYuhnmJwZ0IDNbhHo9SrTSFxpwXP5pcYeGCMkp8aUln/vdZGPHn4Rbi5Z 70Qx67sX3V3+QslzE8nnKfZdB9hJ1FzJlL1wWbUkbWRVUbIbOmZMUoOXpvP4VjpqZOskBmsQSNkS CxB9Ef84mbWzay3TPB X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= Date: Sun, 23 Jul 2023 16:46:03 +0800 X-OQ-MSGID: <15a031841acf0a30a0ddc619dd518792680b03bc.1690099026.git.873216071@qq.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches From: Zheng Junjie via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: -6.15 X-Spam-Score: -6.15 X-Migadu-Queue-Id: 8BF9248269 X-TUID: AzitHscuFyEs * gnu/packages/kde-systemtools.scm (khelpcenter)[arguments]: Rewrite as G-expressions. --- gnu/packages/kde-systemtools.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 52a711a1bb..3a2d0e6cd3 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -26,6 +26,7 @@ (define-module (gnu packages kde-systemtools) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) @@ -164,17 +165,17 @@ (define-public khelpcenter qtbase-5 xapian)) (arguments - `(#:tests? #f ;; 1/1 test fails - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - ;; Since qt-wrap selectors do not wrap for /share/kf5 - ;; directories, we need this so khelpcenter can find html4.css. - (wrap-program (string-append out "/bin/khelpcenter") - `("XDG_DATA_DIRS" suffix - (,(string-append (assoc-ref inputs "khtml") "/share")))))))))) + (list #:tests? #f ;;1/1 test fails + #:phases #~(modify-phases %standard-phases + (add-after 'install 'wrap-executable + (lambda* (#:key inputs #:allow-other-keys) + ;; Since qt-wrap selectors do not wrap for /share/kf5 + ;; directories, we need this so khelpcenter can find html4.css. + (wrap-program (string-append #$output + "/bin/khelpcenter") + `("XDG_DATA_DIRS" suffix + (,(string-append (assoc-ref inputs "khtml") + "/share"))))))))) (home-page "https://apps.kde.org/khelpcenter/") (synopsis "KDE documentation viewer") (description "KHelpCenter uses meta data files which describe the -- 2.41.0