From dfbb40b6bf6c70351cf9ffc993ccb8affaa5d592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 21 Oct 2024 18:01:53 +0200
Subject: [PATCH] Update pixbuf loaders and immodules when building installers

Closes #13611
(grafted from e5fd55d3e783988236505502614e4ae708cce785)

--HG--
branch : 6.0
---
 tryton/darwin/gtk-3.0/gdk-pixbuf.loaders | 107 ---------------------
 tryton/darwin/gtk-3.0/gtk.immodules      |  40 --------
 tryton/make-darwin-installer.sh          |  10 ++
 tryton/make-win32-installer.sh           |   3 +
 tryton/win32/gtk-3.0/gdk-pixbuf.loaders  | 114 -----------------------
 tryton/win32/gtk-3.0/gtk.immodules       |   0
 6 files changed, 13 insertions(+), 261 deletions(-)
 delete mode 100644 tryton/darwin/gtk-3.0/gdk-pixbuf.loaders
 delete mode 100644 tryton/darwin/gtk-3.0/gtk.immodules
 delete mode 100644 tryton/win32/gtk-3.0/gdk-pixbuf.loaders
 delete mode 100644 tryton/win32/gtk-3.0/gtk.immodules

diff --git a/tryton/darwin/gtk-3.0/gdk-pixbuf.loaders b/tryton/darwin/gtk-3.0/gdk-pixbuf.loaders
deleted file mode 100644
index fe2e0bee31..0000000000
--- a/tryton/darwin/gtk-3.0/gdk-pixbuf.loaders
+++ /dev/null
@@ -1,107 +0,0 @@
-# GdkPixbuf Image Loader Modules file
-# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.34.0
-#
-# LoaderDir = @executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders
-#
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so"
-"ani" 4 "gdk-pixbuf" "Windows animated cursor" "LGPL"
-"application/x-navi-animation" ""
-"ani" ""
-"RIFF    ACON" "    xxxx    " 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
-"bmp" 5 "gdk-pixbuf" "BMP" "LGPL"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so"
-"gif" 4 "gdk-pixbuf" "GIF" "LGPL"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so"
-"icns" 4 "gdk-pixbuf" "MacOS X icon" "GPL"
-"image/x-icns" ""
-"icns" ""
-"icns" "" 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so"
-"ico" 5 "gdk-pixbuf" "Windows icon" "LGPL"
-"image/x-icon" "image/x-ico" "image/x-win-bitmap" "image/vnd.microsoft.icon" "application/ico" "image/ico" "image/icon" "text/ico" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
-"jpeg" 5 "gdk-pixbuf" "JPEG" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so"
-"png" 5 "gdk-pixbuf" "PNG" "LGPL"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so"
-"pnm" 4 "gdk-pixbuf" "PNM/PBM/PGM/PPM" "LGPL"
-"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
-"pnm" "pbm" "pgm" "ppm" ""
-"P1" "" 100
-"P2" "" 100
-"P3" "" 100
-"P4" "" 100
-"P5" "" 100
-"P6" "" 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so"
-"qtif" 4 "gdk-pixbuf" "QuickTime" "LGPL"
-"image/x-quicktime" "image/qtif" ""
-"qtif" "qif" ""
-"abcdidsc" "xxxx    " 100
-"abcdidat" "xxxx    " 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so"
-"svg" 6 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL"
-"image/svg+xml" "image/svg" "image/svg-xml" "image/vnd.adobe.svg+xml" "text/xml-svg" "image/svg+xml-compressed" ""
-"svg" "svgz" "svg.gz" ""
-" <svg" "*    " 100
-" <!DOCTYPE svg" "*             " 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so"
-"tga" 4 "gdk-pixbuf" "Targa" "LGPL"
-"image/x-tga" ""
-"tga" "targa" ""
-" \001\001" "x  " 100
-" \001\t" "x  " 100
-"  \002" "xz " 99
-"  \003" "xz " 100
-"  \n" "xz " 100
-"  \v" "xz " 100
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
-"tiff" 5 "gdk-pixbuf" "TIFF" "LGPL"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-"II* \020   CR\002 " "   z zzz   z" 0
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so"
-"xbm" 4 "gdk-pixbuf" "XBM" "LGPL"
-"image/x-xbitmap" ""
-"xbm" ""
-"#define " "" 100
-"/*" "" 50
-
-"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
-"xpm" 4 "gdk-pixbuf" "XPM" "LGPL"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
-
-
diff --git a/tryton/darwin/gtk-3.0/gtk.immodules b/tryton/darwin/gtk-3.0/gtk.immodules
deleted file mode 100644
index 0237a0036e..0000000000
--- a/tryton/darwin/gtk-3.0/gtk.immodules
+++ /dev/null
@@ -1,40 +0,0 @@
-# GTK+ Input Method Modules file
-# Automatically generated file, do not edit
-# Created by gtk-query-immodules-3.0 from gtk+-3.22.26
-#
-# ModulesPath = @executable_path/lib/gtk-3.0/3.0.0/x86_64-apple-darwin16.7.0/immodules:@executable_path/lib/gtk-3.0/3.0.0/immodules:@executable_path/lib/gtk-3.0/x86_64-apple-darwin16.7.0/immodules:@executable_path/lib/gtk-3.0/immodules
-#
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-am-et.so"
-"am_et" "Amharic (EZ+)" "gtk30" "@executable_path/share/locale" "am"
-
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-cedilla.so"
-"cedilla" "Cedilla" "gtk30" "@executable_path/share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa"
-
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-cyrillic-translit.so"
-"cyrillic_translit" "Cyrillic (Transliterated)" "gtk30" "@executable_path/share/locale" ""
-
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-inuktitut.so"
-"inuktitut" "Inuktitut (Transliterated)" "gtk30" "@executable_path/share/locale" "iu"
-
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-ipa.so"
-"ipa" "IPA" "gtk30" "@executable_path/share/locale" ""
-
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-multipress.so"
-"multipress" "Multipress" "gtk30" "" ""
-
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-quartz.so"
-"quartz" "Mac OS X Quartz" "gtk30" "@executable_path/share/locale" "ja:ko:zh:*"
-
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-thai.so"
-"thai" "Thai-Lao" "gtk30" "@executable_path/share/locale" "lo:th"
-
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-ti-er.so"
-"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk30" "@executable_path/share/locale" "ti"
-
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-ti-et.so"
-"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk30" "@executable_path/share/locale" "ti"
-
-"@executable_path/lib/gtk-3.0/3.0.0/immodules/im-viqr.so"
-"viqr" "Vietnamese (VIQR)" "gtk30" "@executable_path/share/locale" "vi"
-
-
diff --git a/tryton/make-darwin-installer.sh b/tryton/make-darwin-installer.sh
index 2b1d7386d0..e78e3d96ba 100644
--- a/tryton/make-darwin-installer.sh
+++ b/tryton/make-darwin-installer.sh
@@ -2,6 +2,16 @@
 set -e
 version=`./setup.py --version`
 rm -rf build dist
+mkdir -p darwin/gtk-3.0
+GDK_PIXBUF_MODULEDIR="$(dirname $(which gdk-pixbuf-query-loaders))/../lib/gdk-pixbuf-2.0/2.10.0/loaders" \
+    gdk-pixbuf-query-loaders \
+    | sed -e '/^#/d' \
+    | sed  -e 's@/.*/lib/gdk-pixbuf-2.0@\@executable_path/lib/gdk-pixbuf-2.0@' \
+    > darwin/gtk-3.0/gdk-pixbuf.loaders
+gtk-query-immodules-3.0 \
+    | sed -e '/^#/d' \
+    | sed  -e 's@/.*/lib/gtk-3.0@\@executable_path/lib/gtk-3.0@' \
+    > darwin/gtk-3.0/gtk.immodules
 ./setup.py compile_catalog
 ./setup-freeze.py bdist_mac
 mkdir dist
diff --git a/tryton/make-win32-installer.sh b/tryton/make-win32-installer.sh
index 36387935b8..218645bf7b 100644
--- a/tryton/make-win32-installer.sh
+++ b/tryton/make-win32-installer.sh
@@ -4,6 +4,9 @@ version=`./setup.py --version`
 series=${version%.*}
 bits=`python -c "import platform; print(platform.architecture()[0])"`
 rm -rf build dist
+mkdir -p win32/gtk-3.0
+gdk-pixbuf-query-loaders | sed -e '/^#/d' > win32/gtk-3.0/gdk-pixbuf.loaders
+gtk-query-immodules-3.0 | sed -e '/^#/d' > win32/gtk-3.0/gtk.immodules
 ./setup.py compile_catalog
 ./setup-freeze.py install_exe -d dist
 cp `which gdbus.exe` dist/
diff --git a/tryton/win32/gtk-3.0/gdk-pixbuf.loaders b/tryton/win32/gtk-3.0/gdk-pixbuf.loaders
deleted file mode 100644
index 6fd63640c3..0000000000
--- a/tryton/win32/gtk-3.0/gdk-pixbuf.loaders
+++ /dev/null
@@ -1,114 +0,0 @@
-# GdkPixbuf Image Loader Modules file
-# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.36.12
-#
-# LoaderDir = lib\gdk-pixbuf-2.0\2.10.0\loaders
-#
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-ani.dll"
-"ani" 4 "gdk-pixbuf" "Windows animated cursor" "LGPL"
-"application/x-navi-animation" ""
-"ani" ""
-"RIFF    ACON" "    xxxx    " 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-bmp.dll"
-"bmp" 5 "gdk-pixbuf" "BMP" "LGPL"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-gif.dll"
-"gif" 4 "gdk-pixbuf" "GIF" "LGPL"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-icns.dll"
-"icns" 4 "gdk-pixbuf" "MacOS X icon" "GPL"
-"image/x-icns" ""
-"icns" ""
-"icns" "" 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-ico.dll"
-"ico" 5 "gdk-pixbuf" "Windows icon" "LGPL"
-"image/x-icon" "image/x-ico" "image/x-win-bitmap" "image/vnd.microsoft.icon" "application/ico" "image/ico" "image/icon" "text/ico" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-jasper.dll"
-"jpeg2000" 4 "gdk-pixbuf" "JPEG 2000" "LGPL"
-"image/jp2" "image/jpeg2000" "image/jpx" ""
-"jp2" "jpc" "jpx" "j2k" "jpf" ""
-"    jP" "!!!!  " 100
-"\377O\377Q" "" 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-jpeg.dll"
-"jpeg" 5 "gdk-pixbuf" "JPEG" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-png.dll"
-"png" 5 "gdk-pixbuf" "PNG" "LGPL"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-pnm.dll"
-"pnm" 4 "gdk-pixbuf" "PNM/PBM/PGM/PPM" "LGPL"
-"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
-"pnm" "pbm" "pgm" "ppm" ""
-"P1" "" 100
-"P2" "" 100
-"P3" "" 100
-"P4" "" 100
-"P5" "" 100
-"P6" "" 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-qtif.dll"
-"qtif" 4 "gdk-pixbuf" "QuickTime" "LGPL"
-"image/x-quicktime" "image/qtif" ""
-"qtif" "qif" ""
-"abcdidsc" "xxxx    " 100
-"abcdidat" "xxxx    " 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-svg.dll"
-"svg" 6 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL"
-"image/svg+xml" "image/svg" "image/svg-xml" "image/vnd.adobe.svg+xml" "text/xml-svg" "image/svg+xml-compressed" ""
-"svg" "svgz" "svg.gz" ""
-" <svg" "*    " 100
-" <!DOCTYPE svg" "*             " 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-tga.dll"
-"tga" 4 "gdk-pixbuf" "Targa" "LGPL"
-"image/x-tga" ""
-"tga" "targa" ""
-" \001\001" "x  " 100
-" \001\t" "x  " 100
-"  \002" "xz " 99
-"  \003" "xz " 100
-"  \n" "xz " 100
-"  \v" "xz " 100
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-tiff.dll"
-"tiff" 5 "gdk-pixbuf" "TIFF" "LGPL"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-"II* \020   CR\002 " "   z zzz   z" 0
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-xbm.dll"
-"xbm" 4 "gdk-pixbuf" "XBM" "LGPL"
-"image/x-xbitmap" ""
-"xbm" ""
-"#define " "" 100
-"/*" "" 50
-
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-xpm.dll"
-"xpm" 4 "gdk-pixbuf" "XPM" "LGPL"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
-
-
diff --git a/tryton/win32/gtk-3.0/gtk.immodules b/tryton/win32/gtk-3.0/gtk.immodules
deleted file mode 100644
index e69de29bb2..0000000000