Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package karchive for openSUSE:Factory checked in at 2021-06-16 20:33:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/karchive (Old) and /work/SRC/openSUSE:Factory/.karchive.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "karchive" Wed Jun 16 20:33:38 2021 rev:91 rq:899710 version:5.83.0 Changes: -------- --- /work/SRC/openSUSE:Factory/karchive/karchive.changes 2021-05-10 15:36:43.958191197 +0200 +++ /work/SRC/openSUSE:Factory/.karchive.new.32437/karchive.changes 2021-06-16 20:35:02.647140985 +0200 @@ -1,0 +2,14 @@ +Sat Jun 5 11:58:29 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.83.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.83.0 +- Changes since 5.82.0: + * [KArchive] Use better wording for open error + * [kziptest] Print errorString() for easier debugging + * Bump required CMake version to 3.16 + * Use imported target for ZLib + * Add missing QIODevice include + +------------------------------------------------------------------- Old: ---- karchive-5.82.0.tar.xz karchive-5.82.0.tar.xz.sig New: ---- karchive-5.83.0.tar.xz karchive-5.83.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ karchive.spec ++++++ --- /var/tmp/diff_new_pack.jUGff9/_old 2021-06-16 20:35:03.203141934 +0200 +++ /var/tmp/diff_new_pack.jUGff9/_new 2021-06-16 20:35:03.203141934 +0200 @@ -17,7 +17,7 @@ %define lname libKF5Archive5 -%define _tar_path 5.82 +%define _tar_path 5.83 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: karchive -Version: 5.82.0 +Version: 5.83.0 Release: 0 Summary: Qt 5 addon providing access to numerous types of archives License: LGPL-2.1-or-later ++++++ karchive-5.82.0.tar.xz -> karchive-5.83.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/.gitignore new/karchive-5.83.0/.gitignore --- old/karchive-5.82.0/.gitignore 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/.gitignore 2021-06-05 10:50:19.000000000 +0200 @@ -24,3 +24,4 @@ .clangd .idea /cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/CMakeLists.txt new/karchive-5.83.0/CMakeLists.txt --- old/karchive-5.82.0/CMakeLists.txt 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/CMakeLists.txt 2021-06-05 10:50:19.000000000 +0200 @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.82.0") # handled by release scripts +set(KF_VERSION "5.83.0") # handled by release scripts project(KArchive VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.82.0 NO_MODULE) +find_package(ECM 5.83.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) @@ -43,9 +43,6 @@ DESCRIPTION "Support for xz compressed files and data streams" PURPOSE "Support for xz compressed files and data streams" ) -include_directories( - ${ZLIB_INCLUDE_DIR} -) find_package(PkgConfig) pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") @@ -68,7 +65,6 @@ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/karchive_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ArchiveConfigVersion.cmake" SOVERSION 5) -add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/autotests/CMakeLists.txt new/karchive-5.83.0/autotests/CMakeLists.txt --- old/karchive-5.82.0/autotests/CMakeLists.txt 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/autotests/CMakeLists.txt 2021-06-05 10:50:19.000000000 +0200 @@ -17,7 +17,7 @@ LINK_LIBRARIES KF5::Archive Qt5::Test ) -target_link_libraries(kfiltertest ${ZLIB_LIBRARIES}) +target_link_libraries(kfiltertest ZLIB::ZLIB) ########### klimitediodevicetest ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/examples/bzip2gzip/CMakeLists.txt new/karchive-5.83.0/examples/bzip2gzip/CMakeLists.txt --- old/karchive-5.82.0/examples/bzip2gzip/CMakeLists.txt 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/examples/bzip2gzip/CMakeLists.txt 2021-06-05 10:50:19.000000000 +0200 @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.8.12) - project(BZip2GZip) find_package(KF5Archive ${KF_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/examples/helloworld/CMakeLists.txt new/karchive-5.83.0/examples/helloworld/CMakeLists.txt --- old/karchive-5.82.0/examples/helloworld/CMakeLists.txt 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/examples/helloworld/CMakeLists.txt 2021-06-05 10:50:19.000000000 +0200 @@ -2,8 +2,6 @@ # http://www.cmake.org/cmake/help/documentation.html # http://techbase.kde.org/Development/Tutorials/CMake -cmake_minimum_required(VERSION 2.8.12) - # Project name project(HelloWorld) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/examples/tarlocalfiles/CMakeLists.txt new/karchive-5.83.0/examples/tarlocalfiles/CMakeLists.txt --- old/karchive-5.82.0/examples/tarlocalfiles/CMakeLists.txt 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/examples/tarlocalfiles/CMakeLists.txt 2021-06-05 10:50:19.000000000 +0200 @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.8.12) - project(TarLocalFiles) find_package(KF5Archive ${KF_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/examples/unzipper/CMakeLists.txt new/karchive-5.83.0/examples/unzipper/CMakeLists.txt --- old/karchive-5.82.0/examples/unzipper/CMakeLists.txt 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/examples/unzipper/CMakeLists.txt 2021-06-05 10:50:19.000000000 +0200 @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.8.12) - project(Unzipper) find_package(KF5Archive ${KF_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/src/CMakeLists.txt new/karchive-5.83.0/src/CMakeLists.txt --- old/karchive-5.82.0/src/CMakeLists.txt 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/src/CMakeLists.txt 2021-06-05 10:50:19.000000000 +0200 @@ -7,28 +7,27 @@ set(HAVE_ZSTD_SUPPORT ${LibZstd_FOUND}) configure_file(config-compression.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compression.h) -add_definitions(-DQT_NO_CAST_FROM_ASCII) + +add_library(KF5Archive) +add_library(KF5::Archive ALIAS KF5Archive) if(BZIP2_FOUND) - include_directories(${BZIP2_INCLUDE_DIR}) - set(karchive_OPTIONAL_SRCS ${karchive_OPTIONAL_SRCS} kbzip2filter.cpp) - set(karchive_OPTIONAL_LIBS ${karchive_OPTIONAL_LIBS} ${BZIP2_LIBRARIES}) + target_sources(KF5Archive PRIVATE kbzip2filter.cpp) + target_link_libraries(KF5Archive PRIVATE BZip2::BZip2) endif() if(LIBLZMA_FOUND) - include_directories(${LIBLZMA_INCLUDE_DIRS}) - set(karchive_OPTIONAL_SRCS ${karchive_OPTIONAL_SRCS} kxzfilter.cpp k7zip.cpp) - set(karchive_OPTIONAL_LIBS ${karchive_OPTIONAL_LIBS} ${LIBLZMA_LIBRARIES}) + target_sources(KF5Archive PRIVATE kxzfilter.cpp k7zip.cpp) + target_link_libraries(KF5Archive PRIVATE LibLZMA::LibLZMA) endif() if (LibZstd_FOUND) - set(karchive_OPTIONAL_SRCS ${karchive_OPTIONAL_SRCS} kzstdfilter.cpp) - set(karchive_OPTIONAL_LIBS ${karchive_OPTIONAL_LIBS} PkgConfig::LibZstd) + target_sources(KF5Archive PRIVATE kzstdfilter.cpp) + target_link_libraries(KF5Archive PRIVATE PkgConfig::LibZstd) endif() -set(karchive_SRCS - karchive.cpp +target_sources(KF5Archive PRIVATE karchive.cpp kar.cpp kcompressiondevice.cpp kfilterbase.cpp @@ -41,7 +40,7 @@ krcc.cpp ) -ecm_qt_declare_logging_category(karchive_SRCS +ecm_qt_declare_logging_category(KF5Archive HEADER loggingcategory.h IDENTIFIER KArchiveLog CATEGORY_NAME kf.archive @@ -51,8 +50,6 @@ EXPORT KARCHIVE ) -add_library(KF5Archive ${karchive_SRCS} ${karchive_OPTIONAL_SRCS}) -add_library(KF5::Archive ALIAS KF5Archive) ecm_generate_export_header(KF5Archive BASE_NAME KArchive GROUP_BASE_NAME KF @@ -70,12 +67,11 @@ PUBLIC Qt5::Core PRIVATE - ${karchive_OPTIONAL_LIBS} - ${ZLIB_LIBRARY} + ZLIB::ZLIB ) set_target_properties(KF5Archive PROPERTIES - VERSION ${KARCHIVE_VERSION_STRING} + VERSION ${KARCHIVE_VERSION} SOVERSION ${KARCHIVE_SOVERSION} EXPORT_NAME "Archive" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/src/karchive.cpp new/karchive-5.83.0/src/karchive.cpp --- old/karchive-5.82.0/src/karchive.cpp 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/src/karchive.cpp 2021-06-05 10:50:19.000000000 +0200 @@ -153,7 +153,7 @@ } if (!d->dev->isOpen() && !d->dev->open(mode)) { - setErrorString(tr("Could not set device mode to %1").arg(mode)); + setErrorString(tr("Could not open device in mode %1").arg(mode)); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/src/kzstdfilter.cpp new/karchive-5.83.0/src/kzstdfilter.cpp --- old/karchive-5.82.0/src/kzstdfilter.cpp 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/src/kzstdfilter.cpp 2021-06-05 10:50:19.000000000 +0200 @@ -7,6 +7,8 @@ #include "kzstdfilter.h" #include "loggingcategory.h" +#include <QIODevice> + #if HAVE_ZSTD_SUPPORT extern "C" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/test_package/CMakeLists.txt new/karchive-5.83.0/test_package/CMakeLists.txt --- old/karchive-5.82.0/test_package/CMakeLists.txt 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/test_package/CMakeLists.txt 2021-06-05 10:50:19.000000000 +0200 @@ -1,5 +1,4 @@ project(PackageTest CXX) -cmake_minimum_required(VERSION 2.8.12) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.82.0/tests/kziptest.cpp new/karchive-5.83.0/tests/kziptest.cpp --- old/karchive-5.82.0/tests/kziptest.cpp 2021-05-01 11:37:13.000000000 +0200 +++ new/karchive-5.83.0/tests/kziptest.cpp 2021-06-05 10:50:19.000000000 +0200 @@ -68,7 +68,7 @@ { KZip zip(fileName); if (!zip.open(QIODevice::ReadOnly)) { - qWarning() << "Could not open" << fileName << "for reading. ZIP file doesn't exist or is invalid."; + qWarning() << "Could not open" << fileName << "for reading. ZIP file doesn't exist or is invalid:" << zip.errorString(); return 1; } const KArchiveDirectory *dir = zip.directory(); @@ -82,7 +82,7 @@ KZip zip(fileName); qDebug() << "Opening zip file"; if (!zip.open(QIODevice::ReadOnly)) { - qWarning() << "Could not open" << fileName << "for reading. ZIP file doesn't exist or is invalid."; + qWarning() << "Could not open" << fileName << "for reading. ZIP file doesn't exist or is invalid:" << zip.errorString(); return 1; } const KArchiveDirectory *dir = zip.directory(); @@ -108,7 +108,7 @@ { KZip zip(fileName); if (!zip.open(QIODevice::WriteOnly)) { - qWarning() << "Could not open" << fileName << "for writing"; + qWarning() << "Could not open" << fileName << "for writing:" << zip.errorString(); return 1; } @@ -136,7 +136,7 @@ { KZip zip(fileName); if (!zip.open(QIODevice::ReadOnly)) { - qWarning() << "Could not open" << fileName << "for reading. ZIP file doesn't exist or is invalid."; + qWarning() << "Could not open" << fileName << "for reading. ZIP file doesn't exist or is invalid:" << zip.errorString(); return 1; } const KArchiveDirectory *dir = zip.directory(); @@ -151,7 +151,7 @@ { KZip zip(fileName); if (!zip.open(QIODevice::ReadOnly)) { - qWarning() << "Could not open" << fileName << "for reading. ZIP file doesn't exist or is invalid."; + qWarning() << "Could not open" << fileName << "for reading. ZIP file doesn't exist or is invalid:" << zip.errorString(); return 1; } const KArchiveDirectory *dir = zip.directory(); @@ -170,13 +170,13 @@ { KZip zip(archiveName); if (!zip.open(QIODevice::WriteOnly)) { - qWarning() << "Could not open" << archiveName << "for writing"; + qWarning() << "Could not open" << archiveName << "for writing:" << zip.errorString(); return 1; } for (const QString &fileName : fileNames) { QFile f(fileName); if (!f.open(QIODevice::ReadOnly)) { - qWarning() << "Could not open" << fileName << "for reading."; + qWarning() << "Could not open" << fileName << "for reading:" << zip.errorString(); return 1; } zip.writeFile(fileName, f.readAll()); @@ -188,13 +188,13 @@ { KZip zip(archiveName); if (!zip.open(QIODevice::ReadWrite)) { - qWarning() << "Could not open" << archiveName << "for read/write"; + qWarning() << "Could not open" << archiveName << "for read/write:" << zip.errorString(); return 1; } QFile f(fileName); if (!f.open(QIODevice::ReadOnly)) { - qWarning() << "Could not open" << fileName << "for reading."; + qWarning() << "Could not open" << fileName << "for reading:" << zip.errorString(); return 1; } @@ -207,11 +207,11 @@ KZip zip1(sourceFile); KZip zip2(destFile); if (!zip1.open(QIODevice::ReadOnly)) { - qWarning() << "Could not open" << sourceFile << "for reading. ZIP file doesn't exist or is invalid."; + qWarning() << "Could not open" << sourceFile << "for reading. ZIP file doesn't exist or is invalid:" << zip1.errorString(); return 1; } if (!zip2.open(QIODevice::WriteOnly)) { - qWarning() << "Could not open" << destFile << "for writing"; + qWarning() << "Could not open" << destFile << "for writing:" << zip2.errorString(); return 1; } const KArchiveDirectory *dir1 = zip1.directory(); @@ -239,7 +239,7 @@ { KCompressionDevice device(fileName, KCompressionDevice::BZip2); if (!device.open(QIODevice::WriteOnly)) { - qWarning() << "Could not open" << fileName << "for writing"; + qWarning() << "Could not open" << fileName << "for writing:" << device.errorString(); return 1; } @@ -257,7 +257,7 @@ { KCompressionDevice device(fileName, KCompressionDevice::BZip2); if (!device.open(QIODevice::ReadOnly)) { - qWarning() << "Could not open" << fileName << "for reading"; + qWarning() << "Could not open" << fileName << "for reading:" << device.errorString(); return 1; } return load(&device);
