Hello community, here is the log from the commit of package karchive for openSUSE:Factory checked in at 2016-02-24 18:53:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-01-20 09:41:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.karchive.new/karchive.changes 2016-02-24 18:53:52.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Feb 6 17:59:13 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.19.0 (boo#967668) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.19.0.php + +------------------------------------------------------------------- Old: ---- karchive-5.18.0.tar.xz New: ---- karchive-5.19.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ karchive.spec ++++++ --- /var/tmp/diff_new_pack.CZRqGy/_old 2016-02-24 18:53:53.000000000 +0100 +++ /var/tmp/diff_new_pack.CZRqGy/_new 2016-02-24 18:53:53.000000000 +0100 @@ -17,9 +17,9 @@ %define lname libKF5Archive5 -%define _tar_path 5.18 +%define _tar_path 5.19 Name: karchive -Version: 5.18.0 +Version: 5.19.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ karchive-5.18.0.tar.xz -> karchive-5.19.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.18.0/CMakeLists.txt new/karchive-5.19.0/CMakeLists.txt --- old/karchive-5.18.0/CMakeLists.txt 2016-01-01 20:48:59.000000000 +0100 +++ new/karchive-5.19.0/CMakeLists.txt 2016-02-06 10:29:29.000000000 +0100 @@ -3,7 +3,7 @@ project(KArchive) include(FeatureSummary) -find_package(ECM 5.18.0 NO_MODULE) +find_package(ECM 5.19.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) @@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) @@ -49,7 +49,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.18.0") # handled by release scripts +set(KF5_VERSION "5.19.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.18.0/autotests/CMakeLists.txt new/karchive-5.19.0/autotests/CMakeLists.txt --- old/karchive-5.18.0/autotests/CMakeLists.txt 2016-01-01 20:48:59.000000000 +0100 +++ new/karchive-5.19.0/autotests/CMakeLists.txt 2016-02-06 10:29:29.000000000 +0100 @@ -38,21 +38,22 @@ LINK_LIBRARIES KF5::Archive Qt5::Test Qt5::Network ) + set(testDir $<TARGET_FILE_DIR:kcompressiondevicetest>) get_filename_component(topdir ${CMAKE_CURRENT_SOURCE_DIR}/.. ABSOLUTE) - execute_process( + add_custom_command(TARGET kcompressiondevicetest POST_BUILD COMMAND ${CMAKE_COMMAND} -E tar czf - ${CMAKE_CURRENT_BINARY_DIR}/kcompressiondevice_test.tar.gz examples + ${testDir}/kcompressiondevice_test.tar.gz examples WORKING_DIRECTORY ${topdir}) - execute_process( + add_custom_command(TARGET kcompressiondevicetest POST_BUILD COMMAND ${CMAKE_COMMAND} -E tar cjf - ${CMAKE_CURRENT_BINARY_DIR}/kcompressiondevice_test.tar.bz2 examples + ${testDir}/kcompressiondevice_test.tar.bz2 examples WORKING_DIRECTORY ${topdir}) if (LIBLZMA_FOUND) - execute_process( + add_custom_command(TARGET kcompressiondevicetest POST_BUILD COMMAND ${CMAKE_COMMAND} -E tar cJf - ${CMAKE_CURRENT_BINARY_DIR}/kcompressiondevice_test.tar.xz examples + ${testDir}/kcompressiondevice_test.tar.xz examples WORKING_DIRECTORY ${topdir}) endif() endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.18.0/autotests/kcompressiondevicetest.cpp new/karchive-5.19.0/autotests/kcompressiondevicetest.cpp --- old/karchive-5.18.0/autotests/kcompressiondevicetest.cpp 2016-01-01 20:48:59.000000000 +0100 +++ new/karchive-5.19.0/autotests/kcompressiondevicetest.cpp 2016-02-06 10:29:29.000000000 +0100 @@ -32,13 +32,15 @@ QTEST_MAIN(KCompressionDeviceTest) +static QString archiveFileName(const QString &extension) +{ + return QFINDTESTDATA(QString("kcompressiondevice_test.%1").arg(extension)); +} + QNetworkReply *KCompressionDeviceTest::getArchive(const QString &extension) { - const QString kcompressionTest = QString("kcompressiondevice_test.%1").arg(extension); - QNetworkReply *r = qnam.get( - QNetworkRequest( - QUrl::fromLocalFile( - QFINDTESTDATA(kcompressionTest)))); + const QString kcompressionTest = archiveFileName(extension); + QNetworkReply *r = qnam.get(QNetworkRequest(QUrl::fromLocalFile(kcompressionTest))); QEventLoop l; connect(&qnam, &QNetworkAccessManager::finished, &l, &QEventLoop::quit); @@ -56,9 +58,10 @@ return "tar.bz2"; case KCompressionDevice::Xz: return "tar.xz"; - default: + case KCompressionDevice::None: return QString(); } + return QString(); // silence compiler warning } void KCompressionDeviceTest::setDeviceToArchive( @@ -75,6 +78,9 @@ QNetworkReply *r = getArchive(formatExtension(type)); const QByteArray data = r->readAll(); QVERIFY(!data.isEmpty()); + const int expectedSize = QFileInfo(archiveFileName(formatExtension(type))).size(); + QVERIFY(expectedSize > 0); + QCOMPARE(data.size(), expectedSize); QBuffer *b = new QBuffer; b->setData(data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.18.0/src/k7zip.cpp new/karchive-5.19.0/src/k7zip.cpp --- old/karchive-5.18.0/src/k7zip.cpp 2016-01-01 20:48:59.000000000 +0100 +++ new/karchive-5.19.0/src/k7zip.cpp 2016-02-06 10:29:29.000000000 +0100 @@ -45,7 +45,7 @@ #define BUFFER_SIZE 8*1024 static const unsigned char k7zip_signature[6] = {'7', 'z', 0xBC, 0xAF, 0x27, 0x1C}; -static const unsigned char XZ_HEADER_MAGIC[6] = { 0xFD, '7', 'z', 'X', 'Z', 0x00 }; +//static const unsigned char XZ_HEADER_MAGIC[6] = { 0xFD, '7', 'z', 'X', 'Z', 0x00 }; #define GetUi16(p, offset) (((unsigned char)p[offset+0]) | (((unsigned char)p[1]) << 8)) @@ -115,49 +115,49 @@ }; // Method ID -static const quint64 k_Copy = 0x00; -static const quint64 k_Delta = 0x03; -static const quint64 k_x86 = 0x04; //BCJ -static const quint64 k_PPC = 0x05; // BIG Endian -static const quint64 k_IA64 = 0x06; -static const quint64 k_ARM = 0x07; // little Endian -static const quint64 k_ARM_Thumb = 0x08; // little Endian -static const quint64 k_SPARC = 0x09; +// static const quint64 k_Copy = 0x00; +// static const quint64 k_Delta = 0x03; +// static const quint64 k_x86 = 0x04; //BCJ +// static const quint64 k_PPC = 0x05; // BIG Endian +// static const quint64 k_IA64 = 0x06; +// static const quint64 k_ARM = 0x07; // little Endian +// static const quint64 k_ARM_Thumb = 0x08; // little Endian +// static const quint64 k_SPARC = 0x09; static const quint64 k_LZMA2 = 0x21; -static const quint64 k_Swap2 = 0x020302; -static const quint64 k_Swap4 = 0x020304; +// static const quint64 k_Swap2 = 0x020302; +// static const quint64 k_Swap4 = 0x020304; static const quint64 k_LZMA = 0x030101; static const quint64 k_BCJ = 0x03030103; static const quint64 k_BCJ2 = 0x0303011B; -static const quint64 k_7zPPC = 0x03030205; -static const quint64 k_Alpha = 0x03030301; -static const quint64 k_7zIA64 = 0x03030401; -static const quint64 k_7zARM = 0x03030501; -static const quint64 k_M68 = 0x03030605; //Big Endian -static const quint64 k_ARMT = 0x03030701; -static const quint64 k_7zSPARC = 0x03030805; +// static const quint64 k_7zPPC = 0x03030205; +// static const quint64 k_Alpha = 0x03030301; +// static const quint64 k_7zIA64 = 0x03030401; +// static const quint64 k_7zARM = 0x03030501; +// static const quint64 k_M68 = 0x03030605; //Big Endian +// static const quint64 k_ARMT = 0x03030701; +// static const quint64 k_7zSPARC = 0x03030805; static const quint64 k_PPMD = 0x030401; -static const quint64 k_Experimental = 0x037F01; -static const quint64 k_Shrink = 0x040101; -static const quint64 k_Implode = 0x040106; -static const quint64 k_Deflate = 0x040108; -static const quint64 k_Deflate64 = 0x040109; -static const quint64 k_Imploding = 0x040110; -static const quint64 k_Jpeg = 0x040160; -static const quint64 k_WavPack = 0x040161; -static const quint64 k_PPMd = 0x040162; -static const quint64 k_wzAES = 0x040163; +// static const quint64 k_Experimental = 0x037F01; +// static const quint64 k_Shrink = 0x040101; +// static const quint64 k_Implode = 0x040106; +// static const quint64 k_Deflate = 0x040108; +// static const quint64 k_Deflate64 = 0x040109; +// static const quint64 k_Imploding = 0x040110; +// static const quint64 k_Jpeg = 0x040160; +// static const quint64 k_WavPack = 0x040161; +// static const quint64 k_PPMd = 0x040162; +// static const quint64 k_wzAES = 0x040163; static const quint64 k_BZip2 = 0x040202; -static const quint64 k_Rar15 = 0x040301; -static const quint64 k_Rar20 = 0x040302; -static const quint64 k_Rar29 = 0x040303; -static const quint64 k_Arj = 0x040401; //1 2 3 -static const quint64 k_Arj4 = 0x040402; -static const quint64 k_Z = 0x0405; -static const quint64 k_Lzh = 0x0406; -static const quint64 k_Cab = 0x0408; -static const quint64 k_DeflateNSIS = 0x040901; -static const quint64 k_Bzip2NSIS = 0x040902; +// static const quint64 k_Rar15 = 0x040301; +// static const quint64 k_Rar20 = 0x040302; +// static const quint64 k_Rar29 = 0x040303; +// static const quint64 k_Arj = 0x040401; //1 2 3 +// static const quint64 k_Arj4 = 0x040402; +// static const quint64 k_Z = 0x0405; +// static const quint64 k_Lzh = 0x0406; +// static const quint64 k_Cab = 0x0408; +// static const quint64 k_DeflateNSIS = 0x040901; +// static const quint64 k_Bzip2NSIS = 0x040902; static const quint64 k_AES = 0x06F10701; /** @@ -280,6 +280,8 @@ qDeleteAll(folderInfos); } + Q_DISABLE_COPY(Folder) + quint64 getUnpackSize() const { if (unpackSizes.isEmpty()) {
