gnu: ark: Update to 24.05.2.

* gnu/packages/kde-utils.scm (ark): Update to 24.05.2.
[inputs]: Remove khtml and qtbase-5; add kfilemetadata.
[arguments]: Set #:qtbase to qtbase; Use Gexps.

* gnu/packages/patches/ark-skip-xar-test.patch: Adjust it.

Change-Id: I225a2e0c6487001160cb7d81032b6dcd1fef12dd

2 files changed, 51 insertions, 58 deletions

diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 00d36c8f4c..a26c5cfb4f 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -54,42 +54,44 @@
 (define-public ark
   (package
     (name "ark")
-    (version "23.04.3")
+    (version "24.05.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/" version
                                   "/src/ark-" version ".tar.xz"))
               (sha256
                (base32
-                "081swq9f87yxg4dxdl5i4hszhr0q4ph402in397zfa5vpyspzy41"))
+                "1q0fyx65gp0d1vj4jxiaswdfzi15hbfi537f3i8y277b621qp3rs"))
               ;; The libarchive package in Guix does not support
               ;; xar; disable related tests.
               (patches (search-patches "ark-skip-xar-test.patch"))))
     (build-system qt-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'start-xserver
-           ;; adddialogtest requires DISPLAY.
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((xorg-server (assoc-ref inputs "xorg-server")))
-               (setenv "HOME" (getcwd))
-               (system (format #f "~a/bin/Xvfb :1 &" xorg-server))
-               (setenv "DISPLAY" ":1"))))
-         (add-after 'install 'wrap-executable
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (lrzip (assoc-ref inputs "lrzip"))
-                    (lzop  (assoc-ref inputs "lzop"))
-                    (p7zip (assoc-ref inputs "p7zip"))
-                    (unzip (assoc-ref inputs "unzip"))
-                    (zip   (assoc-ref inputs "zip"))
-                    (zstd  (assoc-ref inputs "zstd")))
-               (wrap-program (string-append out "/bin/ark")
-                 `("PATH" suffix
-                   ,(map (lambda (p)
-                           (string-append p "/bin"))
-                         (list lrzip lzop p7zip unzip zip zstd))))))))))
+     (list
+      #:qtbase qtbase
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'start-xserver
+            ;; adddialogtest requires DISPLAY.
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((xorg-server (assoc-ref inputs "xorg-server")))
+                (setenv "HOME" (getcwd))
+                (system (format #f "~a/bin/Xvfb :1 &" xorg-server))
+                (setenv "DISPLAY" ":1"))))
+          (add-after 'install 'wrap-executable
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (lrzip (assoc-ref inputs "lrzip"))
+                     (lzop  (assoc-ref inputs "lzop"))
+                     (p7zip (assoc-ref inputs "p7zip"))
+                     (unzip (assoc-ref inputs "unzip"))
+                     (zip   (assoc-ref inputs "zip"))
+                     (zstd  (assoc-ref inputs "zstd")))
+                (wrap-program (string-append out "/bin/ark")
+                  `("PATH" suffix
+                    ,(map (lambda (p)
+                            (string-append p "/bin"))
+                          (list lrzip lzop p7zip unzip zip zstd))))))))))
     (native-inputs
      (list extra-cmake-modules pkg-config kdoctools xorg-server))
     (inputs
@@ -99,7 +101,6 @@
            kconfig
            kcrash
            kdbusaddons
-           khtml
            ki18n
            kiconthemes
            kio
@@ -108,9 +109,9 @@
            kpty
            kservice
            kwidgetsaddons
+           kfilemetadata
            libarchive
            libzip
-           qtbase-5
            zlib
            ;; Command line tools used by Ark.
            lrzip
diff --git a/gnu/packages/patches/ark-skip-xar-test.patch b/gnu/packages/patches/ark-skip-xar-test.patch
index 525201997b..be891ad139 100644
--- a/gnu/packages/patches/ark-skip-xar-test.patch
+++ b/gnu/packages/patches/ark-skip-xar-test.patch
@@ -1,44 +1,36 @@
 Guix libarchive no support xar.
 
---- ark-20.04.1.orig/autotests/kerfuffle/loadtest.cpp	2020-12-23 08:46:15.780782601 +0800
-+++ ark-20.04.1/autotests/kerfuffle/loadtest.cpp	2020-12-23 11:13:17.101724042 +0800
-@@ -181,13 +181,6 @@
+--- ark-24.05.2.orig/autotests/kerfuffle/loadtest.cpp	2024-07-08 11:19:30.347366493 +0800
++++ ark-24.05.2/autotests/kerfuffle/loadtest.cpp	2024-07-08 11:19:47.495641516 +0800
+@@ -125,8 +125,6 @@
          qDebug() << "lz4 executable not found in path. Skipping lz4 test.";
      }
  
--    QTest::newRow("xar archive")
--            << QFINDTESTDATA("data/simplearchive.xar")
--            << QStringLiteral("simplearchive")
--            << true << false << false << false << false << 0 << Archive::Unencrypted
--            << QStringLiteral("simplearchive")
--            << QString();
--
-     QTest::newRow("mimetype child of application/zip")
-             << QFINDTESTDATA("data/test.odt")
-             << QStringLiteral("test")
---- ark-20.04.1.orig/autotests/kerfuffle/extracttest.cpp	2020-12-23 08:46:15.780782601 +0800
-+++ ark-20.04.1/autotests/kerfuffle/extracttest.cpp	2020-12-23 11:14:02.801809620 +0800
-@@ -350,23 +350,6 @@
+-    QTest::newRow("xar archive") << QFINDTESTDATA("data/simplearchive.xar") << QStringLiteral("simplearchive") << true << false << false << false << false << 0
+-                                 << Archive::Unencrypted << 6 << QStringLiteral("simplearchive") << QString();
+ 
+     QTest::newRow("mimetype child of application/zip") << QFINDTESTDATA("data/test.odt") << QStringLiteral("test") << false << true << false << false << false
+                                                        << 0 << Archive::Unencrypted << 17 << QStringLiteral("test") << QString();
+
+
+--- ark-24.05.2.orig/autotests/kerfuffle/extracttest.cpp	2024-07-08 11:21:25.849219202 +0800
++++ ark-24.05.2/autotests/kerfuffle/extracttest.cpp	2024-07-08 11:22:01.413789814 +0800
+@@ -329,18 +329,5 @@
          qDebug() << "lz4 executable not found in path. Skipping lz4 test.";
      }
  
 -    archivePath = QFINDTESTDATA("data/simplearchive.xar");
--    QTest::newRow("extract selected entries from a xar archive without path")
--            << archivePath
--            << QVector<Archive::Entry*> {
--                   new Archive::Entry(this, QStringLiteral("dir1/file11.txt"), QString()),
--                   new Archive::Entry(this, QStringLiteral("file4.txt"), QString())
--               }
--            << optionsNoPaths
--            << 2;
+-    setupRow("extract selected entries from a xar archive without path",
+-             archivePath,
+-             QList<Archive::Entry *>{
+-                 new Archive::Entry(this, QStringLiteral("dir1/file11.txt"), QString()),
+-                 new Archive::Entry(this, QStringLiteral("file4.txt"), QString()),
+-             },
+-             optionsNoPaths,
+-             2);
 -
 -    archivePath = QFINDTESTDATA("data/simplearchive.xar");
--    QTest::newRow("extract all entries from a xar archive with path")
--            << archivePath
--            << QVector<Archive::Entry*>()
--            << optionsPreservePaths
--            << 6;
+-    setupRow("extract all entries from a xar archive with path", archivePath, QList<Archive::Entry *>(), optionsPreservePaths, 6);
 -
      archivePath = QFINDTESTDATA("data/hello-1.0-x86_64.AppImage");
-     QTest::newRow("extract all entries from an AppImage with path")
-             << archivePath
+     setupRow("extract all entries from an AppImage with path", archivePath, QList<Archive::Entry *>(), optionsPreservePaths, 7);