Skip to content

Commit cf6bff6

Browse files
committed
fix: bundle enchant providers in windows installer
1 parent 7d2b97c commit cf6bff6

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

build-aux/inno_build.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ def run_command(command, error_message):
5757
f"Collecting pixbuf-loader ({loader}) DLLs failed"
5858
)
5959

60+
for enchant_provider in glob.glob(f"{build_environment_path}/lib/enchant-2/*.dll"):
61+
run_command(
62+
f"ldd {enchant_provider} | grep '\\/mingw.*\.dll' -o | xargs -i cp {{}} {dlls_dir}",
63+
f"Collecting enchant provider ({enchant_provider}) DLLs failed",
64+
)
65+
6066
for angle_dll in itertools.chain(
6167
glob.glob(f"{build_environment_path}/bin/libEGL*.dll"),
6268
glob.glob(f"{build_environment_path}/bin/libGLES*.dll"),

build-aux/rnote_inno.iss.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ Source: "{#meson_build_root}\dlls\*.dll"; DestDir: "{app}\bin"; Flags: ignorever
5757

5858
; gdk-pixbuf loaders
5959
Source: "{#build_environment_path}\lib\gdk-pixbuf-2.0\*"; DestDir: "{app}\lib\gdk-pixbuf-2.0"; Flags: ignoreversion recursesubdirs createallsubdirs
60+
; enchant providers
61+
Source: "{#build_environment_path}\lib\enchant-2\*"; DestDir: "{app}\lib\enchant-2"; Flags: ignoreversion recursesubdirs createallsubdirs
6062
; poppler-data
6163
Source: "{#build_environment_path}\share\poppler\*"; DestDir: "{app}\share\poppler"; Flags: ignoreversion recursesubdirs createallsubdirs
6264
; Settings GSchema

0 commit comments

Comments
 (0)