[gnome-build-meta/abderrahim/41.2: 4/4] core/gnome-builder.bst: add patch to fix build on i386
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/41.2: 4/4] core/gnome-builder.bst: add patch to fix build on i386
- Date: Thu, 9 Dec 2021 08:16:42 +0000 (UTC)
commit 5066ec813911b510c82773d8e479bd3d254575d2
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Wed Dec 8 16:13:36 2021 +0100
core/gnome-builder.bst: add patch to fix build on i386
Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1401>
elements/core/gnome-builder.bst | 3 +++
files/gnome-builder/468.patch | 26 ++++++++++++++++++++++++++
2 files changed, 29 insertions(+)
---
diff --git a/elements/core/gnome-builder.bst b/elements/core/gnome-builder.bst
index 42719e3bf..098b9cc17 100644
--- a/elements/core/gnome-builder.bst
+++ b/elements/core/gnome-builder.bst
@@ -4,6 +4,9 @@ sources:
- kind: tar
url: gnome_downloads:gnome-builder/41/gnome-builder-41.3.tar.xz
ref: e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1
+- kind: patch
+ path: files/gnome-builder/468.patch
+
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/files/gnome-builder/468.patch b/files/gnome-builder/468.patch
new file mode 100644
index 000000000..101c6492c
--- /dev/null
+++ b/files/gnome-builder/468.patch
@@ -0,0 +1,26 @@
+From fcf976d5fcfb81d14ea0ec9b9909bc9b8dc52a81 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro redhat com>
+Date: Fri, 19 Nov 2021 08:27:28 -0600
+Subject: [PATCH] flatpak: attempt to fix build on i686
+
+There may be more problems, but this should fix the first build failure.
+---
+ src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
+index 0f2da7456..6e9d82732 100644
+--- a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
++++ b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
+@@ -597,7 +597,7 @@ is_known_worker (GTask *task,
+ }
+
+ finish:
+- g_debug ("RuntimeIsKnown => (%d, %"G_GSIZE_FORMAT")", found, download_size);
++ g_debug ("RuntimeIsKnown => (%d, %"G_GINT64_FORMAT")", found, download_size);
+ ipc_flatpak_service_complete_runtime_is_known (g_task_get_source_object (task),
+ g_steal_pointer (&state->invocation),
+ found,
+--
+GitLab
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]