From 533e14f51dd41e1f42fa541746977d6cf5f2b197 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 9 Mar 2024 22:59:35 +0500 Subject: [PATCH] ark: update to 24.02.2. --- srcpkgs/ark/patches/disable-xar-test.patch | 54 ---------------------- srcpkgs/ark/template | 13 +++--- 2 files changed, 7 insertions(+), 60 deletions(-) delete mode 100644 srcpkgs/ark/patches/disable-xar-test.patch diff --git a/srcpkgs/ark/patches/disable-xar-test.patch b/srcpkgs/ark/patches/disable-xar-test.patch deleted file mode 100644 index 8fd56287fd7..00000000000 --- a/srcpkgs/ark/patches/disable-xar-test.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 1bbfda77ea96fb8399a4c12c0c096a52371e5864 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= -Date: Wed, 11 Mar 2020 23:02:33 +0100 -Subject: [PATCH] disable xar test - - -diff --git autotests/kerfuffle/extracttest.cpp autotests/kerfuffle/extracttest.cpp -index 9178611..c1d3f13 100644 ---- a/autotests/kerfuffle/extracttest.cpp -+++ b/autotests/kerfuffle/extracttest.cpp -@@ -350,23 +350,6 @@ void ExtractTest::testExtraction_data() - 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 { -- 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() -- << optionsPreservePaths -- << 6; -- - archivePath = QFINDTESTDATA("data/hello-1.0-x86_64.AppImage"); - QTest::newRow("extract all entries from an AppImage with path") - << archivePath - ---- ark-23.08.0/autotests/kerfuffle/loadtest.cpp 2023-08-16 22:56:56.000000000 +0200 -+++ - 2023-09-11 22:52:41.215856157 +0200 -@@ -195,13 +195,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 << 6 -- << QStringLiteral("simplearchive") -- << QString(); -- - QTest::newRow("mimetype child of application/zip") - << QFINDTESTDATA("data/test.odt") - << QStringLiteral("test") --- -2.23.0 - diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template index 4b6c16e5390..1a5865e1e0f 100644 --- a/srcpkgs/ark/template +++ b/srcpkgs/ark/template @@ -1,19 +1,20 @@ # Template file for 'ark' pkgname=ark -version=23.08.5 +version=24.02.2 revision=1 build_style=cmake -configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" -hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake - kdoctools kconfig gettext pkg-config python3 kcoreaddons kparts" -makedepends="libarchive-devel kpty-devel kparts-devel kitemmodels-devel libzip-devel" +configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake + -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" +hostmakedepends="extra-cmake-modules qt6-base gettext + kf6-kdoctools kf6-kconfig pkg-config python3 kf6-kcoreaddons" +makedepends="libarchive-devel kf6-kpty-devel kf6-kparts-devel kf6-kitemmodels-devel libzip-devel kf6-kfilemetadata-devel kf6-kdbusaddons-devel kf6-kdoctools-devel kf6-ki18n-devel kf6-kio-devel kf6-kwindowsystem-devel kf6-kiconthemes-devel kf6-kwidgetsaddons-devel kf6-kconfig-devel kf6-kcrash-devel" checkdepends="p7zip p7zip-unrar lzop lrzip unrar unzip zip zstd" short_desc="KDE Archiving Tool" maintainer="John " license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/utilities/org.kde.ark" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=6081c564e2d4e25113691483d2cf3843461a9db6c726e1e547fa9a9697aecfeb +checksum=06374f5c7c2aee7a93c04bfd7b6b3baaeab3962e8277c9087fea54ba9805bdce do_check() { cd build