calligra-exiv2.patch

   1 diff -ruNp calligra-2.8.7.orig/CMakeLists.txt calligra-2.8.7/CMakeLists.txt
   2 --- calligra-2.8.7.orig/CMakeLists.txt  2014-11-30 15:02:18.000000000 +0100
   3 +++ calligra-2.8.7/CMakeLists.txt       2019-03-01 13:32:40.627835371 +0100
   4 @@ -438,8 +438,11 @@ macro_log_feature(QCA2_FOUND "QCA" "Qt C
   5  ## Test for exiv2
   6  ##
   7  set(EXIV2_MIN_VERSION "0.16")
   8 -macro_optional_find_package(Exiv2)
   9 -macro_log_feature(EXIV2_FOUND "Exiv2" "Image metadata library and tools" "http://www.exiv2.org" FALSE "0.16" "Required by Krita")
  10 +macro_optional_find_package(exiv2)
  11 +macro_log_feature(exiv2_FOUND "exiv2" "Image metadata library and tools" "http://www.exiv2.org" FALSE "0.16" "Required by Krita")
  12 +if(exiv2_FOUND)
  13 +    set(EXIV2_LIBRARIES exiv2lib)
  14 +endif()
  15
  16  ##
  17  ## Test for soprano
  18 @@ -937,9 +937,9 @@
  19      calligra_disable_product(SHEETS_PART "Eigen devel not found")
  20  endif(NOT EIGEN2_FOUND)
  21
  22 -if(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
  23 +if(NOT EIGEN2_FOUND OR NOT exiv2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
  24      calligra_disable_product(KRITA_APP "SharedMimeInfo|libeigen2|libexiv2|lcms devel not found ")
  25 -endif(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
  26 +endif(NOT EIGEN2_FOUND OR NOT exiv2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
  27
  28  if(NOT APPLE AND NOT REQUIRED_Xinput_FOUND)
  29      calligra_disable_product(KRITA_APP "Xinput devel not found ")
  30 --- calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp.orig        2014-11-30 15:01:15.000000000 +0100
  31 +++ calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp     2019-03-04 23:08:54.941391753 +0100
  32 @@ -17,7 +17,7 @@
  33  #include "kis_xmp_io.h"
  34
  35  #include <string>
  36 -#include <exiv2/xmp.hpp>
  37 +#include <exiv2/xmp_exiv2.hpp>
  38
  39  #include "kis_exiv2.h"
  40
  41 @@ -277,9 +277,8 @@
  42                  const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get());
  43                  Q_ASSERT(xav);
  44                  QList<KisMetaData::Value> array;
  45 -                for (std::vector< std::string >::const_iterator it = xav->value_.begin();
  46 -                        it != xav->value_.end(); ++it) {
  47 -                    QString value = it->c_str();
  48 +               for (int i=0; i<xav->count(); i++) {
  49 +                    QString value = xav->toString(i).c_str();
  50                      if (parser) {
  51                          array.push_back(parser->parse(value));
  52                      } else {