all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sughosha via Guix-patches via <guix-patches@gnu.org>
To: 64798@debbugs.gnu.org
Cc: Sughosha <sughosha@disroot.org>
Subject: [bug#64798] [PATCH] gnu: plasma-workspace: Add more inputs and patch path for qdbus.
Date: Wed, 16 Aug 2023 14:33:14 +0200	[thread overview]
Message-ID: <a944a44ef87ae943ea4c8b6ef5a0390bcaad60d8.1692188954.git.sughosha@disroot.org> (raw)
In-Reply-To: <tencent_E4CD36415249B326FEE475D2CA7D4BFA6A09@qq.com>

* 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





  parent reply	other threads:[~2023-08-16 12:42 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-23  8:09 [bug#64798] [PATCH 000/209] update kde package and add plasme desktop Zheng Junjie via Guix-patches via
2023-07-29  8:43 ` 宋文武 via Guix-patches via
2023-08-02 14:48   ` 宋文武 via Guix-patches via
2023-08-05 11:50     ` 宋文武 via Guix-patches via
2023-08-07 12:03     ` Andreas Enge
2023-08-08 12:39       ` 宋文武 via Guix-patches via
2023-08-08 14:34         ` Andreas Enge
2023-08-09  9:54           ` 宋文武 via Guix-patches via
2023-08-19  9:47             ` bug#53543: bug#64798: " Andreas Enge
2023-08-09 10:33           ` [bug#64798] " 宋文武 via Guix-patches via
2023-08-09 11:18             ` Andreas Enge
2023-08-10  9:58 ` [bug#64798] Request for merging "kde-updates" branch 宋文武 via Guix-patches via
2023-08-11 12:29   ` [bug#64798] bug#65199: " 宋文武 via Guix-patches via
2023-08-18 21:18     ` 宋文武 via Guix-patches via
2023-08-10 19:26 ` [bug#64798] [PATCH 000/209] update kde package and add plasma desktop Sughosha via Guix-patches via
2023-08-10 19:26   ` [bug#64798] [PATCH 1/3] gnu: plasma-systemmonitor: Add qqc2-desktop-style to inputs Sughosha via Guix-patches via
2023-08-10 19:26   ` [bug#64798] [PATCH 2/3] gnu: Add spectacle Sughosha via Guix-patches via
2023-08-10 19:26   ` [bug#64798] [PATCH 3/3] gnu: plasma: Add spectacle to inputs Sughosha via Guix-patches via
2023-08-11 10:40   ` [bug#64798] [PATCH 000/209] update kde package and add plasme desktop 宋文武 via Guix-patches via
2023-08-18 21:23   ` bug#64798: " 宋文武 via Guix-patches via
2023-08-12  0:05 ` [bug#64798] [PATCH] gnu: kio-extras: Add missing inputs Sughosha via Guix-patches via
2023-08-12  0:33 ` [bug#64798] [PATCH v2] " Sughosha via Guix-patches via
2023-08-12  0:54   ` [bug#64798] [PATCH 000/209] update kde package and add plasme desktop 宋文武 via Guix-patches via
2023-08-12 21:05 ` [bug#64798] [PATCH 0/9] Add more KDE applications Sughosha via Guix-patches via
2023-08-12 21:05   ` [bug#64798] [PATCH 1/9] gnu: Add libkdcraw Sughosha via Guix-patches via
2023-08-12 21:05   ` [bug#64798] [PATCH 2/9] gnu: Add kcolorpicker Sughosha via Guix-patches via
2023-08-12 21:05   ` [bug#64798] [PATCH 3/9] gnu: Add kimageannotator Sughosha via Guix-patches via
2023-08-12 21:05   ` [bug#64798] [PATCH 4/9] gnu: Add gwenview Sughosha via Guix-patches via
2023-08-12 21:05   ` [bug#64798] [PATCH 5/9] gnu: Add kolourpaint Sughosha via Guix-patches via
2023-08-12 21:05   ` [bug#64798] [PATCH 6/9] gnu: Add kommit Sughosha via Guix-patches via
2023-08-12 21:05   ` [bug#64798] [PATCH 7/9] gnu: Add kompare Sughosha via Guix-patches via
2023-08-12 21:05   ` [bug#64798] [PATCH 8/9] gnu: Add falkon Sughosha via Guix-patches via
2023-08-12 21:05   ` [bug#64798] [PATCH 9/9] gnu: Add kcolorchooser Sughosha via Guix-patches via
2023-08-13  4:52   ` [bug#64798] [PATCH 000/209] update kde package and add plasme desktop 宋文武 via Guix-patches via
2023-08-16 11:04 ` [bug#64798] [PATCH] gnu: extra-cmake-modules: Fix libexec path Sughosha via Guix-patches via
2023-08-17 11:04   ` [bug#64798] [PATCH 000/209] update kde package and add plasme desktop 宋文武 via Guix-patches via
2023-08-16 12:33 ` Sughosha via Guix-patches via [this message]
2023-08-16 13:00 ` [bug#64798] [PATCH] gnu: Add kaccounts-providers Sughosha via Guix-patches via
2023-08-16 20:29 ` [bug#64798] [PATCH 1/2] gnu: Add kde-gtk-config Sughosha via Guix-patches via
2023-08-16 20:29   ` [bug#64798] [PATCH 2/2] gnu: plasma: " Sughosha via Guix-patches via
2023-08-18  8:11 ` [bug#64798] [PATCH 0/2] Fix libexec path in KDE packages Sughosha via Guix-patches via
2023-08-18  8:11   ` [bug#64798] [PATCH 1/2] gnu: kde-cli-tools: Fix path to kdesu Sughosha via Guix-patches via
2023-08-18  8:11   ` [bug#64798] [PATCH 2/2] gnu: plasma-workspace: Fix path to kf5 Sughosha via Guix-patches via
2023-08-18 21:20   ` [bug#64798] [PATCH 000/209] update kde package and add plasme desktop 宋文武 via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a944a44ef87ae943ea4c8b6ef5a0390bcaad60d8.1692188954.git.sughosha@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=64798@debbugs.gnu.org \
    --cc=sughosha@disroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.