From e26760436615892f1879438d2fe281b3a41f9b94 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Thu, 10 Apr 2025 19:29:08 +0900 Subject: [PATCH] Resolves: RHEL-83888 Bump to 1.5.32 --- .gitignore | 1 + ibus-1385349-segv-bus-proxy.patch | 11 ----------- ibus.spec | 20 +++++++++++++------- ibus.tar.gz.sum | 8 ++++---- sources | 2 +- 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 6bdb723..be542a5 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ ibus-1.3.6.tar.gz /ibus-1.5.30.tar.gz /ibus-1.5.31-beta1.tar.gz /ibus-1.5.31.tar.gz +/ibus-1.5.32.tar.gz diff --git a/ibus-1385349-segv-bus-proxy.patch b/ibus-1385349-segv-bus-proxy.patch index d4ea329..47a37bd 100644 --- a/ibus-1385349-segv-bus-proxy.patch +++ b/ibus-1385349-segv-bus-proxy.patch @@ -533,17 +533,6 @@ diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala index 26bded99..21ede7be 100644 --- a/ui/gtk3/switcher.vala +++ b/ui/gtk3/switcher.vala -@@ -176,8 +176,8 @@ class Switcher : Gtk.Window { - IBus.EngineDesc[] engines, - int index, - string input_context_path) { -- assert (m_loop == null); -- assert (index < engines.length); -+ assert(m_loop == null); -+ assert(index < engines.length); - - if (m_is_running) - return index; @@ -236,16 +236,18 @@ class Switcher : Gtk.Window { null, event, diff --git a/ibus.spec b/ibus.spec index 749bec9..1ff7c53 100644 --- a/ibus.spec +++ b/ibus.spec @@ -32,10 +32,11 @@ %global ibus_xinit_condition %ibus_panel_condition # FIXME: How to write a condition with multiple lines -%global ibus_panel_condition (%pcd1 or %pcd2 or %pcd3) +%global ibus_panel_condition (%pcd1 or %pcd2 or %pcd3 or %pcd4) %global pcd1 budgie-desktop or cinnamon or deepin-desktop or i3 %global pcd2 lxqt-session or lxsession or mate-panel or phosh %global pcd3 plasma-workspace or sugar or xfce4-session +%global pcd4 cosmic-panel or hyprland or sway %if %with_pkg_config %if %{with gtk2} @@ -49,7 +50,7 @@ %else %{!?gtk4_binary_version: %global gtk4_binary_version ?.?.?} %endif -%global glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999") +%global glib_ver %([ -a /usr/%{_lib}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999") %else %{!?gtk2_binary_version: %global gtk2_binary_version ?.?.?} %{!?gtk3_binary_version: %global gtk3_binary_version ?.?.?} @@ -60,9 +61,9 @@ %global dbus_python_version 0.83.0 Name: ibus -Version: 1.5.31 +Version: 1.5.32 # https://github.com/fedora-infra/rpmautospec/issues/101 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPL-2.1-or-later URL: https://github.com/ibus/%name/wiki @@ -110,6 +111,7 @@ BuildRequires: cldr-emoji-annotation BuildRequires: unicode-emoji BuildRequires: unicode-ucd BuildRequires: systemd +BuildRequires: wayland-protocols-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} %if %{with gtk2} @@ -334,8 +336,6 @@ fi # cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || : # cp client/gtk2/ibusim.c client/gtk3/ibusim.c || : # cp client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c || : -cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || : -cp client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c || : # prep test @@ -357,8 +357,8 @@ fi #autoreconf -f -i -v #make -C ui/gtk3 maintainer-clean-generic #make -C tools maintainer-clean-generic +#make -C portal maintainer-clean-generic #make -C src/compose maintainer-clean-generic -autoreconf -f -i -v %configure \ --disable-static \ %if %{with gtk2} @@ -384,7 +384,10 @@ autoreconf -f -i -v --enable-introspection \ --enable-install-tests \ %{nil} +# for 1385349-segv-bus-proxy.patch make -C ui/gtk3 maintainer-clean-generic +# for g_variant_builder_init_static in ibus-portal-dbus.c +make -C portal maintainer-clean-generic %make_build @@ -637,6 +640,9 @@ dconf update || : %{_datadir}/installed-tests/ibus %changelog +* Thu Apr 10 2025 Takao Fujiwara - 1.5.32-1 +- Resolves: RHEL-83888 Bump to 1.5.32 + * Thu Nov 14 2024 Takao Fujiwara - 1.5.31-3 - Rebuild to export GSK_RENDERER=cairo in CentOS but not RHEL for Vulkan diff --git a/ibus.tar.gz.sum b/ibus.tar.gz.sum index a26de42..2c0a6f3 100644 --- a/ibus.tar.gz.sum +++ b/ibus.tar.gz.sum @@ -1,4 +1,4 @@ -cksum 3075875856 4108303 ibus-1.5.31.tar.gz -sha1sum 02c754a119a1a1f88ed8d578148e8ec609496733 ibus-1.5.31.tar.gz -sha256sum 5093994c8342551134c81f2d271575efbc459bb756cef1173c22430c8601a1e1 ibus-1.5.31.tar.gz -sha512sum adfad740002662262981ddfcc3f6eb1e898433d3bd90b07535ceef367d496d3da3e0836e59133d0063caf2d3d55d0deb6cf18ae2807fdd1ce4afab84a7725ca5 ibus-1.5.31.tar.gz +cksum 968784061 4192999 ibus-1.5.32.tar.gz +sha1sum bd5061f17b183c93d439cd2d01642805a5df6497 ibus-1.5.32.tar.gz +sha256sum b24f41ae38b236b254c09f1a8f53c2354b69b0789e89cea888d0494b09d15d67 ibus-1.5.32.tar.gz +sha512sum 2c63cab1fe553cb8f3ce00d22f3374e396f8cb3f9e66b81b8c8c59d141eb68d036549460ac0b836e93b0261c185a33aba0fc930178fd04d142344324e1562b9c ibus-1.5.32.tar.gz diff --git a/sources b/sources index 692c996..343c967 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ibus-1.5.31.tar.gz) = adfad740002662262981ddfcc3f6eb1e898433d3bd90b07535ceef367d496d3da3e0836e59133d0063caf2d3d55d0deb6cf18ae2807fdd1ce4afab84a7725ca5 +SHA512 (ibus-1.5.32.tar.gz) = 2c63cab1fe553cb8f3ce00d22f3374e396f8cb3f9e66b81b8c8c59d141eb68d036549460ac0b836e93b0261c185a33aba0fc930178fd04d142344324e1562b9c