Bump to 1.5.26

- Revert CCedilla change for pt-BR

.gitignore

@@ -60,3 +60,4 @@ ibus-1.3.6.tar.gz
 /ibus-1.5.23.tar.gz
 /ibus-1.5.24.tar.gz
 /ibus-1.5.25.tar.gz
+/ibus-1.5.26.tar.gz

ibus-HEAD.patch

@@ -0,0 +1,78 @@
+From 1b5b9548ad418765717ce1fbdc70b3f3eaae67fc Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Mon, 14 Mar 2022 14:25:10 +0900
+Subject: [PATCH] client/gtk2: Revert CCedilla change for pt-BR
+
+gtk_im_context_simple_add_table() is deprecated in GTK4.
+I decide to delete gtk_im_context_simple_add_table() here because
+the change 03c9e591430c62354bbf26ef7bd4a2e6acfb7c8f is no longer needed
+because IBusEngineSimple has implemented to load pt_br compose key
+by locale
+
+BUG=chromium-os:11421
+BUG=http://codereview.appspot.com/3989060
+---
+ client/gtk2/ibusimcontext.c | 33 +--------------------------------
+ 1 file changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index a5e5e792..e314ae98 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -2,7 +2,7 @@
+ /* vim:set et sts=4: */
+ /* ibus - The Input Bus
+  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+- * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
++ * Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+  * Copyright (C) 2008-2021 Red Hat, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+@@ -874,33 +874,6 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
+     g_bus_unwatch_name (_daemon_name_watch_id);
+ }
+ 
+-/* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421.
+- * Overwrite the original Gtk+'s compose table in gtk+-2.x.y/gtk/gtkimcontextsimple.c. */
+-
+-/* The difference between this and the default input method is the handling
+- * of C+acute - this method produces C WITH CEDILLA rather than C WITH ACUTE.
+- * For languages that use CCedilla and not acute, this is the preferred mapping,
+- * and is particularly important for pt_BR, where the us-intl keyboard is
+- * used extensively.
+- */
+-static guint16 cedilla_compose_seqs[] = {
+-#ifdef DEPRECATED_GDK_KEYSYMS
+-  GDK_dead_acute,	GDK_C,	0,	0,	0,	0x00C7,	/* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
+-  GDK_dead_acute,	GDK_c,	0,	0,	0,	0x00E7,	/* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
+-  GDK_Multi_key,	GDK_apostrophe,	GDK_C,  0,      0,      0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
+-  GDK_Multi_key,	GDK_apostrophe,	GDK_c,  0,      0,      0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
+-  GDK_Multi_key,	GDK_C,  GDK_apostrophe,	0,      0,      0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
+-  GDK_Multi_key,	GDK_c,  GDK_apostrophe,	0,      0,      0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
+-#else
+-  GDK_KEY_dead_acute,	GDK_KEY_C,	0,	0,	0,	0x00C7,	/* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
+-  GDK_KEY_dead_acute,	GDK_KEY_c,	0,	0,	0,	0x00E7,	/* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
+-  GDK_KEY_Multi_key,	GDK_KEY_apostrophe,	GDK_KEY_C,  0,      0,      0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
+-  GDK_KEY_Multi_key,	GDK_KEY_apostrophe,	GDK_KEY_c,  0,      0,      0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
+-  GDK_KEY_Multi_key,	GDK_KEY_C,  GDK_KEY_apostrophe,	0,      0,      0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
+-  GDK_KEY_Multi_key,	GDK_KEY_c,  GDK_KEY_apostrophe,	0,      0,      0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
+-#endif
+-};
+-
+ static void
+ ibus_im_context_init (GObject *obj)
+ {
+@@ -936,10 +909,6 @@ ibus_im_context_init (GObject *obj)
+ 
+     // Create slave im context
+     ibusimcontext->slave = gtk_im_context_simple_new ();
+-    gtk_im_context_simple_add_table (GTK_IM_CONTEXT_SIMPLE (ibusimcontext->slave),
+-                                     cedilla_compose_seqs,
+-                                     4,
+-                                     G_N_ELEMENTS (cedilla_compose_seqs) / (4 + 2));
+ 
+     g_signal_connect (ibusimcontext->slave,
+                       "commit",
+-- 
+2.34.1
+

ibus.spec

@@ -38,8 +38,8 @@
 %global dbus_python_version 0.83.0
 
 Name:           ibus
-Version:        1.5.25
+Version:        1.5.26
-Release:        13%{?dist}
+Release:        1%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
@@ -321,7 +321,6 @@ autoreconf -f -i -v
     --enable-introspection \
     --enable-install-tests \
     %{nil}
-make -C ui/gtk3 maintainer-clean-generic
 
 %make_build
 
@@ -522,6 +521,10 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Mon Mar 14 2022 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.26-1
+- Bump to 1.5.26
+- Revert CCedilla change for pt-BR
+
 * Fri Mar 04 2022 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.25-13
 - Check XDG_SESSION_DESKTOP for Plasma desktop
 

sources

@@ -1 +1 @@
-SHA512 (ibus-1.5.25.tar.gz) = 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6
+SHA512 (ibus-1.5.26.tar.gz) = 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714