* [bug#45285] [PATCH] gnu: Add ark.
[not found] <87pn39t3s0.fsf@qq.com>
@ 2020-12-17 5:11 ` Z572
2020-12-21 15:46 ` Ludovic Courtès
[not found] ` <87wnx9kqe1.fsf@qq.com>
1 sibling, 1 reply; 4+ messages in thread
From: Z572 @ 2020-12-17 5:11 UTC (permalink / raw)
To: 45285
[-- Attachment #1: Type: text/plain, Size: 660 bytes --]
> QWARN : ExtractTest::testExtraction(extract all entries from a xar archive with path) ark.libarchive: Could not open the archive: Unrecognized archive format
> QWARN : ExtractTest::testExtraction(extract all entries from a xar archive with path) ark.libarchive: Could not open the archive: Unrecognized archive format
> FAIL! : ExtractTest::testExtraction(extract all entries from a xar archive with path) Compared values are not the same
> Actual (extractedEntriesCount) : 0
> Expected (expectedExtractedEntriesCount): 6
> Loc: [/tmp/guix-build-ark-20.04.1.drv-0/ark-20.04.1/autotests/kerfuffle/extracttest.cpp(469)]
The tests fail.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ark.patch --]
[-- Type: text/x-patch, Size: 2106 bytes --]
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 2718acac9a..cf0305c355 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -41,6 +41,7 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages apr)
#:use-module (gnu packages audio)
+ #:use-module (gnu packages backup)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages code)
@@ -79,6 +80,56 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg))
+(define-public ark
+ (package
+ (name "ark")
+ (version "20.04.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/ark-" version ".tar.xz"))
+
+ (sha256
+ (base32
+ "0g5bfa1lc7mhrc2ngd4ldf33dpwr7gqrj95kp897pf632wwj23iw"))))
+ (build-system qt-build-system)
+ (arguments
+ `(#:tests? #f
+ #:configure-flags
+ (list "-DBUILD_TESTING=OFF")))
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)
+ ("kdoctools" ,kdoctools)))
+ (inputs
+ `(("breeze-icons" ,breeze-icons)
+ ("kdbusaddons" ,kdbusaddons)
+ ("kitemmodels" ,kitemmodels)
+ ("kparts" ,kparts)
+ ("kpty" ,kpty)
+ ("karchive" ,karchive)
+ ("kconfig" ,kconfig)
+ ("kcrash" ,kcrash)
+ ("khtml" ,khtml)
+ ("ki18n" ,ki18n)
+ ("kio" ,kio)
+ ("qtbase" ,qtbase)
+ ("libarchive" ,libarchive)
+ ("libzip" ,libzip)
+ ("p7zip" ,p7zip)
+ ("zip" ,zip)
+ ;; ("unar" ,unar)
+ ("unzip" ,unzip)
+ ("lrzip" ,lrzip)
+ ("lzop" ,lzop)
+ ("zstd" ,zstd)
+ ("zlib" ,zlib)))
+ (home-page "https://apps.kde.org/en/ark")
+ (synopsis "Archiving Tool")
+ (description "Graphical file compression/decompression utility with support
+for multiple formats.")
+ (license license:gpl2+)))
+
(define-public baloo-widgets
(package
(name "baloo-widgets")
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#45285] [PATCH] gnu: Add ark.
2020-12-17 5:11 ` [bug#45285] [PATCH] gnu: Add ark Z572
@ 2020-12-21 15:46 ` Ludovic Courtès
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2020-12-21 15:46 UTC (permalink / raw)
To: Z572; +Cc: 45285
Hi,
Z572 <873216071@qq.com> skribis:
>> QWARN : ExtractTest::testExtraction(extract all entries from a xar archive with path) ark.libarchive: Could not open the archive: Unrecognized archive format
>> QWARN : ExtractTest::testExtraction(extract all entries from a xar archive with path) ark.libarchive: Could not open the archive: Unrecognized archive format
>> FAIL! : ExtractTest::testExtraction(extract all entries from a xar archive with path) Compared values are not the same
>> Actual (extractedEntriesCount) : 0
>> Expected (expectedExtractedEntriesCount): 6
>> Loc: [/tmp/guix-build-ark-20.04.1.drv-0/ark-20.04.1/autotests/kerfuffle/extracttest.cpp(469)]
>
> The tests fail.
What you paste above sounds like there could be a real issue with some
archive formats, which may be a core issue for this archiving tool.
Could you investigate a bit and/or get in touch with upstream to see if
they can provide guidance?
> + (home-page "https://apps.kde.org/en/ark")
> + (synopsis "Archiving Tool")
> + (description "Graphical file compression/decompression utility with support
> +for multiple formats.")
Please expound a bit and write pull sentences, as explained at:
https://guix.gnu.org/manual/en/html_node/Synopses-and-Descriptions.html
Could you send an updated patch once you know more about the issue
evidenced by the test suite?
Thanks in advance!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#45285] [PATCH] gnu: Add ark.
[not found] ` <87wnx9kqe1.fsf@qq.com>
@ 2020-12-23 6:06 ` Z572
2021-07-16 4:09 ` bug#45285: " Maxim Cournoyer
0 siblings, 1 reply; 4+ messages in thread
From: Z572 @ 2020-12-23 6:06 UTC (permalink / raw)
To: 45285
[-- Attachment #1: Type: text/plain, Size: 1653 bytes --]
Hi,
Ludovic Courtès <ludo@gnu.org> skribis:
>>> QWARN : ExtractTest::testExtraction(extract all entries from a xar archive with path) ark.libarchive: Could not open the archive: Unrecognized archive format
>>> QWARN : ExtractTest::testExtraction(extract all entries from a xar archive with path) ark.libarchive: Could not open the archive: Unrecognized archive format
>>> FAIL! : ExtractTest::testExtraction(extract all entries from a xar archive with path) Compared values are not the same
>>> Actual (extractedEntriesCount) : 0
>>> Expected (expectedExtractedEntriesCount): 6
>>> Loc: [/tmp/guix-build-ark-20.04.1.drv-0/ark-20.04.1/autotests/kerfuffle/extracttest.cpp(469)]
>>
>> The tests fail.
>
> What you paste above sounds like there could be a real issue with some
> archive formats, which may be a core issue for this archiving tool.
>
> Could you investigate a bit and/or get in touch with upstream to see if
> they can provide guidance?
I think this is guix libarchive's problem, it doesn't support xar format because it
needs to input OpenSSL, EXPAT, And XML2.
See libarchive-3.4.2.tar.xz!libarchive-3.4.2/configure :
-----+------------------------------------------------------------------------------
L1546| --without-openssl Don't build support for mtree and xar hashes through
L1547| openssl
L1548| --without-xml2 Don't build support for xar through libxml2
L1549| --without-expat Don't build support for xar through expat
-----+------------------------------------------------------------------------------
It's new patch.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ark.patch --]
[-- Type: text/x-patch, Size: 5130 bytes --]
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index b1b8b6a484..b832a6893c 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -41,6 +41,7 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages apr)
#:use-module (gnu packages audio)
+ #:use-module (gnu packages backup)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages code)
@@ -79,6 +80,74 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg))
+(define-public ark
+ (package
+ (name "ark")
+ ;; 20.12.0 need ECM 5.71.0, but guix extra-cmake-modules ECM is 5.70.1.
+ (version "20.04.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/ark-" version ".tar.xz"))
+
+ (sha256
+ (base32
+ "0g5bfa1lc7mhrc2ngd4ldf33dpwr7gqrj95kp897pf632wwj23iw"))
+ (patches (search-patches
+ ;; guix libarchive no support xar.
+ "ark-skip-xar-test.patch"))))
+ (build-system qt-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'start-xserver
+ ;;; adddialogtest need 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")
+ #t))))))
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)
+ ("kdoctools" ,kdoctools)))
+ (inputs
+ `(("breeze-icons" ,breeze-icons)
+ ("karchive" ,karchive)
+ ("kconfig" ,kconfig)
+ ("kcrash" ,kcrash)
+ ("kdbusaddons" ,kdbusaddons)
+ ("khtml" ,khtml)
+ ("ki18n" ,ki18n)
+ ("kio" ,kio)
+ ("kitemmodels" ,kitemmodels)
+ ("kparts" ,kparts)
+ ("kpty" ,kpty)
+ ("kservice" ,kservice)
+ ("kwidgetsaddons" ,kwidgetsaddons)
+ ("libarchive" ,libarchive)
+ ("libzip" ,libzip)
+ ("qtbase" ,qtbase)
+ ("zlib" ,zlib)
+
+ ;; test
+ ("lz4" ,lz4)
+ ("xorg-server" ,xorg-server)))
+ (propagated-inputs
+ `(("unzip" ,unzip)
+ ("zip" ,zip)
+ ("lrzip" ,lrzip)
+ ("lzop" ,lzop)
+ ("zstd" ,zstd)
+ ("p7zip" ,p7zip)))
+ (home-page "https://apps.kde.org/en/ark")
+ (synopsis "Archiving Tool")
+ (description "Ark is a graphical file compression/decompression utility with
+ support for multiple formats, including tar, gzip, bzip2, rar and zip, as well
+as CD-ROM images.")
+ (license license:gpl2+)))
+
(define-public baloo-widgets
(package
(name "baloo-widgets")
diff --git a/gnu/packages/patches/ark-skip-xar-test.patch b/gnu/packages/patches/ark-skip-xar-test.patch
new file mode 100644
index 0000000000..525201997b
--- /dev/null
+++ b/gnu/packages/patches/ark-skip-xar-test.patch
@@ -0,0 +1,44 @@
+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 @@
+ 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 @@
+ 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;
+-
+- archivePath = QFINDTESTDATA("data/simplearchive.xar");
+- QTest::newRow("extract all entries from a xar archive with path")
+- << archivePath
+- << QVector<Archive::Entry*>()
+- << optionsPreservePaths
+- << 6;
+-
+ archivePath = QFINDTESTDATA("data/hello-1.0-x86_64.AppImage");
+ QTest::newRow("extract all entries from an AppImage with path")
+ << archivePath
[-- Attachment #3: Type: text/plain, Size: 7 bytes --]
Z572.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#45285: [PATCH] gnu: Add ark.
2020-12-23 6:06 ` Z572
@ 2021-07-16 4:09 ` Maxim Cournoyer
0 siblings, 0 replies; 4+ messages in thread
From: Maxim Cournoyer @ 2021-07-16 4:09 UTC (permalink / raw)
To: Z572; +Cc: 45285-done
Hello,
Z572 <873216071@qq.com> writes:
> Hi,
>
> Ludovic Courtès <ludo@gnu.org> skribis:
>
>>>> QWARN : ExtractTest::testExtraction(extract all entries from a xar archive with path) ark.libarchive: Could not open the archive: Unrecognized archive format
>>>> QWARN : ExtractTest::testExtraction(extract all entries from a xar archive with path) ark.libarchive: Could not open the archive: Unrecognized archive format
>>>> FAIL! : ExtractTest::testExtraction(extract all entries from a xar archive with path) Compared values are not the same
>>>> Actual (extractedEntriesCount) : 0
>>>> Expected (expectedExtractedEntriesCount): 6
>>>> Loc: [/tmp/guix-build-ark-20.04.1.drv-0/ark-20.04.1/autotests/kerfuffle/extracttest.cpp(469)]
>>>
>>> The tests fail.
>>
>> What you paste above sounds like there could be a real issue with some
>> archive formats, which may be a core issue for this archiving tool.
>>
>> Could you investigate a bit and/or get in touch with upstream to see if
>> they can provide guidance?
>
> I think this is guix libarchive's problem, it doesn't support xar format because it
> needs to input OpenSSL, EXPAT, And XML2.
> See libarchive-3.4.2.tar.xz!libarchive-3.4.2/configure :
>
> -----+------------------------------------------------------------------------------
> L1546| --without-openssl Don't build support for mtree and xar hashes through
> L1547| openssl
> L1548| --without-xml2 Don't build support for xar through libxml2
> L1549| --without-expat Don't build support for xar through expat
> -----+------------------------------------------------------------------------------
>
> It's new patch.
Thanks for the update!
I've moved it to the (gnu packages kde-utils) module, dropped the
unnecessary lz4 input, moved the propagated inputs to inputs and wrapped
the command line tools using wrap-program in a phase, tested that it
could run and open a tarball, and applied as commit 4094d12df1.
Thank you for the contribution!
Closing.
Maxim
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-16 4:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <87pn39t3s0.fsf@qq.com>
2020-12-17 5:11 ` [bug#45285] [PATCH] gnu: Add ark Z572
2020-12-21 15:46 ` Ludovic Courtès
[not found] ` <87wnx9kqe1.fsf@qq.com>
2020-12-23 6:06 ` Z572
2021-07-16 4:09 ` bug#45285: " Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).