Changes - SailfishOS Open Build Service

Changes of Revision 4

[-] [+]	Changed	_service:tar_git:kimageformats.spec
@@ -8,8 +8,14 @@ # >> macros # << macros +# >> bcond_with +# << bcond_with + +# >> bcond_without +# << bcond_without + Summary: KDE Frameworks 5 Tier 1 addon with additional image plugins for QtGui -Version: 5.1.0 +Version: 5.2.0 Release: 1 Group: System/Base License: GPLv2+
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/CMakeLists.txt ^
@@ -2,7 +2,7 @@ project(KImageFormats) -find_package(ECM 1.1.0 REQUIRED NO_MODULE) +find_package(ECM 1.2.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -30,13 +30,17 @@ endif() endif() -find_package(Jasper) -set_package_properties(Jasper PROPERTIES - DESCRIPTION "A library for handling JPEG-2000 images" - PURPOSE "Required for the QImage plugin for JPEG-2000 images" - URL "http://www.ece.uvic.ca/~mdadams/jasper" - TYPE OPTIONAL -) +# QtImageFormats 5.3 comes with a JPEG-2000 plugin; don't duplicate it here +# TODO: remove our JPEG-2000 plugin when we depend on Qt 5.3. +if (Qt5Gui_VERSION VERSION_LESS 5.3.0) + find_package(Jasper) + set_package_properties(Jasper PROPERTIES + DESCRIPTION "A library for handling JPEG-2000 images" + PURPOSE "Required for the QImage plugin for JPEG-2000 images" + URL "http://www.ece.uvic.ca/~mdadams/jasper" + TYPE OPTIONAL + ) +endif() find_package(OpenEXR) set_package_properties(OpenEXR PROPERTIES
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/README.md ^
@@ -1,6 +1,6 @@ # KImageFormats -Image format plugins for Qt +Plugins to allow QImage to support extra file formats. ## Introduction @@ -63,9 +63,3 @@ The CMake code in this framework is licensed under the [BSD license](http://opensource.org/licenses/BSD-3-Clause). -## Links - -- Home page: <https://projects.kde.org/projects/frameworks/kimageformats> -- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-frameworks-devel> -- IRC channel: \#kde-devel on Freenode -- Git repository: <https://projects.kde.org/projects/frameworks/kimageformats/repository>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/metainfo.yaml ^
@@ -1,5 +1,5 @@ maintainer: alexmerry -description: Plugins to allow QImage to support extra file formats +description: Image format plugins for Qt tier: 1 type: functional platforms:
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/CMakeLists.txt ^
@@ -2,11 +2,15 @@ ################################## -add_library(kimg_dds MODULE dds.cpp) -target_link_libraries(kimg_dds Qt5::Gui) - -install(TARGETS kimg_dds DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/) -install(FILES dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/) +if (Qt5Gui_VERSION VERSION_LESS 5.3.0) + add_library(kimg_dds MODULE dds.cpp) + target_link_libraries(kimg_dds Qt5::Gui) + + install(TARGETS kimg_dds DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/) + install(FILES dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/) +else() + install(FILES dds-qt.desktop RENAME dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/) +endif() ################################## @@ -34,6 +38,9 @@ install(TARGETS kimg_jp2 DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/) install(FILES jp2.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/) +elseif (NOT Qt5Gui_VERSION VERSION_LESS 5.3.0) + # need this for Qt's version of the plugin + install(FILES jp2.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/) endif() ##################################
[-] [+]	Added	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/dds-qt.desktop ^
@@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Service +X-KDE-ServiceTypes=QImageIOPlugins +X-KDE-ImageFormat=dds +X-KDE-MimeType=image/x-dds +X-KDE-Read=true +X-KDE-Write=true
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/dds.cpp ^
@@ -19,7 +19,7 @@ * rgb dds files only -- TODO */ -#include "dds.h" +#include "dds_p.h" #include <QtCore/QStringList> #include <QImage>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/dds_p.h ^
(renamed from upstream/src/imageformats/dds.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/eps.cpp ^
@@ -6,7 +6,7 @@ * * This library is distributed under the conditions of the GNU LGPL. */ -#include "eps.h" +#include "eps_p.h" #include <QDebug> #include <QImage>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/eps_p.h ^
(renamed from upstream/src/imageformats/eps.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/exr.cpp ^
@@ -7,7 +7,7 @@ * This library is distributed under the conditions of the GNU LGPL. */ -#include "exr.h" +#include "exr_p.h" #include <ImfRgbaFile.h> #include <ImfStandardAttributes.h>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/exr_p.h ^
(renamed from upstream/src/imageformats/exr.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/gimp_p.h ^
(renamed from upstream/src/imageformats/gimp.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/hdr.cpp ^
@@ -8,7 +8,7 @@ version 2 of the License, or (at your option) any later version. */ -#include "hdr.h" +#include "hdr_p.h" #include <QImage> #include <QtCore/QDataStream>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/hdr_p.h ^
(renamed from upstream/src/imageformats/hdr.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/jp2.cpp ^
@@ -5,7 +5,7 @@ * This library is distributed under the conditions of the GNU LGPL. */ -#include "jp2.h" +#include "jp2_p.h" #include <config-jp2.h>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/jp2_p.h ^
(renamed from upstream/src/imageformats/jp2.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/pcx.cpp ^
@@ -7,7 +7,7 @@ version 2 of the License, or (at your option) any later version. */ -#include "pcx.h" +#include "pcx_p.h" #include <QColor> #include <QDataStream>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/pcx_p.h ^
(renamed from upstream/src/imageformats/pcx.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/pic.cpp ^
@@ -25,7 +25,7 @@ * with his permission. */ -#include "pic.h" +#include "pic_p.h" #include <QDataStream> #include <QDebug>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/pic_p.h ^
(renamed from upstream/src/imageformats/pic.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/psd.cpp ^
@@ -17,7 +17,7 @@ * not supported */ -#include "psd.h" +#include "psd_p.h" #include <QImage> #include <QtCore/QDataStream>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/psd_p.h ^
(renamed from upstream/src/imageformats/psd.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/ras.cpp ^
@@ -9,7 +9,7 @@ version 2 of the License, or (at your option) any later version. */ -#include "ras.h" +#include "ras_p.h" #include <QImage> #include <QtCore/QDataStream>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/ras_p.h ^
(renamed from upstream/src/imageformats/ras.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/rgb.cpp ^
@@ -21,7 +21,7 @@ * saved by this filter. */ -#include "rgb.h" +#include "rgb_p.h" #include <QtCore/QMap> #include <QtCore/QVector>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/rgb_p.h ^
(renamed from upstream/src/imageformats/rgb.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/tga.cpp ^
@@ -18,7 +18,7 @@ * uncompressed true color tga files */ -#include "tga.h" +#include "tga_p.h" #include <assert.h>
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/tga_p.h ^
(renamed from upstream/src/imageformats/tga.h)
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/xcf.cpp ^
@@ -19,7 +19,7 @@ * */ -#include "xcf.h" +#include "xcf_p.h" #include <stdlib.h> #include <QImage> @@ -29,7 +29,7 @@ #include <QtCore/QVector> // #include <QDebug> -#include "gimp.h" +#include "gimp_p.h" const float INCHESPERMETER = (100.0f / 2.54f);
[-] [+]	Changed	_service:tar_git:kimageformats-5.2.0.tar.xz/upstream/src/imageformats/xcf_p.h ^
(renamed from upstream/src/imageformats/xcf.h)
[-] [+]	Changed	_service:tar_git:kimageformats.yaml ^
@@ -1,5 +1,5 @@ Name : kimageformats -Version : 5.1.0 +Version : 5.2.0 Release : 1 Group : System/Base License : GPLv2+