From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id KKghHS3E3GQkrQAASxT56A (envelope-from ) for ; Wed, 16 Aug 2023 14:42:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aKbuGy3E3GSGEQEAG6o9tA (envelope-from ) for ; Wed, 16 Aug 2023 14:42:21 +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 1EE784CA03 for ; Wed, 16 Aug 2023 14:42:21 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=GdmBHy9p; 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=1692189741; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=kLP4DO/YeRzgPQ1zGWQYYuJ0dMqDgHwztt719qhXInk=; b=K67HNEfZuFETxjwc6yelBwm5P/CHmH7iW6l7BCrvLbTBuxJtzDDKkhVFDEEU6wmYb36vXL 2P7pqgpmYCkWx3fTlKeUrTKJbnjZqCaZa5DB4Hs0JUdruzjE6N2+ZBxPVnLyvIHWkKg1uL HjpNAZugDDAFc/he0lLleIFIRayL+HQPcuZvUQMcxvzkccqg/dJYN369nT1xDU4r2fWYeO erhS9rR1iskknwogHfOI3JcH86Fw2qrsE3U8gfST6ZkS1zEW6CLKUUQ/+uCwmYeHQfQTAn AROKKxAn+zPlH7ZFxpO0mi2pp6550xUDyLJv8r+BoZ/o0zXmuFEXv5sTHgT+tA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=GdmBHy9p; 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-Seal: i=1; s=key1; d=yhetil.org; t=1692189741; a=rsa-sha256; cv=none; b=rS2kdLiltcDGphNAvc/zsCKxJpCqJ6xz+yEzOkVFPVe7UMAoURBQi8U6WGWnSEuLQPIHsO eQpNoI+4AwGZAO7zG/8fN00sRDKokFFpC+XXQOdmR0Vs1j0dMfqnX2k7rOqFrZq62s1P8H vFx3jov5hqcKXvbgd9/q9ci3/CBYrSnSjE1FOw69hazBH9q5rEm3uskUlIdP/sPuxClu6M ZVwPIUe0ZJQQHBjBwO3/DTZ1RN7xhu3lE0Irgaf4ZYsyceL0OGs4iDjfYvkjqF7pzHAyfR 7kZ/IGRXU60nKJUmOavoAvdRaRJDpYWR58ydVqecH1lnrHgdN20iGPQ2ltVylw== 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 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: Sughosha X-ACL-Warn: , Sughosha via Guix-patches From: Sughosha 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-Queue-Id: 1EE784CA03 X-Migadu-Scanner: mx1.migadu.com X-Spam-Score: -6.19 X-Migadu-Spam-Score: -6.19 X-TUID: ZTindBR7V1aq * 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(-) 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) base-commit: 461602d07c8da0e29bae392270f4ef3fd4f7fffb -- 2.41.0