From 4df51ba8a6479c8d9c0b524de506001ae98561f2 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 20 Mar 2022 17:45:51 +0000 Subject: [PATCH] d/p/debian/Disable-optimized-GResource-embedding.patch: Remove The upstream code now disables this on the architectures where it is known to be problematic, namely 32-bit ARM. --- ...isable-optimized-GResource-embedding.patch | 55 ------------------- debian/patches/series | 1 - 2 files changed, 56 deletions(-) delete mode 100644 debian/patches/debian/Disable-optimized-GResource-embedding.patch diff --git a/debian/patches/debian/Disable-optimized-GResource-embedding.patch b/debian/patches/debian/Disable-optimized-GResource-embedding.patch deleted file mode 100644 index 9ced54453c..0000000000 --- a/debian/patches/debian/Disable-optimized-GResource-embedding.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Simon McVittie -Date: Sat, 8 Jan 2022 18:26:52 +0000 -Subject: 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 -Forwarded: no ---- - demos/gtk-demo/meson.build | 2 +- - demos/widget-factory/meson.build | 2 +- - gtk/meson.build | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build -index f594cd5..0200246 100644 ---- 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 9a083eb..162a66a 100644 ---- 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 9e01201..9b20626 100644 ---- 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 diff --git a/debian/patches/series b/debian/patches/series index f2ed1520c5..e4908f38da 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,3 @@ debian/Disable-web-fonts-for-now.patch debian/templates-Remove-html5shiv.patch debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch debian/Disable-clipboard-test.patch -debian/Disable-optimized-GResource-embedding.patch -- 2.30.2