From patchwork Wed Aug 16 12:33:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 15991 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 B60F227BBEA; Wed, 16 Aug 2023 13:34: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=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 8360E27BBE2 for ; Wed, 16 Aug 2023 13:34:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWFiy-0001V4-Em; Wed, 16 Aug 2023 08:34: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 1qWFis-0001UQ-Cg for guix-patches@gnu.org; Wed, 16 Aug 2023 08:34: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 1qWFis-0000XD-3m for guix-patches@gnu.org; Wed, 16 Aug 2023 08:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWFir-0000VC-L6 for guix-patches@gnu.org; Wed, 16 Aug 2023 08:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH] gnu: plasma-workspace: Add more inputs and patch path for qdbus. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 12:34: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 Cc: Sughosha Received: via spool by 64798-submit@debbugs.gnu.org id=B64798.16921892141879 (code B ref 64798); Wed, 16 Aug 2023 12:34:01 +0000 Received: (at 64798) by debbugs.gnu.org; 16 Aug 2023 12:33:34 +0000 Received: from localhost ([127.0.0.1]:39479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFiQ-0000UE-B2 for submit@debbugs.gnu.org; Wed, 16 Aug 2023 08:33:34 -0400 Received: from layka.disroot.org ([178.21.23.139]:37808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFiN-0000U5-6B for 64798@debbugs.gnu.org; Wed, 16 Aug 2023 08:33:32 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1156A40EBE; Wed, 16 Aug 2023 14:33:30 +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]) (amavisd-new, port 10024) with ESMTP id yd2f13jnJuqj; Wed, 16 Aug 2023 14:33:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1692189209; bh=J890P1v9fwgBHEsr1M+R+mrE1njiLaAFTUplX/rwDVk=; h=From:To:Cc:Subject:Date; b=GdmBHy9pKmv81YTTR8f/6e1KI3j68GYs0aZWTTvxxa4lxUnrpzK1WlL/k1GHP6xil qbfm7Z9kvGy7snuAR7VabG+7m7f9C8g/tIte8TKHWDYRZq7YOxwn61agmNzcqGBeQl u5qkMVHVcKMJQQfaPltn44G6/MFS8mzRMpDa5g9UafITC5TQhL5zTMDNNf6sIGF7ce BLW91Ze/bIc44fos3lLMsT5BxW+48iEPiWaalXX1AMqxZdg5oyKD+dgjftC8I16yDE VSRerf3O9bbuEkOlokcMpr7f9OpCJllXO1VfTRj6EMNi8KNfOAHPbU4PoXed9XnaXQ P9eLIllo+HMlw== Date: Wed, 16 Aug 2023 14:33:14 +0200 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-plasma.scm (plasma-workspace)[inputs]: Add icu4c, kpipewire, kquickcharts, and qttools-5. [#:phases]: Patch QtBinariesDir for qdbus. --- gnu/packages/kde-plasma.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) base-commit: 461602d07c8da0e29bae392270f4ef3fd4f7fffb diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index b23c2c6ce8..25b1370947 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -50,6 +50,7 @@ (define-module (gnu packages kde-plasma) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages ibus) + #:use-module (gnu packages icu4c) #:use-module (gnu packages iso-codes) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) @@ -69,6 +70,7 @@ (define-module (gnu packages kde-plasma) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages package-management) ; flatpak + #:use-module (gnu packages unicode) #:use-module (gnu packages video) #:use-module (gnu packages vpn) #:use-module (gnu packages vulkan) @@ -2345,6 +2347,7 @@ (define-public plasma-workspace breeze-icons dbus fontconfig + icu4c iso-codes kactivities kactivities-stats @@ -2374,6 +2377,8 @@ (define-public plasma-workspace kquickcharts kpackage kpeople + kpipewire + kquickcharts krunner kscreenlocker ktexteditor @@ -2404,6 +2409,7 @@ (define-public plasma-workspace qtbase-5 qtdeclarative-5 qtquickcontrols2-5 + qttools-5 qtwayland-5 qtgraphicaleffects qtx11extras @@ -2416,6 +2422,7 @@ (define-public plasma-workspace xmessage xsetroot polkit-qt + ucd libxcursor libkexiv2 @@ -2442,7 +2449,8 @@ (define-public plasma-workspace (let ((xmessage (search-input-file inputs "/bin/xmessage")) (xsetroot (search-input-file inputs "/bin/xsetroot")) (xrdb (search-input-file inputs "/bin/xrdb")) - (kinit #$(this-package-input "kinit"))) + (kinit #$(this-package-input "kinit")) + (qttools #$(this-package-input "qttools"))) (substitute* "startkde/startplasma.cpp" (("xmessage") xmessage) (("xsetroot") xsetroot)) @@ -2458,7 +2466,13 @@ (define-public plasma-workspace "startkde/startplasma-wayland.cpp" "startkde/startplasma-x11.cpp") (("kdeinit5_shutdown") - (string-append kinit "/bin/kdeinit5_shutdown")))))) + (string-append kinit "/bin/kdeinit5_shutdown"))) + ;; QT_INSTALL_BINS refers to qtbase, but qdbus is in + ;; qttools. + (substitute* "CMakeLists.txt" + (("ecm_query_qt\\(QtBinariesDir QT_INSTALL_BINS\\)") + (string-append "set(QtBinariesDir \"" qttools + "/bin\")")))))) (delete 'check) (add-after 'install 'check-after-install (lambda* (#:key tests? #:allow-other-keys)