From patchwork Wed Aug 17 03:24:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 41720 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 23A9E27BBEA; Wed, 17 Aug 2022 04:26:23 +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 343C727BBE9 for ; Wed, 17 Aug 2022 04:26:22 +0100 (BST) Received: from localhost ([::1]:57024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oO9hE-0000os-E8 for patchwork@mira.cbaines.net; Tue, 16 Aug 2022 23:26:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oO9gw-0000oI-Ak for guix-patches@gnu.org; Tue, 16 Aug 2022 23:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59173) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oO9gw-0005AC-1y for guix-patches@gnu.org; Tue, 16 Aug 2022 23:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oO9gv-0002af-SQ for guix-patches@gnu.org; Tue, 16 Aug 2022 23:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57257] [PATCH 01/31] gnu: lxqt-build-tools: Update to 0.11.0. References: <20220817032024.29955-1-iyzsong@envs.net> In-Reply-To: <20220817032024.29955-1-iyzsong@envs.net> Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Aug 2022 03:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57257 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57257@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 57257-submit@debbugs.gnu.org id=B57257.16607067379880 (code B ref 57257); Wed, 17 Aug 2022 03:26:01 +0000 Received: (at 57257) by debbugs.gnu.org; 17 Aug 2022 03:25:37 +0000 Received: from localhost ([127.0.0.1]:48908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oO9gX-0002ZI-4r for submit@debbugs.gnu.org; Tue, 16 Aug 2022 23:25:37 -0400 Received: from envs.net ([89.163.145.170]:54096 helo=mail.envs.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oO9gV-0002Z7-5l for 57257@debbugs.gnu.org; Tue, 16 Aug 2022 23:25:35 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 026BE38A0E01; Wed, 17 Aug 2022 03:25:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1660706733; bh=jvfTeDqjIh8Gz4qrvL70EhnrG8VPzB0N7cBZZxeOGrs=; h=From:To:Cc:Subject:Date:From; b=IFoh9u9c4KrzNVHWmRqkySMDaoZ4DaQk6ikcrbAz/kmjBxBE3vMmwU90SX1zwckk+ pwSFE5DEFCgM3dQLz13SsBsXrK4XCHlV6ULMEsRpI0QU0LW0wbq06i06CL6SBJhrld +gpNC2zeKvpXPOzhwFqyJLmN5YzrltBrvK1Go2j60R0Yodd+5jd5HPxrmSAaXgfaJJ Ism64vtD6FquSnY0GwbhWwM1uEsL7XfIpXjpUbYheQqFgLx4qu2C5Glw52v7C6ka+e gtsO6EbZnqb61twIE0sTQpnA0jqYf3lqmE1wMRejGSktr/PmmUUc3jlx/KXm64FwHY KYZQg+2lHNLNFgkDAZ6esWzgaNMwyCByhX9LXtBxupyXNvRV9CvJuBygEGRbBFnM3r O0+StC07jIWQzDYGen4QDt00pht0EaToJy4XaaI4d0EiuYnOdLeg1h7YRVUSBLF44K 9p6ydCxJBsokC/15RDtEdXI69WHOTtR1ZhrSPymyUbF4pRDwMdYj7wEpzhVGVre0d5 hmlEnMaqmj9bxV0RXW1EmythqzXRIs44Eyywoj4JmkD3eBndIn7W7uigvmW/QIXd+e 9Cp5Fdhu+F2tXGlCAW7IqUh+3o2qHFyFAKxdA3jJGLryfihDYde01MtML6lyuyu5Pn tgjcTFRcxBVQsH/7XpaBJUVs= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id pJJua8DVmxIW; Wed, 17 Aug 2022 03:25:26 +0000 (UTC) Received: from localhost (unknown [182.150.116.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: iyzsong@envs.net) by mail.envs.net (Postfix) with ESMTPSA; Wed, 17 Aug 2022 03:25:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id de124135; Wed, 17 Aug 2022 03:25:07 +0000 (UTC) Date: Wed, 17 Aug 2022 11:24:30 +0800 Message-Id: <20220817032500.30011-1-iyzsong@envs.net> X-Mailer: git-send-email 2.37.2 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" Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * gnu/packages/lxqt.scm (lxqt-build-tools) [version]: Update to 0.11.0. [arguments]: Configure LXQtConfigVars.cmake to use relative paths. --- gnu/packages/lxqt.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index eab9a24d1d..29ed90a462 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015 Sou Bunnbu +;;; Copyright © 2015, 2022 Sou Bunnbu ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Nikita @@ -31,6 +31,7 @@ (define-module (gnu packages lxqt) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix build-system cmake) @@ -129,7 +130,7 @@ (define-public libstatgrab (define-public lxqt-build-tools (package (name "lxqt-build-tools") - (version "0.9.0") + (version "0.11.0") (source (origin (method url-fetch) @@ -137,16 +138,29 @@ (define-public lxqt-build-tools "/download/" version "/lxqt-build-tools-" version ".tar.xz")) (sha256 - (base32 "0kayad5l72h8n90zkf3hy8fxy72n4b1mrkjglpa9dj0cdj6qg0lp")))) + (base32 "1ff1pkrlxd8h0j8v49p6wrfhnqrz8s5b53hi835m41cvkzjljpfx")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no tests - #:configure-flags - ;; 'startlxqt' will add LXQT_DATA_DIR to XDG_DATA_DIRS, - ;; LXQT_ETC_XDG_DIR to XDG_CONFIG_DIRS, and 'lxqt-about' will report - ;; LXQT_ETC_XDG_DIR in its "Technical Info". - '("-DLXQT_DATA_DIR=/run/current-system/profile/share" - "-DLXQT_ETC_XDG_DIR=/run/current-system/profile/etc/xdg"))) + (list + #:tests? #f ; no tests + #:modules `((ice-9 regex) + (guix build cmake-build-system) + (guix build utils)) + ;; In phases and configure-flags: Set LXQT_TRANSLATIONS_DIR, + ;; LXQT_DATA_DIR, etc. to relative paths, so that packages using + ;; LXQtConfigVars.cmake from lxqt-build-tools will install translations + ;; and data files into their outputs, remove the need to patch their + ;; cmake files. + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'patch-LXQtConfigVars.cmake + (lambda _ + (substitute* (string-append #$output + "/share/cmake/lxqt-build-tools" + "/modules/LXQtConfigVars.cmake") + (((regexp-quote (string-append #$output "/"))) ""))))) + #:configure-flags + #~(list "-DLXQT_ETC_XDG_DIR=etc/xdg"))) (native-inputs (list pkg-config glib)) (inputs