From 67ba648595a759834c2efe33005a3ceaf54eb218 Mon Sep 17 00:00:00 2001 From: dmiller Date: Fri, 11 Apr 2025 21:18:22 +0000 Subject: [PATCH] Make styrene config robust against version changes --- zenmap/install_scripts/windows/styrene.cfg | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/zenmap/install_scripts/windows/styrene.cfg b/zenmap/install_scripts/windows/styrene.cfg index 6c1f4b5fd..24695cde0 100755 --- a/zenmap/install_scripts/windows/styrene.cfg +++ b/zenmap/install_scripts/windows/styrene.cfg @@ -72,8 +72,8 @@ nodelete = # * recursive `dumpbin /imports` on known python/gtk dlls # * recursive `dumpbin /imports` on pyd files in lib/python3.11 # * `g-ir-inspect --print-shlibs` for typelibs listed below - mingw*/bin/libpython3.11.dll - mingw*/bin/libatk-1.0-0.dll + mingw*/bin/libpython3.*.dll + mingw*/bin/libatk-1.*.dll mingw*/bin/libbrotlicommon.dll mingw*/bin/libbrotlidec.dll mingw*/bin/libbz2-1.dll @@ -87,27 +87,27 @@ nodelete = mingw*/bin/libfreetype-6.dll mingw*/bin/libfribidi-0.dll mingw*/bin/libgcc_s_seh-1.dll - mingw*/bin/libgdk-3-0.dll - mingw*/bin/libgdk_pixbuf-2.0-0.dll - mingw*/bin/libgio-2.0-0.dll - mingw*/bin/libgirepository-1.0-1.dll - mingw*/bin/libglib-2.0-0.dll - mingw*/bin/libgmodule-2.0-0.dll - mingw*/bin/libgobject-2.0-0.dll + mingw*/bin/libgdk-3-*.dll + mingw*/bin/libgdk_pixbuf-2.*.dll + mingw*/bin/libgio-2.*.dll + mingw*/bin/libgirepository-1.*.dll + mingw*/bin/libglib-2.*.dll + mingw*/bin/libgmodule-2.*.dll + mingw*/bin/libgobject-2.*.dll mingw*/bin/libgraphite2.dll - mingw*/bin/libgtk-3-0.dll + mingw*/bin/libgtk-3-*.dll mingw*/bin/libharfbuzz-0.dll mingw*/bin/libharfbuzz-gobject-0.dll mingw*/bin/libiconv-2.dll mingw*/bin/libintl-8.dll - mingw*/bin/libpango-1.0-0.dll - mingw*/bin/libpangocairo-1.0-0.dll - mingw*/bin/libpangoft2-1.0-0.dll - mingw*/bin/libpangowin32-1.0-0.dll - mingw*/bin/libpcre2-8-0.dll - mingw*/bin/libpixman-1-0.dll + mingw*/bin/libpango-1.*.dll + mingw*/bin/libpangocairo-1.*.dll + mingw*/bin/libpangoft2-1.*.dll + mingw*/bin/libpangowin32-1.*.dll + mingw*/bin/libpcre2-8-*.dll + mingw*/bin/libpixman-1-*.dll mingw*/bin/libpng16-16.dll - mingw*/bin/libsqlite3-0.dll + mingw*/bin/libsqlite3-*.dll mingw*/bin/libstdc++-6.dll mingw*/bin/libthai-0.dll mingw*/bin/libwinpthread-1.dll