From patchwork Mon Apr 15 12:46:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 62999 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 64DDD27BBEA; Mon, 15 Apr 2024 13:51:50 +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,URIBL_BLOCKED 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 1908327BBE9 for ; Mon, 15 Apr 2024 13:51:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwLoA-0004Fx-LB; Mon, 15 Apr 2024 08:51:39 -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 1rwLnU-0003pO-5u for guix-patches@gnu.org; Mon, 15 Apr 2024 08:50:57 -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 1rwLnS-0002uF-3T for guix-patches@gnu.org; Mon, 15 Apr 2024 08:50:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwLnd-0003Zl-J4 for guix-patches@gnu.org; Mon, 15 Apr 2024 08:51:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70395] [PATCH kde-team 21/63] gnu: Add kpty-6. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 12:51:05 +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.171318545613620 (code B ref 70395); Mon, 15 Apr 2024 12:51:05 +0000 Received: (at 70395) by debbugs.gnu.org; 15 Apr 2024 12:50:56 +0000 Received: from localhost ([127.0.0.1]:37211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLnS-0003X9-Ge for submit@debbugs.gnu.org; Mon, 15 Apr 2024 08:50:56 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:41790 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwLlI-00033n-Up for 70395@debbugs.gnu.org; Mon, 15 Apr 2024 08:48:52 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-05 (Coremail) with SMTP id zQCowABXXgIUIh1m2Y6uAw--.18832S2; Mon, 15 Apr 2024 20:48:20 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 20:46:58 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowABXXgIUIh1m2Y6uAw--.18832S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww4xCr48Cw1fWr13Kr4Uurg_yoW8KFW8pF WSkFn09r1rKw13Ja1fXF42g3ZxW397J3WqkwsxJw4kCw4agr48ury7KrZ8KF13ur4xW3W2 9a18u3WUuay5trJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyIb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I 3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxV WUGVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAF wI0_Xr0_Ar1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcI k0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j 6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUgVHqDUUUU 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 (kpty-6): New variable. (kpty): Inherit above. Change-Id: If3e018e48599db552bce4f1c467c31ba7ae37720 --- gnu/packages/kde-frameworks.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index d1a57db53d..13253b7a1a 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2497,10 +2497,10 @@ (define-public kpackage were traditional plugins.") (license (list license:gpl2+ license:lgpl2.1+)))) -(define-public kpty +(define-public kpty-6 (package (name "kpty") - (version "5.114.0") + (version "6.1.0") (source (origin (method url-fetch) (uri (string-append @@ -2509,21 +2509,20 @@ (define-public kpty name "-" version ".tar.xz")) (sha256 (base32 - "0fm7bfp89kvg1a64q8piiyal71p6vjnqcm13zak6r9fbfwcm0gs9")))) + "1psrryrgkn9fbw81a7zlshwssr175db9kiq40ib77xx61gcnq8nz")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list kcoreaddons ki18n - ;; TODO: utempter, for managing UTMP entries - qtbase-5)) + ;; TODO: utempter, for managing UTMP entries + (list kcoreaddons-6 ki18n-6 qtbase)) (arguments (list #:tests? #f ; FIXME: 1/1 tests fail. #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-tests (lambda _ (substitute* "autotests/kptyprocesstest.cpp" - (("/bin/bash") + (("/bin/sh") (which "bash")))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Interfacing with pseudo terminal devices") @@ -2532,6 +2531,26 @@ (define-public kpty and communicating with them using a pty.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kpty + (package + (inherit kpty-6) + (name "kpty") + (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 + "0fm7bfp89kvg1a64q8piiyal71p6vjnqcm13zak6r9fbfwcm0gs9")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list kcoreaddons ki18n + qtbase-5)))) + (define-public kunitconversion (package (name "kunitconversion")