Hello community, here is the log from the commit of package karchive for openSUSE:Factory checked in at 2014-03-10 12:17:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-24 06:53:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.karchive.new/karchive.changes 2014-03-10 12:17:22.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:39:39 UTC 2014 - [email protected] + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- karchive-4.96.0.tar.xz New: ---- karchive-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ karchive.spec ++++++ --- /var/tmp/diff_new_pack.QCozit/_old 2014-03-10 12:17:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QCozit/_new 2014-03-10 12:17:23.000000000 +0100 @@ -16,12 +16,12 @@ # -%define lname libKF5Archive4 +%define lname libKF5Archive5 Name: karchive -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 ++++++ karchive-4.96.0.tar.xz -> karchive-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-4.96.0/CMakeLists.txt new/karchive-4.97.0/CMakeLists.txt --- old/karchive-4.96.0/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/karchive-4.97.0/CMakeLists.txt 2014-03-01 12:50:05.000000000 +0100 @@ -2,7 +2,7 @@ project(KArchive) -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -45,13 +45,13 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KARCHIVE VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/karchive_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ArchiveConfigVersion.cmake" -) + SOVERSION 5) add_subdirectory(src) add_subdirectory(autotests) @@ -61,9 +61,9 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Archive") -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) -configure_package_config_file( +ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5ArchiveConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5ArchiveConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-4.96.0/autotests/CMakeLists.txt new/karchive-4.97.0/autotests/CMakeLists.txt --- old/karchive-4.96.0/autotests/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/karchive-4.97.0/autotests/CMakeLists.txt 2014-03-01 12:50:05.000000000 +0100 @@ -13,15 +13,20 @@ foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) # TODO NOGUI add_test(karchive-${_testname} ${_testname}) - target_link_libraries(${_testname} KF5::Archive Qt5::Test) + target_link_libraries(${_testname} PRIVATE KF5::Archive Qt5::Test) ecm_mark_as_test(${_testname}) endforeach(_testname) endmacro(KARCHIVE_UNIT_TESTS) karchive_unit_tests( karchivetest + kfiltertest + deprecatedtest ) +target_compile_definitions(deprecatedtest PRIVATE KARCHIVE_DEPRECATED=) +target_link_libraries(kfiltertest PRIVATE ${ZLIB_LIBRARIES}) + ########### klimitediodevicetest ############### add_executable(klimitediodevicetest @@ -30,16 +35,6 @@ ) ecm_mark_as_test(klimitediodevicetest) add_test(karchive-klimitediodevicetest klimitediodevicetest) -target_link_libraries(klimitediodevicetest Qt5::Test) +target_link_libraries(klimitediodevicetest PRIVATE Qt5::Test) target_include_directories(klimitediodevicetest PRIVATE $<TARGET_PROPERTY:KF5Archive,INTERFACE_INCLUDE_DIRECTORIES>) - -########### kfiltertest ############### - -add_executable(kfiltertest kfiltertest.cpp) -ecm_mark_as_test(kfiltertest) -add_test(karchive-kfiltertest kfiltertest) -target_link_libraries(kfiltertest - Qt5::Test - KF5::Archive - ${ZLIB_LIBRARIES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-4.96.0/autotests/deprecatedtest.cpp new/karchive-4.97.0/autotests/deprecatedtest.cpp --- old/karchive-4.96.0/autotests/deprecatedtest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/karchive-4.97.0/autotests/deprecatedtest.cpp 2014-03-01 12:50:05.000000000 +0100 @@ -0,0 +1,72 @@ +/* This file is part of the KDE project + Copyright (C) 2006, 2010 David Faure <[email protected]> + Copyright (C) 2012 Mario Bensi <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include <kzip.h> + +#include <QtTest/QtTest> + +static const char s_zipFileName[] = "deprecatedtest.zip"; + +class DeprecatedTest : public QObject +{ + Q_OBJECT + +#ifndef KARCHIVE_NO_DEPRECATED +private Q_SLOTS: + void testKArchiveWriteFile() + { + KZip zip(s_zipFileName); + + QVERIFY(zip.open(QIODevice::WriteOnly)); + + const QByteArray fileData("There could be a fire, if there is smoke."); + const QString fileName = QLatin1String("wisdom"); + QVERIFY(zip.writeFile(fileName, "konqi", "dragons", fileData.constData(), fileData.size())); + + QVERIFY(zip.close()); + + QVERIFY(zip.open(QIODevice::ReadOnly)); + + const KArchiveDirectory *dir = zip.directory(); + QVERIFY(dir != 0); + const QStringList listing = dir->entries(); + QCOMPARE(listing.count(), 1); + QCOMPARE(listing.at(0), fileName); + const KArchiveEntry *entry = dir->entry(listing.at(0)); + QCOMPARE(entry->permissions(), mode_t(0100644)); + QVERIFY(!entry->isDirectory()); + const KArchiveFile *fileEntry = static_cast<const KArchiveFile *>(entry); + QCOMPARE(fileEntry->size(), fileData.size()); + QCOMPARE(fileEntry->data(), fileData); + } + + /** + * @see QTest::cleanupTestCase() + */ + void cleanupTestCase() + { + QFile::remove(s_zipFileName); + } +#endif +}; + +QTEST_MAIN(DeprecatedTest) + +#include <deprecatedtest.moc> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-4.96.0/autotests/karchivetest.cpp new/karchive-4.97.0/autotests/karchivetest.cpp --- old/karchive-4.96.0/autotests/karchivetest.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/karchive-4.97.0/autotests/karchivetest.cpp 2014-03-01 12:50:05.000000000 +0100 @@ -955,11 +955,11 @@ const QByteArray fileData1("There could be a fire, if there is smoke."); const QString fileName = QLatin1String("wisdom"); - QVERIFY(zip.writeFile(fileName, "konqi", "dragons", fileData1.constData(), fileData1.size())); + QVERIFY(zip.writeFile(fileName, fileData1, 0100644, "konqi", "dragons")); // now overwrite it const QByteArray fileData2("If there is smoke, there could be a fire."); - QVERIFY(zip.writeFile(fileName, "konqi", "dragons", fileData2.constData(), fileData2.size())); + QVERIFY(zip.writeFile(fileName, fileData2, 0100644, "konqi", "dragons")); QVERIFY(zip.close()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-4.96.0/src/CMakeLists.txt new/karchive-4.97.0/src/CMakeLists.txt --- old/karchive-4.96.0/src/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/karchive-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:05.000000000 +0100 @@ -56,7 +56,8 @@ EXPORT_NAME "Archive" ) -ecm_generate_headers( +ecm_generate_headers(KArchive_HEADERS + HEADER_NAMES KArchive KArchiveEntry KArchiveFile @@ -69,21 +70,17 @@ KZip KZipFileEntry - MODULE_NAME KArchive REQUIRED_HEADERS KArchive_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KArchive - DESTINATION ${INCLUDE_INSTALL_DIR} - COMPONENT Devel) install(TARGETS KF5Archive EXPORT KF5ArchiveTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) if(LIBLZMA_FOUND) - ecm_generate_headers( + ecm_generate_headers(KArchive_HEADERS + HEADER_NAMES K7Zip - MODULE_NAME KArchive REQUIRED_HEADERS KArchive_HEADERS ) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-4.96.0/src/k7zip.cpp new/karchive-4.97.0/src/k7zip.cpp --- old/karchive-4.96.0/src/k7zip.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/karchive-4.97.0/src/k7zip.cpp 2014-03-01 12:50:05.000000000 +0100 @@ -702,8 +702,7 @@ quint64 numInStreamsTotal = 0; quint64 numOutStreamsTotal = 0; - for (int i = 0; i < numCoders; i++) { - Folder::FolderInfo *info = new Folder::FolderInfo(); + for (int i = 0; i < numCoders; ++i) { //BYTE // { // 0:3 CodecIdSize @@ -720,6 +719,7 @@ delete folder; return 0; } + Folder::FolderInfo *info = new Folder::FolderInfo(); unsigned char codecID[codecIdSize]; for (int i = 0; i < codecIdSize; ++i) { codecID[i] = readByte(); @@ -750,6 +750,7 @@ if ((coderInfo & 0x80) != 0) { qDebug() << "unsupported"; + delete info; delete folder; return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-4.96.0/src/karchive.cpp new/karchive-4.97.0/src/karchive.cpp --- old/karchive-4.96.0/src/karchive.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/karchive-4.97.0/src/karchive.cpp 2014-03-01 12:50:05.000000000 +0100 @@ -303,16 +303,6 @@ return true; } -#ifndef KDE_NO_DEPRECATED -bool KArchive::writeFile(const QString &name, const QString &user, - const QString &group, const char *data, qint64 size, - mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) -{ - QByteArray array(data, size); - return writeFile(name, array, perm, user, group, atime, mtime, ctime); -} -#endif - bool KArchive::writeFile(const QString &name, const QByteArray &data, mode_t perm, const QString &user, const QString &group, const QDateTime &atime, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-4.96.0/src/karchive.h new/karchive-4.97.0/src/karchive.h --- old/karchive-4.96.0/src/karchive.h 2014-02-05 00:02:37.000000000 +0100 +++ new/karchive-4.97.0/src/karchive.h 2014-03-01 12:50:05.000000000 +0100 @@ -180,30 +180,17 @@ const QDateTime &mtime = QDateTime(), const QDateTime &ctime = QDateTime()); /** - * If an archive is opened for writing then you can add a new file - * using this function. If the file name is for example "mydir/test1" then - * the directory "mydir" is automatically appended first if that did not - * happen yet. - * - * This method also allows some file metadata to be - * set. However, depending on the archive type not all metadata might be - * regarded. - * @param name the name of the file - * @param user the user that owns the file - * @param group the group that owns the file - * @param data the data to write (@p size bytes) - * @param size the size of the file - * @param perm permissions of the file - * @param atime time the file was last accessed - * @param mtime modification time of the file - * @param ctime time of last status change - * @overload + * @deprecated use writeFile(const QString&,const QByteArray&,mode_t,const QString&,const QString&,const QDateTime&,const QDateTime&,const QDateTime&) */ -#ifndef KDE_NO_DEPRECATED +#ifndef KARCHIVE_NO_DEPRECATED KARCHIVE_DEPRECATED bool writeFile(const QString &name, const QString &user, const QString &group, const char *data, qint64 size, mode_t perm = 0100644, const QDateTime &atime = QDateTime(), - const QDateTime &mtime = QDateTime(), const QDateTime &ctime = QDateTime()); + const QDateTime &mtime = QDateTime(), const QDateTime &ctime = QDateTime()) + { + QByteArray array(data, size); + return writeFile(name, array, perm, user, group, atime, mtime, ctime); + } // The above can lead to ambiguous calls when using "..." for the first 4 arguments, // but that's good, better than unexpected behavior due to the signature change. #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-4.96.0/src/kfilterdev.cpp new/karchive-4.97.0/src/kfilterdev.cpp --- old/karchive-4.96.0/src/kfilterdev.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/karchive-4.97.0/src/kfilterdev.cpp 2014-03-01 12:50:05.000000000 +0100 @@ -46,7 +46,12 @@ return KCompressionDevice::None; } -static KCompressionDevice::CompressionType findCompressionTypeByMimeType(const QString &mimeType) +KFilterDev::KFilterDev(const QString &fileName) + : KCompressionDevice(fileName, findCompressionByFileName(fileName)) +{ +} + +KCompressionDevice::CompressionType KFilterDev::compressionTypeForMimeType(const QString &mimeType) { if (mimeType == QLatin1String("application/x-gzip")) { return KCompressionDevice::GZip; @@ -93,45 +98,3 @@ return KCompressionDevice::None; } -KFilterDev::KFilterDev(const QString &fileName) - : KCompressionDevice(fileName, findCompressionByFileName(fileName)) -{ -} - -KCompressionDevice::CompressionType KFilterDev::compressionTypeForMimeType(const QString &mimetype) -{ - return findCompressionTypeByMimeType(mimetype); -} - -#ifndef KDE_NO_DEPRECATED -//static -KCompressionDevice *KFilterDev::deviceForFile(const QString &fileName, const QString &mimetype, - bool forceFilter) -{ - CompressionType type = mimetype.isEmpty() ? findCompressionByFileName(fileName) - : findCompressionTypeByMimeType(mimetype); - - //qDebug() << "KFilterDev::deviceForFile" << "fileName" << fileName << "mimetype" << mimetype << "CompressionType" << type; - - KCompressionDevice *device = new KCompressionDevice(fileName, type); - if (device->compressionType() == KCompressionDevice::None - && forceFilter) { - delete device; - return 0; - } else { - return device; - } -} - -KCompressionDevice *KFilterDev::device(QIODevice *inDevice, const QString &mimetype, bool autoDeleteInDevice) -{ - if (inDevice == 0) { - return 0; - } - CompressionType type = findCompressionTypeByMimeType(mimetype); - qDebug() << "KFilterDev::deviceForFile" << "mimetype" << mimetype << "CompressionType" << type; - KCompressionDevice *device = new KCompressionDevice(inDevice, autoDeleteInDevice, type); - return device; -} -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-4.96.0/src/kfilterdev.h new/karchive-4.97.0/src/kfilterdev.h --- old/karchive-4.96.0/src/kfilterdev.h 2014-02-05 00:02:37.000000000 +0100 +++ new/karchive-4.97.0/src/kfilterdev.h 2014-03-01 12:50:05.000000000 +0100 @@ -91,10 +91,24 @@ * filter does not exist, the return value depends on @p forceFilter. * The returned KCompressionDevice has to be deleted after using. */ -#ifndef KDE_NO_DEPRECATED +#ifndef KARCHIVE_NO_DEPRECATED KARCHIVE_DEPRECATED static KCompressionDevice *deviceForFile(const QString &fileName, const QString &mimetype = QString(), - bool forceFilter = false); + bool forceFilter = false) + { + KCompressionDevice *device; + if (mimetype.isEmpty()) { + device = new KFilterDev(fileName); + } else { + device = new KCompressionDevice(fileName, compressionTypeForMimeType(mimetype)); + } + if (device->compressionType() == KCompressionDevice::None && forceFilter) { + delete device; + return 0; + } else { + return device; + } + } #endif /** @@ -123,9 +137,17 @@ * @param autoDeleteInDevice if true, @p inDevice will be deleted automatically * @return a KCompressionDevice that filters the original stream. Must be deleted after using */ -#ifndef KDE_NO_DEPRECATED +#ifndef KARCHIVE_NO_DEPRECATED KARCHIVE_DEPRECATED static KCompressionDevice *device(QIODevice *inDevice, const QString &mimetype, - bool autoDeleteInDevice = true); + bool autoDeleteInDevice = true) + { + if (inDevice == 0) { + return 0; + } + CompressionType type = compressionTypeForMimeType(mimetype); + KCompressionDevice *device = new KCompressionDevice(inDevice, autoDeleteInDevice, type); + return device; + } #endif }; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
