Skip to content

Commit

Permalink
Fix Windows build with latest msys2 packages
Browse files Browse the repository at this point in the history
Not sure why the svg pixbuf loader file name changed, but it's easy to
fix.

For `lib/p11-kit`, it looks like the `mingw-w64-i686-ca-certificates`
package has that file. But Keyboard Configurator doesn't seem to really
need that, so just remove it.
  • Loading branch information
ids1024 committed Jan 13, 2025
1 parent 7d70f09 commit 59621a0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions windows/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
'symbolic/actions/edit-find-symbolic.svg',
]
ADWAITA_FILES = [f'share/icons/Adwaita/{i}' for i in ADWAITA_FILES]
ADDITIONAL_FILES = ['share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml', 'share/icons/hicolor/index.theme', 'lib/p11-kit', 'lib/gdk-pixbuf-2.0'] + ADWAITA_FILES
ADDITIONAL_FILES = ['share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml', 'share/icons/hicolor/index.theme', 'lib/gdk-pixbuf-2.0'] + ADWAITA_FILES

# Use ntldd to find the mingw dlls required by a .exe
def find_depends(exe):
Expand Down Expand Up @@ -98,7 +98,7 @@ def check_call(args, **kwargs):
mingw_dir = mingw_dir or mingw_dir_new

# The svg module is loaded at runtime, so it's dependencies are also needed
dlls = dlls.union(find_depends(f"{mingw_dir}/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll")[1])
dlls = dlls.union(find_depends(f"{mingw_dir}/lib/gdk-pixbuf-2.0/2.10.0/loaders/pixbufloader_svg.dll")[1])

def copy(srcdir, destdir, path):
src = f"{srcdir}/{path}"
Expand Down

0 comments on commit 59621a0

Please sign in to comment.