Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package karchive for openSUSE:Factory checked in at 2022-01-11 21:15:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/karchive (Old) and /work/SRC/openSUSE:Factory/.karchive.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "karchive" Tue Jan 11 21:15:56 2022 rev:98 rq:945032 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/karchive/karchive.changes 2021-12-13 20:43:38.884479578 +0100 +++ /work/SRC/openSUSE:Factory/.karchive.new.1892/karchive.changes 2022-01-11 21:18:18.964918587 +0100 @@ -1,0 +2,11 @@ +Mon Jan 3 12:47:14 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Fix printf conversion specifiers + * Change the build system to enable building with Qt 6 + +------------------------------------------------------------------- Old: ---- karchive-5.89.0.tar.xz karchive-5.89.0.tar.xz.sig New: ---- karchive-5.90.0.tar.xz karchive-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ karchive.spec ++++++ --- /var/tmp/diff_new_pack.pgGovb/_old 2022-01-11 21:18:19.432918916 +0100 +++ /var/tmp/diff_new_pack.pgGovb/_new 2022-01-11 21:18:19.436918918 +0100 @@ -17,22 +17,22 @@ %define lname libKF5Archive5 -%define _tar_path 5.89 +%define _tar_path 5.90 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} # Only needed for the package signature condition -%bcond_without lang +%bcond_without released Name: karchive -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Qt 5 addon providing access to numerous types of archives License: LGPL-2.0-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif ++++++ karchive-5.89.0.tar.xz -> karchive-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.89.0/CMakeLists.txt new/karchive-5.90.0/CMakeLists.txt --- old/karchive-5.89.0/CMakeLists.txt 2021-12-04 17:56:00.000000000 +0100 +++ new/karchive-5.90.0/CMakeLists.txt 2022-01-01 13:11:22.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts project(KArchive VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.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) @@ -19,7 +19,7 @@ include(ECMGenerateExportHeader) set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(ZLIB) set_package_properties(ZLIB PROPERTIES @@ -97,7 +97,7 @@ ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/karchive_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel) install(FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.89.0/KF5ArchiveConfig.cmake.in new/karchive-5.90.0/KF5ArchiveConfig.cmake.in --- old/karchive-5.89.0/KF5ArchiveConfig.cmake.in 2021-12-04 17:56:00.000000000 +0100 +++ new/karchive-5.90.0/KF5ArchiveConfig.cmake.in 2022-01-01 13:11:22.000000000 +0100 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) set(KArchive_HAVE_ZLIB "@ZLIB_FOUND@") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.89.0/autotests/CMakeLists.txt new/karchive-5.90.0/autotests/CMakeLists.txt --- old/karchive-5.89.0/autotests/CMakeLists.txt 2021-12-04 17:56:00.000000000 +0100 +++ new/karchive-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:11:22.000000000 +0100 @@ -2,11 +2,11 @@ include(ECMAddTests) -find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET) -find_package(Qt5Network) +find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG QUIET) +find_package(Qt${QT_MAJOR_VERSION}Network) -if(NOT Qt5Test_FOUND) - message(STATUS "Qt5Test not found, autotests will not be built.") +if(NOT Qt${QT_MAJOR_VERSION}Test_FOUND) + message(STATUS "Qt${QT_MAJOR_VERSION}Test not found, autotests will not be built.") return() endif() @@ -14,7 +14,7 @@ karchivetest.cpp kfiltertest.cpp deprecatedtest.cpp - LINK_LIBRARIES KF5::Archive Qt5::Test + LINK_LIBRARIES KF5::Archive Qt${QT_MAJOR_VERSION}::Test ) target_link_libraries(kfiltertest ZLIB::ZLIB) @@ -25,16 +25,16 @@ klimitediodevicetest.cpp ../src/klimitediodevice.cpp TEST_NAME klimitediodevicetest - LINK_LIBRARIES Qt5::Test + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test ) target_include_directories(klimitediodevicetest PRIVATE $<TARGET_PROPERTY:KF5Archive,INTERFACE_INCLUDE_DIRECTORIES>) ########## kcompressiondevicetest ############## -if (Qt5Network_FOUND) +if (Qt${QT_MAJOR_VERSION}Network_FOUND) ecm_add_test( kcompressiondevicetest.cpp - LINK_LIBRARIES KF5::Archive Qt5::Test Qt5::Network + LINK_LIBRARIES KF5::Archive Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Network ) set(testDir $<TARGET_FILE_DIR:kcompressiondevicetest>) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.89.0/examples/helloworld/CMakeLists.txt new/karchive-5.90.0/examples/helloworld/CMakeLists.txt --- old/karchive-5.89.0/examples/helloworld/CMakeLists.txt 2021-12-04 17:56:00.000000000 +0100 +++ new/karchive-5.90.0/examples/helloworld/CMakeLists.txt 2022-01-01 13:11:22.000000000 +0100 @@ -8,9 +8,9 @@ # Look for the KArchive module find_package(KF5Archive ${KF_VERSION} REQUIRED) -find_package(Qt5Core REQUIRED) +find_package(Qt${QT_MAJOR_VERSION}Core REQUIRED) add_executable(helloworld main.cpp) # Link our executable with the KArchive library -target_link_libraries(helloworld KF5::Archive Qt5::Core) +target_link_libraries(helloworld KF5::Archive Qt${QT_MAJOR_VERSION}::Core) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.89.0/src/CMakeLists.txt new/karchive-5.90.0/src/CMakeLists.txt --- old/karchive-5.89.0/src/CMakeLists.txt 2021-12-04 17:56:00.000000000 +0100 +++ new/karchive-5.90.0/src/CMakeLists.txt 2022-01-01 13:11:22.000000000 +0100 @@ -66,12 +66,12 @@ ) target_include_directories(KF5Archive - INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KArchive>" + INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KArchive>" ) target_link_libraries(KF5Archive PUBLIC - Qt5::Core + Qt${QT_MAJOR_VERSION}::Core PRIVATE ZLIB::ZLIB ) @@ -115,7 +115,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/karchive_export.h ${KArchive_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KArchive + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KArchive COMPONENT Devel) ecm_qt_install_logging_categories( @@ -149,7 +149,7 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KArchive LIB_NAME KF5Archive DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KArchive) +ecm_generate_pri_file(BASE_NAME KArchive LIB_NAME KF5Archive DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KArchive) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.89.0/test_package/CMakeLists.txt new/karchive-5.90.0/test_package/CMakeLists.txt --- old/karchive-5.89.0/test_package/CMakeLists.txt 2021-12-04 17:56:00.000000000 +0100 +++ new/karchive-5.90.0/test_package/CMakeLists.txt 2022-01-01 13:11:22.000000000 +0100 @@ -3,10 +3,12 @@ include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup() +# TODO: rename to Qt6 after branching KF6 find_package(Qt5 5.6 CONFIG REQUIRED Core ) +# TODO: rename to Qt6 after branching KF6 add_executable(example example.cpp) target_link_libraries(example ${CONAN_LIBS} Qt5::Core) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.89.0/tests/kziptest.cpp new/karchive-5.90.0/tests/kziptest.cpp --- old/karchive-5.89.0/tests/kziptest.cpp 2021-12-04 17:56:00.000000000 +0100 +++ new/karchive-5.90.0/tests/kziptest.cpp 2022-01-01 13:11:22.000000000 +0100 @@ -49,7 +49,11 @@ printf("FILE=%s\n", qPrintable(e->name())); QByteArray arr(f->data()); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + printf("SIZE=%lli\n", arr.size()); +#else printf("SIZE=%i\n", arr.size()); +#endif QString str(arr); printf("DATA=%s\n", qPrintable(str)); @@ -95,7 +99,11 @@ Q_ASSERT(e && e->isFile()); const KArchiveFile *f = static_cast<const KArchiveFile *>(e); const QByteArray data(f->data()); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + printf("SIZE=%lli\n", data.size()); +#else printf("SIZE=%i\n", data.size()); +#endif QString str = QString::fromUtf8(data); printf("DATA=%s\n", qPrintable(str)); } @@ -160,7 +168,12 @@ const KArchiveFile *f = static_cast<const KArchiveFile *>(e); const QByteArray arr(f->data()); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + printf("SIZE=%lli\n", arr.size()); +#else printf("SIZE=%i\n", arr.size()); +#endif + QString str = QString::fromUtf8(arr); printf("%s", qPrintable(str)); return zip.close() ? 0 : 1 /*error*/;
