Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kimageformats for openSUSE:Factory checked in at 2021-05-10 15:35:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kimageformats (Old) and /work/SRC/openSUSE:Factory/.kimageformats.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kimageformats" Mon May 10 15:35:36 2021 rev:92 rq:891758 version:5.82.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kimageformats/kimageformats.changes 2021-04-12 12:36:28.341305481 +0200 +++ /work/SRC/openSUSE:Factory/.kimageformats.new.2988/kimageformats.changes 2021-05-10 15:37:12.538079894 +0200 @@ -1,0 +2,14 @@ +Sat May 1 16:40:57 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.82.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.82.0 +- Changes since 5.81.0: + * Support building with OpenEXR 3 + * test: imageconverter: add a way to list mimes instead of formats + * xcf: fix new[]/delete mismatch, as detected by ASAN + * ani: convert +1 to -1 so we don't do a potential integer overflow + * xcf: Fix Stack-buffer-overflow WRITE on broken files + +------------------------------------------------------------------- Old: ---- kimageformats-5.81.0.tar.xz kimageformats-5.81.0.tar.xz.sig New: ---- kimageformats-5.82.0.tar.xz kimageformats-5.82.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kimageformats.spec ++++++ --- /var/tmp/diff_new_pack.wspoN8/_old 2021-05-10 15:37:13.074077818 +0200 +++ /var/tmp/diff_new_pack.wspoN8/_new 2021-05-10 15:37:13.074077818 +0200 @@ -19,7 +19,7 @@ %if 0%{?suse_version} > 1500 %define with_avif 1 %endif -%define _tar_path 5.81 +%define _tar_path 5.82 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -27,7 +27,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kimageformats -Version: 5.81.0 +Version: 5.82.0 Release: 0 Summary: Image format plugins for Qt License: LGPL-2.1-or-later @@ -44,9 +44,9 @@ BuildRequires: openexr BuildRequires: openexr-devel BuildRequires: cmake(KF5Archive) >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5Gui) >= 5.14.0 -BuildRequires: cmake(Qt5PrintSupport) >= 5.14.0 -BuildRequires: cmake(Qt5Test) >= 5.14.0 +BuildRequires: cmake(Qt5Gui) >= 5.15.0 +BuildRequires: cmake(Qt5PrintSupport) >= 5.15.0 +BuildRequires: cmake(Qt5Test) >= 5.15.0 %if 0%{?with_avif} BuildRequires: cmake(libavif) >= 0.8.2 %endif @@ -73,15 +73,15 @@ environments. %prep -%setup -q +%autosetup -p1 %build - %cmake_kf5 -d build - %cmake_build +%cmake_kf5 -d build +%cmake_build %install - %kf5_makeinstall -C build - %fdupes %{buildroot} +%kf5_makeinstall -C build +%fdupes %{buildroot} %files %license LICENSES/* ++++++ kimageformats-5.81.0.tar.xz -> kimageformats-5.82.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.81.0/.gitignore new/kimageformats-5.82.0/.gitignore --- old/kimageformats-5.81.0/.gitignore 2021-04-03 11:33:41.000000000 +0200 +++ new/kimageformats-5.82.0/.gitignore 2021-05-02 11:51:43.000000000 +0200 @@ -22,3 +22,6 @@ .cmake/ /.clang-format /compile_commands.json +.clangd +.idea +/cmake-build* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.81.0/CMakeLists.txt new/kimageformats-5.82.0/CMakeLists.txt --- old/kimageformats-5.81.0/CMakeLists.txt 2021-04-03 11:33:41.000000000 +0200 +++ new/kimageformats-5.82.0/CMakeLists.txt 2021-05-02 11:51:43.000000000 +0200 @@ -5,7 +5,7 @@ set (CMAKE_CXX_STANDARD 14) include(FeatureSummary) -find_package(ECM 5.81.0 NO_MODULE) +find_package(ECM 5.82.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) @@ -20,7 +20,7 @@ include(CheckIncludeFiles) -set(REQUIRED_QT_VERSION 5.14.0) +set(REQUIRED_QT_VERSION 5.15.0) find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(KF5Archive) @@ -43,7 +43,10 @@ endif() endif() -find_package(OpenEXR) +find_package(OpenEXR 3.0 CONFIG QUIET) +if(NOT OpenEXR_FOUND) + find_package(OpenEXR) +endif() set_package_properties(OpenEXR PROPERTIES TYPE OPTIONAL PURPOSE "Required for the QImage plugin for OpenEXR images" @@ -65,8 +68,8 @@ add_definitions(-DQT_NO_FOREACH) # 050d00 (5.13) triggers a BIC in qimageiohandler.h, in Qt 5.13, so do not enable that until we can require 5.14 # https://codereview.qt-project.org/c/qt/qtbase/+/279215 -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.81.0/src/imageformats/CMakeLists.txt new/kimageformats-5.82.0/src/imageformats/CMakeLists.txt --- old/kimageformats-5.81.0/src/imageformats/CMakeLists.txt 2021-04-03 11:33:41.000000000 +0200 +++ new/kimageformats-5.82.0/src/imageformats/CMakeLists.txt 2021-05-02 11:51:43.000000000 +0200 @@ -58,7 +58,11 @@ if(OpenEXR_FOUND) kimageformats_add_plugin(kimg_exr JSON "exr.json" SOURCES exr.cpp) - target_link_libraries(kimg_exr OpenEXR::IlmImf) + if(TARGET OpenEXR::OpenEXR) + target_link_libraries(kimg_exr OpenEXR::OpenEXR) + else() + target_link_libraries(kimg_exr OpenEXR::IlmImf) + endif() kde_target_enable_exceptions(kimg_exr PRIVATE) install(FILES exr.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.81.0/src/imageformats/ani.cpp new/kimageformats-5.82.0/src/imageformats/ani.cpp --- old/kimageformats-5.81.0/src/imageformats/ani.cpp 2021-04-03 11:33:41.000000000 +0200 +++ new/kimageformats-5.82.0/src/imageformats/ani.cpp 2021-05-02 11:51:43.000000000 +0200 @@ -504,7 +504,7 @@ return false; } - if (!m_frameOffsets.isEmpty() && m_frameOffsets.count() != m_frameCount + 1) { + if (!m_frameOffsets.isEmpty() && m_frameOffsets.count() - 1 != m_frameCount) { qWarning("ANIHandler: number of actual frames does not match 'nFrames' in anih"); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.81.0/src/imageformats/eps.cpp new/kimageformats-5.82.0/src/imageformats/eps.cpp --- old/kimageformats-5.81.0/src/imageformats/eps.cpp 2021-04-03 11:33:41.000000000 +0200 +++ new/kimageformats-5.82.0/src/imageformats/eps.cpp 2021-05-02 11:51:43.000000000 +0200 @@ -251,7 +251,8 @@ psOut.setOutputFileName(tmpFile.fileName()); psOut.setOutputFormat(QPrinter::PdfFormat); psOut.setFullPage(true); - psOut.setPaperSize(image.size(), QPrinter::DevicePixel); + const double multiplier = psOut.resolution() <= 0 ? 1.0 : 72.0 / psOut.resolution(); + psOut.setPageSize(QPageSize(image.size() * multiplier, QPageSize::Point)); // painting the pixmap to the "printer" which is a file p.begin(&psOut); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.81.0/src/imageformats/exr.cpp new/kimageformats-5.82.0/src/imageformats/exr.cpp --- old/kimageformats-5.81.0/src/imageformats/exr.cpp 2021-04-03 11:33:41.000000000 +0200 +++ new/kimageformats-5.82.0/src/imageformats/exr.cpp 2021-05-02 11:51:43.000000000 +0200 @@ -18,6 +18,7 @@ #include <ImfConvert.h> #include <ImfFloatAttribute.h> #include <ImfInputFile.h> +#include <ImfInt64.h> #include <ImfIntAttribute.h> #include <ImfLineOrderAttribute.h> #include <ImfRgbaFile.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.81.0/src/imageformats/xcf.cpp new/kimageformats-5.82.0/src/imageformats/xcf.cpp --- old/kimageformats-5.81.0/src/imageformats/xcf.cpp 2021-04-03 11:33:41.000000000 +0200 +++ new/kimageformats-5.82.0/src/imageformats/xcf.cpp 2021-05-02 11:51:43.000000000 +0200 @@ -537,6 +537,7 @@ */ XCFImageFormat::XCFImageFormat() { + static_assert(sizeof(QRgb) == 4, "the code assumes sizeof(QRgb) == 4, if that's not your case, help us fix it :)"); } /*! @@ -1361,6 +1362,11 @@ break; } + if (bpp > 4) { + qCDebug(XCFPLUGIN) << "bpp is" << bpp << "We don't support layers with bpp > 4"; + return false; + } + // GIMP stores images in a "mipmap"-like format (multiple levels of // increasingly lower resolution). Only the top level is used here, // however. @@ -1491,7 +1497,7 @@ xcf_io >> width >> height >> name; - delete name; + delete[] name; if (!loadChannelProperties(xcf_io, layer)) { return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.81.0/tests/imageconverter.cpp new/kimageformats-5.82.0/tests/imageconverter.cpp --- old/kimageformats-5.81.0/tests/imageconverter.cpp 2021-04-03 11:33:41.000000000 +0200 +++ new/kimageformats-5.82.0/tests/imageconverter.cpp 2021-05-02 11:51:43.000000000 +0200 @@ -38,6 +38,9 @@ QCommandLineOption listformats(QStringList() << QStringLiteral("l") << QStringLiteral("list"), QStringLiteral("List supported image formats")); parser.addOption(listformats); + QCommandLineOption listmimes(QStringList() << QStringLiteral("m") << QStringLiteral("listmime"), QStringLiteral("List supported image mime formats")); + parser.addOption(listmimes); + parser.process(app); const QStringList files = parser.positionalArguments(); @@ -55,6 +58,21 @@ out << " " << fmt << '\n'; } return 0; + } + + if (parser.isSet(listmimes)) { + QTextStream out(stdout); + out << "Input mime formats:\n"; + const auto lstReaderSupportedMimes = QImageReader::supportedMimeTypes(); + for (const QByteArray &fmt : lstReaderSupportedMimes) { + out << " " << fmt << '\n'; + } + out << "Output mime formats:\n"; + const auto lstWriterSupportedMimes = QImageWriter::supportedMimeTypes(); + for (const QByteArray &fmt : lstWriterSupportedMimes) { + out << " " << fmt << '\n'; + } + return 0; } if (files.count() != 2) {
