--- extensions/exiv2_tools/exiv2-utils.cpp.orig	2015-12-23 07:14:15.000000000 -0800
+++ extensions/exiv2_tools/exiv2-utils.cpp	2018-12-22 14:46:58.000000000 -0800
@@ -32,7 +32,7 @@
 #include <sstream>
 #include <vector>
 #include <iomanip>
-#include <exiv2/xmp.hpp>
+#include <exiv2/xmp_exiv2.hpp>
 #include <gthumb.h>
 #include "exiv2-utils.h"
 
@@ -720,11 +720,11 @@
 static const char *
 get_exif_default_category (const Exiv2::Exifdatum &md)
 {
-#if EXIV2_TEST_VERSION(0, 21, 0)
+//#if EXIV2_TEST_VERSION(0, 21, 0)
 	if (Exiv2::ExifTags::isMakerGroup(md.groupName()))
-#else
+/* #else
 	if (Exiv2::ExifTags::isMakerIfd(md.ifdId()))
-#endif
+#endif */
 		return "Exif::MakerNotes";
 
 	if (md.groupName().compare("Thumbnail") == 0)
@@ -755,11 +755,11 @@
 			stringstream description;
 			if (! md->tagLabel().empty())
 				description << md->tagLabel();
-#if EXIV2_TEST_VERSION(0, 21, 0)
+//#if EXIV2_TEST_VERSION(0, 21, 0)
 			else if (Exiv2::ExifTags::isMakerGroup(md->groupName()))
-#else
+/* #else
 			else if (Exiv2::ExifTags::isMakerIfd(md->ifdId()))
-#endif
+#endif */
 				// Must be a MakerNote - include group name
 				description << md->groupName() << "." << md->tagName();
 			else
@@ -1073,7 +1073,7 @@
 
 	try {
 		if (exifData.empty()) {
-			throw Exiv2::Error(1, " No Exif data found in the file");
+			throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file");
 		}
 		Exiv2::ExifData::const_iterator end = exifData.end();
 		for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {