Hello community, here is the log from the commit of package ark for openSUSE:Leap:15.2 checked in at 2020-05-12 11:32:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ark (Old) and /work/SRC/openSUSE:Leap:15.2/.ark.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ark" Tue May 12 11:32:57 2020 rev:53 rq:797311 version:20.04.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ark/ark.changes 2020-03-15 07:10:21.124927118 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ark.new.2738/ark.changes 2020-05-12 11:32:59.991819925 +0200 @@ -1,0 +2,33 @@ +Thu Apr 23 12:21:48 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- Changes since 20.03.90: + * Forward errors from archive interface when batch-extracting + * libzip: Enable progress when batch-extracting + +------------------------------------------------------------------- +Sun Apr 5 20:29:35 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- No code change since 20.03.80 + +------------------------------------------------------------------- +Sun Mar 22 09:16:30 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Too many changes to list here. +- Add patch to allow building with libarchive 3.3.2: + * 0001-Support-building-against-libarchive-3.3.2-again.patch +- Dropped patches for obsolete distribution versions: + * lower-libarchive-minimum-version.patch + +------------------------------------------------------------------- Old: ---- ark-19.12.3.tar.xz ark-19.12.3.tar.xz.sig lower-libarchive-minimum-version.patch New: ---- 0001-Support-building-against-libarchive-3.3.2-again.patch ark-20.04.0.tar.xz ark-20.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.zerIgD/_old 2020-05-12 11:33:00.583821168 +0200 +++ /var/tmp/diff_new_pack.zerIgD/_new 2020-05-12 11:33:00.587821177 +0200 @@ -1,7 +1,7 @@ # # spec file for package ark # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,36 +16,41 @@ # -%define SOMAJOR 19 +%define SOMAJOR 20 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: ark -Version: 19.12.3 +Version: 20.04.0 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0-or-later Group: Productivity/Other URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif -# PATCH-FIX-OPENSUSE lower-libarchive-minimum-version.patch -Patch0: lower-libarchive-minimum-version.patch +# PATCH-FIX-OPENSUSE +Patch0: 0001-Support-building-against-libarchive-3.3.2-again.patch BuildRequires: extra-cmake-modules -BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5KDELibs4Support) BuildRequires: kf5-filesystem -BuildRequires: cmake(KF5Pty) BuildRequires: libarchive-devel +BuildRequires: libzip-devel >= 1.2.0 BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5ItemModels) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5Pty) +BuildRequires: cmake(KF5Service) BuildRequires: cmake(Qt5Concurrent) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Test) @@ -57,17 +62,16 @@ # unrar is non-free. Avoid installing it automatically. Suggests: unrar Obsoletes: ark-devel -%if 0%{?suse_version} >= 1330 -BuildRequires: libzip-devel >= 1.2.0 +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring %endif %if 0%{?suse_version} > 1500 Recommends: p7zip-full %else Recommends: p7zip %endif -%if %{with lang} Recommends: %{name}-lang -%endif %description This is a KDE application to work with compressed archives. @@ -79,13 +83,10 @@ %description -n libkerfuffle%{SOMAJOR} This is a KDE application to work with compressed archives. -%if %{with lang} %lang_package -%endif %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build %cmake_kf5 -d build @@ -124,7 +125,6 @@ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ %{_kf5_sharedir}/kxmlgui5/ -%{_kf5_sharedir}/mime/packages/kerfuffle.xml %files -n libkerfuffle%{SOMAJOR} %license COPYING* ++++++ 0001-Support-building-against-libarchive-3.3.2-again.patch ++++++ >From 441355f3865516f4bc415350da5c7f928799758e Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Fri, 22 Nov 2019 13:09:34 +0100 Subject: [PATCH] Support building against libarchive 3.3.2 again No zstd support though. --- CMakeLists.txt | 2 +- plugins/libarchive/readwritelibarchiveplugin.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29828b44..335ffc27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ if(NOT Qt5Test_FOUND) set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") endif() -find_package(LibArchive 3.3.3 REQUIRED) +find_package(LibArchive 3.3.2 REQUIRED) set_package_properties(LibArchive PROPERTIES URL "https://www.libarchive.org/"; DESCRIPTION "A library for dealing with a wide variety of archive file formats" diff --git a/plugins/libarchive/readwritelibarchiveplugin.cpp b/plugins/libarchive/readwritelibarchiveplugin.cpp index 37025947..ab580e2a 100644 --- a/plugins/libarchive/readwritelibarchiveplugin.cpp +++ b/plugins/libarchive/readwritelibarchiveplugin.cpp @@ -290,9 +290,11 @@ bool ReadWriteLibarchivePlugin::initializeWriterFilters() case ARCHIVE_FILTER_LZ4: ret = archive_write_add_filter_lz4(m_archiveWriter.data()); break; +#if ARCHIVE_VERSION_NUMBER >= 3003003 case ARCHIVE_FILTER_ZSTD: ret = archive_write_add_filter_zstd(m_archiveWriter.data()); break; +#endif case ARCHIVE_FILTER_NONE: ret = archive_write_add_filter_none(m_archiveWriter.data()); break; @@ -345,9 +347,11 @@ bool ReadWriteLibarchivePlugin::initializeNewFileWriterFilters(const Compression } else if (filename().right(3).toUpper() == QLatin1String("LZ4")) { qCDebug(ARK) << "Detected lz4 compression for new file"; ret = archive_write_add_filter_lz4(m_archiveWriter.data()); +#if ARCHIVE_VERSION_NUMBER >= 3003003 } else if (filename().right(3).toUpper() == QLatin1String("ZST")) { qCDebug(ARK) << "Detected zstd compression for new file"; ret = archive_write_add_filter_zstd(m_archiveWriter.data()); +#endif } else if (filename().right(3).toUpper() == QLatin1String("TAR")) { qCDebug(ARK) << "Detected no compression for new file (pure tar)"; ret = archive_write_add_filter_none(m_archiveWriter.data()); -- 2.23.0 ++++++ ark-19.12.3.tar.xz -> ark-20.04.0.tar.xz ++++++ ++++ 53237 lines of diff (skipped)
