diff mbox series

[meta-gnome,18/26] gnome-flashback: upgrade 3.46.0 -> 3.58.0

Message ID 20261021100717.11068-18-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-gnome,01/26] eog: upgrade 50.3 -> 50.4 | expand

Commit Message

Markus Volk Oct. 21, 2026, 10:07 a.m. UTC
Drop ibus.patch, a backport that is part of the release.

AI-Generated: Uses Claude Code (Claude Opus 5.5)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../gnome-flashback/files/ibus.patch          | 27 -------------------
 ...ck_3.46.0.bb => gnome-flashback_3.58.0.bb} |  4 +--
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gnome-flashback/files/ibus.patch
 rename meta-gnome/recipes-gnome/gnome-flashback/{gnome-flashback_3.46.0.bb => gnome-flashback_3.58.0.bb} (87%)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-flashback/files/ibus.patch b/meta-gnome/recipes-gnome/gnome-flashback/files/ibus.patch
deleted file mode 100644
index cd7f052ea5..0000000000
--- a/meta-gnome/recipes-gnome/gnome-flashback/files/ibus.patch
+++ /dev/null
@@ -1,27 +0,0 @@ 
-From 1bb758374500e247ffab150205d05b72bf21b561 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
-Date: Thu, 23 Jan 2025 14:22:33 +0200
-Subject: [PATCH] input-sources: use correct function to get attribute type
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- gnome-flashback/libinput-sources/gf-candidate-popup.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gnome-flashback/libinput-sources/gf-candidate-popup.c b/gnome-flashback/libinput-sources/gf-candidate-popup.c
-index a8bf5825..2c31e71a 100644
---- a/gnome-flashback/libinput-sources/gf-candidate-popup.c
-+++ b/gnome-flashback/libinput-sources/gf-candidate-popup.c
-@@ -121,7 +121,7 @@ update_preedit_text_cb (IBusPanelService *service,
-       guint start;
-       guint end;
- 
--      if (ibus_attribute_get_type (attribute) != IBUS_ATTR_TYPE_BACKGROUND)
-+      if (ibus_attribute_get_attr_type (attribute) != IBUS_ATTR_TYPE_BACKGROUND)
-         continue;
- 
-       start = ibus_attribute_get_start_index (attribute);
--- 
-GitLab
-
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.58.0.bb
similarity index 87%
rename from meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.46.0.bb
rename to meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.58.0.bb
index f297394d00..eb1fb3bd23 100644
--- a/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.58.0.bb
@@ -19,9 +19,7 @@  DEPENDS += " \
     gnome-panel \
 "
 
-SRC_URI += "file://ibus.patch"
-
-SRC_URI[archive.sha256sum] = "7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045"
+SRC_URI[archive.sha256sum] = "aaa23e7042477e741f24279b468b9d20af4ec195ee43b3d312cdaaf84d98c321"
 
 do_install:append() {
     # no oe-layer has compiz -> remove dead session