Merge pull request #2 from djam/ibus:rosa2023.1

Backports and update

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  ibus-1.5.24.tar.gz: 9603f9880ecc955e3125e78151ed36f6f98cd871
+  ibus-1.5.29.tar.gz: 1c788992f3ac5eea13865a244ed35cc71ddeffa0

ibus.spec

@@ -6,7 +6,7 @@
 
 Summary:	A next generation input framework
 Name:		ibus
-Version:	1.5.24
+Version:	1.5.29
 Release:	1
 License:	GPLv2+
 Group:		System/Internationalization
@@ -24,6 +24,8 @@ BuildRequires:	gettext-devel
 BuildRequires:	pkgconfig(dbus-1)
 BuildRequires:	pkgconfig(dbus-glib-1)
 BuildRequires:	pkgconfig(dbus-python)
+BuildRequires:	pkgconfig(dbusmenu-glib-0.4)
+BuildRequires:	pkgconfig(dbusmenu-gtk3-0.4)
 BuildRequires:	pkgconfig(dconf)
 BuildRequires:	pkgconfig(gdk-2.0)
 BuildRequires:	pkgconfig(gdk-3.0)
@@ -45,13 +47,14 @@ BuildRequires:	wayland-devel
 BuildRequires:	cldr-emoji-annotation
 BuildRequires:	unicode-emoji
 BuildRequires:	unicode-ucd
+BuildRequires:	libx11-common
 Requires:	iso-codes
 Requires:	librsvg
 Requires:	python3-gobject
 Requires:	python3-dbus
 Requires:	python3-notify
 Requires:	python3-pyxdg
-Recommends:	%{name}-gtk = %{EVRD}
+Requires:	%{name}-gtk = %{EVRD}
 
 %description
 IBus is a next generation input framework.
@@ -60,6 +63,7 @@ IBus is a next generation input framework.
 %doc AUTHORS ChangeLog NEWS README
 %{_sysconfdir}/dconf/profile/ibus
 %{_sysconfdir}/dconf/db/ibus.d
+%{_sysconfdir}/xdg/Xwayland-session.d/10-ibus-x11
 %{_bindir}/*
 %{_libexecdir}/ibus-dconf
 %{_libexecdir}/ibus-extension-gtk3
@@ -67,7 +71,6 @@ IBus is a next generation input framework.
 %{_libexecdir}/ibus-ui-emojier
 %{_libexecdir}/ibus-wayland
 %{_libexecdir}/ibus-portal
-# %{_libexecdir}/ibus-ui-gtk*
 %{_libexecdir}/ibus-engine-simple
 %exclude %{_datadir}/ibus/component/gtkpanel.xml
 %{_datadir}/applications/*.desktop
@@ -82,6 +85,9 @@ IBus is a next generation input framework.
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man7/*
+%{_userunitdir}/gnome-session.target.wants/org.freedesktop.IBus.session.GNOME.service
+%{_userunitdir}/org.freedesktop.IBus.session.GNOME.service
+%{_userunitdir}/org.freedesktop.IBus.session.generic.service
 
 %preun
 %preun_uninstall_gconf_schemas ibus
@@ -203,17 +209,18 @@ Python bindings to ibus
 %setup -q
 %autopatch -p1
 
+
 %build
+autoreconf -vfi
 %configure \
-        --enable-vala=yes \
+	--enable-vala=yes \
-        --enable-gtk3 \
+	--enable-gtk3 \
-        --enable-dconf \
+	--enable-dconf \
-        --disable-gconf \
+	--with-python=python3 \
-        --with-python=python3 \
+	--disable-python2 \
-        --enable-python-library \
+	--disable-python-library \
-        --disable-python2 \
+	--disable-dbus-python-check \
-        --disable-dbus-python-check \
+	--enable-wayland
-        --enable-wayland
 
 %make