Subject: [bug#70395] [PATCH kde-team 21/63] gnu: Add kpty-6.

From: Zheng Junjie <[email-masked]>
Date: Mon, 15 Apr 2024 20:46:58 +0800

* 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")
-- 
2.41.0