From e4fef94e1b861202de1fc0138f6e759e8216c4e9 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 10 Oct 2024 17:05:04 +0200
Subject: [PATCH] [exiv2] Fix exiv2 find package expat (#41444)

---
 ports/exiv2/dependencies.diff | 2 +-
 ports/exiv2/vcpkg.json        | 2 +-
 versions/baseline.json        | 2 +-
 versions/e-/exiv2.json        | 5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/exiv2/dependencies.diff b/ports/exiv2/dependencies.diff
index c3ed45edf9..a1d917dc27 100644
--- a/ports/exiv2/dependencies.diff
+++ b/ports/exiv2/dependencies.diff
@@ -7,7 +7,7 @@ index c9e2eba..ca170e1 100644
  
  if(@EXIV2_ENABLE_XMP@) # if(EXIV2_ENABLE_XMP)
 -  find_dependency(EXPAT REQUIRED)
-+  find_dependency(expat)
++  find_dependency(expat CONFIG)
 +endif()
 +
 +if(@EXIV2_ENABLE_BMFF@ AND @EXIV2_ENABLE_BROTLI@)
diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json
index 332a0d9bd1..27ea742e47 100644
--- a/ports/exiv2/vcpkg.json
+++ b/ports/exiv2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "exiv2",
   "version": "0.28.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Image metadata library and tools",
   "homepage": "https://exiv2.org",
   "license": "GPL-2.0-or-later",
diff --git a/versions/baseline.json b/versions/baseline.json
index 43ae234a9d..bdd369b1ec 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2602,7 +2602,7 @@
     },
     "exiv2": {
       "baseline": "0.28.3",
-      "port-version": 1
+      "port-version": 2
     },
     "expat": {
       "baseline": "2.6.3",
diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json
index a75a466a47..b71cc9fea2 100644
--- a/versions/e-/exiv2.json
+++ b/versions/e-/exiv2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cb984642ef06d8cf0919e733b042b674c22cb3b4",
+      "version": "0.28.3",
+      "port-version": 2
+    },
     {
       "git-tree": "94c950d5e7bfffa984940dbbd278984f68181ab6",
       "version": "0.28.3",