automatic version update by autodist [release 1.5.31-1mamba;Sat Nov 09 2024]

add gtk2, gtk3 and wayland subpackages [release 1.5.26-2mamba;Fri Jun 24 2022]

ibus-1.5.23-vala-0.50.2.patch

@@ -1,104 +0,0 @@
-From dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 30 Sep 2020 20:35:23 +0900
-Subject: [PATCH] ui/gtk3: Fix arguments in GLib.DBusSignalCallback for Vala
- 0.50
-
-BUG=https://github.com/ibus/ibus/issues/2265
----
- ui/gtk3/application.vala | 22 +++++++++++-----------
- ui/gtk3/extension.vala   | 22 +++++++++++-----------
- 2 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
-index cc9ee54c9..da65301b4 100644
---- a/ui/gtk3/application.vala
-+++ b/ui/gtk3/application.vala
-@@ -3,7 +3,7 @@
-  * ibus - The Input Bus
-  *
-  * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
-- * Copyright(c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright(c) 2017-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -69,22 +69,22 @@ class Application {
-     }
- 
-     private void bus_name_acquired_cb(DBusConnection connection,
--                                      string sender_name,
--                                      string object_path,
--                                      string interface_name,
--                                      string signal_name,
--                                      Variant parameters) {
-+                                      string?        sender_name,
-+                                      string         object_path,
-+                                      string         interface_name,
-+                                      string         signal_name,
-+                                      Variant        parameters) {
-         debug("signal_name = %s", signal_name);
-         m_panel = new Panel(m_bus);
-         m_panel.load_settings();
-     }
- 
-     private void bus_name_lost_cb(DBusConnection connection,
--                                  string sender_name,
--                                  string object_path,
--                                  string interface_name,
--                                  string signal_name,
--                                  Variant parameters) {
-+                                  string?        sender_name,
-+                                  string         object_path,
-+                                  string         interface_name,
-+                                  string         signal_name,
-+                                  Variant        parameters) {
-         // "Destroy" dbus method was called before this callback is called.
-         // "Destroy" dbus method -> ibus_service_destroy()
-         // -> g_dbus_connection_unregister_object()
-diff --git a/ui/gtk3/extension.vala b/ui/gtk3/extension.vala
-index ea3cd4647..a6f2e8e6a 100644
---- a/ui/gtk3/extension.vala
-+++ b/ui/gtk3/extension.vala
-@@ -3,7 +3,7 @@
-  * ibus - The Input Bus
-  *
-  * Copyright(c) 2018 Peng Huang <shawn.p.huang@gmail.com>
-- * Copyright(c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright(c) 2018-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -67,22 +67,22 @@ class ExtensionGtk : Gtk.Application {
- 
- 
-     private void bus_name_acquired_cb(DBusConnection connection,
--                                      string sender_name,
--                                      string object_path,
--                                      string interface_name,
--                                      string signal_name,
--                                      Variant parameters) {
-+                                      string?        sender_name,
-+                                      string         object_path,
-+                                      string         interface_name,
-+                                      string         signal_name,
-+                                      Variant        parameters) {
-         debug("signal_name = %s", signal_name);
-         m_panel = new PanelBinding(m_bus, this);
-         m_panel.load_settings();
-     }
- 
-     private void bus_name_lost_cb(DBusConnection connection,
--                                  string sender_name,
--                                  string object_path,
--                                  string interface_name,
--                                  string signal_name,
--                                  Variant parameters) {
-+                                  string?        sender_name,
-+                                  string         object_path,
-+                                  string         interface_name,
-+                                  string         signal_name,
-+                                  Variant        parameters) {
-         // "Destroy" dbus method was called before this callback is called.
-         // "Destroy" dbus method -> ibus_service_destroy()
-         // -> g_dbus_connection_unregister_object()

ibus.spec

@@ -1,5 +1,5 @@
 Name:          ibus
-Version:       1.5.25
+Version:       1.5.31
 Release:       1mamba
 Summary:       Intelligent Input Bus for Linux / Unix OS
 Group:         System/Servers
@@ -8,39 +8,32 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://code.google.com/archive/p/ibus
 Source:        https://github.com/ibus/ibus.git/%{version}/ibus-%{version}.tar.bz2
-Patch0:        ibus-1.5.23-vala-0.50.2.patch
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libX11-devel
-BuildRequires: libXau-devel
-BuildRequires: libXdmcp-devel
-BuildRequires: libXext-devel
 BuildRequires: libXfixes-devel
 BuildRequires: libXi-devel
-BuildRequires: libatk-devel
-BuildRequires: libbrotli-devel
-BuildRequires: libbsd-devel
-BuildRequires: libbzip2-devel
+BuildRequires: libat-spi2-core-devel
 BuildRequires: libcairo-devel
 BuildRequires: libdbus-devel
+BuildRequires: libdbusmenu-devel
+BuildRequires: libdbusmenu-gtk3-devel
 BuildRequires: libdconf-devel
-BuildRequires: libexpat-devel
-BuildRequires: libffi-devel
 BuildRequires: libfontconfig-devel
 BuildRequires: libfreetype-devel
 BuildRequires: libgdk-pixbuf-devel
 BuildRequires: libglib-devel
-BuildRequires: libgraphite2-devel
+BuildRequires: libgraphene-devel
+BuildRequires: libgtk-devel
 BuildRequires: libgtk2-devel
 BuildRequires: libgtk3-devel
 BuildRequires: libharfbuzz-devel
+BuildRequires: libnotify-devel
 BuildRequires: libpango-devel
-BuildRequires: libpcre-devel
-BuildRequires: libpng-devel
-BuildRequires: libsystemd-devel
+BuildRequires: libpython311-devel
+BuildRequires: libvulkan-devel
 BuildRequires: libwayland-devel
-BuildRequires: libxcb-devel
 BuildRequires: libxkbcommon-devel
 BuildRequires: libz-devel
 ## AUTOBUILDREQ-END
@@ -52,6 +45,9 @@ BuildRequires: cldr-emoji-annotation
 BuildRequires: python
 BuildRequires: python3
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      %{name}-gtk2 = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      %{name}-gtk3 = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      %{name}-wayland = %{?epoch:%epoch:}%{version}-%{release}
 
 %description
 Intelligent Input Bus for Linux / Unix OS.
@@ -64,20 +60,53 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 %description -n lib%{name}
 This package contains shared libraries for %{name}.
 
-%package -n python-ibus
-Group:         System/Libraries
-Summary:       Python bindings for %{name}
+%package desktop
+Group:         Graphical Desktop/Applications/Configuration
+Summary:       Desktop menu entries for %{name} tools
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
-Requires:      python-dbus
 
-%description -n python-ibus
-Python bindings for %{name}.
+%description desktop
+Desktop menu entries for %{name} tools.
+
+%package gtk2
+Group:         System/Libraries
+Summary:       Gtk2 bindings for %{name}
+Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description gtk2
+Gtk2 bindings for %{name}.
+
+%package gtk3
+Group:         System/Libraries
+Summary:       Gtk3 bindings for %{name}
+Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description gtk3
+Gtk3 bindings for %{name}.
+
+%package gtk4
+Group:         System/Libraries
+Summary:       Gtk4 bindings for %{name}
+Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description gtk4
+Gtk4 bindings for %{name}.
+
+%package wayland
+Group:         System/Libraries
+Summary:       Wayland bindings for %{name}
+Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description wayland
+Wayland bindings for %{name}.
 
 %package -n python-ibus-py3
 Group:         System/Libraries
 Summary:       Python 3 bindings for %{name}
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      python-dbus-py3
+Provides:      python-ibus
+Obsoletes:     python-ibus < 1.5.30
 
 %description -n python-ibus-py3
 Python 3 bindings for %{name}.
@@ -104,24 +133,29 @@ This package includes the %{name} API documentation.
 
 %prep
 %setup -q
-#%patch0 -p1
-
+#-D -T
+#:<< _EOF
 ./autogen.sh
 
 sed -i "s|/usr/bin/python$|%{__python3}|" engine/gensimple.py
 
+%ifarch arm aarch64
+# 1.5.26: workaround
+sed -i "s|umount|: #umount|" data/dconf/make-dconf-override-db.sh
+%endif
+
 %build
+#:<< _EOF
 %configure \
    --enable-dconf \
    --enable-gtk-doc \
    --enable-wayland \
    --disable-memconf \
    --enable-ui \
-   --with-python=%{__python3}
+   --with-python=%{__python3} \
+   --disable-python2
 
-#   --enable-python-library \
-
-%make
+%make -j1
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -144,23 +178,29 @@ if [ $1 -eq 0 ]; then
 fi
 :
 
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
 
 %files -f %{name}10.lang
 %defattr(-,root,root)
 %dir %{_sysconfdir}/dconf/db/ibus.d
 %{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
 %{_sysconfdir}/dconf/profile/ibus
+%{_sysconfdir}/xdg/Xwayland-session.d/10-ibus-x11
 %{_bindir}/ibus
 %{_bindir}/ibus-daemon
 %{_bindir}/ibus-setup
+%{_userunitdir}/org.freedesktop.IBus.session.*.service
+%{_userunitdir}/gnome-session.target.wants/org.freedesktop.IBus.session.GNOME.service
+%{_libexecdir}/ibus-engine-simple
+%{_libexecdir}/ibus-dconf
+%{_libexecdir}/ibus-portal
+%{_libexecdir}/ibus-extension-gtk3
+%{_libexecdir}/ibus-ui-emojier
+%{_libexecdir}/ibus-ui-gtk3
+%{_libexecdir}/ibus-x11
 %{_datadir}/bash-completion/completions/ibus.bash
-%{_datadir}/gir-1.0/IBus-1.0.gir
 %dir %{_datadir}/ibus
 %dir %{_datadir}/ibus/component
 %{_datadir}/ibus/component/*.xml
-%{_datadir}/applications/org.freedesktop.IBus.*.desktop
 %{_datadir}/dbus-1/services/org.freedesktop.IBus.service
 %{_datadir}/dbus-1/services/org.freedesktop.portal.IBus.service
 %{_datadir}/gettext/its/ibus.*
@@ -181,37 +221,46 @@ fi
 %{_mandir}/man5/ibus.5*
 %{_mandir}/man7/ibus-emoji.7*
 
-%ifnarch aarch64
-%files -n python-%{name}
-%defattr(-,root,root)
-%{python_sitearch}/gi/overrides/*
-%endif
-
 %files -n python-%{name}-py3
 %defattr(-,root,root)
 %{python3_sitearch}/gi/overrides/*
 
 %files -n lib%{name}
 %defattr(-,root,root)
-%{_libdir}/gtk-2.0/2.10.0/immodules/im-ibus.la
-%{_libdir}/gtk-2.0/2.10.0/immodules/im-ibus.so
-%{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.la
-%{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so
-%{_libdir}/girepository-1.0/IBus-1.0.typelib
 %{_libdir}/libibus-1.0.so.*
-%{_libexecdir}/ibus-*
+%{_libdir}/girepository-1.0/IBus-1.0.typelib
 %doc AUTHORS COPYING
 
+%files desktop
+%defattr(-,root,root)
+%{_datadir}/applications/org.freedesktop.IBus.*.desktop
+
+%files gtk2
+%defattr(-,root,root)
+%{_libdir}/gtk-2.0/2.10.0/immodules/im-ibus.so
+
+%files gtk3
+%defattr(-,root,root)
+%{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so
+
+%files gtk4
+%defattr(-,root,root)
+%{_libdir}/gtk-4.0/4.0.0/immodules/libim-ibus.so
+
+%files wayland
+%defattr(-,root,root)
+%{_libexecdir}/ibus-wayland
+
 %files -n lib%{name}-devel
 %defattr(-,root,root)
 %dir %{_includedir}/ibus-1.0
 %{_includedir}/ibus-1.0/*.h
-%{_libdir}/libibus-1.0.la
 %{_libdir}/libibus-1.0.so
+%{_datadir}/gir-1.0/IBus-1.0.gir
 %{_datadir}/vala/vapi/ibus-1.0.deps
 %{_datadir}/vala/vapi/ibus-1.0.vapi
 %{_libdir}/pkgconfig/ibus-1.0.pc
-%doc ChangeLog README
+#%doc ChangeLog README
 
 %files apidocs
 %defattr(-,root,root)
@@ -219,6 +268,31 @@ fi
 %{_datadir}/gtk-doc/html/ibus/*
 
 %changelog
+* Sat Nov 09 2024 Automatic Build System <autodist@openmamba.org> 1.5.31-1mamba
+- automatic version update by autodist
+
+* Sun May 26 2024 Automatic Build System <autodist@openmamba.org> 1.5.30-1mamba
+- automatic version update by autodist
+
+* Fri Nov 17 2023 Automatic Build System <autodist@mambasoft.it> 1.5.29-1mamba
+- automatic version update by autodist
+
+* Fri Feb 24 2023 Automatic Build System <autodist@mambasoft.it> 1.5.28-1mamba
+- automatic version update by autodist
+
+* Tue Aug 23 2022 Automatic Build System <autodist@mambasoft.it> 1.5.27-1mamba
+- automatic version update by autodist
+
+* Tue Jul 12 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.26-3mamba
+- move desktop menu files to -desktop subpackage; libibus: require ibus
+
+* Fri Jun 24 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.26-2mamba
+- libibus: don't require ibus so that it doesn't get install in default desktops
+- add gtk2, gtk3 and wayland subpackages
+
+* Sat Jun 04 2022 Automatic Build System <autodist@mambasoft.it> 1.5.26-1mamba
+- automatic version update by autodist
+
 * Sat Aug 21 2021 Automatic Build System <autodist@mambasoft.it> 1.5.25-1mamba
 - automatic version update by autodist