z572 pushed a commit to branch master
in repository guix.
commit 220e323893b28247a348e530ea79f0a93c345a89
Author: Zheng Junjie <[email protected]>
AuthorDate: Fri Jan 10 00:36:45 2025 +0800
gnu: ark: Update to 24.12.1.
* gnu/packages/kde-utils.scm (ark): Update to 24.12.1.
* gnu/packages/patches/ark-skip-xar-test.patch: Adjust it.
Change-Id: Ib8cb7ec347b6373a2fbe7857925dea4b0d7af782
---
gnu/packages/kde-utils.scm | 4 ++--
gnu/packages/patches/ark-skip-xar-test.patch | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 1cff636844..d4c3d5c7a8 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -54,14 +54,14 @@
(define-public ark
(package
(name "ark")
- (version "24.05.2")
+ (version "24.12.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version
"/src/ark-" version ".tar.xz"))
(sha256
(base32
- "1q0fyx65gp0d1vj4jxiaswdfzi15hbfi537f3i8y277b621qp3rs"))
+ "1f96k7jisjdvpg8wjrm1pyz6p6zkqcx70054cg3sd0244skrzrna"))
;; The libarchive package in Guix does not support
;; xar; disable related tests.
(patches (search-patches "ark-skip-xar-test.patch"))))
diff --git a/gnu/packages/patches/ark-skip-xar-test.patch
b/gnu/packages/patches/ark-skip-xar-test.patch
index be891ad139..e9286618cb 100644
--- a/gnu/packages/patches/ark-skip-xar-test.patch
+++ b/gnu/packages/patches/ark-skip-xar-test.patch
@@ -15,7 +15,7 @@ Guix libarchive no support xar.
--- 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 @@
+@@ -329,19 +329,6 @@
qDebug() << "lz4 executable not found in path. Skipping lz4 test.";
}
@@ -32,5 +32,6 @@ Guix libarchive no support xar.
- archivePath = QFINDTESTDATA("data/simplearchive.xar");
- 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");
- setupRow("extract all entries from an AppImage with path", archivePath,
QList<Archive::Entry *>(), optionsPreservePaths, 7);
+ // Test tarball with leading /, i.e. here /tmp/testfile instead of
tmp/testfile
+ archivePath = QFINDTESTDATA("data/absolutepath.tar.xz");
+ setupRow("extract all entries from a tar archive with absolute path",
archivePath, QList<Archive::Entry *>(), optionsPreservePaths, 2);
