File 0001-Fix-build-with-exiv2-0.28-raise-minimum-to... of Package krename

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-build-with-exiv2-0.28-raise-minimum-to-0.27.patch of Package krename (Revision 9cb77635b19fa32e699d55d43acbbef8)

Currently displaying revision 9cb77635b19fa32e699d55d43acbbef8 , Show latest

From 0d4127ce11c460809352dcbeeec78065f99e7a38 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 26 May 2023 23:23:10 +0200
Subject: [PATCH] Fix build with >=exiv2-0.28, raise minimum to 0.27

- enables use of EXIV2_TEST_VERSION macro
- exiv2 headers cleanup

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 CMakeLists.txt         |  6 +-----
 config-krename.h.cmake |  3 ---
 src/exiv2plugin.cpp    | 17 +++++------------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc9df14..a696009 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,13 +54,9 @@ set_package_properties(Taglib PROPERTIES
     TYPE OPTIONAL)
 
 # Find exiv2
-find_package(LibExiv2 0.13) # AccessMode was added in 0.13
+find_package(LibExiv2 0.27) # EXIV2_TEST_VERSION was added in 0.27
 set_package_properties(LibExiv2 PROPERTIES TYPE OPTIONAL)
 
-if (LibExiv2_VERSION VERSION_GREATER_EQUAL "0.27")
-    set(HAVE_LIBEXIV2_0_27 TRUE)
-endif()
-
 # Find podofo
 find_package(PoDoFo)
 set_package_properties(PoDoFo PROPERTIES
diff --git a/config-krename.h.cmake b/config-krename.h.cmake
index 2c23d5a..258471e 100644
--- a/config-krename.h.cmake
+++ b/config-krename.h.cmake
@@ -6,9 +6,6 @@
 /* have Exiv2 */
 #cmakedefine01 HAVE_EXIV2
 
-/* Defined if we have libexiv2 >= 0.27 */
-#cmakedefine HAVE_LIBEXIV2_0_27
-
 /* have PoDoFo */
 #cmakedefine01 HAVE_PODOFO
 
diff --git a/src/exiv2plugin.cpp b/src/exiv2plugin.cpp
index 43633c6..4d24b19 100644
--- a/src/exiv2plugin.cpp
+++ b/src/exiv2plugin.cpp
@@ -17,20 +17,9 @@
 
 #include "exiv2plugin.h"
 
-#include "../config-krename.h"
-
 #include <KLocalizedString>
 
-#include <exiv2/error.hpp>
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/iptc.hpp>
-#ifdef HAVE_LIBEXIV2_0_27
-    #include <exiv2/xmp_exiv2.hpp>
-#else
-    #include <exiv2/xmp.hpp>
-#endif
-#include <exiv2/tags.hpp>
+#include <exiv2/exiv2.hpp>
 
 #include "batchrenamer.h"
 #include "tokenhelpdialog.h"
@@ -395,7 +384,11 @@ QString Exiv2Plugin::processFile(BatchRenamer *b, int index, const QString &file
     std::string strFilename(asc.constData(), asc.length());
 
     try {
+#if EXIV2_TEST_VERSION(0,28,0)
+        Image::UniquePtr image = Exiv2::ImageFactory::open(strFilename);
+#else
         Image::AutoPtr image = Exiv2::ImageFactory::open(strFilename);
+#endif
         if (image.get() != nullptr && image->good()) {
             image->readMetadata();
 
-- 
2.41.0

Places

File 0001-Fix-build-with-exiv2-0.28-raise-minimum-to-0.27.patch of Package krename (Revision 9cb77635b19fa32e699d55d43acbbef8)

Places