File Fix-building-against-exiv2-0.27.patch of Package calligra4
From: Wolfgang Bauer <wbauer@tmo.at>
Subject: Fix building against exiv2-0.27
Summary:
Backport of the necessary parts from https://phabricator.kde.org/D17810
---
diff --git a/krita/ui/kisexiv2/kis_exiv2.h b/krita/ui/kisexiv2/kis_exiv2.h
index 9343265..6b66aa7 100644
--- a/krita/ui/kisexiv2/kis_exiv2.h
+++ b/krita/ui/kisexiv2/kis_exiv2.h
@@ -21,7 +21,7 @@
#include <metadata/kis_meta_data_value.h>
-#include <exiv2/value.hpp>
+#include <exiv2/exiv2.hpp>
#include "kritaui_export.h"
/// Convert an exiv value to a KisMetaData value
diff --git a/krita/ui/kisexiv2/kis_xmp_io.cpp b/krita/ui/kisexiv2/kis_xmp_io.cpp
index c4663ef..72fa5c5 100644
--- a/krita/ui/kisexiv2/kis_xmp_io.cpp
+++ b/krita/ui/kisexiv2/kis_xmp_io.cpp
@@ -17,7 +17,6 @@
#include "kis_xmp_io.h"
#include <string>
-#include <exiv2/xmp.hpp>
#include "kis_exiv2.h"
@@ -277,9 +276,8 @@ bool KisXMPIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get());
Q_ASSERT(xav);
QList<KisMetaData::Value> 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; i < xav->count(); ++i) {
+ QString value = QString(xav->toString(i).c_str());
if (parser) {
array.push_back(parser->parse(value));
} else {