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

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

* gnu/packages/kde-frameworks.scm (karchive-6): New variable.
(karchive): Inherit above.

Change-Id: Ia8603de96bf0b470ec27e7587af88ecb9a564116
---
 gnu/packages/kde-frameworks.scm | 34 +++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index bb38fd33ce..bab4aaa9ca 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -481,10 +481,10 @@ (define-public kapidox
     ;; This list is taken from http://packaging.neon.kde.org/cgit/
     (license (list license:bsd-2 license:expat))))
 
-(define-public karchive
+(define-public karchive-6
   (package
     (name "karchive")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/frameworks/"
@@ -492,7 +492,7 @@ (define-public karchive
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "015gc1zarny8r478p7g9m6r67l5dk3r0vcp28ilmfmznxy0k0hda"))))
+                "0b7q4qcniwiqhmfhshmfl9x25nkbj85h6xvkplqbb55rrwrp2v2p"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -501,23 +501,41 @@ (define-public karchive
                             (when tests?
                               (invoke "ctest" "-E" "karchivetest")))))))
     (native-inputs
-     (list extra-cmake-modules pkg-config qttools-5))
-    (inputs
-     (list bzip2 qtbase-5 xz zlib `(,zstd "lib")))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Qt 5 addon providing access to numerous types of archives")
+     (list extra-cmake-modules pkg-config qttools))
+    (inputs (list bzip2 qtbase xz zlib `(,zstd "lib")))
+    (synopsis "Qt 6 addon providing access to numerous types of archives")
     (description
      "KArchive provides classes for easy reading, creation and
 manipulation of @code{archive} formats like ZIP and TAR.
 
 It also provides transparent compression and decompression of data, like the
 GZip format, via a subclass of QIODevice.")
+    (home-page "https://community.kde.org/Frameworks")
     ;; The included licenses is are gpl2 and lgpl2.1, but the sources are
     ;; under a variety of licenses.
     ;; This list is taken from http://packaging.neon.kde.org/cgit/
     (license (list license:lgpl2.1 license:lgpl2.1+
                    license:lgpl3+ license:bsd-2))))
 
+(define-public karchive
+  (package
+    (inherit karchive-6)
+    (name "karchive")
+    (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
+                "015gc1zarny8r478p7g9m6r67l5dk3r0vcp28ilmfmznxy0k0hda"))))
+    (native-inputs
+     (list extra-cmake-modules pkg-config qttools-5))
+    (inputs
+     (list bzip2 qtbase-5 xz zlib `(,zstd "lib")))
+    (synopsis "Qt 5 addon providing access to numerous types of archives")))
+
 (define-public kcalendarcore
   (package
     (name "kcalendarcore")
-- 
2.41.0