Upgrade ECM and KF5 version requirements for 5.7.0 release.

Fixes build with Qt 5.5

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(KImageFormats)
 
-find_package(ECM 1.0.0 REQUIRED NO_MODULE)
+find_package(ECM 1.7.0 REQUIRED NO_MODULE)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
@@ -30,6 +30,9 @@ if (UNIX)
     endif()
 endif()
 
+# 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"
@@ -37,6 +40,7 @@ set_package_properties(Jasper PROPERTIES
         URL "http://www.ece.uvic.ca/~mdadams/jasper"
         TYPE OPTIONAL
     )
+endif()
 
 find_package(OpenEXR)
 set_package_properties(OpenEXR PROPERTIES

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 @@ This framework is licensed under the
 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>

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:

src/imageformats/CMakeLists.txt

@@ -2,11 +2,15 @@
 
 ##################################
 
+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(TARGETS kimg_dds  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-install(FILES dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+    install(FILES dds.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)
+else()
+    install(FILES dds-qt.desktop RENAME dds.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)
+endif()
 
 ##################################
 
@@ -15,8 +19,8 @@ if (BUILD_EPS_PLUGIN)
         add_library(kimg_eps MODULE eps.cpp)
         target_link_libraries(kimg_eps  Qt5::Gui Qt5::PrintSupport)
 
-        install(TARGETS kimg_eps  DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+        install(TARGETS kimg_eps  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-        install(FILES eps.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+        install(FILES eps.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)
     endif()
 endif()
 
@@ -32,8 +36,11 @@ if(JASPER_FOUND)
     target_include_directories(kimg_jp2 PRIVATE ${JASPER_INCLUDE_DIR})
     target_link_libraries(kimg_jp2  Qt5::Gui ${JASPER_LIBRARIES})
 
-    install(TARGETS kimg_jp2  DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+    install(TARGETS kimg_jp2  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-    install(FILES jp2.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+    install(FILES jp2.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)
+elseif (NOT Qt5Gui_VERSION VERSION_LESS 5.3.0)
+    # need this for Qt's version of the plugin
+    install(FILES jp2.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)
 endif()
 
 ##################################
@@ -43,8 +50,8 @@ if(OpenEXR_FOUND)
     target_link_libraries(kimg_exr Qt5::Gui OpenEXR::IlmImf)
     kde_target_enable_exceptions(kimg_exr PRIVATE)
 
-    install(TARGETS kimg_exr  DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+    install(TARGETS kimg_exr  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-    install(FILES exr.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+    install(FILES exr.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)
 endif()
 
 ##################################
@@ -52,54 +59,54 @@ endif()
 add_library(kimg_pcx MODULE pcx.cpp)
 target_link_libraries(kimg_pcx  Qt5::Gui)
 
-install(TARGETS kimg_pcx  DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+install(TARGETS kimg_pcx  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-install(FILES pcx.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+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 ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+install(TARGETS kimg_pic  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-install(FILES pic.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+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 ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+install(TARGETS kimg_psd  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-install(FILES psd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+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 ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+install(TARGETS kimg_ras  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-install(FILES ras.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+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 ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+install(TARGETS kimg_rgb  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-install(FILES rgb.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+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 ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+install(TARGETS kimg_tga  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-install(FILES tga.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+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 ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
+install(TARGETS kimg_xcf  DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
-install(FILES xcf.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
+install(FILES xcf.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)
 

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

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>

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>

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>

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>

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>
 

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>

src/imageformats/pic.cpp

@@ -25,7 +25,7 @@
  * with his permission.
  */
 
-#include "pic.h"
+#include "pic_p.h"
 
 #include <QDataStream>
 #include <QDebug>

src/imageformats/pic_p.h

@@ -22,6 +22,7 @@
 #define KIMG_PIC_H
 
 #include <QImageIOPlugin>
+#include <QDataStream>
 
 /**
  * The magic number at the start of a SoftImage PIC file.

src/imageformats/psd.cpp

@@ -17,7 +17,7 @@
  *     not supported
  */
 
-#include "psd.h"
+#include "psd_p.h"
 
 #include <QImage>
 #include <QtCore/QDataStream>

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>

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>

src/imageformats/tga.cpp

@@ -18,7 +18,7 @@
  *     uncompressed true color tga files
  */
 
-#include "tga.h"
+#include "tga_p.h"
 
 #include <assert.h>
 

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);