GNU bug report logs - #70395
[PATCH kde-team 00/63] some kde patch.

Previous Next

Package: guix-patches;

Reported by: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>

Date: Mon, 15 Apr 2024 12:46:05 UTC

Severity: normal

Tags: patch

Done: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>

Bug is archived. No further changes may be made.

Full log


Message #140 received at 70395 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 70395 <at> debbugs.gnu.org
Subject: [PATCH kde-team 53/63] gnu: qtbase: propagate libxkbcommon.
Date: Mon, 15 Apr 2024 20:47:30 +0800
* gnu/packages/qt.scm (qtbase)[propagated-inputs]: prepend libxkbcommon.
[inputs]: Remove libxkbcommon-1.5.

Change-Id: I1bea99e4580242bb6e83cf43129ab49935ef79d3
---
 gnu/packages/qt.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 13af841455..fa1e016178 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1083,6 +1083,10 @@ (define-public qtbase
        (prepend tzdata-for-tests
                 wayland-protocols
                 xvfb-run)))
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs qtbase-5)
+       ;; Qt6::GuiPrivate require XKB::XKB
+       (prepend libxkbcommon)))
     (inputs
      (modify-inputs (package-inputs qtbase-5)
        (prepend at-spi2-core
@@ -1095,7 +1099,8 @@ (define-public qtbase
                 libxcb
                 libxext
                 xcb-util-cursor
-                `(,zstd "lib"))))
+                `(,zstd "lib"))
+       (delete "libxkbcommon")))
     (native-search-paths
      (list (search-path-specification
             (variable "QMAKEPATH")
-- 
2.41.0





This bug report was last modified 286 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.