From 1a163bdb8b4878f456fb04b33978a92f3fcd8e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Thu, 11 Aug 2022 11:36:31 +0200 Subject: Resolve a few issues with MSYS2 cross-builds - Fix launching of subprocesses (missing gspawn helpers). - Discard unused GSettings schemas. - Make the program find its user guide. - Bundle a somewhat suboptimal version of ExifTool. --- msys2-cross-install.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'msys2-cross-install.sh') diff --git a/msys2-cross-install.sh b/msys2-cross-install.sh index f349e86..b98a227 100755 --- a/msys2-cross-install.sh +++ b/msys2-cross-install.sh @@ -3,14 +3,17 @@ export LC_ALL=C cd "$MESON_INSTALL_DESTDIR_PREFIX" msys2_root=$1 -# Copy libraries we depend on, and a few files required by GTK+. +# Copy libraries we depend on, and a few files required by GLib/GTK+. +cp -p "$msys2_root"/bin/exiftool.exe . cp -p "$msys2_root"/bin/*.dll . +# The console helper is only useful for debug builds. +cp -p "$msys2_root"/bin/gspawn-*-helper*.exe . cp -pR "$msys2_root"/etc/ . mkdir -p lib cp -pR "$msys2_root"/lib/gdk-pixbuf-2.0/ lib -mkdir -p share/glib-2.0 -cp -pR "$msys2_root"/share/glib-2.0/schemas/ share/glib-2.0 +mkdir -p share/glib-2.0/schemas +cp -pR "$msys2_root"/share/glib-2.0/schemas/*.Settings.* share/glib-2.0/schemas mkdir -p share cp -pR "$msys2_root"/share/mime/ share mkdir -p share/icons -- cgit v1.2.3