1 files changed, 86 insertions, 0 deletions
diff --git a/graphics/photoqt/c6fd41478e818f3a651d40f96cab3d790e1c09a4.diff b/graphics/photoqt/c6fd41478e818f3a651d40f96cab3d790e1c09a4.diff
new file mode 100644
index 0000000000..0bae8ec0aa
--- /dev/null
+++ b/graphics/photoqt/c6fd41478e818f3a651d40f96cab3d790e1c09a4.diff
@@ -0,0 +1,86 @@
+diff --git a/cplusplus/scripts/getanddostuff/manipulation.h b/cplusplus/scripts/getanddostuff/manipulation.h
+index b3fa9b42ce5b1882ac0d9f915302866eb5b428ba..465d93727047d884ce967d9c3cdb7fdadca3dabd 100644
+--- a/cplusplus/scripts/getanddostuff/manipulation.h
++++ b/cplusplus/scripts/getanddostuff/manipulation.h
+@@ -38,8 +38,7 @@
+ #include "../../logger.h"
+ 
+ #ifdef EXIV2
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #endif
+ 
+ class GetAndDoStuffManipulation : public QObject {
+diff --git a/cplusplus/scripts/getmetadata.cpp b/cplusplus/scripts/getmetadata.cpp
+index deb89a25cbafe3dad306cec14d9ea412ea5b1f38..df92de6bba978ec6c6e0f2deb70f20cd4b4907c3 100644
+--- a/cplusplus/scripts/getmetadata.cpp
++++ b/cplusplus/scripts/getmetadata.cpp
+@@ -203,7 +203,7 @@ QVariantMap GetMetaData::getExiv2(QString path) {
+                 }
+ 
+             } catch(Exiv2::Error &e) {
+-                LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
++                LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e.what() << NL;
+             }
+ 
+             // If GPS is set, compose into one string
+@@ -246,7 +246,7 @@ QVariantMap GetMetaData::getExiv2(QString path) {
+                 }
+ 
+             } catch(Exiv2::Error &e) {
+-                LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
++                LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e.what() << NL;
+             }
+ 
+             QString city = returnMap["Iptc.Application2.City"].toString();
+diff --git a/cplusplus/scripts/getmetadata.h b/cplusplus/scripts/getmetadata.h
+index e427cbc124732f46b4750552b47fa84adb24fba1..c5b991404171339b16815ee8184c6a39b1bd5203 100644
+--- a/cplusplus/scripts/getmetadata.h
++++ b/cplusplus/scripts/getmetadata.h
+@@ -34,8 +34,7 @@
+ #include "../logger.h"
+ 
+ #ifdef EXIV2
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #endif
+ 
+ class GetMetaData : public QObject {
+diff --git a/cplusplus/scripts/managepeopletags.cpp b/cplusplus/scripts/managepeopletags.cpp
+index 9b8c7503e5f03ba3c63932ebd8e3d2f17c457ef5..96baeb9e6d87e14011aa60c4444e75b2a3bb09b1 100644
+--- a/cplusplus/scripts/managepeopletags.cpp
++++ b/cplusplus/scripts/managepeopletags.cpp
+@@ -98,7 +98,7 @@ QVariantList ManagePeopleTags::getFaceTags(QString path) {
+ 
+     } catch(Exiv2::Error& e) {
+         LOG << CURDATE << "GetPeopleTag::getPeopleLocations() 2 - ERROR reading exiv data (caught exception): "
+-            << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
++            << e.what() << NL;
+         return ret;
+     }
+ 
+@@ -201,7 +201,7 @@ void ManagePeopleTags::setFaceTags(QString filename, QVariantList tags) {
+ 
+     } catch(Exiv2::Error& e) {
+         LOG << CURDATE << "GetPeopleTag::setFaceTags() - ERROR reading exiv data (caught exception): "
+-            << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
++            << e.what() << NL;
+         return;
+     }
+ 
+diff --git a/cplusplus/scripts/managepeopletags.h b/cplusplus/scripts/managepeopletags.h
+index 1908ba0adb2bb75c1f150cc69ea8e6bb91ed9647..59686cc1efd37ac2a949389b5be83fa25f4205f2 100644
+--- a/cplusplus/scripts/managepeopletags.h
++++ b/cplusplus/scripts/managepeopletags.h
+@@ -29,8 +29,7 @@
+ #include "../logger.h"
+ 
+ #ifdef EXIV2
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #endif
+ 
+ class ManagePeopleTags : public QObject {