From 36534d29fa1e2ed1d8a105787c892f661842fc73f0e22231ad03bef0dbc82426 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 15 Jul 2022 07:07:27 +0000 Subject: [PATCH] Accepting request 988899 from home:rhabacker:branches:windows:mingw:win64:Qt512 - Update to 20220620 - Add more provides required by libqt5 related packages - Add optional support for excluding runtime DLL dependencies to avoid rebuilding the whole project, see macro %_mingw64_find_requires_exclude in macros.mingw64 for details OBS-URL: https://build.opensuse.org/request/show/988899 OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=135 --- macros.mingw64 | 10 +++++++++- mingw64-filesystem.changes | 9 +++++++++ mingw64-filesystem.spec | 6 +++++- mingw64-find-requires.sh | 9 ++++++++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/macros.mingw64 b/macros.mingw64 index 318ccb1..733c973 100644 --- a/macros.mingw64 +++ b/macros.mingw64 @@ -71,8 +71,16 @@ # %global _mingw64_find_requires_scan_implibs 1 # to the related spec file # +# To exclude project wide shared library requirements add this to project config +# Macros: +# %_mingw64_find_requires_exclude "d3d12 ..." +# :Macros +# for a single package add +# %global _mingw64_find_requires_exclude "d3d12 ..." +# to the related spec file +# %_mingw64_findprovides /usr/lib/rpm/mingw64-find-provides.sh -%_mingw64_findrequires /usr/lib/rpm/mingw64-find-requires.sh %{?_mingw64_find_requires_scan_implibs:--scan-implibs} +%_mingw64_findrequires /usr/lib/rpm/mingw64-find-requires.sh %{?_mingw64_find_requires_exclude:--exclude "%_mingw64_find_requires_exclude"} %{?_mingw64_find_requires_scan_implibs:--scan-implibs} %_mingw64_install_post /usr/lib/rpm/mingw64-install-post.sh %_mingw64_find_lang /usr/lib/rpm/mingw64-find-lang.sh %{buildroot} diff --git a/mingw64-filesystem.changes b/mingw64-filesystem.changes index 6782656..4b481bd 100644 --- a/mingw64-filesystem.changes +++ b/mingw64-filesystem.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Jun 5 05:03:17 UTC 2022 - Ralf Habacker + +- Update to 20220620 +- Add more provides required by libqt5 related packages +- Add optional support for excluding runtime DLL dependencies to avoid + rebuilding the whole project, see macro %_mingw64_find_requires_exclude + in macros.mingw64 for details + ------------------------------------------------------------------- Mon May 23 13:58:15 UTC 2022 - Ralf Habacker diff --git a/mingw64-filesystem.spec b/mingw64-filesystem.spec index 62448ec..55f9fd6 100644 --- a/mingw64-filesystem.spec +++ b/mingw64-filesystem.spec @@ -31,7 +31,7 @@ %define _rpmmacrodir %{_sysconfdir}/rpm %endif Name: mingw64-filesystem -Version: 20220524 +Version: 20220620 Release: 0 Summary: MinGW base filesystem and environment License: GPL-2.0-or-later @@ -64,8 +64,12 @@ Provides: mingw64(uxtheme.dll) # needed by mingw64-libqt5-qtbase Provides: mingw64(d2d1.dll) Provides: mingw64(d3d11.dll) +Provides: mingw64(d3d12.dll) +Provides: mingw64(dcomp.dll) Provides: mingw64(dwrite.dll) +Provides: mingw64(dxgi.dll) Provides: mingw64(ncrypt.dll) +Provides: mingw64(wtsapi32.dll) Requires: mingw64-cross-breakpad-tools Requires: python3 Requires: rpm diff --git a/mingw64-find-requires.sh b/mingw64-find-requires.sh index 2c0d7a2..7007b2f 100644 --- a/mingw64-find-requires.sh +++ b/mingw64-find-requires.sh @@ -11,6 +11,13 @@ if [ "$1" = "--scan-implibs" ]; then shift fi +libs_to_exclude= +if [ "$1" = "--exclude" ]; then + shift + libs_to_exclude="$1" + shift +fi + if [ -n "$1" ]; then package_name="$1" fi @@ -21,7 +28,7 @@ fi filelist=`sed "s/['\"]/\\\&/g"` -libs_to_exclude=" +libs_to_exclude+=" advapi32 cfgmgr32 comctl32