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
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")
13 + set(EXIV2_LIBRARIES exiv2lib)
18 --- calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp.orig 2014-11-30 15:01:15.000000000 +0100
19 +++ calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp 2019-03-04 23:08:54.941391753 +0100
21 #include "kis_xmp_io.h"
24 -#include <exiv2/xmp.hpp>
25 +#include <exiv2/xmp_exiv2.hpp>
27 #include "kis_exiv2.h"
30 const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get());
32 QList<KisMetaData::Value> array;
33 - for (std::vector< std::string >::const_iterator it = xav->value_.begin();
34 - it != xav->value_.end(); ++it) {
35 - QString value = it->c_str();
36 + for (int i=0; i<xav->count(); i++) {
37 + QString value = xav->toString(i).c_str();
39 array.push_back(parser->parse(value));