Disable optimized GResource embedding

This seems to be triggering failures on armel and armhf. Second-guessing
GResource seems to be more trouble than it's worth.

Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4617
Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: no

Gbp-Pq: Topic debian
Gbp-Pq: Name Disable-optimized-GResource-embedding.patch

diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index f594cd59b29cb96ec45bb1c22cc82cd1f30df587..0200246ed2176b7185e4860bce853c427ceab790 100644 (file)
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -160,7 +160,7 @@ endif
 
 ld = find_program('ld', required : false)
 
-if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+if false
   glib_compile_resources = find_program('glib-compile-resources')
 
   # Create the resource blob

diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
index 9a083eb1aca5dbb6ae6e019be3bac1596dbcc8c2..162a66ae41c7d30558dd556d9cd8097078715424 100644 (file)
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -8,7 +8,7 @@ endif
 
 ld = find_program('ld', required : false)
 
-if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+if false
   glib_compile_resources = find_program('glib-compile-resources')
 
   # Create the resource blob

diff --git a/gtk/meson.build b/gtk/meson.build
index 9e012015227bcfeb8db3b575830a0415d5a26d60..9b206264dce55f2c2309886ca5a0cd7bcb866ad0 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -872,7 +872,7 @@ endif
 
 ld = find_program('ld', required : false)
 
-if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+if false
   glib_compile_resources = find_program('glib-compile-resources')
 
   # Create the resource blob