diff -ruNp calligra-2.8.7.orig/CMakeLists.txt calligra-2.8.7/CMakeLists.txt --- calligra-2.8.7.orig/CMakeLists.txt 2014-11-30 15:02:18.000000000 +0100 +++ calligra-2.8.7/CMakeLists.txt 2019-03-01 13:32:40.627835371 +0100 @@ -438,8 +438,11 @@ macro_log_feature(QCA2_FOUND "QCA" "Qt C ## Test for exiv2 ## set(EXIV2_MIN_VERSION "0.16") -macro_optional_find_package(Exiv2) -macro_log_feature(EXIV2_FOUND "Exiv2" "Image metadata library and tools" "http://www.exiv2.org" FALSE "0.16" "Required by Krita") +macro_optional_find_package(exiv2) +macro_log_feature(exiv2_FOUND "exiv2" "Image metadata library and tools" "http://www.exiv2.org" FALSE "0.16" "Required by Krita") +if(exiv2_FOUND) + set(EXIV2_LIBRARIES exiv2lib) +endif() ## ## Test for soprano @@ -847,7 +847,7 @@ calligra_drop_product_on_bad_condition( APP_KRITA EIGEN3_FOUND "Eigen devel not found" - EXIV2_FOUND "libexiv2 devel not found" + exiv2_FOUND "libexiv2 devel not found" HAVE_REQUIRED_LCMS_VERSION "lcms devel not found" SHARED_MIME_INFO_FOUND "SharedMimeInfo not found" Boost_SYSTEM_FOUND "boost-system devel not found" --- calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp.orig 2014-11-30 15:01:15.000000000 +0100 +++ calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp 2019-03-04 23:08:54.941391753 +0100 @@ -17,7 +17,7 @@ #include "kis_xmp_io.h" #include -#include +#include #include "kis_exiv2.h" @@ -277,9 +277,8 @@ const Exiv2::XmpArrayValue* xav = dynamic_cast(value.get()); Q_ASSERT(xav); QList array; - for (std::vector< std::string >::const_iterator it = xav->value_.begin(); - it != xav->value_.end(); ++it) { - QString value = it->c_str(); + for (int i=0; icount(); i++) { + QString value = xav->toString(i).c_str(); if (parser) { array.push_back(parser->parse(value)); } else { --- calligra-2.9.11/krita/ui/kisexiv2/kis_iptc_io.cpp~ 2016-02-02 20:53:15.000000000 +0100 +++ calligra-2.9.11/krita/ui/kisexiv2/kis_iptc_io.cpp 2019-10-05 10:39:13.546782615 +0200 @@ -20,6 +20,7 @@ #include #include +#include #include "kis_exiv2.h"