From patchwork Wed Aug 17 03:24:46 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: 41738 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 9703827BBEB; Wed, 17 Aug 2022 04:29:19 +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 D006B27BBEA for ; Wed, 17 Aug 2022 04:29:18 +0100 (BST) Received: from localhost ([::1]:38120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oO9k6-0003ix-0z for patchwork@mira.cbaines.net; Tue, 16 Aug 2022 23:29:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oO9jq-0003iE-KJ for guix-patches@gnu.org; Tue, 16 Aug 2022 23:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59278) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oO9jq-00060p-Bn for guix-patches@gnu.org; Tue, 16 Aug 2022 23:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oO9jq-0002lB-7H for guix-patches@gnu.org; Tue, 16 Aug 2022 23:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57257] [PATCH 17/31] gnu: lxqt-session: Update to 1.1.1, don't hardcode /run/current-system. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Aug 2022 03:29:02 +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.166070688510437 (code B ref 57257); Wed, 17 Aug 2022 03:29:02 +0000 Received: (at 57257) by debbugs.gnu.org; 17 Aug 2022 03:28:05 +0000 Received: from localhost ([127.0.0.1]:48993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oO9iu-0002hq-D9 for submit@debbugs.gnu.org; Tue, 16 Aug 2022 23:28:04 -0400 Received: from envs.net ([89.163.145.170]:56158 helo=mail.envs.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oO9ir-0002h2-Lx for 57257@debbugs.gnu.org; Tue, 16 Aug 2022 23:28:02 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id EB29438A1FD1; Wed, 17 Aug 2022 03:27:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1660706845; bh=MWx3ANDCIjiu07AcZIY48JqzQ3tkbJGx0mup5LzwBQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hNG21NitQbqNxwa6tPgiibSSH+juYER//n1d29GuCiPnqed9fgW65Le2cHpsCCIN+ 4JNUjfryyZ1wJjNSYNHMpLCrmlSBcqnrVOqz1VmQuwo6nc/o9KC2fpyS+/KOHc+ceW UxeCkeVDBCcYypiGwzyAkBspcIn+DQ54FVDBaWPwiqDxwH/IvA8s9NCI8pybybXP3F EI7he65Hk1x9dnnH24PIVawVqIAlq+WNixYgTK0lv9oZA/dgqiwwiR19kwwCyW+Y+j DZJEEe85kkM2nMWrAVXoebYA2BFcl48zXEMtByAHSbYLiA2KyaxLn0UrCiCGs3w+R9 9cnkVAIeAUfhIR8xuozrA+mJCvPFPtjzIICuQNw65luQQ84rkFXFHtTshL/ANZyjIQ R4TYcI/qeZ8+LEtss3OV/KjJkRQwYFMejhBar/1XNXPBHfV9kK2b4G6rsjShMJd/Yw jVxjaHLjE2QQKmdvWVXlT7AQW0OoGJUCrAlwu3+C2gp5zlVuB82erWfZBG3aZD1pEs B3wktz8X6E0xrc2k23SV6q4ua9qKZSn3Tsu5MY7cTEHLrUvavGUyRIQouYAY9WAU4I sM70wRPDsEiwTLCY9xmwJU+lJ5uNetvQdfJKfMDwlNktPQ/R9FMxNeP8QZArBFGTtc wq1s9wzt7w9274JXfPknyfs4= 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 EmwlxvUZdtKy; Wed, 17 Aug 2022 03:27:12 +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:26:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f139109d; Wed, 17 Aug 2022 03:25:08 +0000 (UTC) Date: Wed, 17 Aug 2022 11:24:46 +0800 Message-Id: <20220817032500.30011-17-iyzsong@envs.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220817032500.30011-1-iyzsong@envs.net> References: <20220817032500.30011-1-iyzsong@envs.net> 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-session): Update to 1.1.1. [inputs]: Add qtxdg-tools, remove libqtxdg. [arguments]: Remove patching of LXQT_ETC_XDG_DIR and LXQT_TRANSLATIONS_DIR. Remove wrap-program. [native-search-paths]: Add 'XDG_CONFIG_DIRS'. --- gnu/packages/lxqt.scm | 44 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 3c8d4fc8b7..9fea479605 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -698,20 +698,20 @@ (define-public lxqt-runner (define-public lxqt-session (package (name "lxqt-session") - (version "0.17.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0iwwfyngpbhs2dwvbw0cci0bf3qbqcpjjw7h5vm46nimvgp8q1fr")))) + (base32 "0j8q5jfpb2l0vvji3xs8y0jcr792z6sxzj111qqvmdrbpxrkwxnw")))) (build-system cmake-build-system) (inputs (list eudev kwindowsystem liblxqt - libqtxdg + qtxdg-tools procps qtbase-5 qtsvg-5 @@ -725,40 +725,28 @@ (define-public lxqt-session (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("autostart/CMakeLists.txt" - "config/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) (let ((out (assoc-ref outputs "out"))) (substitute* '("xsession/lxqt.desktop.in") (("Exec=startlxqt") (string-append "Exec=" out "/bin/startlxqt")) - (("TryExec=lxqt-session") (string-append "TryExec=" out "/bin/startlxqt"))) - #t))) - ;; add write permission to lxqt-rc.xml file which is stored as read-only in store + (("TryExec=lxqt-session") (string-append "TryExec=" out "/bin/startlxqt")))))) + (add-after 'unpack 'patch-openbox-permission (lambda _ (substitute* "startlxqt.in" + ;; Don't add 'etc/xdg' to XDG_CONFIG_DIRS, and 'share' to XDG_DATA_DIRS. + (("! contains .*;") "false;") + ;; Add write permission to lxqt-rc.xml file which is stored as + ;; read-only in store. (("cp \"\\$LXQT_DEFAULT_OPENBOX_CONFIG\" \"\\$XDG_CONFIG_HOME/openbox\"") (string-append "cp \"$LXQT_DEFAULT_OPENBOX_CONFIG\" \"$XDG_CONFIG_HOME/openbox\"\n" " # fix openbox permission issue\n" - " chmod u+w \"$XDG_CONFIG_HOME/openbox\"/*"))) - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("lxqt-config-session/CMakeLists.txt" - "lxqt-leave/CMakeLists.txt" - "lxqt-session/CMakeLists.txt") - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/startlxqt") - `("XDG_CONFIG_DIRS" ":" suffix ("/run/current-system/profile/share" - "/run/current-system/profile/share/pcmanfm-qt"))) - #t)))))) + " chmod u+w \"$XDG_CONFIG_HOME/openbox\"/*")))))))) + (native-search-paths + (list (search-path-specification + ;; LXQt applications install their default config files into + ;; 'share/lxqt' and search them from XDG_CONFIG_DIRS/lxqt. + (variable "XDG_CONFIG_DIRS") + (files '("share"))))) (home-page "https://lxqt-project.org") (synopsis "Session manager for LXQt") (description "lxqt-session provides the standard session manager