3ee2f82512
Pull in many wxi fixes from upstream post v0.100. Switch to autosetup macro for easier patching. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
46 lines
2.5 KiB
Diff
46 lines
2.5 KiB
Diff
From 10cf73d3f26b0cd8f829f122a7e4ef32f67e496d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
Date: Wed, 15 Jan 2020 18:27:41 +0400
|
|
Subject: [PATCH 2/9] ilmbase.wxi: update v2.4
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
---
|
|
data/wixl/ilmbase.wxi | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/data/wixl/ilmbase.wxi b/data/wixl/ilmbase.wxi
|
|
index 5083be2..fce3925 100644
|
|
--- a/data/wixl/ilmbase.wxi
|
|
+++ b/data/wixl/ilmbase.wxi
|
|
@@ -5,19 +5,19 @@
|
|
<DirectoryRef Id="INSTALLDIR">
|
|
<Directory Id="dirFEE7741CD6956C044C54657F0DD3C9C6" Name="bin">
|
|
<Component Win64="$(var.Win64)" Id="cmp49032B593A9BDF7943A16C679B6064B2" Guid="*">
|
|
- <File Id="fil787174B51DF1BE93A0239955863C72FF" KeyPath="yes" Source="$(var.SourceDir)/bin/libHalf-24.dll"/>
|
|
+ <File Id="fil787174B51DF1BE93A0239955863C72FF" KeyPath="yes" Source="$(var.SourceDir)/bin/libHalf-2_4-24.dll"/>
|
|
</Component>
|
|
<Component Win64="$(var.Win64)" Id="cmpE94B4B037392585281516E3184369B52" Guid="*">
|
|
- <File Id="filEA13CCB16F8A7A448980B093DC653D05" KeyPath="yes" Source="$(var.SourceDir)/bin/libIex-2_3-24.dll"/>
|
|
+ <File Id="filEA13CCB16F8A7A448980B093DC653D05" KeyPath="yes" Source="$(var.SourceDir)/bin/libIex-2_4-24.dll"/>
|
|
</Component>
|
|
<Component Win64="$(var.Win64)" Id="cmp0054B3C0B8B7B470B50527958678189F" Guid="*">
|
|
- <File Id="filFD41AFF06C58E24D166C1552FC612BE1" KeyPath="yes" Source="$(var.SourceDir)/bin/libIexMath-2_3-24.dll"/>
|
|
+ <File Id="filFD41AFF06C58E24D166C1552FC612BE1" KeyPath="yes" Source="$(var.SourceDir)/bin/libIexMath-2_4-24.dll"/>
|
|
</Component>
|
|
<Component Win64="$(var.Win64)" Id="cmpCE5584F830B91965B9E59E141529BB0E" Guid="*">
|
|
- <File Id="fil1852EFB6E5AEF1D07CAB79ED27F0DD74" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmThread-2_3-24.dll"/>
|
|
+ <File Id="fil1852EFB6E5AEF1D07CAB79ED27F0DD74" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmThread-2_4-24.dll"/>
|
|
</Component>
|
|
<Component Win64="$(var.Win64)" Id="cmp8510F7023D50444985A90AB94DFEDD96" Guid="*">
|
|
- <File Id="filE53EBCCD25A262F9346BBF8E4A6AB74B" KeyPath="yes" Source="$(var.SourceDir)/bin/libImath-2_3-24.dll"/>
|
|
+ <File Id="filE53EBCCD25A262F9346BBF8E4A6AB74B" KeyPath="yes" Source="$(var.SourceDir)/bin/libImath-2_4-24.dll"/>
|
|
</Component>
|
|
</Directory>
|
|
</DirectoryRef>
|
|
--
|
|
2.25.3
|
|
|