diff --git a/app/exiv2wrapper.cpp b/app/exiv2wrapper.cpp index 48e3604..e57027a 100644 --- a/app/exiv2wrapper.cpp +++ b/app/exiv2wrapper.cpp @@ -47,8 +47,12 @@ void Exiv2Wrapper::cacheSection(Collection collection) m_metadataValue.insert(key, value); m_metadataLabel.insert(key, label); qDebug() << key << label << value; - } catch (Exiv2::BasicError & err) { - qWarning() << "Error loading key" << key << ":" << err.code() << err.what(); +#if EXIV2_TEST_VERSION(0, 28, 0) + } catch (Exiv2::Error & err) { +#else // 0.27.x + } catch (Exiv2::AnyError & err) { +#endif // EXIV2_TEST_VERSION(0, 28, 0) + qWarning() << "Error loading key" << key << ":" << err.what(); } } } diff --git a/appveyor.yml b/appveyor.yml index 511918d..0cf2d77 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,12 +12,16 @@ environment: QTDIR: C:\Qt\6.4\mingw_64 MINGW64: C:\Qt\Tools\mingw1120_64 KF_BRANCH: master + EXIV2_VERSION: "0.28.0" + EXIV2_CMAKE_OPTIONS: "-DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF" PPIC_CMAKE_OPTIONS: "-DPREFER_QT_5=OFF" WINDEPLOYQT_ARGS: "--verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler" - job_name: mingw81_64_qt5_15_2 QTDIR: C:\Qt\5.15.2\mingw81_64 MINGW64: C:\Qt\Tools\mingw810_64 KF_BRANCH: kf5 + EXIV2_VERSION: "0.27.7" + EXIV2_CMAKE_OPTIONS: "-DEXIV2_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_WIN_UNICODE=ON -DEXIV2_BUILD_EXIV2_COMMAND=OFF" PPIC_CMAKE_OPTIONS: "" WINDEPLOYQT_ARGS: "--verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-angle --no-system-d3d-compiler" @@ -108,10 +112,10 @@ build_script: - cd %APPVEYOR_BUILD_FOLDER% # build libexiv2 - cd %LIBEXIV2% - - curl -fsSL -o v0.27.6.zip https://github.com/Exiv2/exiv2/archive/v0.27.6.zip - - 7z x v0.27.6.zip -y - - cd exiv2-0.27.6 - - cmake -G "Ninja" . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DEXIV2_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_WIN_UNICODE=ON + - curl -fsSL -o v%EXIV2_VERSION%.zip https://github.com/Exiv2/exiv2/archive/v%EXIV2_VERSION%.zip + - 7z x v%EXIV2_VERSION%.zip -y + - cd exiv2-%EXIV2_VERSION% + - cmake -G "Ninja" . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% %EXIV2_CMAKE_OPTIONS% - cmake --build . --target install/strip - cd %APPVEYOR_BUILD_FOLDER% # install KImageFormats @@ -149,7 +153,7 @@ build_script: - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\kimageformats\LICENSES\LGPL-2.1-or-later.txt License.kimageformats.txt - copy %LIBEXPAT%\libexpat-R_2_5_0\expat\COPYING License.expat.txt - copy %LIBAVIF%\libavif-0.11.1\LICENSE License.libavif.txt - - copy %LIBEXIV2%\exiv2-0.27.6\COPYING License.exiv2.txt + - copy %LIBEXIV2%\exiv2-%EXIV2_VERSION%\COPYING License.exiv2.txt # TODO: Qt, zlib - cd .. # for debug..