Hello community, here is the log from the commit of package karchive for openSUSE:Factory checked in at 2018-04-19 15:14:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/karchive (Old) and /work/SRC/openSUSE:Factory/.karchive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "karchive" Thu Apr 19 15:14:17 2018 rev:52 rq:596849 version:5.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/karchive/karchive.changes 2018-03-20 21:44:47.327321327 +0100 +++ /work/SRC/openSUSE:Factory/.karchive.new/karchive.changes 2018-04-19 15:15:37.676602768 +0200 @@ -1,0 +2,13 @@ +Sat Apr 14 13:19:02 CEST 2018 - lbeltr...@kde.org + +- Update to 5.45.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.45.0.php +- Changes since 5.44.0: + * Remove not necessary QtCore and co + * karchive, kzip: try to handle duplicate files in a bit nicer way + * autotests: add crashing test with duplicate names + * Use nullptr for passing a null pointer to crc32 + +------------------------------------------------------------------- Old: ---- karchive-5.44.0.tar.xz New: ---- karchive-5.45.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ karchive.spec ++++++ --- /var/tmp/diff_new_pack.2n33pt/_old 2018-04-19 15:15:38.264579431 +0200 +++ /var/tmp/diff_new_pack.2n33pt/_new 2018-04-19 15:15:38.264579431 +0200 @@ -17,13 +17,13 @@ %define lname libKF5Archive5 -%define _tar_path 5.44 +%define _tar_path 5.45 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: karchive -Version: 5.44.0 +Version: 5.45.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} @@ -92,7 +92,7 @@ %files -n %lname %defattr(-,root,root) %doc COPYING* README* -%config %{_kf5_configdir}/karchive.categories +%{_kf5_debugdir}/karchive.categories %{_kf5_libdir}/libKF5Archive.so.* %files devel ++++++ karchive-5.44.0.tar.xz -> karchive-5.45.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/CMakeLists.txt new/karchive-5.45.0/CMakeLists.txt --- old/karchive-5.44.0/CMakeLists.txt 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/CMakeLists.txt 2018-04-07 09:46:37.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.44.0") # handled by release scripts +set(KF5_VERSION "5.45.0") # handled by release scripts project(KArchive VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.44.0 NO_MODULE) +find_package(ECM 5.45.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -18,7 +18,7 @@ include(GenerateExportHeader) -set(REQUIRED_QT_VERSION 5.7.0) +set(REQUIRED_QT_VERSION 5.8.0) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(ZLIB) Binary files old/karchive-5.44.0/autotests/data/out.epub and new/karchive-5.45.0/autotests/data/out.epub differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/autotests/deprecatedtest.cpp new/karchive-5.45.0/autotests/deprecatedtest.cpp --- old/karchive-5.44.0/autotests/deprecatedtest.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/autotests/deprecatedtest.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -20,7 +20,7 @@ #include <kzip.h> -#include <QtTest/QtTest> +#include <QtTest> static const char s_zipFileName[] = "deprecatedtest.zip"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/autotests/karchivetest.cpp new/karchive-5.45.0/autotests/karchivetest.cpp --- old/karchive-5.44.0/autotests/karchivetest.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/autotests/karchivetest.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -24,8 +24,8 @@ #include <k7zip.h> #include <krcc.h> -#include <QtTest/QtTest> -#include <QtCore/QFileInfo> +#include <QtTest> +#include <QFileInfo> #include <kfilterdev.h> #include <qtemporarydir.h> @@ -1159,6 +1159,26 @@ QCOMPARE(listing.join(' '), QLatin1String("mode=40744 path=test type=dir mode=744 path=test/os-release type=file size=199")); } +void KArchiveTest::testZipDuplicateNames() +{ + QString fileName = QFINDTESTDATA("data/out.epub"); + QVERIFY(!fileName.isEmpty()); + + KZip zip(fileName); + + QVERIFY(zip.open(QIODevice::ReadOnly)); + + int metaInfCount = 0; + for (const QString &entryName : zip.directory()->entries()) { + if (entryName.startsWith("META-INF")) { + metaInfCount++; + } + } + + QVERIFY2(metaInfCount == 1, "Archive root directory contains duplicates"); +} + + void KArchiveTest::testRcc() { const QString rccFile = QFINDTESTDATA("runtime_resource.rcc"); // was copied from qtbase/tests/auto/corelib/io/qresourceengine diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/autotests/karchivetest.h new/karchive-5.45.0/autotests/karchivetest.h --- old/karchive-5.44.0/autotests/karchivetest.h 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/autotests/karchivetest.h 2018-04-07 09:46:37.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef KARCHIVETEST_H #define KARCHIVETEST_H -#include <QtCore/QObject> +#include <QObject> #include <config-compression.h> class KArchiveTest : public QObject @@ -92,6 +92,7 @@ void testZipReadRedundantDataDescriptor(); void testZipDirectoryPermissions(); void testZipUnusualButValid(); + void testZipDuplicateNames(); void testRcc(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/autotests/kcompressiondevicetest.h new/karchive-5.45.0/autotests/kcompressiondevicetest.h --- old/karchive-5.44.0/autotests/kcompressiondevicetest.h 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/autotests/kcompressiondevicetest.h 2018-04-07 09:46:37.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KCOMPRESSIONDEVICETEST_H #define KCOMPRESSIONDEVICETEST_H -#include <QtCore/QObject> +#include <QObject> #include <QNetworkAccessManager> #include <QScopedPointer> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/autotests/kfiltertest.cpp new/karchive-5.45.0/autotests/kfiltertest.cpp --- old/karchive-5.44.0/autotests/kfiltertest.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/autotests/kfiltertest.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -18,16 +18,16 @@ #include "kfiltertest.h" -#include <QtTest/QtTest> +#include <QtTest> #include <config-compression.h> #include "kfilterdev.h" #include "kfilterbase.h" -#include <QtCore/QFile> -#include <QtCore/QTextStream> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QFile> +#include <QTextStream> +#include <QDebug> +#include <QDir> +#include <QFileInfo> #include <zlib.h> #ifdef Q_OS_UNIX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/autotests/kfiltertest.h new/karchive-5.45.0/autotests/kfiltertest.h --- old/karchive-5.44.0/autotests/kfiltertest.h 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/autotests/kfiltertest.h 2018-04-07 09:46:37.000000000 +0200 @@ -18,7 +18,7 @@ #ifndef KFILTERTEST_H #define KFILTERTEST_H -#include <QtCore/QObject> +#include <QObject> class KFilterTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/autotests/klimitediodevicetest.cpp new/karchive-5.45.0/autotests/klimitediodevicetest.cpp --- old/karchive-5.44.0/autotests/klimitediodevicetest.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/autotests/klimitediodevicetest.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -21,7 +21,7 @@ #include "klimitediodevice_p.h" -#include <QtTest/QtTest> +#include <QtTest> QTEST_MAIN(KLimitedIODeviceTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/k7zip.cpp new/karchive-5.45.0/src/k7zip.cpp --- old/karchive-5.44.0/src/k7zip.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/k7zip.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -20,10 +20,10 @@ #include "karchive_p.h" #include "loggingcategory.h" -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QBuffer> -#include <QtCore/QFile> +#include <QDebug> +#include <QDir> +#include <QBuffer> +#include <QFile> #include <qplatformdefs.h> #include "kcompressiondevice.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/kar.cpp new/karchive-5.45.0/src/kar.cpp --- old/karchive-5.44.0/src/kar.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/kar.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -20,8 +20,8 @@ #include "karchive_p.h" #include "loggingcategory.h" -#include <QtCore/QFile> -#include <QtCore/QDebug> +#include <QFile> +#include <QDebug> #include "kfilterdev.h" //#include "klimitediodevice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/karchive.cpp new/karchive-5.45.0/src/karchive.cpp --- old/karchive-5.44.0/src/karchive.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/karchive.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -27,10 +27,10 @@ #include <qplatformdefs.h> // QT_STATBUF, QT_LSTAT #include <QStack> -#include <QtCore/QMap> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> +#include <QMap> +#include <QDebug> +#include <QDir> +#include <QFile> #include <stdio.h> #include <stdlib.h> @@ -468,7 +468,16 @@ const KArchiveDirectory *dir = static_cast<const KArchiveDirectory *>(ent); return const_cast<KArchiveDirectory *>(dir); } else { - //qCWarning(KArchiveLog) << "Found" << path << "but it's not a directory"; + const KArchiveFile *file = static_cast<const KArchiveFile *>(ent); + if (file->size() > 0) { + qCWarning(KArchiveLog) << path << "is normal file, but there are file paths in the archive assuming it is a directory, bailing out"; + return nullptr; + } + + qCDebug(KArchiveLog) << path << " is an empty file, assuming it is actually a directory and replacing"; + KArchiveEntry *myEntry = const_cast<KArchiveEntry*>(ent); + rootDir()->removeEntry(myEntry); + delete myEntry; } } @@ -827,8 +836,8 @@ void KArchiveDirectory::addEntry(KArchiveEntry *entry) { if (d->entries.value(entry->name())) { - /*qCWarning(KArchiveLog) << "directory " << name() - << "has entry" << entry->name() << "already";*/ + qCWarning(KArchiveLog) << "directory " << name() + << "has entry" << entry->name() << "already"; delete entry; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/karchive.h new/karchive-5.45.0/src/karchive.h --- old/karchive-5.44.0/src/karchive.h 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/karchive.h 2018-04-07 09:46:37.000000000 +0200 @@ -24,12 +24,12 @@ #include <sys/stat.h> #include <sys/types.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDate> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QHash> -#include <QtCore/QIODevice> +#include <QCoreApplication> +#include <QDate> +#include <QString> +#include <QStringList> +#include <QHash> +#include <QIODevice> #include <karchive_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/karchivedirectory.h new/karchive-5.45.0/src/karchivedirectory.h --- old/karchive-5.44.0/src/karchivedirectory.h 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/karchivedirectory.h 2018-04-07 09:46:37.000000000 +0200 @@ -24,9 +24,9 @@ #include <sys/stat.h> #include <sys/types.h> -#include <QtCore/QDate> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QDate> +#include <QString> +#include <QStringList> #include <karchiveentry.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/kcompressiondevice.cpp new/karchive-5.45.0/src/kcompressiondevice.cpp --- old/karchive-5.44.0/src/kcompressiondevice.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/kcompressiondevice.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -21,7 +21,7 @@ #include "loggingcategory.h" #include <config-compression.h> #include "kfilterbase.h" -#include <QtCore/QFile> +#include <QFile> #include <stdio.h> // for EOF #include <stdlib.h> #include <assert.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/kcompressiondevice.h new/karchive-5.45.0/src/kcompressiondevice.h --- old/karchive-5.44.0/src/kcompressiondevice.h 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/kcompressiondevice.h 2018-04-07 09:46:37.000000000 +0200 @@ -20,9 +20,9 @@ #define __kcompressiondevice_h #include <karchive_export.h> -#include <QtCore/QIODevice> -#include <QtCore/QString> -#include <QtCore/QMetaType> +#include <QIODevice> +#include <QString> +#include <QMetaType> class KCompressionDevicePrivate; class KFilterBase; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/kfilterbase.cpp new/karchive-5.45.0/src/kfilterbase.cpp --- old/karchive-5.44.0/src/kfilterbase.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/kfilterbase.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -19,7 +19,7 @@ #include "kfilterbase.h" -#include <QtCore/QIODevice> +#include <QIODevice> class KFilterBasePrivate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/kfilterbase.h new/karchive-5.45.0/src/kfilterbase.h --- old/karchive-5.44.0/src/kfilterbase.h 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/kfilterbase.h 2018-04-07 09:46:37.000000000 +0200 @@ -22,8 +22,8 @@ #include <karchive_export.h> -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> class KFilterBasePrivate; class QIODevice; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/kfilterdev.h new/karchive-5.45.0/src/kfilterdev.h --- old/karchive-5.44.0/src/kfilterdev.h 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/kfilterdev.h 2018-04-07 09:46:37.000000000 +0200 @@ -20,7 +20,7 @@ #include <karchive_export.h> #include <kcompressiondevice.h> -#include <QtCore/QString> +#include <QString> class QFile; class KFilterBase; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/kgzipfilter.cpp new/karchive-5.45.0/src/kgzipfilter.cpp --- old/karchive-5.44.0/src/kgzipfilter.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/kgzipfilter.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -24,7 +24,7 @@ #include <zlib.h> #include <QDebug> -#include <QtCore/QIODevice> +#include <QIODevice> /* gzip flag byte */ #define ORIG_NAME 0x08 /* bit 3 set: original file name present */ @@ -223,7 +223,7 @@ int headerSize = p - d->zStream.next_out; i -= headerSize; Q_ASSERT(i > 0); - d->crc = crc32(0L, Z_NULL, 0); + d->crc = crc32(0L, nullptr, 0); d->zStream.next_out = p; d->zStream.avail_out = i; d->headerWritten = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/klimitediodevice_p.h new/karchive-5.45.0/src/klimitediodevice_p.h --- old/karchive-5.44.0/src/klimitediodevice_p.h 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/klimitediodevice_p.h 2018-04-07 09:46:37.000000000 +0200 @@ -19,8 +19,8 @@ #ifndef klimitediodevice_p_h #define klimitediodevice_p_h -#include <QtCore/QDebug> -#include <QtCore/QIODevice> +#include <QDebug> +#include <QIODevice> /** * A readonly device that reads from an underlying device * from a given point to another (e.g. to give access to a single diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/knonefilter.cpp new/karchive-5.45.0/src/knonefilter.cpp --- old/karchive-5.44.0/src/knonefilter.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/knonefilter.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -22,7 +22,7 @@ #include "knonefilter.h" -#include <QtCore/QFile> +#include <QFile> class Q_DECL_HIDDEN KNoneFilter::Private { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/krcc.cpp new/karchive-5.45.0/src/krcc.cpp --- old/karchive-5.44.0/src/krcc.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/krcc.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -22,8 +22,8 @@ #include "karchive_p.h" #include "loggingcategory.h" -#include <QtCore/QFile> -#include <QtCore/QDebug> +#include <QFile> +#include <QDebug> #include <QUuid> #include <QDateTime> #include <QFileInfo> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/ktar.cpp new/karchive-5.45.0/src/ktar.cpp --- old/karchive-5.44.0/src/ktar.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/ktar.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -24,11 +24,11 @@ #include <stdlib.h> // strtol #include <assert.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> +#include <QDebug> +#include <QDir> +#include <QFile> #include <qmimedatabase.h> -#include <QtCore/QTemporaryFile> +#include <QTemporaryFile> #include <kfilterdev.h> #include <kfilterbase.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/src/kzip.cpp new/karchive-5.45.0/src/kzip.cpp --- old/karchive-5.44.0/src/kzip.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/src/kzip.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -23,13 +23,13 @@ #include "klimitediodevice_p.h" #include "loggingcategory.h" -#include <QtCore/QHash> -#include <QtCore/QByteArray> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QDate> -#include <QtCore/QList> +#include <QHash> +#include <QByteArray> +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QDate> +#include <QList> #include <qplatformdefs.h> #include <time.h> @@ -750,7 +750,13 @@ QString path = QDir::cleanPath(name.left(pos)); // Ensure container directory exists, create otherwise KArchiveDirectory *tdir = findOrCreate(path); - tdir->addEntry(entry); + if (tdir) { + tdir->addEntry(entry); + } else { + setErrorString(tr("File %1 is in folder %2, but %3 is actually a file.").arg(entryName, path, path)); + delete entry; + return false; + } } } @@ -827,7 +833,7 @@ // to be written at the end of the file... char buffer[22]; // first used for 12, then for 22 at the end - uLong crc = crc32(0L, Z_NULL, 0); + uLong crc = crc32(0L, nullptr, 0); qint64 centraldiroffset = device()->pos(); //qCDebug(KArchiveLog) << "closearchive: centraldiroffset: " << centraldiroffset; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/test_package/example.cpp new/karchive-5.45.0/test_package/example.cpp --- old/karchive-5.44.0/test_package/example.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/test_package/example.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -1,4 +1,4 @@ -#include <QtCore/QIODevice> +#include <QIODevice> #include "kzip.h" int main() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/tests/k7ziptest.cpp new/karchive-5.45.0/tests/k7ziptest.cpp --- old/karchive-5.44.0/tests/k7ziptest.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/tests/k7ziptest.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -18,7 +18,7 @@ #include "k7zip.h" #include <stdio.h> -#include <QtCore/QDebug> +#include <QDebug> void recursive_print(const KArchiveDirectory *dir, const QString &path) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/tests/krcctest.cpp new/karchive-5.45.0/tests/krcctest.cpp --- old/karchive-5.44.0/tests/krcctest.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/tests/krcctest.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -18,7 +18,7 @@ #include "krcc.h" #include <stdio.h> -#include <QtCore/QDebug> +#include <QDebug> void recursive_print(const KArchiveDirectory *dir, const QString &path) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/tests/ktartest.cpp new/karchive-5.45.0/tests/ktartest.cpp --- old/karchive-5.44.0/tests/ktartest.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/tests/ktartest.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -18,7 +18,7 @@ #include "ktar.h" #include <stdio.h> -#include <QtCore/QDebug> +#include <QDebug> void recursive_print(const KArchiveDirectory *dir, const QString &path) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.44.0/tests/kziptest.cpp new/karchive-5.45.0/tests/kziptest.cpp --- old/karchive-5.44.0/tests/kziptest.cpp 2018-03-03 10:51:46.000000000 +0100 +++ new/karchive-5.45.0/tests/kziptest.cpp 2018-04-07 09:46:37.000000000 +0200 @@ -19,8 +19,8 @@ #include "kzip.h" #include "kcompressiondevice.h" #include <stdio.h> -#include <QtCore/QDebug> -#include <QtCore/QFile> +#include <QDebug> +#include <QFile> #include <QCoreApplication> void recursive_print(const KArchiveDirectory *dir, const QString &path)
