Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package prison-qt5 for openSUSE:Factory checked in at 2022-01-11 21:16:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prison-qt5 (Old) and /work/SRC/openSUSE:Factory/.prison-qt5.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prison-qt5" Tue Jan 11 21:16:56 2022 rev:63 rq:945097 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/prison-qt5/prison-qt5.changes 2021-12-13 20:45:18.456491776 +0100 +++ /work/SRC/openSUSE:Factory/.prison-qt5.new.1892/prison-qt5.changes 2022-01-11 21:20:08.928995931 +0100 @@ -1,0 +2,12 @@ +Mon Jan 3 12:48:06 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 missing porting to qt6 build system here + * Use preferedSize(1) as other autotest + * Fix compile against qt6 + +------------------------------------------------------------------- Old: ---- prison-5.89.0.tar.xz prison-5.89.0.tar.xz.sig New: ---- prison-5.90.0.tar.xz prison-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prison-qt5.spec ++++++ --- /var/tmp/diff_new_pack.hUKiap/_old 2022-01-11 21:20:09.476996317 +0100 +++ /var/tmp/diff_new_pack.hUKiap/_new 2022-01-11 21:20:09.480996320 +0100 @@ -19,22 +19,22 @@ %define sonum 5 %define rname prison %define _libname KF5Prison -%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: prison-qt5 -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Barcode abstraction layer library License: MIT Group: System/GUI/KDE URL: https://www.kde.org Source: %{rname}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{rname}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif ++++++ prison-5.89.0.tar.xz -> prison-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.89.0/CMakeLists.txt new/prison-5.90.0/CMakeLists.txt --- old/prison-5.89.0/CMakeLists.txt 2021-12-04 18:06:31.000000000 +0100 +++ new/prison-5.90.0/CMakeLists.txt 2022-01-01 13:21:18.000000000 +0100 @@ -1,11 +1,11 @@ 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(prison VERSION ${KF_VERSION}) # ECM setup 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) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${ECM_MODULE_PATH}") @@ -32,8 +32,8 @@ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick) find_package(QRencode) set_package_properties(QRencode PROPERTIES TYPE REQUIRED) find_package(Dmtx) @@ -53,7 +53,7 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) add_subdirectory(src) if(BUILD_TESTING) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) + find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) add_subdirectory(autotests) add_subdirectory(tests) endif() @@ -91,7 +91,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/prison_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.89.0/KF5PrisonConfig.cmake.in new/prison-5.90.0/KF5PrisonConfig.cmake.in --- old/prison-5.89.0/KF5PrisonConfig.cmake.in 2021-12-04 18:06:31.000000000 +0100 +++ new/prison-5.90.0/KF5PrisonConfig.cmake.in 2022-01-01 13:21:18.000000000 +0100 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Gui @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5PrisonTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.89.0/autotests/CMakeLists.txt new/prison-5.90.0/autotests/CMakeLists.txt --- old/prison-5.89.0/autotests/CMakeLists.txt 2021-12-04 18:06:31.000000000 +0100 +++ new/prison-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:21:18.000000000 +0100 @@ -10,14 +10,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/../src/lib/prison_debug.cpp ) -ecm_add_test(${aztecbarcodetest_srcs} TEST_NAME prison-aztecbarcodetest LINK_LIBRARIES Qt5::Test KF5::Prison) +ecm_add_test(${aztecbarcodetest_srcs} TEST_NAME prison-aztecbarcodetest LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::Prison) ecm_add_test( reedsolomontest.cpp ../src/lib/bitvector.cpp ../src/lib/reedsolomon.cpp TEST_NAME prison-reedsolomontest - LINK_LIBRARIES Qt5::Test KF5::Prison + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::Prison ) set(code128barcodetest_srcs @@ -28,9 +28,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/../src/lib/prison_debug.cpp ) -ecm_add_test(${code128barcodetest_srcs} TEST_NAME prison-code128barcodetest LINK_LIBRARIES Qt5::Test KF5::Prison) +ecm_add_test(${code128barcodetest_srcs} TEST_NAME prison-code128barcodetest LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::Prison) if(TARGET Dmtx::Dmtx) - ecm_add_test(datamatrixtest.cpp datamatrix/datamatrix.qrc TEST_NAME prison-datamatrixtest LINK_LIBRARIES Qt5::Test KF5::Prison) + ecm_add_test(datamatrixtest.cpp datamatrix/datamatrix.qrc TEST_NAME prison-datamatrixtest LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::Prison) endif() -ecm_add_test(qrtest.cpp qr/qr.qrc TEST_NAME prison-qrtest LINK_LIBRARIES Qt5::Test KF5::Prison) +ecm_add_test(qrtest.cpp qr/qr.qrc TEST_NAME prison-qrtest LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::Prison) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.89.0/autotests/datamatrixtest.cpp new/prison-5.90.0/autotests/datamatrixtest.cpp --- old/prison-5.89.0/autotests/datamatrixtest.cpp 2021-12-04 18:06:31.000000000 +0100 +++ new/prison-5.90.0/autotests/datamatrixtest.cpp 2022-01-01 13:21:18.000000000 +0100 @@ -32,7 +32,7 @@ { std::unique_ptr<Prison::AbstractBarcode> code(Prison::createBarcode(Prison::DataMatrix)); code->setData(QString::fromLatin1(input.constData(), input.size())); - const auto img = code->toImage(code->minimumSize()); + const auto img = code->toImage(code->preferredSize(1)); img.save(refName); QImage ref(QStringLiteral(":/datamatrix/") + refName); @@ -42,7 +42,7 @@ { std::unique_ptr<Prison::AbstractBarcode> code(Prison::createBarcode(Prison::DataMatrix)); code->setData(input); - const auto img = code->toImage(code->minimumSize()); + const auto img = code->toImage(code->preferredSize(1)); img.save(refName); QImage ref(QStringLiteral(":/datamatrix/") + refName); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.89.0/autotests/qrtest.cpp new/prison-5.90.0/autotests/qrtest.cpp --- old/prison-5.89.0/autotests/qrtest.cpp 2021-12-04 18:06:31.000000000 +0100 +++ new/prison-5.90.0/autotests/qrtest.cpp 2022-01-01 13:21:18.000000000 +0100 @@ -30,7 +30,7 @@ std::unique_ptr<Prison::AbstractBarcode> code(Prison::createBarcode(Prison::QRCode)); code->setData(input); - const auto img = code->toImage(code->minimumSize()); + const auto img = code->toImage(code->preferredSize(1)); img.save(refName); QImage ref(QStringLiteral(":/qr/") + refName); @@ -54,7 +54,7 @@ std::unique_ptr<Prison::AbstractBarcode> code(Prison::createBarcode(Prison::QRCode)); code->setData(input); - const auto img = code->toImage(code->minimumSize()); + const auto img = code->toImage(code->preferredSize(1)); img.save(refName); QImage ref(QStringLiteral(":/qr/") + refName); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.89.0/src/CMakeLists.txt new/prison-5.90.0/src/CMakeLists.txt --- old/prison-5.89.0/src/CMakeLists.txt 2021-12-04 18:06:31.000000000 +0100 +++ new/prison-5.90.0/src/CMakeLists.txt 2022-01-01 13:21:18.000000000 +0100 @@ -1,6 +1,6 @@ add_subdirectory(lib) add_subdirectory(tools) -if(TARGET Qt5::Quick) +if(TARGET Qt${QT_MAJOR_VERSION}::Quick) add_subdirectory(quick) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.89.0/src/lib/CMakeLists.txt new/prison-5.90.0/src/lib/CMakeLists.txt --- old/prison-5.89.0/src/lib/CMakeLists.txt 2021-12-04 18:06:31.000000000 +0100 +++ new/prison-5.90.0/src/lib/CMakeLists.txt 2022-01-01 13:21:18.000000000 +0100 @@ -64,11 +64,11 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_include_directories(KF5Prison INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/prison/>") +target_include_directories(KF5Prison INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/prison/>") target_link_libraries(KF5Prison PUBLIC - Qt5::Gui + Qt${QT_MAJOR_VERSION}::Gui PRIVATE QRencode::QRencode ) @@ -90,21 +90,21 @@ ) # KF6: install to a path having both include visibility layer & namespace dir prefix: -# CamelCase includes to ${KDE_INSTALL_INCLUDEDIR_KF5}/Prison/Prison -# normal headers to ${KDE_INSTALL_INCLUDEDIR_KF5}/Prison/prison +# CamelCase includes to ${KDE_INSTALL_INCLUDEDIR_KF}/Prison/Prison +# normal headers to ${KDE_INSTALL_INCLUDEDIR_KF}/Prison/prison # The generated cmake config files currently points behind the namespace dir prefix, by -# target_include_directories(KF5Prison INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/prison>") +# target_include_directories(KF5Prison INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/prison>") # which should though point to before the namespace dir prefix level. -# Includes using <prison/*> only work currently due to the actual include base ${KDE_INSTALL_INCLUDEDIR_KF5} +# Includes using <prison/*> only work currently due to the actual include base ${KDE_INSTALL_INCLUDEDIR_KF} # also being set, via KF5_INSTALL_TARGETS_DEFAULT_ARGS. install(FILES ${Prison_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/prison COMPONENT Devel) + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/prison COMPONENT Devel) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/prison_export.h ${Prison_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/prison + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/prison COMPONENT Devel ) @@ -119,7 +119,7 @@ ${Prison_HEADERS} MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" LINK_QCHS - Qt5Gui_QCH + Qt${QT_MAJOR_VERSION}Gui_QCH INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} BLANK_MACROS @@ -136,6 +136,6 @@ # INCLUDE_INSTALL_DIR has to be without prison/ subdir # as the generated CamelCase headers have the prison/ path in the forward include -ecm_generate_pri_file(BASE_NAME Prison LIB_NAME KF5Prison DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}) +ecm_generate_pri_file(BASE_NAME Prison LIB_NAME KF5Prison DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.89.0/src/quick/CMakeLists.txt new/prison-5.90.0/src/quick/CMakeLists.txt --- old/prison-5.89.0/src/quick/CMakeLists.txt 2021-12-04 18:06:31.000000000 +0100 +++ new/prison-5.90.0/src/quick/CMakeLists.txt 2022-01-01 13:21:18.000000000 +0100 @@ -3,6 +3,6 @@ barcodequickitem.h prisonquickplugin.cpp ) -target_link_libraries(prisonquickplugin PRIVATE Qt5::Quick KF5::Prison) +target_link_libraries(prisonquickplugin PRIVATE Qt${QT_MAJOR_VERSION}::Quick KF5::Prison) install(TARGETS prisonquickplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/prison) install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/prison) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.89.0/tests/CMakeLists.txt new/prison-5.90.0/tests/CMakeLists.txt --- old/prison-5.89.0/tests/CMakeLists.txt 2021-12-04 18:06:31.000000000 +0100 +++ new/prison-5.90.0/tests/CMakeLists.txt 2022-01-01 13:21:18.000000000 +0100 @@ -1,3 +1,3 @@ add_executable(test-prison) target_sources(test-prison PRIVATE prison.cpp barcodeexamplewidget.cpp main.cpp) -target_link_libraries(test-prison Qt5::Widgets KF5::Prison) +target_link_libraries(test-prison Qt${QT_MAJOR_VERSION}::Widgets KF5::Prison)
