From 15f9f3c991a03e6bfc93c732dbc28094a7a5c712 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Sat, 13 Jul 2024 00:01:07 +0900 Subject: [PATCH] Bump to 1.5.31-beta1 --- .gitignore | 1 + ibus-1.5.31-beta1.tar.gz.sum | 4 ++++ ibus-1385349-segv-bus-proxy.patch | 30 +++++++++++++++--------------- ibus-HEAD.patch | 0 ibus.spec | 6 ++++-- sources | 2 +- 6 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 ibus-1.5.31-beta1.tar.gz.sum create mode 100644 ibus-HEAD.patch diff --git a/.gitignore b/.gitignore index fe96e3e..41a0c0b 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ ibus-1.3.6.tar.gz /ibus-1.5.30-rc2.tar.gz /ibus-1.5.30-rc3.tar.gz /ibus-1.5.30.tar.gz +/ibus-1.5.31-beta1.tar.gz diff --git a/ibus-1.5.31-beta1.tar.gz.sum b/ibus-1.5.31-beta1.tar.gz.sum new file mode 100644 index 0000000..80e3d93 --- /dev/null +++ b/ibus-1.5.31-beta1.tar.gz.sum @@ -0,0 +1,4 @@ +cksum 3313147683 4137125 ibus-1.5.31-beta1.tar.gz +sha1sum ca2f53757e6bbdaaa758441dfa53c5afb07e93a4 ibus-1.5.31-beta1.tar.gz +sha256sum f8c6560cd6ee4487ec568c85347091208759965660ced238c0fb2fcc049fe829 ibus-1.5.31-beta1.tar.gz +sha512sum 4aa27ce1df56afd0a75019fd0398bc892d1697dfe2fed20b3cc5fe5596d14c3531a430e83a513b79b7811abea01241091f5c0f51a38bddb4a24309cc58a76122 ibus-1.5.31-beta1.tar.gz diff --git a/ibus-1385349-segv-bus-proxy.patch b/ibus-1385349-segv-bus-proxy.patch index 7254d7d..eaf76cb 100644 --- a/ibus-1385349-segv-bus-proxy.patch +++ b/ibus-1385349-segv-bus-proxy.patch @@ -1,6 +1,6 @@ -From 68996e1430e3478bda1201d8e31a82679b2659a4 Mon Sep 17 00:00:00 2001 +From 1286ce92a5ccf68b5dcf1b4a7c0884ce29d5c51b Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Sat, 30 Sep 2023 11:50:14 +0900 +Date: Fri, 12 Jul 2024 23:30:25 +0900 Subject: [PATCH] Fix SEGV in bus_panel_proxy_focus_in() rhbz#1350291 SEGV in BUS_IS_CONNECTION(skip_connection) in @@ -68,10 +68,10 @@ BUG=rhbz#2239633 8 files changed, 208 insertions(+), 56 deletions(-) diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c -index 59787a80..af2fbde2 100644 +index 110d864a..391d576a 100644 --- a/bus/dbusimpl.c +++ b/bus/dbusimpl.c -@@ -610,6 +610,7 @@ static void +@@ -621,6 +621,7 @@ static void bus_dbus_impl_destroy (BusDBusImpl *dbus) { GList *p; @@ -79,7 +79,7 @@ index 59787a80..af2fbde2 100644 for (p = dbus->objects; p != NULL; p = p->next) { IBusService *object = (IBusService *) p->data; -@@ -633,6 +634,10 @@ bus_dbus_impl_destroy (BusDBusImpl *dbus) +@@ -644,6 +645,10 @@ bus_dbus_impl_destroy (BusDBusImpl *dbus) for (p = dbus->connections; p != NULL; p = p->next) { BusConnection *connection = BUS_CONNECTION (p->data); @@ -90,7 +90,7 @@ index 59787a80..af2fbde2 100644 g_signal_handlers_disconnect_by_func (connection, bus_dbus_impl_connection_destroy_cb, dbus); ibus_object_destroy (IBUS_OBJECT (connection)); -@@ -647,12 +652,39 @@ bus_dbus_impl_destroy (BusDBusImpl *dbus) +@@ -658,12 +663,39 @@ bus_dbus_impl_destroy (BusDBusImpl *dbus) dbus->unique_names = NULL; dbus->names = NULL; @@ -131,8 +131,8 @@ index 59787a80..af2fbde2 100644 +#undef BUS_DBUS_MUTEX_SAFE_CLEAR /* FIXME destruct _lock and _queue members. */ - IBUS_OBJECT_CLASS(bus_dbus_impl_parent_class)->destroy ((IBusObject *) dbus); -@@ -1483,13 +1515,20 @@ bus_dbus_impl_connection_filter_cb (GDBusConnection *dbus_connection, + IBUS_OBJECT_CLASS(bus_dbus_impl_parent_class)->destroy ((IBusObject *)dbus); +@@ -1539,13 +1571,20 @@ bus_dbus_impl_connection_filter_cb (GDBusConnection *dbus_connection, gboolean incoming, gpointer user_data) { @@ -451,10 +451,10 @@ index b7eb5961..3075d5d0 100644 static void diff --git a/portal/portal.c b/portal/portal.c -index c2e4fc7f..76ef4f0a 100644 +index 5cd38779..5110baad 100644 --- a/portal/portal.c +++ b/portal/portal.c -@@ -90,6 +90,11 @@ static void portal_context_g_signal (GDBusProxy *proxy, +@@ -92,6 +92,11 @@ static void portal_context_g_signal (GDBusProxy *proxy, GVariant *parameters, IBusPortalContext *portal_context); @@ -466,7 +466,7 @@ index c2e4fc7f..76ef4f0a 100644 G_DEFINE_TYPE_WITH_CODE (IBusPortalContext, ibus_portal_context, IBUS_DBUS_TYPE_INPUT_CONTEXT_SKELETON, -@@ -449,11 +454,6 @@ ibus_portal_context_new (IBusInputContext *context, +@@ -492,11 +497,6 @@ ibus_portal_context_new (IBusInputContext *context, g_strdup_printf (IBUS_PATH_INPUT_CONTEXT, portal_context->id); portal_context->service = ibus_dbus_service_skeleton_new (); @@ -478,7 +478,7 @@ index c2e4fc7f..76ef4f0a 100644 if (!g_dbus_interface_skeleton_export ( G_DBUS_INTERFACE_SKELETON (portal_context->service), connection, portal_context->object_path, -@@ -466,8 +466,17 @@ ibus_portal_context_new (IBusInputContext *context, +@@ -509,8 +509,17 @@ ibus_portal_context_new (IBusInputContext *context, return NULL; } @@ -496,7 +496,7 @@ index c2e4fc7f..76ef4f0a 100644 return portal_context; } -@@ -624,6 +633,12 @@ name_owner_changed (GDBusConnection *connection, +@@ -667,6 +676,12 @@ name_owner_changed (GDBusConnection *connection, IBusPortalContext *portal_context = l->data; next = l->next; @@ -542,7 +542,7 @@ index a6f2e8e6..b7a04081 100644 m_panel.load_settings(); } diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala -index e3fab8d9..a827094f 100644 +index 26bded99..21ede7be 100644 --- a/ui/gtk3/switcher.vala +++ b/ui/gtk3/switcher.vala @@ -176,8 +176,8 @@ class Switcher : Gtk.Window { @@ -646,5 +646,5 @@ index e3fab8d9..a827094f 100644 #if VALA_0_34 seat.ungrab(); -- -2.41.0 +2.45.0 diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch new file mode 100644 index 0000000..e69de29 diff --git a/ibus.spec b/ibus.spec index 0286f4d..976b84f 100644 --- a/ibus.spec +++ b/ibus.spec @@ -59,7 +59,7 @@ %global dbus_python_version 0.83.0 Name: ibus -Version: 1.5.30 +Version: 1.5.31~beta1 # https://github.com/fedora-infra/rpmautospec/issues/101 Release: 6%{?dist} Summary: Intelligent Input Bus for Linux OS @@ -70,7 +70,6 @@ Source1: https://github.com/ibus/%name/releases/download/%{source_version Source2: %{name}-xinput Source3: %{name}.conf.5 # Patch0: %%{name}-HEAD.patch -Patch0: %{name}-HEAD.patch # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577 Patch1: %{name}-1385349-segv-bus-proxy.patch %if %{without xinit} @@ -625,6 +624,9 @@ dconf update || : %{_datadir}/installed-tests/ibus %changelog +* Fri Jul 12 2024 Takao Fujiwara - 1.5.31~beta1-1 +- Bump to 1.5.31-beta1 + * Mon Jun 10 2024 Python Maint - 1.5.30-6 - Rebuilt for Python 3.13 diff --git a/sources b/sources index e378b48..1bd563d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ibus-1.5.30.tar.gz) = cbed37bf62e8d8593c838f8ef7fe0b22bf8f4a661b887fc7be2f2768dda912075abdf3070c22b9699def90e7002aaaf7394f5fc590e12ef6ebb2bb5161cc29a0 +SHA512 (ibus-1.5.31-beta1.tar.gz) = 4aa27ce1df56afd0a75019fd0398bc892d1697dfe2fed20b3cc5fe5596d14c3531a430e83a513b79b7811abea01241091f5c0f51a38bddb4a24309cc58a76122