diff -Nru karchive-5.85.0/autotests/karchivetest.cpp karchive-5.86.0/autotests/karchivetest.cpp --- karchive-5.85.0/autotests/karchivetest.cpp 2021-07-30 10:23:48.000000000 +0000 +++ karchive-5.86.0/autotests/karchivetest.cpp 2021-09-04 15:41:08.000000000 +0000 @@ -140,7 +140,7 @@ QStringList ret; QStringList l = dir->entries(); l.sort(); - for (const QString &it : qAsConst(l)) { + for (const QString &it : std::as_const(l)) { const KArchiveEntry *entry = dir->entry(it); QString descr; @@ -672,7 +672,8 @@ // Also exceed 512 byte block size limit to see how well the ././@LongLink // implementation fares for (int i = 98; i < 514; i++) { - QString str, num; + QString str; + QString num; str.fill('a', i - 10); num.setNum(i); num = num.rightJustified(10, '0'); @@ -1054,7 +1055,8 @@ // Similar to testTarMaxLength just to make sure, but of course zip doesn't have // those limitations in the first place. for (int i = 98; i < 514; i++) { - QString str, num; + QString str; + QString num; str.fill('a', i - 10); num.setNum(i); num = num.rightJustified(10, '0'); @@ -1506,7 +1508,8 @@ // Generate long filenames of each possible length bigger than 98... for (int i = 98; i < 514; i++) { - QString str, num; + QString str; + QString num; str.fill('a', i - 10); num.setNum(i); num = num.rightJustified(10, '0'); diff -Nru karchive-5.85.0/autotests/kfiltertest.cpp karchive-5.86.0/autotests/kfiltertest.cpp --- karchive-5.85.0/autotests/kfiltertest.cpp 2021-07-30 10:23:48.000000000 +0000 +++ karchive-5.86.0/autotests/kfiltertest.cpp 2021-09-04 15:41:08.000000000 +0000 @@ -340,7 +340,8 @@ void KFilterTest::test_deflateWithZlibHeader() { - QByteArray data, deflatedData; + QByteArray data; + QByteArray deflatedData; getCompressedData(data, deflatedData); #if 0 // Can't use KFilterDev for this, we need to call KGzipFilter::init(QIODevice::ReadOnly, KGzipFilter::ZlibHeader); diff -Nru karchive-5.85.0/CMakeLists.txt karchive-5.86.0/CMakeLists.txt --- karchive-5.85.0/CMakeLists.txt 2021-07-30 10:23:48.000000000 +0000 +++ karchive-5.86.0/CMakeLists.txt 2021-09-04 15:41:08.000000000 +0000 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts project(KArchive VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -18,7 +18,7 @@ include(ECMGenerateExportHeader) -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(ZLIB) @@ -67,7 +67,7 @@ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/karchive_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ArchiveConfigVersion.cmake" SOVERSION 5) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) add_subdirectory(src) if (BUILD_TESTING) diff -Nru karchive-5.85.0/debian/changelog karchive-5.86.0/debian/changelog --- karchive-5.85.0/debian/changelog 2021-08-13 10:24:55.000000000 +0000 +++ karchive-5.86.0/debian/changelog 2021-09-13 11:46:20.000000000 +0000 @@ -1,3 +1,9 @@ +karchive (5.86.0-0ubuntu1) impish; urgency=medium + + * New upstream release (5.86.0) + + -- José Manuel Santamaría Lema Mon, 13 Sep 2021 12:46:20 +0100 + karchive (5.85.0-0ubuntu1) impish; urgency=medium * New upstream release (5.85.0) diff -Nru karchive-5.85.0/debian/control karchive-5.86.0/debian/control --- karchive-5.85.0/debian/control 2021-08-13 10:24:55.000000000 +0000 +++ karchive-5.86.0/debian/control 2021-09-13 11:46:20.000000000 +0000 @@ -7,7 +7,7 @@ Build-Depends: cmake (>= 3.5~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.85.0~), + extra-cmake-modules (>= 5.86.0~), graphviz, libbz2-dev, liblzma-dev, diff -Nru karchive-5.85.0/.git-blame-ignore-revs karchive-5.86.0/.git-blame-ignore-revs --- karchive-5.85.0/.git-blame-ignore-revs 2021-07-30 10:23:48.000000000 +0000 +++ karchive-5.86.0/.git-blame-ignore-revs 2021-09-04 15:41:08.000000000 +0000 @@ -1,3 +1,4 @@ -#clang-format +#clang-format/tidy 02f0505a0f56fd0680582eb565e439117f320b10 c3cce473d8e3dab1d69617c48e76755326a99017 +f7d760797b5bb879e666110b3659b9963cb43a3a diff -Nru karchive-5.85.0/metainfo.yaml karchive-5.86.0/metainfo.yaml --- karchive-5.85.0/metainfo.yaml 2021-07-30 10:23:48.000000000 +0000 +++ karchive-5.86.0/metainfo.yaml 2021-09-04 15:41:08.000000000 +0000 @@ -6,7 +6,7 @@ - name: Linux - name: FreeBSD - name: Windows - - name: MacOSX + - name: macOS - name: Android portingAid: false deprecated: false diff -Nru karchive-5.85.0/src/k7zip.cpp karchive-5.86.0/src/k7zip.cpp --- karchive-5.85.0/src/k7zip.cpp 2021-07-30 10:23:48.000000000 +0000 +++ karchive-5.86.0/src/k7zip.cpp 2021-09-04 15:41:08.000000000 +0000 @@ -1096,7 +1096,8 @@ * To convert take 12 from Januari and Februari and * increase the year by one. */ - short month, year; + short month; + short year; if (months < 14) { month = (short)(months - 1); year = (short)(years + 1524); @@ -1223,7 +1224,8 @@ return false; } - quint32 coderIndex, coderStreamIndex; + quint32 coderIndex; + quint32 coderStreamIndex; folder->findInStream(folder->inIndexes[binderIndex], coderIndex, coderStreamIndex); quint32 startIndex = folder->getCoderOutStreamIndex(coderIndex); @@ -1680,7 +1682,7 @@ } QByteArray inflated; - for (const QByteArray &data : qAsConst(inflatedDatas)) { + for (const QByteArray &data : std::as_const(inflatedDatas)) { inflated.append(data); } @@ -2164,8 +2166,10 @@ writeNumber(((unsigned)emptyStreamVector.size() + 7) / 8); writeBoolVector(emptyStreamVector); - QVector emptyFileVector, antiVector; - int numEmptyFiles = 0, numAntiItems = 0; + QVector emptyFileVector; + QVector antiVector; + int numEmptyFiles = 0; + int numAntiItems = 0; for (int i = 0; i < fileInfos.size(); i++) { const FileInfo *file = fileInfos.at(i); if (!file->hasStream) { @@ -2906,8 +2910,9 @@ if (!entry) { K7ZipFileEntry *e = new K7ZipFileEntry(this, fileName, perm, mtime, user, group, QString() /*symlink*/, d->outData.size(), 0 /*unknown yet*/, d->outData); - if (!parentDir->addEntryV2(e)) + if (!parentDir->addEntryV2(e)) { return false; + } d->m_entryList << e; d->m_currentFile = e; } else { @@ -2995,8 +3000,9 @@ K7ZipFileEntry *e = new K7ZipFileEntry(this, fileName, perm, mtime, user, group, target, 0, 0, nullptr); d->outData.append(encodedTarget); - if (!parentDir->addEntryV2(e)) + if (!parentDir->addEntryV2(e)) { return false; + } d->m_entryList << e; diff -Nru karchive-5.85.0/src/karchive.cpp karchive-5.86.0/src/karchive.cpp --- karchive-5.85.0/src/karchive.cpp 2021-07-30 10:23:48.000000000 +0000 +++ karchive-5.86.0/src/karchive.cpp 2021-09-04 15:41:08.000000000 +0000 @@ -811,14 +811,17 @@ static QFileDevice::Permissions withExecutablePerms(QFileDevice::Permissions filePerms, mode_t perms) { - if (perms & 01) + if (perms & 01) { filePerms |= QFileDevice::ExeOther; + } - if (perms & 010) + if (perms & 010) { filePerms |= QFileDevice::ExeGroup; + } - if (perms & 0100) + if (perms & 0100) { filePerms |= QFileDevice::ExeOwner; + } return filePerms; } diff -Nru karchive-5.85.0/src/kcompressiondevice.cpp karchive-5.86.0/src/kcompressiondevice.cpp --- karchive-5.85.0/src/kcompressiondevice.cpp 2021-07-30 10:23:48.000000000 +0000 +++ karchive-5.86.0/src/kcompressiondevice.cpp 2021-09-04 15:41:08.000000000 +0000 @@ -35,14 +35,14 @@ class KCompressionDevicePrivate { public: - KCompressionDevicePrivate(KCompressionDevice *q) + KCompressionDevicePrivate(KCompressionDevice *qq) : bNeedHeader(true) , bSkipHeaders(false) , bOpenedUnderlyingDevice(false) , type(KCompressionDevice::None) , errorCode(QFileDevice::NoError) , deviceReadPos(0) - , q(q) + , q(qq) { } @@ -300,8 +300,9 @@ Q_ASSERT(d->filter->mode() == QIODevice::ReadOnly); if (pos == 0) { - if (!QIODevice::seek(pos)) + if (!QIODevice::seek(pos)) { return false; + } // We can forget about the cached data d->bNeedHeader = !d->bSkipHeaders;