From 003ac7403f3664e788b6e758fbc21bde146de789 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 8 Sep 2022 16:25:56 +0200
Subject: [PATCH] coverage.sh|qa.sh: Fix copying of DLLs for Wine/MinGW for
 Ubuntu 22.04

Ubuntu 22.04 no longer has libgcc_s_sjlj-1.dll but needs
libgcc_s_dw2-1.dll now, instead.
---
 expat/coverage.sh | 4 ++--
 expat/qa.sh       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/expat/coverage.sh b/expat/coverage.sh
index 260bcf56..10512111 100755
--- a/expat/coverage.sh
+++ b/expat/coverage.sh
@@ -117,8 +117,8 @@ _copy_missing_mingw_libaries() {
     # * coverage GCC flags make them needed
     # * With WINEDLLPATH Wine looks for .dll.so in these folders, not .dll
     local target="$1"
-    local mingw_gcc_dll_dir="$(dirname "$(ls -1 /usr/lib*/gcc/i686-w64-mingw32/*/libgcc_s_sjlj-1.dll | head -n1)")"
-    for dll in libgcc_s_sjlj-1.dll libstdc++-6.dll; do
+    local mingw_gcc_dll_dir="$(dirname "$(ls -1 /usr/lib*/gcc/i686-w64-mingw32/*/{libgcc_s_sjlj-1.dll,libstdc++-6.dll} | head -n1)")"
+    for dll in libgcc_s_dw2-1.dll libgcc_s_sjlj-1.dll libstdc++-6.dll; do
         (
             set -x
             ln -s "${mingw_gcc_dll_dir}"/${dll} "${target}"/${dll}
diff --git a/expat/qa.sh b/expat/qa.sh
index b7e9c25e..cb1eb5f9 100755
--- a/expat/qa.sh
+++ b/expat/qa.sh
@@ -154,11 +154,11 @@ run_tests() {
     esac
 
     if [[ ${CC} =~ mingw ]]; then
-        # NOTE: Filenames are hardcoded for Travis' Ubuntu Bionic, as of now
         for i in tests xmlwf ; do
-            mingw32_dir="$(ls -1d /usr/lib/gcc/i686-w64-mingw32/* | head -n1)"
+            mingw32_dir="$(dirname "$(ls -1 /usr/lib*/gcc/i686-w64-mingw32/*/{libgcc_s_sjlj-1.dll,libstdc++-6.dll} | head -n1)")"
             RUN ln -s \
                     /usr/i686-w64-mingw32/lib/libwinpthread-1.dll \
+                    "${mingw32_dir}"/libgcc_s_dw2-1.dll \
                     "${mingw32_dir}"/libgcc_s_sjlj-1.dll \
                     "${mingw32_dir}"/libstdc++-6.dll \
                     "$PWD"/libexpat{,w}-*.dll \