From c3a6b4822a6d9276938d8c6a3172ebda3de1c0e0 Mon Sep 17 00:00:00 2001
From: Lawrence37 <45837045+Lawrence37@users.noreply.github.com>
Date: Sun, 14 Aug 2022 22:17:05 -0700
Subject: [PATCH] Automated builds: Patch lensfun-update-data script (#6549)

* Patch lensfun-update-data in automated builds

* Fix Windows build libffi DLL version
---
 .github/workflows/appimage.yml | 2 ++
 .github/workflows/windows.yml  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index e8e9f44a1..105f2c840 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -76,6 +76,8 @@ jobs:
 
       - name: Include Lensfun
         run: |
+          echo "Patching lensfun-update-data script."
+          sudo sed -i 's/HTTPError\(, ValueError\)/URLError\1/' $(which lensfun-update-data)
           echo "Updating Lensfun database."
           lensfun-update-data
           echo "Creating Lensfun directory in the build directory."
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c2e59a099..456b365d2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -82,6 +82,8 @@ jobs:
 
       - name: Include Lensfun
         run: |
+          echo "Patching lensfun-update-data script."
+          sed -i 's/HTTPError\(, ValueError\)/URLError\1/' $(which lensfun-update-data)
           echo "Updating Lensfun database."
           lensfun-update-data
           echo "Creating Lensfun directory in the build directory."
@@ -115,7 +117,7 @@ jobs:
             "libdeflate.dll" \
             "libepoxy-0.dll" \
             "libexpat-1.dll" \
-            "libffi-7.dll" \
+            libffi-*.dll \
             "libfftw3f-3.dll" \
             "libfontconfig-1.dll" \
             "libfreetype-6.dll" \