From ec10efdeec15c010cbb79ad58ca1d52593462560354971cb44a33b8e0c6341bc Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 17 Jul 2022 17:30:35 +0000
Subject: [PATCH 1/3] transplant SR 988555 to mingw64

OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=137
---
 mingw64-find-lang.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mingw64-find-lang.sh b/mingw64-find-lang.sh
index a39e01b..e98ce2e 100644
--- a/mingw64-find-lang.sh
+++ b/mingw64-find-lang.sh
@@ -227,6 +227,10 @@ s:'"$TOP_DIR"'::
 '"$NO_ALL_NAME$QT"'s:\(.*/'"$NAME"'_\([a-zA-Z]\{2\}\([_@].*\)\?\)\.qm$\):%lang(\2) \1:
 '"$ALL_NAME$QT"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
 '"$ALL_NAME$QT"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QT"'s:^\([^%].*/\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QT"'s:^\([^%].*/\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QT"'s:^\([^%].*/[^/_]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QT"'s:^\([^%].*/[^/_]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
 '"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
 '"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
 s:^[^%].*::

From 97ed581d6c4162f9feedac9a6a6b8ca663cb7756423aa635b581633c344d14ce Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 17 Jul 2022 17:31:02 +0000
Subject: [PATCH 2/3] transplant SR 988555 to mingw64

OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=138
---
 mingw64-filesystem.changes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mingw64-filesystem.changes b/mingw64-filesystem.changes
index 4b481bd..bfcb01e 100644
--- a/mingw64-filesystem.changes
+++ b/mingw64-filesystem.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 12 07:18:39 UTC 2022 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Fix finding qm files for KDE Frameworks >= 5.76 (taken from rpm-4.14.1)
+
 -------------------------------------------------------------------
 Sun Jun  5 05:03:17 UTC 2022 - Ralf Habacker <ralf.habacker@freenet.de>
 

From cb18632f38e85623f47c015724af905c12adf0b3bf5d20bc1b9dba7a1fa0e598 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sat, 23 Jul 2022 16:18:26 +0000
Subject: [PATCH 3/3] Accepting request 990652 from
 home:rhabacker:branches:windows:mingw:win64

- Update to 20220801
- Fetch real used shared library name from import libraries to avoid
  file name generation errors, for example with mingw32-glib2
- Scan all archives for shared library names as packages may not use
  the default import library extension

OBS-URL: https://build.opensuse.org/request/show/990652
OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=139
---
 mingw64-filesystem.changes | 9 +++++++++
 mingw64-filesystem.spec    | 2 +-
 mingw64-find-requires.sh   | 7 +++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/mingw64-filesystem.changes b/mingw64-filesystem.changes
index bfcb01e..1e7ab06 100644
--- a/mingw64-filesystem.changes
+++ b/mingw64-filesystem.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jul 20 07:11:15 UTC 2022 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Update to 20220801
+- Fetch real used shared library name from import libraries to avoid
+  file name generation errors, for example with mingw32-glib2
+- Scan all archives for shared library names as packages may not use
+  the default import library extension
+
 -------------------------------------------------------------------
 Tue Jul 12 07:18:39 UTC 2022 - Ralf Habacker <ralf.habacker@freenet.de>
 
diff --git a/mingw64-filesystem.spec b/mingw64-filesystem.spec
index 55f9fd6..540e177 100644
--- a/mingw64-filesystem.spec
+++ b/mingw64-filesystem.spec
@@ -31,7 +31,7 @@
 %define _rpmmacrodir %{_sysconfdir}/rpm
 %endif
 Name:           mingw64-filesystem
-Version:        20220620
+Version:        20220801
 Release:        0
 Summary:        MinGW base filesystem and environment
 License:        GPL-2.0-or-later
diff --git a/mingw64-find-requires.sh b/mingw64-find-requires.sh
index 7007b2f..d5006f0 100644
--- a/mingw64-find-requires.sh
+++ b/mingw64-find-requires.sh
@@ -106,11 +106,14 @@ for f in $dlls; do
         sed 's/\(.*\)/'"$target"'(\1)/'
 done | sort -u
 
+# scan import libraries - all archive files are scanned, not only
+# '.dll.a' as some packages do not use the standard extension
+# for import libraries
 if [ -n "$scan_implibs" ]; then
-    implibs=$(echo "$filelist" | grep '\.dll.a$')
+    implibs=$(echo "$filelist" | grep '\.a$')
     for f in $implibs; do
         [ ! -f "$f" ] && continue
-        "$OBJDUMP" -r "$f" | grep '_iname' | sed 's,^.*lib,lib,g;s,_iname,,g;s,_dll,.dll,g;s,_,-,g' |
+        "$STRINGS" "$f" | grep '\.dll$' |
             tr "[:upper:]" "[:lower:]" |
             grep -Ev "$exclude_pattern" |
             sed 's/\(.*\)/'"$target"'(\1)/'