From 472123181de5aba805614726b00d6b3cdc02b5d9 Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Thu, 12 Jun 2025 16:59:58 -0300 Subject: [PATCH] build/windows: Do not bundle unneeded share/metainfo on Windows Seems it was used at runtime in the past but that is not the case anymore. Indeed, it started to be bundled in af79bbe028a41a16ce66574447f011dc4b583079 due to an error: before the Windows bundling unification the crossbuilds "script" on .yml bundled all the 'share' dir. --- build/linux/appimage/3_dist-gimp-goappimage.sh | 4 ++-- build/windows/2_bundle-gimp-uni_base.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/linux/appimage/3_dist-gimp-goappimage.sh b/build/linux/appimage/3_dist-gimp-goappimage.sh index 0bdf87ce74..ea8d64cd2f 100644 --- a/build/linux/appimage/3_dist-gimp-goappimage.sh +++ b/build/linux/appimage/3_dist-gimp-goappimage.sh @@ -306,8 +306,6 @@ done bund_usr "$GIMP_PREFIX" "etc/gimp" ## Other features and plug-ins -### Needed for welcome page -bund_usr "$GIMP_PREFIX" "share/metainfo/*.xml" ### mypaint brushes bund_usr "$UNIX_PREFIX" "share/mypaint-data/1.0" ### Needed for 'th' word breaking in Text tool etc @@ -362,6 +360,8 @@ conf_app PYTHONDONTWRITEBYTECODE "1" --no-expand #bund_usr "$UNIX_PREFIX" "share/lua/5.1" #conf_app LUA_PATH "\${APPDIR}/usr/share/lua/5.1/?.lua;\${APPDIR}/usr/share/lua/5.1/lgi/?.lua;\${APPDIR}/usr/share/lua/5.1/lgi/override/?.lua" --no-expand +## Used by AppImage "centers" etc +bund_usr "$GIMP_PREFIX" "share/metainfo/*.xml" ## Other binaries and deps (bundle them and do fine-tuning with bundling tool) bund_usr "$GIMP_PREFIX" 'bin/gimp*' bund_usr "$GIMP_PREFIX" "bin/gegl" diff --git a/build/windows/2_bundle-gimp-uni_base.py b/build/windows/2_bundle-gimp-uni_base.py index 5af4f7995b..465ae74ecb 100644 --- a/build/windows/2_bundle-gimp-uni_base.py +++ b/build/windows/2_bundle-gimp-uni_base.py @@ -127,8 +127,6 @@ for lang in lang_array: bundle(MSYSTEM_PREFIX, f"share/locale/{lang}/LC_MESSAGES/gtk*.mo") # For language list in text tool options bundle(MSYSTEM_PREFIX, f"share/locale/{lang}/LC_MESSAGES/iso_639_3.mo") -### Needed for welcome page -bundle(GIMP_PREFIX, "share/metainfo/org.gimp*.xml") ### mypaint brushes bundle(MSYSTEM_PREFIX, "share/mypaint-data") ### Needed for full CJK and Cyrillic support in file-pdf