Hello community, here is the log from the commit of package kimageformats for openSUSE:Factory checked in at 2018-01-22 16:00:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kimageformats (Old) and /work/SRC/openSUSE:Factory/.kimageformats.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kimageformats" Mon Jan 22 16:00:47 2018 rev:50 rq:566683 version:5.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kimageformats/kimageformats.changes 2018-01-09 14:42:33.573717856 +0100 +++ /work/SRC/openSUSE:Factory/.kimageformats.new/kimageformats.changes 2018-01-22 16:00:49.623597149 +0100 @@ -1,0 +2,12 @@ +Tue Jan 16 22:50:18 CET 2018 - [email protected] + +- Update to 5.42.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.42.0.php +- Changes since 5.41.0: + * Remove obsolete reviewboardrc file + * Set LIBRARY_OUTPUT_DIRECTORY so the autotests can run without the plugins installed + * Use brace-initializer instead of nullptr in returning 0-QFlags + +------------------------------------------------------------------- Old: ---- kimageformats-5.41.0.tar.xz New: ---- kimageformats-5.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kimageformats.spec ++++++ --- /var/tmp/diff_new_pack.NazL0d/_old 2018-01-22 16:00:50.403560648 +0100 +++ /var/tmp/diff_new_pack.NazL0d/_new 2018-01-22 16:00:50.407560461 +0100 @@ -1,7 +1,7 @@ # # spec file for package kimageformats # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,13 @@ # -%define _tar_path 5.41 +%define _tar_path 5.42 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kimageformats -Version: 5.41.0 +Version: 5.42.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ kimageformats-5.41.0.tar.xz -> kimageformats-5.42.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/.reviewboardrc new/kimageformats-5.42.0/.reviewboardrc --- old/kimageformats-5.41.0/.reviewboardrc 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/kimageformats' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' -TARGET_PEOPLE = 'alexmerry' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/CMakeLists.txt new/kimageformats-5.42.0/CMakeLists.txt --- old/kimageformats-5.41.0/CMakeLists.txt 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/CMakeLists.txt 2018-01-06 00:41:49.000000000 +0100 @@ -3,7 +3,7 @@ project(KImageFormats) include(FeatureSummary) -find_package(ECM 5.41.0 NO_MODULE) +find_package(ECM 5.42.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/CMakeLists.txt new/kimageformats-5.42.0/src/imageformats/CMakeLists.txt --- old/kimageformats-5.41.0/src/imageformats/CMakeLists.txt 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/CMakeLists.txt 2018-01-06 00:41:49.000000000 +0100 @@ -2,107 +2,101 @@ ################################## +function(kimageformats_add_plugin plugin) + set(options) + set(oneValueArgs JSON) + set(multiValueArgs SOURCES) + cmake_parse_arguments(KIF_ADD_PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + if(NOT KIF_ADD_PLUGIN_SOURCES) + message(FATAL_ERROR "kimageformats_add_plugin called without SOURCES parameter") + endif() + get_filename_component(json "${KIF_ADD_PLUGIN_JSON}" REALPATH) + if(NOT KIF_ADD_PLUGIN_JSON OR NOT EXISTS ${json}) + message(FATAL_ERROR "JSON file doesn't exist: ${json}") + endif() + + set_property(SOURCE ${KIF_ADD_PLUGIN_SOURCES} APPEND PROPERTY OBJECT_DEPENDS ${json}) + add_library(${plugin} MODULE ${KIF_ADD_PLUGIN_SOURCES}) + set_property(TARGET ${plugin} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${json}) + set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/imageformats") + target_link_libraries(${plugin} Qt5::Gui) + install(TARGETS ${plugin} DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats) +endfunction() + +################################## + install(FILES dds-qt.desktop RENAME dds.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) ################################## if (BUILD_EPS_PLUGIN) if (Qt5PrintSupport_FOUND) - add_library(kimg_eps MODULE eps.cpp) - target_link_libraries(kimg_eps Qt5::Gui Qt5::PrintSupport) - - install(TARGETS kimg_eps DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) + kimageformats_add_plugin(kimg_eps JSON "eps.json" SOURCES eps.cpp) + target_link_libraries(kimg_eps Qt5::PrintSupport) install(FILES eps.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) endif() endif() ################################## - # need this for Qt's version of the plugin install(FILES jp2.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) ################################## if(OpenEXR_FOUND) - add_library(kimg_exr MODULE exr.cpp) - target_link_libraries(kimg_exr Qt5::Gui OpenEXR::IlmImf) + kimageformats_add_plugin(kimg_exr JSON "exr.json" SOURCES exr.cpp) + target_link_libraries(kimg_exr OpenEXR::IlmImf) kde_target_enable_exceptions(kimg_exr PRIVATE) - install(TARGETS kimg_exr DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) install(FILES exr.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) endif() ################################## -add_library(kimg_pcx MODULE pcx.cpp) -target_link_libraries(kimg_pcx Qt5::Gui) - -install(TARGETS kimg_pcx DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) +kimageformats_add_plugin(kimg_pcx JSON "pcx.json" SOURCES pcx.cpp) install(FILES pcx.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) ################################## -add_library(kimg_pic MODULE pic.cpp) -target_link_libraries(kimg_pic Qt5::Gui) - -install(TARGETS kimg_pic DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) +kimageformats_add_plugin(kimg_pic JSON "pic.json" SOURCES pic.cpp) install(FILES pic.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) ################################## -add_library(kimg_psd MODULE psd.cpp) -target_link_libraries(kimg_psd Qt5::Gui) - -install(TARGETS kimg_psd DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) +kimageformats_add_plugin(kimg_psd JSON "psd.json" SOURCES psd.cpp) install(FILES psd.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) ################################## -add_library(kimg_ras MODULE ras.cpp) -target_link_libraries(kimg_ras Qt5::Gui) - -install(TARGETS kimg_ras DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) +kimageformats_add_plugin(kimg_ras JSON "ras.json" SOURCES ras.cpp) install(FILES ras.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) ################################## -add_library(kimg_rgb MODULE rgb.cpp) -target_link_libraries(kimg_rgb Qt5::Gui) - -install(TARGETS kimg_rgb DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) +kimageformats_add_plugin(kimg_rgb JSON "rgb.json" SOURCES rgb.cpp) install(FILES rgb.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) ################################## -add_library(kimg_tga MODULE tga.cpp) -target_link_libraries(kimg_tga Qt5::Gui) - -install(TARGETS kimg_tga DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) +kimageformats_add_plugin(kimg_tga JSON "tga.json" SOURCES tga.cpp) install(FILES tga.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) ################################## -add_library(kimg_xcf MODULE xcf.cpp) -target_link_libraries(kimg_xcf Qt5::Gui) - -install(TARGETS kimg_xcf DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) +kimageformats_add_plugin(kimg_xcf JSON "xcf.json" SOURCES xcf.cpp) install(FILES xcf.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) ################################## if (KF5Archive_FOUND) - add_library(kimg_kra MODULE kra.cpp) - target_link_libraries(kimg_kra Qt5::Gui KF5::Archive) - - install(TARGETS kimg_kra DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) + kimageformats_add_plugin(kimg_kra JSON "kra.json" SOURCES kra.cpp) + target_link_libraries(kimg_kra KF5::Archive) install(FILES kra.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) - add_library(kimg_ora MODULE ora.cpp) - target_link_libraries(kimg_ora Qt5::Gui KF5::Archive) - - install(TARGETS kimg_ora DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) + kimageformats_add_plugin(kimg_ora JSON "ora.json" SOURCES ora.cpp) + target_link_libraries(kimg_ora KF5::Archive) install(FILES ora.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/eps.cpp new/kimageformats-5.42.0/src/imageformats/eps.cpp --- old/kimageformats-5.41.0/src/imageformats/eps.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/eps.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -337,10 +337,10 @@ return Capabilities(CanRead | CanWrite); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/exr.cpp new/kimageformats-5.42.0/src/imageformats/exr.cpp --- old/kimageformats-5.41.0/src/imageformats/exr.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/exr.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -218,10 +218,10 @@ return Capabilities(CanRead); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/kra.cpp new/kimageformats-5.42.0/src/imageformats/kra.cpp --- old/kimageformats-5.41.0/src/imageformats/kra.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/kra.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -66,10 +66,10 @@ return Capabilities(CanRead); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/ora.cpp new/kimageformats-5.42.0/src/imageformats/ora.cpp --- old/kimageformats-5.41.0/src/imageformats/ora.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/ora.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -65,10 +65,10 @@ return Capabilities(CanRead); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/pcx.cpp new/kimageformats-5.42.0/src/imageformats/pcx.cpp --- old/kimageformats-5.41.0/src/imageformats/pcx.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/pcx.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -667,10 +667,10 @@ return Capabilities(CanRead | CanWrite); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/pic.cpp new/kimageformats-5.42.0/src/imageformats/pic.cpp --- old/kimageformats-5.41.0/src/imageformats/pic.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/pic.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -449,10 +449,10 @@ return Capabilities(CanRead | CanWrite); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/psd.cpp new/kimageformats-5.42.0/src/imageformats/psd.cpp --- old/kimageformats-5.41.0/src/imageformats/psd.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/psd.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -300,10 +300,10 @@ return Capabilities(CanRead); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/ras.cpp new/kimageformats-5.42.0/src/imageformats/ras.cpp --- old/kimageformats-5.41.0/src/imageformats/ras.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/ras.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -282,10 +282,10 @@ return Capabilities(CanRead); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/rgb.cpp new/kimageformats-5.42.0/src/imageformats/rgb.cpp --- old/kimageformats-5.41.0/src/imageformats/rgb.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/rgb.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -714,10 +714,10 @@ return Capabilities(CanRead | CanWrite); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/tga.cpp new/kimageformats-5.42.0/src/imageformats/tga.cpp --- old/kimageformats-5.41.0/src/imageformats/tga.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/tga.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -423,10 +423,10 @@ return Capabilities(CanRead | CanWrite); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimageformats-5.41.0/src/imageformats/xcf.cpp new/kimageformats-5.42.0/src/imageformats/xcf.cpp --- old/kimageformats-5.41.0/src/imageformats/xcf.cpp 2017-12-02 11:14:43.000000000 +0100 +++ new/kimageformats-5.42.0/src/imageformats/xcf.cpp 2018-01-06 00:41:49.000000000 +0100 @@ -2690,10 +2690,10 @@ return Capabilities(CanRead); } if (!format.isEmpty()) { - return nullptr; + return {}; } if (!device->isOpen()) { - return nullptr; + return {}; } Capabilities cap;
