fix: bundle enchant providers in windows installer

flxzt · Dec 2, 2024 · cf6bff6 · cf6bff6
1 parent 7d2b97c
commit cf6bff6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/build-aux/inno_build.py b/build-aux/inno_build.py
@@ -57,6 +57,12 @@ def run_command(command, error_message):
         f"Collecting pixbuf-loader ({loader}) DLLs failed"
     )
 
+for enchant_provider in glob.glob(f"{build_environment_path}/lib/enchant-2/*.dll"):
+    run_command(
+        f"ldd {enchant_provider} | grep '\\/mingw.*\.dll' -o | xargs -i cp {{}} {dlls_dir}",
+        f"Collecting enchant provider ({enchant_provider}) DLLs failed",
+    )
+
 for angle_dll in itertools.chain(
     glob.glob(f"{build_environment_path}/bin/libEGL*.dll"),
     glob.glob(f"{build_environment_path}/bin/libGLES*.dll"),

diff --git a/build-aux/rnote_inno.iss.in b/build-aux/rnote_inno.iss.in
@@ -57,6 +57,8 @@ Source: "{#meson_build_root}\dlls\*.dll"; DestDir: "{app}\bin"; Flags: ignorever
 
 ; gdk-pixbuf loaders
 Source: "{#build_environment_path}\lib\gdk-pixbuf-2.0\*"; DestDir: "{app}\lib\gdk-pixbuf-2.0"; Flags: ignoreversion recursesubdirs createallsubdirs
+; enchant providers
+Source: "{#build_environment_path}\lib\enchant-2\*"; DestDir: "{app}\lib\enchant-2"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; poppler-data
 Source: "{#build_environment_path}\share\poppler\*"; DestDir: "{app}\share\poppler"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; Settings GSchema