From patchwork Mon Apr 15 12:47:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63026 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 76D3527BBEB; Mon, 15 Apr 2024 13:56:31 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 0D29C27BBE9 for ; Mon, 15 Apr 2024 13:56:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwLse-0007tm-4G; Mon, 15 Apr 2024 08:56:16 -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 1rwLsb-0007ri-6s for guix-patches@gnu.org; Mon, 15 Apr 2024 08:56:13 -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 1rwLsa-0004De-N9 for guix-patches@gnu.org; Mon, 15 Apr 2024 08:56:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwLsl-0004YQ-D1; Mon, 15 Apr 2024 08:56:23 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70395] [PATCH kde-team 53/63] gnu: qtbase: propagate libxkbcommon. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 12:56:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70395 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70395@debbugs.gnu.org Cc: Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 70395-submit@debbugs.gnu.org id=B70395.171318575617151 (code B ref 70395); Mon, 15 Apr 2024 12:56:23 +0000 Received: (at 70395) by debbugs.gnu.org; 15 Apr 2024 12:55:56 +0000 Received: from localhost ([127.0.0.1]:37311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLsJ-0004SR-Vm for submit@debbugs.gnu.org; Mon, 15 Apr 2024 08:55:56 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:42834 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLra-0004IO-5j for 70395@debbugs.gnu.org; Mon, 15 Apr 2024 08:55:17 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-05 (Coremail) with SMTP id zQCowADHzgIjIh1mg5GuAw--.11091S4; Mon, 15 Apr 2024 20:48:36 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 20:47:30 +0800 Message-ID: <02925a68152b02d7c75c3a9b6119184f6112848e.1713184499.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowADHzgIjIh1mg5GuAw--.11091S4 X-Coremail-Antispam: 1UD129KBjvdXoW7Xr1rWrWUZw4rAr1DGF1Utrb_yoWDWwc_u3 43Gw4YvrWkZrW0k3WktF95KF1rurnrArWxKFy7tr4xtr13Xr43XF9F9F18Aa17Xr42yF1S yr4a9r13WFW29jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUba8YjsxI4VWDJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW7JVWDJw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWU CwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcS sGvfC2KfnxnUUI43ZEXa7IU8IoGPUUUUU== X-Originating-IP: [111.0.51.68] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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")