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 @@ -847,7 +847,7 @@
  19
  20  calligra_drop_product_on_bad_condition( APP_KRITA
  21      EIGEN3_FOUND "Eigen devel not found"
  22 -    EXIV2_FOUND "libexiv2 devel not found"
  23 +    exiv2_FOUND "libexiv2 devel not found"
  24      HAVE_REQUIRED_LCMS_VERSION "lcms devel not found"
  25      SHARED_MIME_INFO_FOUND "SharedMimeInfo not found"
  26      Boost_SYSTEM_FOUND "boost-system devel not found"
  27 --- calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp.orig        2014-11-30 15:01:15.000000000 +0100
  28 +++ calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp     2019-03-04 23:08:54.941391753 +0100
  29 @@ -17,7 +17,7 @@
  30  #include "kis_xmp_io.h"
  31
  32  #include <string>
  33 -#include <exiv2/xmp.hpp>
  34 +#include <exiv2/xmp_exiv2.hpp>
  35
  36  #include "kis_exiv2.h"
  37
  38 @@ -277,9 +277,8 @@
  39                  const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get());
  40                  Q_ASSERT(xav);
  41                  QList<KisMetaData::Value> array;
  42 -                for (std::vector< std::string >::const_iterator it = xav->value_.begin();
  43 -                        it != xav->value_.end(); ++it) {
  44 -                    QString value = it->c_str();
  45 +               for (int i=0; i<xav->count(); i++) {
  46 +                    QString value = xav->toString(i).c_str();
  47                      if (parser) {
  48                          array.push_back(parser->parse(value));
  49                      } else {
  50 --- calligra-2.9.11/krita/ui/kisexiv2/kis_iptc_io.cpp~  2016-02-02 20:53:15.000000000 +0100
  51 +++ calligra-2.9.11/krita/ui/kisexiv2/kis_iptc_io.cpp   2019-10-05 10:39:13.546782615 +0200
  52 @@ -20,6 +20,7 @@
  53  #include <kis_debug.h>
  54
  55  #include <exiv2/iptc.hpp>
  56 +#include <exiv2/exiv2.hpp>
  57
  58  #include "kis_exiv2.h"
  59