From patchwork Sun Jul 23 08:46:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 52130 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 B920C27BBEA; Sun, 23 Jul 2023 13:02:48 +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.5 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, 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 985CF27BBE2 for ; Sun, 23 Jul 2023 13:02:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNXmv-00054g-4O; Sun, 23 Jul 2023 08:02:13 -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 1qNXmm-0004zK-4H for guix-patches@gnu.org; Sun, 23 Jul 2023 08:02:05 -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 1qNXml-0006XT-SH for guix-patches@gnu.org; Sun, 23 Jul 2023 08:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNXml-0006lC-OR for guix-patches@gnu.org; Sun, 23 Jul 2023 08:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 193/209] gnu: kinfocenter: Update to 5.27.6. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 12:02:03 +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 Received: via spool by 64798-submit@debbugs.gnu.org id=B64798.169011372225963 (code B ref 64798); Sun, 23 Jul 2023 12:02:03 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 12:02:02 +0000 Received: from localhost ([127.0.0.1]:38918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNXmj-0006kV-9v for submit@debbugs.gnu.org; Sun, 23 Jul 2023 08:02:01 -0400 Received: from out203-205-251-36.mail.qq.com ([203.205.251.36]:46939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNXmc-0006is-Lc for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 08:01:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690113705; bh=EjOHqVqccbGvS4Z03lpmLkfJ89rslL4s9mPvtpkFM9M=; h=From:To:Subject:Date:In-Reply-To:References; b=ORhdzzB3XiV1QOT2HLJyYVC6hnpeivNWYvYT+LG/imBmR8KlXM0h4zNfyH4WtaR3C 7oluyUDc+ctvjkfCokQDzEkMle2B1uyWInoOf0Hf/DF+Dl2FIYTaRgXCE5EJb73JOH IhPkuK8EVLkxLHwaayKilw1Zdbx1XsKmqgfzSrlA= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 6A88C04; Sun, 23 Jul 2023 20:01:42 +0800 X-QQ-mid: xmsmtpt1690113703tl3zz1n6k Message-ID: X-QQ-XMAILINFO: N7h1OCCDntujEsnnP6Oe5+q3e0936+NW4uUU9cQRxTlMH+eNR05w6VbNeFl2fD m4FOGdW4MhZQBFmyLODHyqavGwsFTPt7DJqzqQRw0jEmgm7wbWC+Tiyl/aLqMK7IiouWrnVdj2+5 sTxOh9ebMHTx6A/KcHyrzR1sy4pfN8NoLI7To5GIbxdL3R3VbA8aKwumBobgmH6ZjLACM2eBCiLe tvwCijg2i4cShj7FcpXfV9/OuvGJ4/U0aAqr7mDWXnR5nxEGw0bfHbQpBpNCv+ONPbc2VtQ0W5c5 5JjGwhrZW8jAV99lU36qxiT/GK9HTGyVlZjGBh00mqeJ1FVtiNZwUiaeuegbAo1RWqY/4/swNb1e Yn+q+QA/85mdpA8B5LAL9LFKGhYtyE1qzzFNyrlqmAdp5XtOsO1e6THFpGTRVNwTKROwmGfPvnTf L10ZZG3dPAMQTdwg8DHX6FAgMP01MIKcm2leUA/aZeSDex6qB5+SA/wSryO7QTLmhP7W/a4qw8Ry ruQ2/XxqT2DXVaZJC0KrcgVel+RaVVwlfNdOj48BvpcJ1NhKP8d1lVI0fg4MwHh5oGogffzRWSKZ PWsaB/u1LwkE1ZkVTDHM6nqKz6wFOrPXCcD08HvCud4DKlQMAlUKrf6XKmAkiapppRkxxJ6r+gno b18aAVk5XQ12lmaFuWoAG7BUXWnjvUsSxjja1j6dV21iwHIn1DZ1L51BdOlQWe4dAgOFI9Fh39CY yD3kj06uPVN0MpGoriR+/cmQUCzI7VcE+q0hW8w/h5YwPtXDyBhtv11HzCBJTHYPVxpVj9ugPZYt TcnYmY0EGDRhI2XLi8E/ZfNftWlOf8PUp4idPqyUfnOqPsW2ZzNuqU96prGiyGDO0xXltEtSUGDm uF1f0CeA5JQBaPzzRnXh3Xk3OZWXDGedvVhmsRR74mbtLeC5dNUrwRAJSSI9PhaPIuJ6RAkarIiW dAUTz3yVtfsZ9ZqnnpYKsRrKHCR4M+vMndMDp1vNer2++3iwnRJjBSH0i6MsWmUfoSjLpbu3g= X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= Date: Sun, 23 Jul 2023 16:46:53 +0800 X-OQ-MSGID: <6acb50380c19f3016afcb10972fde7ec2107eff3.1690099027.git.873216071@qq.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches X-Patchwork-Original-From: Zheng Junjie via Guix-patches via From: Z572 <873216071@qq.com> 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-plasma.scm (kinfocenter): Update to 5.27.6. [inputs]: add qttools-5, clinfo. --- gnu/packages/kde-plasma.scm | 52 +++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index e0cc048103..9e3eb5e960 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -78,7 +78,8 @@ (define-module (gnu packages kde-plasma) #:use-module (gnu packages xorg) #:use-module (gnu packages base) #:use-module (gnu packages gps) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (gnu packages opencl)) (define-public bluedevil (package @@ -539,23 +540,56 @@ (define-public khotkeys (define-public kinfocenter (package (name "kinfocenter") - (version "5.25.5") + (version "5.27.6") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0zvki76yghkn158s7hb5g9drz7xaqxkmp2747404n2n0gmnmsdif")))) + "06whh4wzc292xvzabv7q6x8wm0gkyd2nsy50vlvk7iy85jayk5nd")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-systemsettings-symlink (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{KDE_INSTALL_FULL_BINDIR\\}/systemsettings5") - (search-input-file inputs - "/bin/systemsettings5")))))))) + (let ((replace (lambda (file cmd) + (substitute* file + (((string-append + "\"" + cmd + "\"")) + (string-append + "\"" + (search-input-file + inputs + (string-append "/bin/" cmd)) + "\"")))))) + (substitute* "CMakeLists.txt" + (("\\$\\{KDE_INSTALL_FULL_BINDIR\\}/systemsettings5") + (search-input-file inputs + "/bin/.systemsettings5-real"))) + (substitute* "Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in" + (("@QtBinariesDir@/qdbus") + (search-input-file inputs "/bin/qdbus"))) + (substitute* "Modules/kwinsupportinfo/main.cpp" + (("QLibraryInfo::location\\(QLibraryInfo::BinariesPath\\) \\+ QStringLiteral\\(\"/qdbus\"\\)") + (string-append "QStringLiteral(\"" (search-input-file inputs "/bin/qdbus") "\")"))) + + (replace '("Modules/cpu/kcm_cpu.json" + "Modules/cpu/main.cpp") "lscpu") + (replace '("Modules/opencl/kcm_opencl.json" + "Modules/opencl/main.cpp") "clinfo") + (replace '("Modules/vulkan/kcm_vulkan.json" + "Modules/vulkan/main.cpp") "vulkaninfo") + (replace '("Modules/glx/kcm_glx.json" + "Modules/glx/main.cpp") "glxinfo") + (replace '("Modules/wayland/kcm_wayland.json" + "Modules/wayland/main.cpp") "wayland-info") + (replace '("Modules/egl/kcm_egl.json" + "Modules/egl/main.cpp") "eglinfo") + (replace '("Modules/xserver/kcm_xserver.json" + "Modules/xserver/main.cpp") "xdpyinfo"))))))) (native-inputs (list aha extra-cmake-modules kdoctools pkg-config)) ;; * vulkaninfo ;; Wayland KCM @@ -582,7 +616,9 @@ (define-public kinfocenter util-linux vulkan-tools wayland-utils - xdpyinfo)) + xdpyinfo + qttools-5 + clinfo)) (propagated-inputs (list system-settings)) (home-page "https://invent.kde.org/plasma/kinfocenter") (synopsis "View information about computer's hardware")