diff options
| author | Ross Burton <ross.burton@arm.com> | 2025-11-12 21:02:45 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-11-12 22:46:02 -0800 |
| commit | 08ce81505342cdcfa0e50e3a201b12ab46316c14 (patch) | |
| tree | da3fd08637e8dc6c2fe78fd8cde410fda8e7786e | |
| parent | 9e97fa325f726d785bed4b32ba5966bdc23d7bce (diff) | |
| download | meta-openembedded-08ce81505342cdcfa0e50e3a201b12ab46316c14.tar.gz | |
gnome-flashback: fix build with new ibus
Backport a patch to fix the build:
libinput-sources/gf-candidate-popup.c:124:11: error:
too many arguments to function 'ibus_attribute_get_type';
expected 0, have 1
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-flashback/files/ibus.patch | 27 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.46.0.bb | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-flashback/files/ibus.patch b/meta-gnome/recipes-gnome/gnome-flashback/files/ibus.patch new file mode 100644 index 0000000000..cd7f052ea5 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-flashback/files/ibus.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From 1bb758374500e247ffab150205d05b72bf21b561 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com> | ||
| 3 | Date: Thu, 23 Jan 2025 14:22:33 +0200 | ||
| 4 | Subject: [PATCH] input-sources: use correct function to get attribute type | ||
| 5 | |||
| 6 | Upstream-Status: Backport | ||
| 7 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 8 | --- | ||
| 9 | gnome-flashback/libinput-sources/gf-candidate-popup.c | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/gnome-flashback/libinput-sources/gf-candidate-popup.c b/gnome-flashback/libinput-sources/gf-candidate-popup.c | ||
| 13 | index a8bf5825..2c31e71a 100644 | ||
| 14 | --- a/gnome-flashback/libinput-sources/gf-candidate-popup.c | ||
| 15 | +++ b/gnome-flashback/libinput-sources/gf-candidate-popup.c | ||
| 16 | @@ -121,7 +121,7 @@ update_preedit_text_cb (IBusPanelService *service, | ||
| 17 | guint start; | ||
| 18 | guint end; | ||
| 19 | |||
| 20 | - if (ibus_attribute_get_type (attribute) != IBUS_ATTR_TYPE_BACKGROUND) | ||
| 21 | + if (ibus_attribute_get_attr_type (attribute) != IBUS_ATTR_TYPE_BACKGROUND) | ||
| 22 | continue; | ||
| 23 | |||
| 24 | start = ibus_attribute_get_start_index (attribute); | ||
| 25 | -- | ||
| 26 | GitLab | ||
| 27 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.46.0.bb b/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.46.0.bb index cf1122714f..f297394d00 100644 --- a/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.46.0.bb | |||
| @@ -19,6 +19,8 @@ DEPENDS += " \ | |||
| 19 | gnome-panel \ | 19 | gnome-panel \ |
| 20 | " | 20 | " |
| 21 | 21 | ||
| 22 | SRC_URI += "file://ibus.patch" | ||
| 23 | |||
| 22 | SRC_URI[archive.sha256sum] = "7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045" | 24 | SRC_URI[archive.sha256sum] = "7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045" |
| 23 | 25 | ||
| 24 | do_install:append() { | 26 | do_install:append() { |
