1 --- digikam-5.9.0/core/cmake/modules/FindExiv2.cmake~ 2018-03-19 10:41:56.000000000 +0100
2 +++ digikam-5.9.0/core/cmake/modules/FindExiv2.cmake 2019-02-11 22:51:15.308354934 +0100
5 # Get the version number from exiv2/version.hpp and store it in the cache:
6 if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
7 - file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
8 + file(READ ${EXIV2_INCLUDE_DIR}/exiv2/exv_conf.h EXIV2_VERSION_CONTENT)
9 string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
10 set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
12 --- digikam-5.9.0/core/libs/dmetadata/metaengine_p.h~ 2018-03-19 10:41:58.000000000 +0100
13 +++ digikam-5.9.0/core/libs/dmetadata/metaengine_p.h 2019-02-11 23:13:30.270882447 +0100
15 #include <exiv2/types.hpp>
16 #include <exiv2/exif.hpp>
17 #include <exiv2/xmpsidecar.hpp>
18 +#include <exiv2/version.hpp>
20 // Check if Exiv2 support XMP
22 --- digikam-5.9.0/core/libs/dmetadata/metaengine_exif.cpp~ 2018-03-19 10:41:58.000000000 +0100
23 +++ digikam-5.9.0/core/libs/dmetadata/metaengine_exif.cpp 2019-02-11 23:16:52.323399768 +0100
24 @@ -1007,7 +1007,11 @@
26 if (pos == d->exifMetadata().end() || pos->count() != 1 || pos->toLong() != 0)
28 +#if EXIV2_TEST_VERSION(0,27,0)
29 + throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image");
31 throw Exiv2::Error(1, "Exif.Image.NewSubfileType missing or not set as main image");
35 // Remove sub-IFD tags