patch for windowsInnoSetup

Software Luminance HDR
1

@heckflosse
Ingo, as the name of ICU dlls change with each updating, could you apply following patch:

diff --git a/build_files/platforms/msys2/WindowsInnoSetup.iss.in b/build_files/platforms/msys2/WindowsInnoSetup.iss.in
index 8eed45fe..8024758f 100644
--- a/build_files/platforms/msys2/WindowsInnoSetup.iss.in
+++ b/build_files/platforms/msys2/WindowsInnoSetup.iss.in
@@ -153,11 +153,11 @@ Source: "{#MySourceLibsDir}\libimath-2_2.dll"; DestDir: "{app}"; Flags: ignoreve
 Source: "{#MySourceLibsDir}\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MySourceLibsDir}\libjasper-4.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MySourceLibsDir}\liblzma-5.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MySourceLibsDir}\libicuin58.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MySourceLibsDir}\libicuuc58.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MySourceLibsDir}\libicuin*.dll"; Excludes: "libicuind*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MySourceLibsDir}\libicuuc*.dll"; Excludes: "libicuucd*.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MySourceLibsDir}\libpcre2-16-0.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MySourceLibsDir}\libharfbuzz-0.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MySourceLibsDir}\libicudt58.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MySourceLibsDir}\libicudt*.dll"; Excludes: "libicudtd*.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MySourceLibsDir}\libfreetype-6.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MySourceLibsDir}\libglib-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MySourceLibsDir}\libgraphite2.dll"; DestDir: "{app}"; Flags: ignoreversion

note: I don’t know why the empty line at the end of the diff disappears!

2

@gaaned92

I tried to apply the patch (with additional empty line at the end), but failed:

$ git apply innosetup.patch
error: Anwendung des Patches fehlgeschlagen: build_files/platforms/msys2/WindowsInnoSetup.iss.in:153
error: build_files/platforms/msys2/WindowsInnoSetup.iss.in: Patch konnte nicht angewendet werden

Can you create a gist with the patch?

3

After using CRLF I could apply the patch. Pushed

4

Thank you Ingo. Could not answer sooner.

Problem with different end of line between Unix and Windows. Sorry

Edit: build ok

2 Likes