From patchwork Mon Apr 15 12:46:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 62995 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 B361427BBEB; Mon, 15 Apr 2024 13:51:26 +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 3460D27BBE9 for ; Mon, 15 Apr 2024 13:51:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwLns-00048V-HW; Mon, 15 Apr 2024 08:51:21 -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 1rwLn3-0003ZS-VG for guix-patches@gnu.org; Mon, 15 Apr 2024 08:50:32 -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 1rwLmz-0002oX-W0 for guix-patches@gnu.org; Mon, 15 Apr 2024 08:50:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwLnB-0003UR-Dd for guix-patches@gnu.org; Mon, 15 Apr 2024 08:50:37 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70395] [PATCH kde-team 22/63] gnu: Add kwindowsystem-6. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 12:50:37 +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 Received: via spool by 70395-submit@debbugs.gnu.org id=B70395.171318539312887 (code B ref 70395); Mon, 15 Apr 2024 12:50:37 +0000 Received: (at 70395) by debbugs.gnu.org; 15 Apr 2024 12:49:53 +0000 Received: from localhost ([127.0.0.1]:37195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLmS-0003Lb-Fi for submit@debbugs.gnu.org; Mon, 15 Apr 2024 08:49:53 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:41792 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLlI-00033m-TJ for 70395@debbugs.gnu.org; Mon, 15 Apr 2024 08:48:51 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-05 (Coremail) with SMTP id zQCowABXXgIUIh1m2Y6uAw--.18832S3; Mon, 15 Apr 2024 20:48:21 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 20:46:59 +0800 Message-ID: <8f65906daa107be595159bdafc632edb1b3f0327.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: zQCowABXXgIUIh1m2Y6uAw--.18832S3 X-Coremail-Antispam: 1UD129KBjvJXoW7tFWDZFy7KrW3urW7Zw1kXwb_yoW5JFyrpF W5tF909rn5CrZxJ3Z3t3W2kFn8ua4vyFyUZwsxC34xGw13tw18AryayFZxK3ZxCw4xCa4U uayrua43urWrJrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU90b7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW5JVW7Jw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIda VFxhVjvjDU0xZFpf9x07j5iSdUUUUU= 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/kde-frameworks.scm (kwindowsystem-6): New variable. (kwindowsystem): Inherit above. Change-Id: Ib5c2d5d396ea372ddc0284b24575d33c3a57a4ff --- gnu/packages/kde-frameworks.scm | 49 +++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 13253b7a1a..8eb3e138e4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1611,10 +1611,10 @@ (define-public kwidgetsaddons "(ksqueezedtextlabelautotest|\ kwidgetsaddons-kcolumnresizertest)"))))))))) -(define-public kwindowsystem +(define-public kwindowsystem-6 (package (name "kwindowsystem") - (version "5.114.0") + (version "6.1.0") (source (origin (method url-fetch) (uri (string-append @@ -1623,19 +1623,24 @@ (define-public kwindowsystem name "-" version ".tar.xz")) (sha256 (base32 - "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9")))) + "15b54bacasg7x3vfky0601vr1n2rjm1v81lga00qp8xahcw581wc")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config + wayland; for wayland-scanner dbus ; for the tests - openbox ; for the tests - qttools-5 + openbox ; for the test + qttools xorg-server-for-tests)) ; for the tests (inputs - (list libxrender - qtbase-5 - qtx11extras + (list qtbase + qtdeclarative + qtwayland + wayland-protocols + plasma-wayland-protocols + libxkbcommon + wayland xcb-util-keysyms xcb-util-wm)) (arguments @@ -1668,6 +1673,34 @@ (define-public kwindowsystem ;; the lgpl2.1. Some source files are under non-copyleft licenses. (license license:lgpl2.1+))) +(define-public kwindowsystem + (package + (inherit kwindowsystem-6) + (name "kwindowsystem") + (version "5.114.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9")))) + (native-inputs + (list extra-cmake-modules + pkg-config + dbus ; for the tests + openbox ; for the tests + qttools-5 + xorg-server-for-tests)) ; for the tests + (inputs + (list libxrender + qtbase-5 + qtx11extras + xcb-util-keysyms + xcb-util-wm)))) + (define-public modemmanager-qt (package (name "modemmanager-qt")