Hello community, here is the log from the commit of package karchive for openSUSE:Factory checked in at 2014-09-12 17:03:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/karchive (Old) and /work/SRC/openSUSE:Factory/.karchive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "karchive" Changes: -------- --- /work/SRC/openSUSE:Factory/karchive/karchive.changes 2014-08-16 15:42:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.karchive.new/karchive.changes 2014-09-12 17:04:40.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 9 09:49:33 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.2.0 + * KArchive: fix handling of uncompressed files + * For more details please see: + http://kde.org/announcements/kde-frameworks-5.2.php + +------------------------------------------------------------------- Old: ---- karchive-5.1.0.tar.xz New: ---- karchive-5.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ karchive.spec ++++++ --- /var/tmp/diff_new_pack.JIZTyN/_old 2014-09-12 17:04:42.000000000 +0200 +++ /var/tmp/diff_new_pack.JIZTyN/_new 2014-09-12 17:04:42.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Archive5 Name: karchive -Version: 5.1.0 +Version: 5.2.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.1.0 +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 ++++++ karchive-5.1.0.tar.xz -> karchive-5.2.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/CMakeLists.txt new/karchive-5.2.0/CMakeLists.txt --- old/karchive-5.1.0/CMakeLists.txt 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/CMakeLists.txt 2014-09-08 01:23:20.000000000 +0200 @@ -2,7 +2,7 @@ project(KArchive) -find_package(ECM 1.1.0 REQUIRED NO_MODULE) +find_package(ECM 1.2.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -45,7 +45,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.1.0") # handled by release scripts +set(KF5_VERSION "5.2.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KARCHIVE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/README.md new/karchive-5.2.0/README.md --- old/karchive-5.1.0/README.md 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/README.md 2014-09-08 01:23:20.000000000 +0200 @@ -1,24 +1,15 @@ # KArchive -Reading, creating, and manipulating file archives - ## Introduction KArchive provides classes for easy reading, creation and manipulation of "archive" formats like ZIP and TAR. -If also provides transparent compression and decompression of data, like the +It also provides transparent compression and decompression of data, like the GZip format, via a subclass of QIODevice. ## Usage -If you are using CMake, you need to have - - find_package(KF5Archive NO_MODULE) - -(or similar) in your CMakeLists.txt file, and you need to link any target that -uses KArchive against KF5::Archive. - If you want to read and write compressed data, just create an instance of KCompressionDevice and write to or read from that. @@ -27,9 +18,3 @@ combine this with usage of KCompressionDevice (see the API documentation for the relevant KArchive subclass for details). -## Links - -- Home page: <https://projects.kde.org/projects/frameworks/karchive> -- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-frameworks-devel> -- IRC channel: #kde-devel on Freenode -- Git repository: <https://projects.kde.org/projects/frameworks/karchive/repository> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/autotests/kfiltertest.cpp new/karchive-5.2.0/autotests/kfiltertest.cpp --- old/karchive-5.1.0/autotests/kfiltertest.cpp 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/autotests/kfiltertest.cpp 2014-09-08 01:23:20.000000000 +0200 @@ -409,7 +409,13 @@ QVERIFY(QFile::exists(outFile)); KCompressionDevice reader(outFile, compressionType); QVERIFY(reader.open(QIODevice::ReadOnly)); + QString expectedFullData; for( int i = 0 ; i < numLines ; ++i ) { QCOMPARE(QString::fromUtf8(reader.readLine()), QString(lineTemplate.arg(i) + '\n')); + expectedFullData += QString(lineTemplate.arg(i) + '\n'); } + KFilterDev otherReader(outFile); + QVERIFY(otherReader.open(QIODevice::ReadOnly)); + QCOMPARE(QString::fromLatin1(otherReader.readAll()), expectedFullData); + QVERIFY(otherReader.atEnd()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/examples/bzip2gzip/main.cpp new/karchive-5.2.0/examples/bzip2gzip/main.cpp --- old/karchive-5.1.0/examples/bzip2gzip/main.cpp 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/examples/bzip2gzip/main.cpp 2014-09-08 01:23:20.000000000 +0200 @@ -66,6 +66,7 @@ return 1; } + //@@snippet_begin(kcompressiondevice_example) // Open the input archive KCompressionDevice input(&file, false, KCompressionDevice::BZip2); input.open(QIODevice::ReadOnly); @@ -86,6 +87,7 @@ input.close(); output.close(); + //@@snippet_end return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/examples/helloworld/CMakeLists.txt new/karchive-5.2.0/examples/helloworld/CMakeLists.txt --- old/karchive-5.1.0/examples/helloworld/CMakeLists.txt 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/examples/helloworld/CMakeLists.txt 2014-09-08 01:23:20.000000000 +0200 @@ -10,7 +10,9 @@ # Look for the KArchive module find_package(KF5Archive ${KF5_VERSION} REQUIRED) +find_package(Qt5Core REQUIRED) + add_executable(helloworld main.cpp) # Link our executable with the KArchive library -target_link_libraries(helloworld KF5::Archive) +target_link_libraries(helloworld KF5::Archive Qt5::Core) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/examples/helloworld/main.cpp new/karchive-5.2.0/examples/helloworld/main.cpp --- old/karchive-5.1.0/examples/helloworld/main.cpp 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/examples/helloworld/main.cpp 2014-09-08 01:23:20.000000000 +0200 @@ -38,10 +38,12 @@ * ./helloworld */ +#include <QDebug> #include <kzip.h> int main() { + //@@snippet_begin(helloworld) // Create a zip archive KZip archive(QStringLiteral("hello.zip")); @@ -59,5 +61,26 @@ archive.close(); } + if (archive.open(QIODevice::ReadOnly)) { + const KArchiveDirectory *dir = archive.directory(); + + const KArchiveEntry *e = dir->entry("world"); + if (!e) { + qDebug() << "File not found!"; + return -1; + } + const KArchiveFile *f = static_cast<const KArchiveFile *>(e); + QByteArray arr(f->data()); + qDebug() << arr; // the file contents + + // To avoid reading everything into memory in one go, we can use createDevice() instead + QIODevice *dev = f->createDevice(); + while (!dev->atEnd()) { + qDebug() << dev->readLine(); + } + delete dev; + } + //@@snippet_end + return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/metainfo.yaml new/karchive-5.2.0/metainfo.yaml --- old/karchive-5.1.0/metainfo.yaml 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/metainfo.yaml 2014-09-08 01:23:20.000000000 +0200 @@ -7,3 +7,7 @@ portingAid: false deprecated: false release: true +libraries: + - qmake: KArchive + cmake: "KF5::Archive" +cmakename: KF5Archive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/src/k7zip.cpp new/karchive-5.2.0/src/k7zip.cpp --- old/karchive-5.1.0/src/k7zip.cpp 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/src/k7zip.cpp 2014-09-08 01:23:20.000000000 +0200 @@ -160,7 +160,7 @@ static const quint64 k_AES = 0x06F10701; /** - * A K7ZipFileEntry represents an file in a 7zip archive. + * A K7ZipFileEntry represents a file in a 7zip archive. */ class KARCHIVE_EXPORT K7ZipFileEntry : public KArchiveFile { @@ -559,7 +559,7 @@ quint64 K7Zip::K7ZipPrivate::readNumber() { - if (!buffer) { + if (!buffer || (quint64)(pos + 8) > end) { return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/src/kcompressiondevice.cpp new/karchive-5.2.0/src/kcompressiondevice.cpp --- old/karchive-5.1.0/src/kcompressiondevice.cpp 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/src/kcompressiondevice.cpp 2014-09-08 01:23:20.000000000 +0200 @@ -213,7 +213,7 @@ bool KCompressionDevice::atEnd() const { - return (d->result == KFilterBase::End) + return (d->type == KCompressionDevice::None || d->result == KFilterBase::End) && QIODevice::atEnd() // take QIODevice's internal buffer into account && d->filter->device()->atEnd(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/src/knonefilter.cpp new/karchive-5.2.0/src/knonefilter.cpp --- old/karchive-5.1.0/src/knonefilter.cpp 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/src/knonefilter.cpp 2014-09-08 01:23:20.000000000 +0200 @@ -121,6 +121,7 @@ KNoneFilter::Result KNoneFilter::copyData() { + Q_ASSERT(d->avail_out > 0); if (d->avail_in > 0) { const int n = qMin(d->avail_in, d->avail_out); memcpy(d->next_out, d->next_in, n); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.1.0/src/kzipfileentry.h new/karchive-5.2.0/src/kzipfileentry.h --- old/karchive-5.1.0/src/kzipfileentry.h 2014-08-02 10:15:53.000000000 +0200 +++ new/karchive-5.2.0/src/kzipfileentry.h 2014-09-08 01:23:20.000000000 +0200 @@ -23,7 +23,7 @@ class KZip; /** - * A KZipFileEntry represents an file in a zip archive. + * A KZipFileEntry represents a file in a zip archive. */ class KARCHIVE_EXPORT KZipFileEntry : public KArchiveFile { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
