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 5b79dfad5f2cf746befa0062bd7b812f690348a3..294d66fb2f10606311539aaa81f7e1b402a2385c 100644 (file)
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -164,7 +164,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 800230b512db8c1c106a7e7f7cd3e37f7124a4df..d78f9f6698a0792c7d8684039efc6c7c67d204b6 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 201af63f2399e5f40f96f4a1d39cecd39d4df89e..8c7c56eb8e2377798546704776d835744adfe7d8 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